Minor - Replace deprecated display_x_message() by return_message(..., 'x')

main/admin/access_url_add_usergroup_to_url.php

@@ -51,10 +51,10 @@ if (isset($_POST['form_sent']) && $_POST['form_sent']) {
 
     if ($form_sent == 1) {
         if (count($userGroups) == 0 || count($urlList) == 0) {
-            Display :: display_error_message(get_lang('AtLeastOneUserGroupAndOneURL'));
+            echo Display::return_message(get_lang('AtLeastOneUserGroupAndOneURL'), 'error');
         } else {
             UrlManager::addUserGroupListToUrl($userGroups, $urlList);
-            Display::display_confirmation_message(get_lang('UserGroupBelongURL'));
+            echo Display::return_message(get_lang('UserGroupBelongURL'), 'confirm');
         }
     }
 }

main/admin/access_url_add_users_to_url.php

@@ -55,12 +55,13 @@ if ($_POST['form_sent']) {
 
     if ($form_sent == 1) {
         if (count($users) == 0 || count($url_list) == 0) {
-            Display:: display_error_message(
+            echo Display::return_message(
-                get_lang('AtLeastOneUserAndOneURL')
+                get_lang('AtLeastOneUserAndOneURL'),
+                'error'
             );
         } else {
             UrlManager::add_users_to_urls($users, $url_list);
-            Display:: display_confirmation_message(get_lang('UsersBelongURL'));
+            echo Display::return_message(get_lang('UsersBelongURL'), 'confirm');
         }
     }
 }

main/admin/course_user_import.php

@@ -208,7 +208,7 @@ if (count($errors) != 0) {
         $error_message .= '</li>';
     }
     $error_message .= '</ul>';
-    Display :: display_error_message($error_message, false);
+    echo Display::return_message($error_message, 'error', false);
 }
 
 // Displaying the form.

main/admin/grade_models.php

@@ -151,7 +151,7 @@ switch ($action) {
                 $values = $form->exportValues();
                 $res    = $obj->save($values);
                 if ($res) {
-                    Display::display_confirmation_message(get_lang('ItemAdded'));
+                    echo Display::return_message(get_lang('ItemAdded'), 'confirm');
                 }
             }
             $obj->display();
@@ -174,7 +174,7 @@ switch ($action) {
             if ($check) {
                 $values = $form->exportValues();
                 $res    = $obj->update($values);
-                Display::display_confirmation_message(get_lang('ItemUpdated'), false);
+                echo Display::return_message(get_lang('ItemUpdated'), 'confirm', false);
             }
             $obj->display();
         } else {
@@ -191,7 +191,7 @@ switch ($action) {
         if ($check) {
             $res = $obj->delete($_GET['id']);
             if ($res) {
-                Display::display_confirmation_message(get_lang('ItemDeleted'));
+                echo Display::return_message(get_lang('ItemDeleted'), 'confirm');
             }
         }
         $obj->display();

main/admin/promotions.php

@@ -169,7 +169,7 @@ switch ($action) {
                 $res    = $promotion->update($values);
                 $promotion->update_all_sessions_status_by_promotion_id($values['id'], $values['status']);
                 if ($res) {
-                    Display::display_confirmation_message(get_lang('PromotionUpdated'), $values['name']);
+                    echo Display::return_message(get_lang('PromotionUpdated').': '.$values['name'], 'confirm');
                 }
             }
             $promotion->display();

main/admin/skills_gradebook.php

@@ -116,7 +116,7 @@ switch ($action) {
             $values = $form->exportValues();
             $res    = $gradebook->update_skills_to_gradebook($values['id'], $values['skill']);
             if ($res) {
-                Display::display_confirmation_message(get_lang('ItemAdded'));
+                echo Display::return_message(get_lang('ItemAdded'), 'confirm');
             }
         }
         $form->display();

main/admin/special_exports.php

@@ -310,7 +310,7 @@ function fullexportspecial()
             return $name;
         }
     } else {
-        Display::display_error_message(get_lang('ErrorMsgSpecialExport')); //main API
+        echo Display::return_message(get_lang('ErrorMsgSpecialExport'), 'error'); //main API
         $export = false;
         return false;
     }

main/admin/subscribe_user2course.php

