From 788a091f43f73b89f1e84a901bd464971b46c666 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 15 Jul 2016 09:38:08 +0200
Subject: [PATCH] Remove one more time unneeded addFlash

---
 main/work/upload.php   |  9 ++-------
 main/work/work.lib.php | 27 ++++++++++++++-------------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/main/work/upload.php b/main/work/upload.php
index 98574322c5..b234aed242 100755
--- a/main/work/upload.php
+++ b/main/work/upload.php
@@ -67,11 +67,11 @@ $validationStatus = getWorkDateValidationStatus($homework);
 
 $interbreadcrumb[] = array(
     'url' => api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq(),
-    'name' => get_lang('StudentPublications'),
+    'name' => get_lang('StudentPublications')
 );
 $interbreadcrumb[] = array(
     'url' => api_get_path(WEB_CODE_PATH).'work/work_list.php?'.api_get_cidreq().'&id='.$work_id,
-    'name' => $workInfo['title'],
+    'name' => $workInfo['title']
 );
 $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('UploadADocument'));
 
@@ -105,11 +105,6 @@ if ($form->validate()) {
         if ($is_allowed_to_edit) {
             $script = 'work_list_all.php';
         }
-        if (!$result) {
-            Display::addFlash(Display::return_message(get_lang('UploadError'), 'error'));
-        } else {
-            Display::addFlash(Display::return_message(get_lang('UplUploadSucceeded'), 'success'));
-        }
         header('Location: '.api_get_path(WEB_CODE_PATH).'work/'.$script.'?'.api_get_cidreq().'&id='.$work_id);
         exit;
     } else {
diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index de3251e7af..fbe4fe72a3 100755
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -1956,7 +1956,7 @@ function get_work_user_list(
             ) {
                 // Firstname, lastname, username
                 $work['fullname'] = Display::div($work['fullname'], array('class' => 'work-name'));
-                
+
                 //$work['firstname'] = Display::div($work['firstname'], array('class' => $class));
                 //$work['lastname'] = Display::div($work['lastname'], array('class' => $class));
 
@@ -2133,7 +2133,7 @@ function get_work_user_list(
                 $works[] = $work;
             }
         }
-        
+
         return $works;
     }
 }
@@ -3341,7 +3341,7 @@ function uploadWork($my_folder_data, $_course, $isCorrection = false, $workInfo
             'error' => Display:: return_message(
                 get_lang('UplUploadFailedSizeIsZero'),
                 'error'
-            ),
+            )
         );
     } elseif (!filter_extension($new_file_name)) {
         return array(
@@ -3523,7 +3523,6 @@ function processWorkForm($workInfo, $values, $courseInfo, $sessionId, $groupId,
     $contains_file = isset($values['contains_file']) && !empty($values['contains_file']) ? intval($values['contains_file']): 0;
 
     $saveWork = true;
-    $message = null;
     $filename = null;
     $url = null;
     $filesize = null;
@@ -3531,28 +3530,30 @@ function processWorkForm($workInfo, $values, $courseInfo, $sessionId, $groupId,
     if ($values['contains_file']) {
         $result = uploadWork($workInfo, $courseInfo, false, [], $file);
         if (!$result) {
-            return false;
+            $saveWork = false;
         }
         if (isset($result['error'])) {
             $message = $result['error'];
+            Display::addFlash($message);
+
             $saveWork = false;
         }
+    }
+
+    $workData = [];
+
+    if ($saveWork) {
         $filename = isset($result['filename']) ? $result['filename'] : null;
         if (empty($title)) {
             $title = isset($result['title']) && !empty($result['title']) ? $result['title'] : get_lang('Untitled');
         }
-
         $filesize = isset($result['filesize']) ? $result['filesize'] : null;
         $url = $result['url'];
-    }
-
-    if (empty($title)) {
-        $title = get_lang('Untitled');
-    }
 
-    $workData = [];
+        if (empty($title)) {
+            $title = get_lang('Untitled');
+        }
 
-    if ($saveWork) {
         $active = '1';
         $params = [
             'c_id' => $courseId,