From 2083ff3f91f69b911184a7834268e1dc9d5802bd Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Wed, 10 Dec 2014 10:20:51 -0500
Subject: [PATCH] Fix session extra fields - refs BT#9089

---
 main/admin/resume_session.php          | 22 +++++++++++++---------
 main/admin/session_add.php             |  2 +-
 main/inc/lib/extra_field.lib.php       | 12 +++++++-----
 main/inc/lib/extra_field_value.lib.php | 24 +++++++++++++-----------
 4 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/main/admin/resume_session.php b/main/admin/resume_session.php
index 726b98efa4..93f7ef5b8a 100755
--- a/main/admin/resume_session.php
+++ b/main/admin/resume_session.php
@@ -240,17 +240,21 @@ foreach ($sessionFields as $field) {
                         }
                         break;
                     case ExtraField::FIELD_TYPE_DATE:
-                        $extraFieldDate = str_replace(';', '-', $sesionValueData['field_value']);
-
-                        echo api_format_date($extraFieldDate, DATE_FORMAT_LONG_NO_DAY);
+                        if ($sesionValueData !== false && !empty($sesionValueData['field_value'])) {
+                            echo api_format_date($sesionValueData['field_value'], DATE_FORMAT_LONG_NO_DAY);
+                        } else {
+                            echo get_lang('None');
+                        }
                         break;
                     case ExtraField::FIELD_TYPE_FILE_IMAGE:
-                        if (file_exists(WEB_CODE_PATH) . $sesionValueData['field_value']) {
-                            echo Display::img(
-                                api_get_path(WEB_CODE_PATH) . $sesionValueData['field_value'],
-                                $field['field_display_text'],
-                                array('width' => '300')
-                            );
+                        if ($sesionValueData !== false && !empty($sesionValueData['field_value'])) {
+                            if (file_exists(api_get_path(SYS_CODE_PATH) . $sesionValueData['field_value'])) {
+                                echo Display::img(
+                                    api_get_path(WEB_CODE_PATH) . $sesionValueData['field_value'],
+                                    $field['field_display_text'],
+                                    array('width' => '300')
+                                );
+                            }
                         }
                         break;
                     default:
diff --git a/main/admin/session_add.php b/main/admin/session_add.php
index 44e019aec5..b3a07f27fd 100755
--- a/main/admin/session_add.php
+++ b/main/admin/session_add.php
@@ -433,7 +433,7 @@ if ($form->validate()) {
 
     if ($return == strval(intval($return))) {
         // integer => no error on session creation
-        header('Location: add_courses_to_session.php?id_session=' . $return . '&add=true&msg=');
+//        header('Location: add_courses_to_session.php?id_session=' . $return . '&add=true&msg=');
         exit();
     }
 }
diff --git a/main/inc/lib/extra_field.lib.php b/main/inc/lib/extra_field.lib.php
index fb17741cb5..b9e4866bce 100755
--- a/main/inc/lib/extra_field.lib.php
+++ b/main/inc/lib/extra_field.lib.php
@@ -1023,11 +1023,13 @@ EOF;
                         );
 
                         if (is_array($extraData) && array_key_exists($fieldVariable, $extraData)) {
-                            $fieldTexts[] = Display::img(
-                                api_get_path(WEB_CODE_PATH) . $extraData[$fieldVariable],
-                                '',
-                                array('width' => '300')
-                            );
+                            if (file_exists(api_get_path(SYS_CODE_PATH) . $extraData[$fieldVariable])) {
+                                $fieldTexts[] = Display::img(
+                                    api_get_path(WEB_CODE_PATH) . $extraData[$fieldVariable],
+                                    'ASDASD',
+                                    array('width' => '300')
+                                );
+                            }
                         }
 
                         $form->addElement(
diff --git a/main/inc/lib/extra_field_value.lib.php b/main/inc/lib/extra_field_value.lib.php
index 9e4cfd1b0e..b450c5fef0 100755
--- a/main/inc/lib/extra_field_value.lib.php
+++ b/main/inc/lib/extra_field_value.lib.php
@@ -163,20 +163,22 @@ class ExtraFieldValue extends Model
                                 mkdir($sysCodePath . $fileDir, $dirPermissions, true);
                             }
 
-                            $imageExtraField = new Image($value['tmp_name']);
-                            $imageExtraField->send_image($sysCodePath . $fileDir . $fileName, -1, 'png');
+                            if ($value['error'] == 0) {
+                                $imageExtraField = new Image($value['tmp_name']);
+                                $imageExtraField->send_image($sysCodePath . $fileDir . $fileName, -1, 'png');
 
-                            $new_params = array(
-                                $this->handler_id => $params[$this->handler_id],
-                                'field_id' => $extra_field_info['id'],
-                                'field_value' => $fileDir . $fileName
-                            );
+                                $new_params = array(
+                                    $this->handler_id => $params[$this->handler_id],
+                                    'field_id' => $extra_field_info['id'],
+                                    'field_value' => $fileDir . $fileName
+                                );
 
-                            if ($this->handler_id !== 'session_id' && $this->handler_id !== 'course_code') {
-                                $new_params['comment'] = $comment;
-                            }
+                                if ($this->type !== 'session' && $this->type !== 'course') {
+                                    $new_params['comment'] = $comment;
+                                }
 
-                            self::save($new_params);
+                                self::save($new_params);
+                            }
                             break;
                         default;
                             $new_params = array(