@@ -92,7 +92,7 @@ if (isset($_POST['form_sent']) && $_POST['form_sent']) {
 
     if ($form_sent == 1) {
         if (count($users) == 0 || count($courses) == 0) {
-            Display :: display_error_message(get_lang('AtLeastOneUserAndOneCourse'));
+            echo Display::return_message(get_lang('AtLeastOneUserAndOneCourse'), 'error');
         } else {
             $errorDrh = 0;
             foreach ($courses as $course_code) {
@@ -107,9 +107,9 @@ if (isset($_POST['form_sent']) && $_POST['form_sent']) {
             }
 
             if ($errorDrh == 0) {
-                Display :: display_confirmation_message(get_lang('UsersAreSubscibedToCourse'));
+                echo Display::return_message(get_lang('UsersAreSubscibedToCourse'), 'confirm');
             } else {
-                Display :: display_error_message(get_lang('HumanResourcesManagerShouldNotBeRegisteredToCourses'));
+                echo Display::return_message(get_lang('HumanResourcesManagerShouldNotBeRegisteredToCourses'), 'error');
             }
         }
     }

main/admin/user_update_import.php

@@ -424,7 +424,7 @@ if (isset($_POST['formSent']) && $_POST['formSent'] && $_FILES['import_file']['s
 Display :: display_header($tool_name);
 
 if (!empty($error_message)) {
-    Display::display_error_message($error_message);
+    echo Display::return_message($error_message, 'error');
 }
 
 $form = new FormValidator('user_update_import', 'post', api_get_self());

main/admin/usergroup_user_import.php

@@ -168,7 +168,7 @@ if (count($errors) != 0) {
         $error_message .= "<br />";
     }
     $error_message .= "\n";
-    Display :: display_error_message($error_message, false);
+    echo Display::return_message($error_message, 'error', false);
 }
 $form->display();
 ?>

main/attendance/attendance_add.php

@@ -12,7 +12,7 @@ api_protect_course_script(true);
 
 // error messages
 if (isset($error)) {
-    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
+    echo Display::return_message(get_lang('FormHasErrorsPleaseComplete'), 'error', false);
 }
 
 if (!isset($error)) {

main/attendance/attendance_edit.php

@@ -12,7 +12,7 @@ api_protect_course_script(true);
 
 // error messages
 if (isset($error)) {
-    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
+    echo Display::return_message(get_lang('FormHasErrorsPleaseComplete'), 'error', false);
 }
 
 if (!isset($error)) {

main/auth/courses_list.php

@@ -22,7 +22,7 @@ $courses_without_category = isset($courses_in_category[0]) ? $courses_in_categor
 </div>
 <?php
 if (!empty($message)) {
-    Display::display_confirmation_message($message, false);
+    echo Display::return_message($message, 'confirm', false);
 }
 
 // COURSES WITH CATEGORIES

main/auth/ldap/authldap.php

@@ -395,7 +395,7 @@ function ldap_get_users() {
 
     } else {
         if (count($ldap_query) != 0)
-            Display :: display_error_message(get_lang('LDAPConnectionError'));
+            echo Display::return_message(get_lang('LDAPConnectionError'), 'error');
         return array();
     }
 }
@@ -450,7 +450,7 @@ function ldap_get_user_data($from, $number_of_items, $column, $direction) {
                 $users[] = $user;
             }
         } else {
-            Display :: display_error_message(get_lang('NoUser'));
+            echo Display::return_message(get_lang('NoUser'), 'error');
         }
     }
     return $users;

main/auth/set_temp_password.php

@@ -46,7 +46,7 @@ if ($form->validate()) {
         header('Location: '.api_get_course_url($course_info['code'], $session_id));
         exit;
     } else {
-        $tpl->assign('error_message', Display::display_error_message(get_lang('CourseRegistrationCodeIncorrect'), true, true));
+        $tpl->assign('error_message', Display::return_message(get_lang('CourseRegistrationCodeIncorrect'), 'error', true));
     }
 }
 

main/auth/shibboleth/app/view/shibboleth_display.class.php

@@ -35,7 +35,7 @@ class ShibbolethDisplay
         $page_title = get_lang('ShibbolethLogin');
 
         Display :: display_header($page_title);
-        Display :: display_error_message($message);
+        echo Display::return_message($message, 'error');
         Display :: display_footer();
         die;
     }
@@ -47,9 +47,9 @@ class ShibbolethDisplay
     {
         $title = $title ? $title : get_lang('ShibbolethLogin');
 
-        Display :: display_header($title);
+        Display::display_header($title);
-        Display :: display_confirmation_message($message);
+        echo Display::return_message($message, 'confirm');
-        Display :: display_footer();
+        Display::display_footer();
         die;
     }
     

main/auth/shibboleth/app/view/shibboleth_status_request_form.class.php

@@ -33,7 +33,7 @@ class ShibbolethStatusRequestForm
         if ($this->is_submitted() && $this->get_reason() == '')
         {
             $reason_is_mandatory = get_lang('ReasonIsMandatory');
-            Display::display_error_message($reason_is_mandatory);
+            echo Display::return_message($reason_is_mandatory, 'error');
         }
 
         $status_request_message = get_lang('StatusRequestMessage');

main/coursecopy/copy_course_session.php

