Browse Source

Clean code when showing the session extra fields - refs BT#9413

Angel Fernando Quiroz Campos 9 years ago
parent
commit
ee972e15ad
1 changed files with 32 additions and 24 deletions
  1. 32 24
      main/inc/lib/extra_field.lib.php

+ 32 - 24
main/inc/lib/extra_field.lib.php

@@ -2053,35 +2053,43 @@ EOF;
                     }
                     break;
                 case ExtraField::FIELD_TYPE_FILE_IMAGE:
-                    if ($valueData !== false && !empty($valueData['value'])) {
-                        if (file_exists(api_get_path(SYS_UPLOAD_PATH) . $valueData['value'])) {
-                            $image = Display::img(
-                                api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
-                                $field['display_text'],
-                                array('width' => '300')
-                            );
+                    if ($valueData === false || empty($valueData['value'])) {
+                        break;
+                    }
 
-                            $displayedValue = Display::url(
-                                $image,
-                                api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
-                                array('target' => '_blank')
-                            );
-                        }
+                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH) . $valueData['value'])) {
+                        break;
                     }
+
+                    $image = Display::img(
+                        api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
+                        $field['display_text'],
+                        array('width' => '300')
+                    );
+
+                    $displayedValue = Display::url(
+                        $image,
+                        api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
+                        array('target' => '_blank')
+                    );
                     break;
                 case ExtraField::FIELD_TYPE_FILE:
-                    if ($valueData !== false && !empty($valueData['value'])) {
-                        if (file_exists(api_get_path(SYS_UPLOAD_PATH) . $valueData['value'])) {
-                            $displayedValue = Display::url(
-                                get_lang('Download'),
-                                api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
-                                array(
-                                    'title' => $field['display_text'],
-                                    'target' => '_blank'
-                                )
-                            );
-                        }
+                    if ($valueData === false || empty($valueData['value'])) {
+                        break;
                     }
+
+                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH) . $valueData['value'])) {
+                        break;
+                    }
+
+                    $displayedValue = Display::url(
+                        get_lang('Download'),
+                        api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
+                        array(
+                            'title' => $field['display_text'],
+                            'target' => '_blank'
+                        )
+                    );
                     break;
                 default:
                     $displayedValue = $valueData['value'];