@@ -329,7 +329,7 @@ if (Security::check_token('post') && (
         if ((is_array($arr_course_origin) && count($arr_course_origin) > 0) && !empty($destination_session)) {
             //We need only one value
             if (count($arr_course_origin) > 1 || count($arr_course_destination) > 1) {
-                Display::display_error_message(get_lang('YouMustSelectACourseFromOriginalSession'));
+                echo Display::return_message(get_lang('YouMustSelectACourseFromOriginalSession'), 'error');
             } else {
                 //first element of the array
                 $course_code = $arr_course_origin[0];
@@ -342,10 +342,10 @@ if (Security::check_token('post') && (
                 $cr->restore($course_destinatination, $destination_session);
 
             }
-            Display::display_confirmation_message(get_lang('CopyFinished'));
+            echo Display::return_message(get_lang('CopyFinished'), 'confirm');
             display_form();
         } else {
-            Display::display_error_message(get_lang('YouMustSelectACourseFromOriginalSession'));
+            echo Display::return_message(get_lang('YouMustSelectACourseFromOriginalSession'), 'error');
             display_form();
         }
     }
@@ -400,8 +400,9 @@ if (Security::check_token('post') && (
             ).
             get_lang('Back').'</a></div>';
     } else {
-        Display::display_error_message(
+        echo Display::return_message(
-            get_lang('You must select a course from original session and select a destination session')
+            get_lang('You must select a course from original session and select a destination session'),
+            'error'
         );
         display_form();
     }

main/coursecopy/create_backup.php

@@ -69,7 +69,7 @@ if (Security::check_token('post') && (
     }
 
     $zip_file = CourseArchiver::createBackup($course);
-    Display::display_confirmation_message(get_lang('BackupCreated'));
+    echo Display::return_message(get_lang('BackupCreated'), 'confirm');
     echo '<br /><a class="btn btn-primary btn-large" href="'.api_get_path(WEB_CODE_PATH).'course_info/download.php?archive='.$zip_file.'&'.api_get_cidreq().'">
     ' . get_lang('Download').'</a>';
 

main/coursecopy/recycle_course.php

@@ -63,7 +63,7 @@ if (Security::check_token('post') && (
     }
     $cr = new CourseRecycler($course);
     $cr->recycle($recycle_type);
-    Display::display_confirmation_message(get_lang('RecycleFinished'));
+    echo Display::return_message(get_lang('RecycleFinished'), 'confirm');
 } elseif (Security::check_token('post') && (
         isset($_POST['recycle_option']) &&
         $_POST['recycle_option'] == 'select_items'

main/dashboard/dashboard.php

@@ -89,7 +89,7 @@ if (isset($dashboard_view) && $dashboard_view == 'blocks') {
 } else {
     // block dashboard list
     if (isset($success)) {
-        Display::display_confirmation_message(get_lang('BlocksHaveBeenUpdatedSuccessfully'));
+        echo Display::return_message(get_lang('BlocksHaveBeenUpdatedSuccessfully'), 'confirm');
     }
     $user_id = api_get_user_id();
     DashboardManager::display_user_dashboard_list($user_id);

main/document/create_audio.php

@@ -400,7 +400,7 @@ function downloadMP3_google($filepath, $dir)
         null,
         $current_session_id
     );
-    Display::display_confirmation_message(get_lang('DocumentCreated'));
+    echo Display::return_message(get_lang('DocumentCreated'), 'confirm');
     //return to location
     echo '<script>window.location.href="'.$location.'"</script>';
 }
@@ -516,7 +516,7 @@ function downloadMP3_pediaphon($filepath, $dir)
         null,
         $current_session_id
     );
-    Display::display_confirmation_message(get_lang('DocumentCreated'));
+    echo Display::return_message(get_lang('DocumentCreated'), 'confirm');
     //return to location
     echo '<script>window.location.href="'.$location.'"</script>';
 }

main/document/create_draw.php

@@ -166,7 +166,7 @@ if (api_browser_support('svg')) {
 	echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0" src="'.$svg_url.'"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>';
 	echo '</noscript>';
 } else {
-	Display::display_error_message(get_lang('BrowserDontSupportsSVG'));
+	echo Display::return_message(get_lang('BrowserDontSupportsSVG'), 'error');
 }
 
 Display :: display_footer();

main/document/download.php

@@ -97,7 +97,7 @@ if (Security::check_abs_path($sys_course_path.$doc_url, $sys_course_path.'/')) {
     }
 
     if (!api_is_allowed_to_edit() && !$is_visible) {
-        Display::display_error_message(get_lang('ProtectedDocument')); //api_not_allowed backbutton won't work.
+        echo Display::return_message(get_lang('ProtectedDocument'), 'error'); //api_not_allowed backbutton won't work.
         exit; // You shouldn't be here anyway.
     }
     // Launch event

main/document/edit_draw.php

@@ -162,6 +162,6 @@ if (api_browser_support('svg')) {
 	echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0\' src="'.$svg_url.'"<noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>';
 	echo '</noscript>';
 } else {
-	Display::display_error_message(get_lang('BrowserDontSupportsSVG'));
+	echo Display::return_message(get_lang('BrowserDontSupportsSVG'), 'error');
 }
 Display::display_footer();

main/dropbox/recover_dropbox_files.php

@@ -24,7 +24,7 @@ if (isset($_GET['recover_id']) && !empty($_GET['recover_id'])) {
     $sql = "INSERT INTO $person_tbl VALUES('$course_id', $recover_id, $user_id)";
     $result = Database::query($sql);
     if ($result) {
-        Display::display_confirmation_message(get_lang('Recovered'));
+        echo Display::return_message(get_lang('Recovered'), 'confirm');
     }
 }
 

main/exercise/exercise.php

@@ -186,11 +186,12 @@ if ($is_allowedToEdit) {
                         }
                     }
                 }
-                Display:: display_confirmation_message(
+                echo Display::return_message(
                     sprintf(
                         get_lang('XResultsCleaned'),
                         $quantity_results_deleted
-                    )
+                    ),
+                    'confirm'
                 );
             }
         }

main/exercise/exercise_history.php

@@ -46,7 +46,7 @@ Display::display_header($nameTools, get_lang('Exercise'));
 if (isset($_GET['message'])) {
     if (in_array($_GET['message'], array('ExerciseEdited'))) {
         $my_message_history = Security::remove_XSS($_GET['message']);
-        Display::display_confirmation_message(get_lang($my_message_history));
+        echo Display::return_message(get_lang($my_message_history), 'confirm');
     }
 }
 

main/exercise/exercise_report.php

@@ -349,7 +349,7 @@ if (($is_allowedToEdit || $is_tutor || api_is_coach()) &&
                 true,
                 $_GET['delete_before_date'].' 23:59:59'
             );
-            Display::display_confirmation_message(sprintf(get_lang('XResultsCleaned'), $count));
+            echo Display::return_message(sprintf(get_lang('XResultsCleaned'), $count), 'confirm');
         }
     }
 }

main/exercise/question_pool.php

@@ -227,7 +227,7 @@ if (isset($fromExercise) && $fromExercise > 0) {
 echo '</div>';
 
 if ($displayMessage != "") {
-    Display::display_confirmation_message($displayMessage);
+    echo Display::return_message($displayMessage, 'confirm');
     $displayMessage = "";
 }
 

main/exercise/savescores.php

@@ -101,9 +101,9 @@ if ($origin != 'learnpath') {
                     lp_view_id = $lpViewId
                 ";
         Database::query($sql);
-        Display::display_confirmation_message(get_lang('HotPotatoesFinished'));
+        echo Display::return_message(get_lang('HotPotatoesFinished'), 'confirm');
     } else {
-        Display::display_error_message(get_lang('Error'));
+        echo Display::return_message(get_lang('Error'), 'error');
     }
 
     Display::display_footer();

main/forum/forumqualify.php

@@ -196,7 +196,7 @@ if ($action == 'move' && isset($_GET['post'])) {
     Display the action messages
 */
 if (!empty($message)) {
-    Display:: display_confirmation_message(get_lang($message));
+    echo Display::return_message(get_lang($message), 'confirm');
 }
 
 // show qualifications history

main/forum/index.php

@@ -129,7 +129,7 @@ if ($actions == 'notify' && isset($_GET['content']) && isset($_GET['id'])) {
         api_not_allowed();
     }
     $return_message = set_notification($_GET['content'], $_GET['id']);
-    Display:: display_confirmation_message($return_message, false);
+    echo Display::return_message($return_message, 'confirm', false);
 }
 
 get_whats_new();

main/forum/viewforum.php

@@ -221,7 +221,7 @@ if (
     api_is_allowed_to_session_edit(false, true)
 ) {
     $return_message = set_notification($_GET['content'], $_GET['id']);
-    Display::display_confirmation_message($return_message, false);
+    echo Display::return_message($return_message, 'confirm', false);
 }
 
 // Student list
@@ -344,7 +344,7 @@ if ($origin == 'learnpath') {
 /* Display the action messages */
 
 if (!empty($message)) {
-    Display::display_confirmation_message($message);
+    echo Display::return_message($message, 'confirm');
 }
 
 /* Action links */

main/forum/viewforumcategory.php

@@ -138,7 +138,7 @@ if (api_is_allowed_to_edit(false, true)) {
 // Notification
 if ($action_forums == 'notify' && isset($_GET['content']) && isset($_GET['id'])) {
     $return_message = set_notification($_GET['content'], $_GET['id']);
-    Display::display_confirmation_message($return_message, false);
+    echo Display::return_message($return_message, 'confirm', false);
 }
 
 if ($action_forums != 'add') {

main/forum/viewpost.php

@@ -105,7 +105,7 @@ if ($_GET['action'] == 'move' && isset($_GET['post'])) {
 /* Display the action messages */
 
 if (!empty($message)) {
-    Display :: display_confirmation_message(get_lang($message));
+    echo Display::return_message(get_lang($message), 'confirm');
 }
 
 // In this case the first and only post of the thread is removed.

main/forum/viewthread.php

@@ -156,7 +156,7 @@ if ($my_action == 'move' && isset($_GET['post'])) {
 
 $my_message = isset($message) ? $message : '';
 if ($my_message) {
-    Display::display_confirmation_message(get_lang($my_message));
+    echo Display::return_message(get_lang($my_message), 'confirm');
 }
 
 if ($my_message != 'PostDeletedSpecial') {

main/gradebook/gradebook_scoring_system.php

@@ -106,11 +106,11 @@ if (((isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'false') ||
     (isset($_GET['selectcat']) && ($_SESSION['studentview'] == 'teacherview')))
 ) {
     if (isset ($_GET['scoringupdated'])) {
-        Display::display_confirmation_message(get_lang('ScoringUpdated'), false);
+        echo Display::return_message(get_lang('ScoringUpdated'), 'confirm', false);
     }
 
     if (isset ($_GET['nouniqueranges'])) {
-        Display::display_error_message(get_lang('NoUniqueScoreRanges'), false);
+        echo Display::return_message(get_lang('NoUniqueScoreRanges'), 'error', false);
     }
     $scoreform->display();
 }

main/gradebook/gradebook_statistics.php

@@ -42,7 +42,7 @@ $displays = $displayscore->get_custom_score_display_settings();
 
 if (!$displayscore->is_custom() || empty($displays)) {
     if (api_is_platform_admin() || api_is_course_admin()) {
-        Display :: display_error_message(get_lang('PleaseEnableScoringSystem'), false);
+        echo Display::return_message(get_lang('PleaseEnableScoringSystem'), 'error', false);
     }
 } else {
     $allresults = Result::load(null, null, $eval[0]->get_id());

main/group/group_creation.php

@@ -78,9 +78,10 @@ Display :: display_header($nameTools, 'Group');
 
 if (isset($_POST['number_of_groups'])) {
     if (!is_numeric($_POST['number_of_groups']) || intval($_POST['number_of_groups']) < 1) {
-        Display :: display_error_message(
+        echo Display::return_message(
 			get_lang('PleaseEnterValidNumber').'<br /><br />
 			<a href="group_creation.php?'.api_get_cidreq().'">&laquo; '.get_lang('Back').'</a>',
+            'error',
 			false
 		);
     } else {

main/group/member_settings.php

@@ -222,7 +222,7 @@ switch ($action) {
     case 'empty':
         if (api_is_allowed_to_edit(false, true)) {
             GroupManager:: unsubscribe_all_users($current_group);
-            Display :: display_confirmation_message(get_lang('GroupEmptied'));
+            echo Display::return_message(get_lang('GroupEmptied'), 'confirm');
         }
         break;
 }

main/inc/ajax/lp.ajax.php

@@ -119,7 +119,7 @@ switch ($action) {
                     )
                 );
             }
-            Display::display_confirmation_message(get_lang('Saved'));
+            echo Display::return_message(get_lang('Saved'), 'confirm');
         }
         break;
     case 'record_audio':

main/inc/lib/AnnouncementManager.php

@@ -1198,7 +1198,7 @@ class AnnouncementManager
 
             if (!filter_extension($new_file_name)) {
                 $return = -1;
-                Display::display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
+                echo Display::return_message(get_lang('UplUnableToSaveFileFilteredExtension'), 'error');
             } else {
                 $new_file_name = uniqid('');
                 $new_path = $updir.'/'.$new_file_name;
@@ -1255,7 +1255,7 @@ class AnnouncementManager
 
             if (!filter_extension($new_file_name)) {
                 $return = -1;
-                Display::display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
+                echo Display::return_message(get_lang('UplUnableToSaveFileFilteredExtension'), 'error');
             } else {
                 $new_file_name = uniqid('');
                 $new_path = $updir.'/'.$new_file_name;
@@ -1273,7 +1273,7 @@ class AnnouncementManager
                 $result = Database::query($sql);
                 if ($result === false) {
                     $return = -1;
-                    Display::display_error_message(get_lang('UplUnableToSaveFile'));
+                    echo Display::return_message(get_lang('UplUnableToSaveFile'), 'error');
                 } else {
                     $return = 1;
                 }

main/inc/lib/TicketManager.php

@@ -713,8 +713,9 @@ class TicketManager
         $file_name = $file_attach['name'];
         $table_support_message_attachments = Database::get_main_table(TABLE_TICKET_MESSAGE_ATTACHMENTS);
         if (!filter_extension($new_file_name)) {
-            Display::display_error_message(
+            echo Display::return_message(
-                get_lang('UplUnableToSaveFileFilteredExtension')
+                get_lang('UplUnableToSaveFileFilteredExtension'),
+                'error'
             );
         } else {
             $new_file_name = uniqid('');

main/inc/lib/display.lib.php

@@ -14,7 +14,7 @@ use Chamilo\CoreBundle\Entity\ExtraField;
  *
  * All public functions static public functions inside a class called Display,
  * so you use them like this: e.g.
- * Display::display_normal_message($message)
+ * Display::return_message($message)
  *
  * @package chamilo.library
  *

main/inc/lib/document.lib.php

@@ -2940,8 +2940,9 @@ class DocumentManager
                 // Showing message when sending zip files
                 if ($new_path === true && $unzip == 1) {
                     if ($show_output) {
-                        Display::display_confirmation_message(
+                        echo Display::return_message(
                             get_lang('UplUploadSucceeded').'<br />',
+                            'confirm',
                             false
                         );
                     }

main/inc/lib/fileUpload.lib.php

@@ -690,10 +690,10 @@ function handle_uploaded_document(
                             // Display success message to user
                             if ($output) {
                                 Display::addFlash(
-                                    Display::display_confirmation_message(
+                                    Display::return_message(
                                         get_lang('UplUploadSucceeded').'<br /> '.$documentTitle,
-                                        false,
+                                        'confirm',
-                                        true
+                                        false
                                     )
                                 );
                             }
@@ -1067,7 +1067,7 @@ function unzip_uploaded_document(
     }
 
     if (!DocumentManager::enough_space($realSize, $maxFilledSpace)) {
-        Display::display_error_message(get_lang('UplNotEnoughSpace'));
+        echo Display::return_message(get_lang('UplNotEnoughSpace'), 'error');
         return false;
     }
 

main/inc/lib/link.lib.php

@@ -327,7 +327,7 @@ class Link extends Model
             $description = trim($_POST['description']);
 
             if (empty($category_title)) {
-                Display:: display_error_message(get_lang('GiveCategoryName'));
+                echo Display::return_message(get_lang('GiveCategoryName'), 'error');
                 $ok = false;
             } else {
                 // Looking for the largest order number for this category.

main/inc/lib/message.lib.php

@@ -586,7 +586,7 @@ class MessageManager
         // user's file name
         $file_name = $file_attach['name'];
         if (!filter_extension($new_file_name)) {
-            Display:: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
+            echo Display::return_message(get_lang('UplUnableToSaveFileFilteredExtension'), 'error');
         } else {
             $new_file_name = uniqid('');
             if (!empty($receiver_user_id)) {

main/inc/lib/myspace.lib.php

@@ -814,9 +814,9 @@ class MySpace
 
                 // Displaying a feedback message
                 if (!empty($_SESSION['additional_export_fields'])) {
-                    Display::display_confirmation_message(get_lang('FollowingFieldsWillAlsoBeExported').': <br /><ul>'.$message.'</ul>', false);
+                    echo Display::return_message(get_lang('FollowingFieldsWillAlsoBeExported').': <br /><ul>'.$message.'</ul>', 'confirm', false);
                 } else {
-                    Display::display_confirmation_message(get_lang('NoAdditionalFieldsWillBeExported'), false);
+                    echo Display::return_message(get_lang('NoAdditionalFieldsWillBeExported'), 'confirm', false);
                 }
             } else {
                 $form->display();

main/inc/lib/search/xapian/XapianQuery.php

@@ -265,5 +265,5 @@ function display_xapian_error($xapian_error_message) {
         $message_error = get_lang('SearchOtherXapianError');
     }
     $display_message = get_lang('Error').' : '.$message_error;
-    Display::display_error_message($display_message);
+    echo Display::return_message($display_message, 'error');
 }

main/lp/download.php

@@ -50,6 +50,6 @@ if ($_SESSION['oLP']) {
     }
 }
 
-Display::display_error_message(get_lang('ProtectedDocument'));
+echo Display::return_message(get_lang('ProtectedDocument'), 'error');
 //api_not_allowed backbutton won't work.
 exit;

main/lp/lp_admin_view.php

@@ -150,7 +150,7 @@ if (isset($_POST['save_audio'])) {
             Database::query($sql_insert_audio);
         }
     }
-    //Display::display_confirmation_message(get_lang('ItemUpdated'));
+    //echo Display::return_message(get_lang('ItemUpdated'), 'confirm');
     $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id).'&'.api_get_cidreq();
     header('Location: '.$url);
     exit;
@@ -279,14 +279,14 @@ echo '<div class="col-md-8">';
 switch ($_GET['action']) {
     case 'edit_item':
         if (isset($is_success) && $is_success === true) {
-            Display::display_confirmation_message(get_lang('LearnpathItemEdited'));
+            echo Display::return_message(get_lang('LearnpathItemEdited'), 'confirm');
         } else {
             echo $_SESSION['oLP']->display_edit_item($_GET['id']);
         }
         break;
     case 'delete_item':
         if (isset($is_success) && $is_success === true) {
-            Display::display_confirmation_message(get_lang('LearnpathItemDeleted'));
+            echo Display::return_message(get_lang('LearnpathItemDeleted'), 'confirm');
         }
         break;
 }

main/lp/lp_list_search.php

@@ -33,7 +33,7 @@ search_widget_prepare($htmlHeadXtra);
 Display::display_header(null, 'Path');
 
 if (api_get_setting('search_enabled') !== 'true') {
-    Display::display_error_message(get_lang('SearchFeatureNotEnabledComment'));
+    echo Display::return_message(get_lang('SearchFeatureNotEnabledComment'), 'error');
 } else {
     if (!empty($_GET['action'])) {
         search_widget_show($_GET['action']);

main/lp/openoffice_text.class.php

@@ -250,7 +250,7 @@ class OpenofficeText extends OpenofficeDocument {
                 // Code for text indexing.
                 if (api_get_setting('search_enabled') == 'true') {
                     if (isset($_POST['index_document']) && $_POST['index_document']) {
-                        //Display::display_normal_message(print_r($_POST));
+                        //echo Display::return_message(print_r($_POST));
                         $di = new ChamiloIndexer();
                         isset($_POST['language']) ? $lang = Database::escape_string($_POST['language']) : $lang = 'english';
                         $di->connectDb(NULL, NULL, $lang);

main/lp/openoffice_text_document.class.php

@@ -240,7 +240,7 @@ class OpenOfficeTextDocument extends OpenofficeDocument {
                 }
                 // Code for text indexing.
                 if (isset($_POST['index_document']) && $_POST['index_document']) {
-                    //Display::display_normal_message(print_r($_POST));
+                    //echo Display::return_message(print_r($_POST));
                     $di = new ChamiloIndexer();
                     isset($_POST['language']) ? $lang = Database::escape_string($_POST['language']) : $lang = 'english';
                     $di->connectDb(NULL, NULL, $lang);

main/mySpace/progression.php

@@ -35,7 +35,7 @@ $result_course = Database::query($sql_course);
 if (Database::num_rows($result_course) > 0) {
 	if (isset($_POST['export'])) {
 		$export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet.
-		Display :: display_error_message($export_result);
+		echo Display::return_message($export_result, 'error');
 	}
 	echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>';
 	$header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', ''));

main/mySpace/user_import.php

@@ -89,7 +89,7 @@ if ($_POST['formSent'] && $_FILES['import_file']['size'] !== 0) {
 Display :: display_header($tool_name);
 
 if ($_FILES['import_file']['size'] == 0 && $_POST) {
-	Display::display_error_message(get_lang('ThisFieldIsRequired'));
+	echo Display::return_message(get_lang('ThisFieldIsRequired'), 'error');
 }
 
 if (count($errors) != 0) {
@@ -100,7 +100,7 @@ if (count($errors) != 0) {
         $error_message .= '</li>';
     }
     $error_message .= '</ul>';
-    Display :: display_error_message($error_message, false);
+    echo Display::return_message($error_message, 'error', false);
 }
 
 $form = new FormValidator('user_import');

main/search/NOTES

@@ -5,7 +5,7 @@ Development information
 
   Debugging help:
     error_log('info: id = <'. $id .'>');
-    Display::display_normal_message(print_r($arrLP,1));
+    echo Display::return_message(print_r($arrLP,1));
 
   DB modifications:
     ALTER TABLE lp_item ADD terms TEXT NULL ;

main/search/index.php

@@ -13,7 +13,7 @@ if (extension_loaded('xapian')) {
 	require '../lp/lp_list_search.php';
 } else {
     Display::display_header(get_lang('Search'));
-    Display::display_error_message(get_lang('SearchXapianModuleNotInstalled'));
+    echo Display::return_message(get_lang('SearchXapianModuleNotInstalled'), 'error');
     Display::display_footer();
     exit;
 }

main/session/add_many_session_to_category.php

@@ -160,11 +160,11 @@ if (!empty($_GET['add'])) {
 <input type="hidden" name="formSent" value="1"/>
 <?php
 if (!empty($errorMsg)) {
-    Display::display_error_message($errorMsg); //main API
+    echo Display::return_message($errorMsg, 'error'); //main API
 }
 
 if (!empty($OkMsg)) {
-    Display::display_confirmation_message($OkMsg); //main API
+    echo Display::return_message($OkMsg, 'confirm'); //main API
 }
 
 /*

main/session/session_add.php

@@ -218,7 +218,7 @@ if ($form->validate()) {
 Display::display_header($tool_name);
 
 if (!empty($return)) {
-	Display::display_error_message($return, false);
+	echo Display::return_message($return, 'error', false);
 }
 
 echo '<div class="actions">';

main/session/session_category_add.php

@@ -61,7 +61,7 @@ $tool_name = get_lang('AddACategory');
 //display the header
 Display::display_header($tool_name);
 if (!empty($return)) {
-	Display::display_error_message($return, false);
+	echo Display::return_message($return, 'error', false);
 }
 ?>
 <div class="row">

main/session/session_category_edit.php

@@ -73,7 +73,7 @@ $thisDay = date('d');
 // display the header
 Display::display_header($tool_name);
 if (!empty($return)) {
-    Display::display_error_message($return, false);
+    echo Display::return_message($return, 'error', false);
 }
 ?>
 <div class="row">

main/survey/copy_survey.php

@@ -36,17 +36,17 @@ if (Security::check_token('post')) {
     // Copy the survey to the target course
     SurveyManager::empty_survey($surveyCopyId, $courseId);
     // Empty the copied survey
-    Display::display_confirmation_message(get_lang('SurveyCopied'));
+    echo Display::return_message(get_lang('SurveyCopied'), 'confirm');
 }
 
 $surveys = SurveyManager::get_surveys(api_get_course_id(), api_get_session_id());
 $courses = CourseManager::get_courses_list();
 $form = new FormValidator('copy_survey', 'post', 'copy_survey.php?'.api_get_cidreq());
 if (!$surveys) {
-    Display::display_error_message(get_lang('NoSurveyAvailable'));
+    echo Display::return_message(get_lang('NoSurveyAvailable'), 'error');
 }
 if (count($courses) <= 1) {
-    Display::display_error_message(get_lang('CourseListNotAvailable'));
+    echo Display::return_message(get_lang('CourseListNotAvailable'), 'error');
 }
 if ($surveys && count($courses) > 1) {
     // Surveys select

main/survey/fillsurvey.php

@@ -579,7 +579,7 @@ if ($survey_data['form_fields'] &&
 
 // Displaying the survey thanks message
 if (isset($_POST['finish_survey'])) {
-    Display::display_confirmation_message(get_lang('SurveyFinished'));
+    echo Display::return_message(get_lang('SurveyFinished'), 'confirm');
     echo $survey_data['survey_thanks'];
 
     SurveyManager::update_survey_answered(

main/survey/preview.php

@@ -109,7 +109,7 @@ if (api_is_course_admin() ||
 
     // Displaying the survey thanks message
     if (isset($_POST['finish_survey'])) {
-        Display::display_confirmation_message(get_lang('SurveyFinished'));
+        echo Display::return_message(get_lang('SurveyFinished'), 'confirm');
         echo $survey_data['survey_thanks'];
         Display :: display_footer();
         exit;
@@ -232,7 +232,7 @@ if (api_is_course_admin() ||
     }
     $form->display();
 } else {
-    Display :: display_error_message(get_lang('NotAllowed'), false);
+    echo Display::return_message(get_lang('NotAllowed'), 'error', false);
 }
 
 Display :: display_footer();

main/survey/question.php

@@ -99,7 +99,7 @@ $actions .= '</div>';
 if (!in_array($_GET['type'], $possible_types)) {
     Display :: display_header($tool_name, 'Survey');
     echo $actions;
-    Display :: display_error_message(get_lang('TypeDoesNotExist'), false);
+    echo Display::return_message(get_lang('TypeDoesNotExist'), 'error', false);
     Display :: display_footer();
 }
 

main/ticket/update_report.php

@@ -13,11 +13,11 @@ $rs_id = intval($_POST['rs_id']);
 api_protect_course_script();
 
 if (!api_is_allowed_to_edit()) {
-    Display::display_error_message(get_lang("DeniedAccess"));
+    echo Display::return_message(get_lang("DeniedAccess"), 'error');
 } else {
     $sql = "UPDATE ".Database::get_main_table('rp_reporte_semanas')."
             SET work_id = '$work_id', forum_id = '$forum_id'
             WHERE  id ='$rs_id'";
     Database::query($sql);
-    Display::display_confirmation_message(get_lang('Updated'));
+    echo Display::return_message(get_lang('Updated'), 'confirm');
 }

main/user/user_import.php

@@ -122,13 +122,13 @@ if (!empty($message)) {
             $userMessage .= implode(', ', $user)."<br />";
         }
         if ($type == 'confirmation') {
-            Display::display_confirmation_message($message.': <br />'.$userMessage, false);
+            echo Display::return_message($message.': <br />'.$userMessage, 'confirm', false);
         } else {
             echo Display::return_message($message.':  <br />'.$userMessage, 'warning', false);
         }
     } else {
         $empty_line_msg = ($empty_line == 0) ? get_lang('ErrorsWhenImportingFile') : get_lang('ErrorsWhenImportingFile').': '.get_lang('EmptyHeaderLine');
-        Display::display_error_message($empty_line_msg);
+        echo Display::return_message($empty_line_msg, 'error');
     }
 }