Update deprecated display_*_message() calls

9 years ago · 6193d198f6
parent 6e3164d478
commit 6193d198f6
43 changed files with 129 additions and 120 deletions
--- a/main/admin/access_url_add_courses_to_url.php
+++ b/main/admin/access_url_add_courses_to_url.php
@ -58,10 +58,10 @@ if (isset($_POST['form_sent']) && $_POST['form_sent']) {

    if ($form_sent == 1) {
        if (count($courses) == 0 || count($url_list) == 0) {
-            Display :: display_error_message(get_lang('AtLeastOneCourseAndOneURL'));
+            Display::addFlash(Display::return_message(get_lang('AtLeastOneCourseAndOneURL'), 'error'));
        } else {
            UrlManager::add_courses_to_urls($courses, $url_list);
-            Display :: display_confirmation_message(get_lang('CourseBelongURL'));
+            Display::addFlash(Display::return_message(get_lang('CourseBelongURL'), 'confirm'));
        }
    }
 }
--- a/main/admin/access_url_edit_usergroup_to_url.php
+++ b/main/admin/access_url_edit_usergroup_to_url.php
@ -202,7 +202,7 @@ $url_list = UrlManager::get_url_data();
        <input type="hidden" name="add_type" value="<?php echo $add_type ?>"/>
        <?php
        if (!empty($errorMsg)) {
-            Display::display_normal_message($errorMsg); //main API
+            Display::addFlash(Display::return_message($errorMsg, 'normal')); //main API
        }
        ?>
        <div class="row">
--- a/main/admin/access_url_edit_users_to_url.php
+++ b/main/admin/access_url_edit_users_to_url.php
@ -134,7 +134,7 @@ if (isset($_POST['form_sent']) && $_POST['form_sent']) {
 Display::display_header($tool_name);

 if (!empty($message)) {
-    Display::display_normal_message($message, false);
+    Display::addFlash(Display::return_message($message, 'normal', false));
 }

 echo '<div class="actions">';
@ -221,7 +221,7 @@ $url_list = UrlManager::get_url_data();

 <?php
 if (!empty($errorMsg)) {
-    Display::display_normal_message($errorMsg); //main API
+    Display::addFlash(Display::return_message($errorMsg, 'normal')); //main API
 }
 ?>

--- a/main/admin/access_urls.php
+++ b/main/admin/access_urls.php
@ -35,18 +35,18 @@ if (isset($_GET['action'])) {
        case 'delete_url':
            $result = UrlManager::delete($url_id);
            if ($result) {
-                Display :: display_normal_message(get_lang('URLDeleted'));
+                Display::addFlash(Display::return_message(get_lang('URLDeleted'), 'normal'));
            } else {
                Display :: display_error_message(get_lang('CannotDeleteURL'));
            }
            break;
        case 'lock':
            UrlManager::set_url_status('lock', $url_id);
-            Display::display_normal_message(get_lang('URLInactive'));
+            Display::addFlash(Display::return_message(get_lang('URLInactive'), 'normal'));
            break;
        case 'unlock':
            UrlManager::set_url_status('unlock', $url_id);
-            Display::display_normal_message(get_lang('URLActive'));
+            Display::addFlash(Display::return_message(get_lang('URLActive'), 'normal'));
            break;
        case 'register':
            // we are going to register the admin
@ -59,9 +59,12 @@ if (isset($_GET['action'])) {
                            $url_str.=$my_url['url'].' <br />';
                        }
                    }
-                    Display:: display_normal_message(
-                        get_lang('AdminUserRegisteredToThisURL').': '.$url_str.'<br />',
-                        false
+                    Display::addFlash(
+                        Display::return_message(
+                            get_lang('AdminUserRegisteredToThisURL').': '.$url_str.'<br />',
+                            'normal',
+                            false
+                        )
                    );
                }
            }
--- a/main/admin/add_courses_to_usergroup.php
+++ b/main/admin/add_courses_to_usergroup.php
@ -206,7 +206,7 @@ echo Display::input('hidden', 'id', $id);
 echo Display::input('hidden', 'form_sent', '1');
 echo Display::input('hidden', 'add_type', null);
 if (!empty($errorMsg)) {
-    Display::display_normal_message($errorMsg); //main API
+    Display::addFlash(Display::return_message($errorMsg, 'normal')); //main API
 }
 ?>

--- a/main/admin/add_sessions_to_usergroup.php
+++ b/main/admin/add_sessions_to_usergroup.php
@ -180,7 +180,7 @@ echo Display::input('hidden', 'id', $id);
 echo Display::input('hidden', 'form_sent', '1');
 echo Display::input('hidden', 'add_type', null);
 if (!empty($errorMsg)) {
-    Display::display_normal_message($errorMsg); //main API
+    Display::addFlash(Display::return_message($errorMsg, 'normal')); //main API
 }
 ?>

--- a/main/admin/configure_extensions.php
+++ b/main/admin/configure_extensions.php
@ -135,8 +135,9 @@ Display::display_header($nameTool);
 ?>
 <div id="message" style="display: none">
 	<?php
-	if (!empty($message))
-		Display::display_normal_message($message)
+	if (!empty($message)) {
+        Display::addFlash(Display::return_message($message, 'normal'));
+    }
 	?>
 </div>

--- a/main/admin/configure_homepage.php
+++ b/main/admin/configure_homepage.php
@ -799,7 +799,7 @@ switch ($action) {
            <input type="hidden" name="formSent" value="1"/>
            <?php
            if (!empty($errorMsg)) {
-                Display::display_normal_message($errorMsg);
+                Display::addFlash(Display::return_message($errorMsg, 'normal'));
            }
            ?>
            <div class="row">
@ -850,7 +850,7 @@ switch ($action) {
    case 'edit_link':
        $menuf = ($action == 'insert_tabs' || $action == 'edit_tabs') ? $mtloggedin : $menuf;
        if (!empty($errorMsg)) {
-            Display::display_normal_message($errorMsg);
+            Display::addFlash(Display::return_message($errorMsg, 'normal'));
        }
        $default = array();
        $form = new FormValidator('configure_homepage_' . $action, 'post', $selfUrl . '?action=' . $action, '', array('style' => 'margin: 0px;'));
@ -943,7 +943,7 @@ switch ($action) {
        $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));

        if (!empty($errorMsg)) {
-            Display::display_normal_message($errorMsg); //main API
+            Display::addFlash(Display::return_message($errorMsg, 'normal')); //main API
        }

        $default = array();
--- a/main/admin/configure_inscription.php
+++ b/main/admin/configure_inscription.php
@ -165,7 +165,7 @@ echo Display::page_header($tool_name);

 //api_display_tool_title($tool_name);
 if (api_get_setting('allow_registration') == 'approval') {
-    Display::display_normal_message(get_lang('YourAccountHasToBeApproved'));
+    Display::addFlash(Display::return_message(get_lang('YourAccountHasToBeApproved'), 'normal'));
 }
 //if openid was not found
 if (!empty($_GET['openid_msg']) && $_GET['openid_msg'] == 'idnotfound') {
@ -364,7 +364,7 @@ switch ($action){
        }

        if (!empty($errorMsg)) {
-            Display::display_normal_message($errorMsg);
+            Display::addFlash(Display::return_message($errorMsg, 'normal'));
        }

        $default = array();
--- a/main/admin/course_import.php
+++ b/main/admin/course_import.php
@ -139,7 +139,7 @@ function save_courses_data($courses)
    }

    if (!empty($msg)) {
-        Display::display_normal_message($msg, false);
+        Display::addFlash(Display::return_message($msg, 'normal', false));
    }
 }

--- a/main/admin/course_intro_pdf_import.php
+++ b/main/admin/course_intro_pdf_import.php
@ -44,7 +44,7 @@ if (count($errors) != 0) {
        $error_message .= '<li>'.get_lang('Course').': '.$error_course['Title'].' ('.$error_course['Code'].')</li>';
    }
    $error_message .= '</ul>';
-    Display :: display_normal_message($error_message, false);
+    Display::addFlash(Display::return_message($error_message, 'normal', false));
 } elseif ($_POST['formSent']) {
    Display :: display_confirmation_message('CourseIntroductionsAllImportesSuccessfully', false);
 }
--- a/main/admin/course_request_accepted.php
+++ b/main/admin/course_request_accepted.php
@ -140,7 +140,7 @@ if (!empty($message)) {
    if ($is_error_message) {
        Display::display_error_message($message, false);
    } else {
-        Display::display_normal_message($message, false);
+        Display::addFlash(Display::return_message($message, 'normal', false));
    }
 }

--- a/main/admin/course_request_rejected.php
+++ b/main/admin/course_request_rejected.php
@ -171,9 +171,9 @@ Display :: display_header($tool_name);
 // Display confirmation or error message.
 if (!empty($message)) {
    if ($is_error_message) {
-        Display::display_error_message($message, false);
+        Display::addFlash(Display::return_message($message, 'error', false));
    } else {
-        Display::display_normal_message($message, false);
+        Display::addFlash(Display::return_message($message, 'normal', false));
    }
 }

--- a/main/admin/course_request_review.php
+++ b/main/admin/course_request_review.php
@ -209,9 +209,9 @@ Display :: display_header($tool_name);
 // Display confirmation or error message.
 if (!empty($message)) {
    if ($is_error_message) {
-        Display::display_error_message($message, false);
+        Display::addFlash(Display::return_message($message, 'error', false));
    } else {
-        Display::display_normal_message($message, false);
+        Display::addFlash(Display::return_message($message, 'normal', false));
    }
 }

--- a/main/admin/dashboard_add_courses_to_user.php
+++ b/main/admin/dashboard_add_courses_to_user.php
@ -223,7 +223,7 @@ $result	= Database::query($sql);
 <input type="hidden" name="formSent" value="1" />
 <?php
 if(!empty($msg)) {
-	Display::display_normal_message($msg); //main API
+	Display::addFlash(Display::return_message($msg, 'normal')); //main API
 }
 ?>

--- a/main/admin/dashboard_add_users_to_user.php
+++ b/main/admin/dashboard_add_users_to_user.php
@ -412,7 +412,7 @@ $result = Database::query($sql);
 <input type="hidden" name="formSent" value="1" />
 <?php
 if (!empty($msg)) {
-	Display::display_normal_message($msg); //main API
+	Display::addFlash(Display::return_message($msg, 'normal')); //main API
 }
 ?>

--- a/main/admin/filler.php
+++ b/main/admin/filler.php
@ -58,7 +58,7 @@ if (count($output) > 0) {
    }
    $result .= '</table>';
    $result .= '</div>';
-    Display::display_normal_message($result, false);
+    Display::addFlash(Display::return_message($result, 'normal', false));
 }
 ?>
 <div id="datafiller" class="panel panel-default">
--- a/main/admin/languages.php
+++ b/main/admin/languages.php
@ -242,12 +242,12 @@ if (isset($_GET['action']) && $_GET['action'] == 'make_unavailable_confirmed') {
        SubLanguageManager::make_unavailable_language($_GET['id']);
        $platform_language = api_get_setting('platformLanguage');
        UserManager::update_all_user_languages($language_info['english_name'], $platform_language);
-        Display::display_confirmation_message(get_lang('LanguageIsNowHidden'));
+        Display::addFlash(Display::return_message(get_lang('LanguageIsNowHidden'), 'confirm'));
    }
 }

 // displaying the explanation for this tool
-Display::display_normal_message(get_lang('PlatformLanguagesExplanation'));
+Display::addFlash(Display::return_message(get_lang('PlatformLanguagesExplanation'), 'normal'));

 echo '<a id="disable_all_except_default" href="javascript:void(0)" class="btn btn-primary"><em class="fa fa-eye"></em> '.get_lang('LanguagesDisableAllExceptDefault').'</a><br /><br />';

--- a/main/admin/ldap_import_students.php
+++ b/main/admin/ldap_import_students.php
@ -305,14 +305,14 @@ elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
 		{
 			$message=get_lang('NoUserAdded');
 		}
-		Display :: display_normal_message($message,false);
+		Display::addFlash(Display::return_message($message, 'normal', false));
 	}
 	*/
 	else
 	{
 		Display::display_header($tool_name);
 		$message=get_lang('NoUserAdded');
-		Display :: display_normal_message($message,false);
+		Display::addFlash(Display::return_message($message, 'normal', false));
 	}
 	echo '<br /><br />';
    echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';
--- a/main/admin/ldap_import_students_to_session.php
+++ b/main/admin/ldap_import_students_to_session.php
@ -199,14 +199,14 @@ elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed'] == 'yes'))
 		{
 			$message=get_lang('NoUserAdded');
 		}
-		Display :: display_normal_message($message,false);
+		Display::addFlash(Display::return_message($message, 'normal', false));
 	}
 	*/
 	else
 	{
 		Display::display_header($tool_name);
 		$message = get_lang('NoUserAdded');
-		Display :: display_normal_message($message, false);
+		Display::addFlash(Display::return_message($message, 'normal', false));
 	}
 	echo '<br /><br />';
    echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';
--- a/main/admin/ldap_users_list.php
+++ b/main/admin/ldap_users_list.php
@ -44,28 +44,28 @@ if (isset ($_GET['action']))
 		{
 			case 'show_message' :
 				Display::display_header($tool_name);
-				Display::display_normal_message($_GET['message']);
+				Display::addFlash(Display::return_message($_GET['message'], 'normal'));
 				break;
 			case 'delete_user' :
 				Display::display_header($tool_name);
 				if ($user_id != $_user['user_id'] && UserManager::delete_user($_GET['user_id']))
 				{
-					Display::display_normal_message(get_lang('UserDeleted'));
+					Display::addFlash(Display::return_message(get_lang('UserDeleted'), 'normal'));
 				}
 				else
 				{
-					Display::display_error_message(get_lang('CannotDeleteUser'));
+					Display::addFlash(Display::return_message(get_lang('CannotDeleteUser'), 'error'));
 				}
 				break;
 			case 'lock' :
 				Display::display_header($tool_name);
 				$message=lock_unlock_user('lock',$_GET['user_id']);
-				Display::display_normal_message($message);
+				Display::addFlash(Display::return_message($message, 'normal'));
 				break;
 			case 'unlock':
 				Display::display_header($tool_name);
 				$message=lock_unlock_user('unlock',$_GET['user_id']);
-				Display::display_normal_message($message);
+				Display::addFlash(Display::return_message($message, 'normal'));
 				break;
            case 'add_user':
 				$id=$_GET['id'];
@ -93,7 +93,7 @@ if (isset ($_GET['action']))
 					{
 						$message=get_lang('NoUserAdded');
 					}
-					Display::display_normal_message($message,false);
+					Display::addFlash(Display::return_message($message, 'normal', false));
 				}
 				break;
 			default:
@ -132,11 +132,11 @@ if (isset ($_POST['action']))
 				}
 				if($number_of_selected_users == $number_of_deleted_users)
 				{
-					Display::display_normal_message(get_lang('SelectedUsersDeleted'));
+					Display::addFlash(Display::return_message(get_lang('SelectedUsersDeleted'), 'normal'));
 				}
 				else
 				{
-					Display::display_error_message(get_lang('SomeUsersNotDeleted'));
+					Display::addFlash(Display::return_message(get_lang('SomeUsersNotDeleted'), 'error'));
 				}
 				break;
 			case 'add_user' :
@ -154,11 +154,11 @@ if (isset ($_POST['action']))
 					addUserToSession($UserList, $_GET['id_session']);
 				if(count($UserList)>0)
 				{
-					Display::display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
+					Display::addFlash(Display::return_message(count($UserList)." ".get_lang('LDAPUsersAdded')));
 				}
 				else
 				{
-					Display::display_normal_message(get_lang('NoUserAdded'));
+					Display::addFlash(Display::return_message(get_lang('NoUserAdded')));
 				}
 				break;

--- a/main/admin/ldap_users_synchro.php
+++ b/main/admin/ldap_users_synchro.php
@ -62,7 +62,7 @@ Display::display_header($tool_name);
 if (isset($action) && ($action == "synchro")) {
 	$included = true;
 	require('ldap_synchro.php');
-	Display :: display_normal_message($message, false);
+	Display::addFlash(Display::return_message($message, 'normal', false));
 }
 Display::display_footer();
 ?>
--- a/main/admin/promotions.php
+++ b/main/admin/promotions.php
@ -130,7 +130,7 @@ switch ($action) {
        $careers = $career->get_all();
        if (empty($careers)) {
            $url = Display::url(get_lang('YouNeedToCreateACareerFirst'), 'careers.php?action=add');
-            Display::display_normal_message($url, false);
+            Display::addFlash(Display::return_message($url, 'normal', false));
            Display::display_footer();
            exit;
        }
@ -144,7 +144,7 @@ switch ($action) {
                $values = $form->exportValues();
                $res    = $promotion->save($values);
                if ($res) {
-                    Display::display_confirmation_message(get_lang('ItemAdded'));
+                    Display::addFlash(Display::return_message(get_lang('ItemAdded', 'confirm')));
                }
            }
            $promotion->display();
@ -195,7 +195,7 @@ switch ($action) {
            // Action handling: deleting an obj
            $res = $promotion->delete($_GET['id']);
            if ($res) {
-                Display::display_confirmation_message(get_lang('ItemDeleted'));
+                Display::addFlash(Display::return_message(get_lang('ItemDeleted'), 'confirm'));
            }
        }
        $promotion->display();
@ -207,11 +207,12 @@ switch ($action) {
        if ($check) {
            $res = $promotion->copy($_GET['id'], null, true);
            if ($res) {
-                Display::display_confirmation_message(
+                Display::addFlash(Display::return_message(
                    get_lang('ItemCopied').' - '.get_lang(
                        'ExerciseAndLPsAreInvisibleInTheNewCourse'
-                    )
-                );
+                    ),
+                    'confirm'
+                ));
            }
        }
        $promotion->display();
--- a/main/admin/settings.lib.php
+++ b/main/admin/settings.lib.php
@ -34,7 +34,7 @@ function handleRegions()
            api_get_utc_datetime(),
            $user_id
        );
-        Display :: display_confirmation_message(get_lang('SettingsStored'));
+        Display::addFlash(Display::return_message(get_lang('SettingsStored'), 'confirmation'));
    }

    $plugin_obj = new AppPlugin();
@ -140,7 +140,7 @@ function handlePlugins()
            api_get_utc_datetime(),
            $user_id
        );
-        Display :: display_confirmation_message(get_lang('SettingsStored'));
+        Display::addFlash(Display::return_message(get_lang('SettingsStored'), 'confirmation'));
    }

    $all_plugins = $plugin_obj->read_plugins_from_path();
@ -583,7 +583,7 @@ function uploadStylesheet($values, $picture)
            }
            $zip->close();
        } else {
-            Display::display_error_message(get_lang('ErrorReadingZip').$info['extension'], false);
+            Display::addFlash(Display::return_message(get_lang('ErrorReadingZip').$info['extension'], 'error', false));
        }
    } else {
        // Simply move the file.
@ -731,7 +731,7 @@ function handleSearch()
        $formValues = $form->exportValues();
        setConfigurationSettingsInDatabase($formValues, $_configuration['access_url']);
        $search_enabled = $formValues['search_enabled'];
-        Display::display_confirmation_message($SettingsStored);
+        Display::addFlash(Display::return_message($SettingsStored, 'confirm'));
    }
    $specific_fields = get_specific_field_list();

@ -1103,7 +1103,7 @@ function addEditTemplate()
                Database::insert($table_system_template, $params);

                // Display a feedback message.
-                Display::display_confirmation_message(get_lang('TemplateAdded'));
+                Display::addFlash(Display::return_message(get_lang('TemplateAdded'), 'confirm'));
                echo '<a href="settings.php?category=Templates&action=add">'.Display::return_icon('new_template.png', get_lang('AddTemplate'),'',ICON_SIZE_MEDIUM).'</a>';
            } else {
                $content_template = '<head>{CSS}<style type="text/css">.text{font-weight: normal;}</style></head><body>'.Database::escape_string($values['template_text']).'</body>';
@ -1115,7 +1115,7 @@ function addEditTemplate()
                Database::query($sql);

                // Display a feedback message.
-                Display::display_confirmation_message(get_lang('TemplateEdited'));
+                Display::addFlash(Display::return_message(get_lang('TemplateEdited'), 'confirm'));
            }
        }
        Security::clear_token();
@ -1154,7 +1154,7 @@ function deleteTemplate($id)
    Database::query($sql);

    // Display a feedback message.
-    Display::display_confirmation_message(get_lang('TemplateDeleted'));
+    Display::addFlash(Display::return_message(get_lang('TemplateDeleted'), 'confirm'));
 }

 /**
@ -1718,7 +1718,7 @@ function generateCSSDownloadLink($style)

        //@TODO: use more generic script to download.
        $str = '<a class="btn btn-primary btn-large" href="' .$url. '">'.get_lang('ClickHereToDownloadTheFile').'</a>';
-        Display::display_normal_message($str, false);
+        Display::addFlash(Display::return_message($str, 'normal', false));
    } else {
        Display::addFlash(Display::return_message(get_lang('FileNotFound'), 'warning'));
    }
--- a/main/admin/skills_import.php
+++ b/main/admin/skills_import.php
@ -243,10 +243,10 @@ $interbreadcrumb[] = array("url" => 'skill_list.php', "name" => get_lang('Manage
 Display :: display_header($tool_name);

 if (!empty($error_message)) {
-    Display::display_error_message($error_message);
+    Display::addFlash(Display::return_message($error_message, 'error'));
 }
 if (!empty($see_message_import)) {
-    Display::display_normal_message($see_message_import);
+    Display::addFlash(Display::return_message($see_message_import, 'normal'));
 }

 $toolbar = Display::url(
--- a/main/admin/special_exports.php
+++ b/main/admin/special_exports.php
@ -37,7 +37,7 @@ Display::display_header($nameTools);
 echo Display::page_header($nameTools);

 if (count($_POST) == 0) {
-    Display::display_normal_message(get_lang('SpecialExportsIntroduction'));
+    Display::addFlash(Display::return_message(get_lang('SpecialExportsIntroduction')));
 }
 $error = 0;
 $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
@ -64,7 +64,7 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') ||

        $zip_folder = new PclZip($FileZip['TEMP_FILE_ZIP']);
        if (!isset($_POST['resource']) || count($_POST['resource']) == 0) {
-            Display::display_error_message(get_lang('ErrorMsgSpecialExport'));
+            Display::addFlash(Display::return_message(get_lang('ErrorMsgSpecialExport'), 'error'));
        } else {
            $Resource = $_POST['resource'];

@ -130,7 +130,7 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') ||
 }

 if ($export && $name) {
-    Display::display_confirmation_message(get_lang('BackupCreated'));
+    Display::addFlash(Display::return_message(get_lang('BackupCreated'), 'confirm'));
    echo '<br /><a class="btn btn-default" href="'.api_get_path(WEB_CODE_PATH).'course_info/download.php?archive_path=&archive='.urlencode($name).'">'.get_lang('Download').'</a>';
 } else {
    // Display forms especial export
@ -138,10 +138,10 @@ if ($export && $name) {
        $cb = new CourseBuilder();
        $course = $cb->build_session_course();
        if ($course === false) {
-            Display::display_error_message(get_lang('ErrorMsgSpecialExport'));
+            Display::addFlash(Display::return_message(get_lang('ErrorMsgSpecialExport'), 'error'));
            form_special_export();
        } else {
-            Display::display_normal_message(get_lang('ToExportSpecialSelect'));
+            Display::addFlash(Display::return_message(get_lang('ToExportSpecialSelect'), 'normal'));
            CourseSelectForm :: display_form_session_export($course);
        }
    } else {
--- a/main/admin/specific_fields.php
+++ b/main/admin/specific_fields.php
@ -58,10 +58,10 @@ if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete') {

 // Displaying the header
 Display::display_header(get_lang('SpecificSearchFields'));
-echo Display::display_normal_message(get_lang('SpecificSearchFieldsIntro'));
+echo Display::addFlash(Display::return_message(get_lang('SpecificSearchFieldsIntro')));

 if(!empty($_GET['message'])) {
-  Display::display_confirmation_message($_GET['message']);
+  Display::addFlash(Display::return_message($_GET['message'], 'confirm'));
 }

 echo '<div class="actions">';
--- a/main/admin/sub_language_add.php
+++ b/main/admin/sub_language_add.php
@ -261,9 +261,9 @@ echo $msg;
 if (isset($_POST['SubmitAddDeleteLanguage'])) {
    $rs = SubLanguageManager::remove_sub_language($_GET['id'], $_GET['sub_language_id']);
    if ($rs === true) {
-        Display::display_confirmation_message(get_lang('TheSubLanguageHasBeenRemoved'));
+        Display::addFlash(Display::return_message(get_lang('TheSubLanguageHasBeenRemoved'), 'confirm'));
    } else {
-        Display::display_error_message(get_lang('TheSubLanguageHasNotBeenRemoved'));
+        Display::addFlash(Display::return_message(get_lang('TheSubLanguageHasNotBeenRemoved'), 'error'));
    }
 }
 // ckeck_if_is_parent_of_sub_language($parent_id)===false
@ -302,7 +302,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'definenewsublanguage') {
        $form->display();
    }
    if (isset($_GET['action']) && $_GET['action'] == 'definenewsublanguage') {
-        Display::display_normal_message(get_lang('TheSubLanguageForThisLanguageHasBeenAdded'));
+        Display::addFlash(Display::return_message(get_lang('TheSubLanguageForThisLanguageHasBeenAdded')));
    }
 }
 /**
--- a/main/admin/user_list.php
+++ b/main/admin/user_list.php
@ -431,7 +431,7 @@ function loginUser($userId)
        $target_url = api_get_path(WEB_PATH)."user_portal.php";
        $message .= '<br />'.sprintf(get_lang('LoginSuccessfulGoToX'), '<a href="'.$target_url.'">'.$target_url.'</a>');
        Display :: display_header(get_lang('UserList'));
-        Display :: display_normal_message($message, false);
+        Display::addFlash(Display::return_message($message, 'normal', false));
        Display :: display_footer();
        exit;
    }
--- a/main/admin/user_move_stats.php
+++ b/main/admin/user_move_stats.php
@ -603,7 +603,7 @@ Display::display_header(get_lang('MoveUserStats'));
 echo  '<div class="actions">';
 echo '<a href="../admin/index.php">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'',ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
-echo Display::display_normal_message(get_lang('CompareUserResultsBetweenCoursesAndCoursesInASession'),false);
+Display::addFlash(Display::return_message(get_lang('CompareUserResultsBetweenCoursesAndCoursesInASession'), 'normal', false));


 // Some pagination
--- a/main/admin/usergroup_import.php
+++ b/main/admin/usergroup_import.php
@ -113,7 +113,7 @@ if ($form->validate()) {
    $errors = validate_data($classes);
    if (count($errors) == 0) {
        $number_of_added_classes = save_data($classes);
-        Display::display_normal_message($number_of_added_classes.' '.get_lang('Added'));
+        Display::addFlash(Display::return_message($number_of_added_classes.' '.get_lang('Added'), 'normal'));
    } else {
        $error_message = get_lang('ErrorsWhenImportingFile');
        $error_message .= '<ul>';
@ -123,7 +123,7 @@ if ($form->validate()) {
        }
        $error_message .= '</ul>';
        $error_message .= get_lang('Error');
-        Display :: display_error_message($error_message, false);
+        Display::addFlash(Display::return_message($error_message, 'error', false));
    }
 }

--- a/main/attendance/attendance_calendar.php
+++ b/main/attendance/attendance_calendar.php
@ -33,17 +33,17 @@ $message_information = get_lang('AttendanceCalendarDescription');
 if (!empty($message_information)) {
    $message = '<strong>'.get_lang('Information').'</strong><br />';
    $message .= $message_information;
-    Display::display_normal_message($message, false);
+    Display::addFlash(Display::return_message($message, 'normal', false));
 }

 if (isset($error_repeat_date) && $error_repeat_date) {
    $message = get_lang('EndDateMustBeMoreThanStartDate');
-    Display::display_error_message($message, false);
+    Display::addFlash(Display::return_message($message, 'error', false));
 }

 if (isset($error_checkdate) && $error_checkdate) {
    $message = get_lang('InvalidDate');
-    Display::display_error_message($message, false);
+    Display::addFlash(Display::return_message($message, 'error', false));
 }

 if (isset($action) && $action == 'calendar_add') {
--- a/main/attendance/attendance_sheet.php
+++ b/main/attendance/attendance_sheet.php
@ -64,7 +64,7 @@ if (api_is_allowed_to_edit(null, true) ||
    }

    if (!$exists_attendance_today) {
-        Display::display_warning_message(get_lang('ThereIsNoClassScheduledTodayTryPickingAnotherDay'));
+        Display::addFlash(Display::return_message(get_lang('ThereIsNoClassScheduledTodayTryPickingAnotherDay'), 'warning'));
    }

    $form->addSelect(
@ -118,11 +118,11 @@ if (api_is_allowed_to_edit(null, true) ||
    if (!empty($message_information)) {
        $message = '<strong>'.get_lang('Information').'</strong><br />';
        $message .= $message_information;
-        Display::display_normal_message($message, false);
+        Display::addFlash(Display::return_message($message, 'normal', false));
    }

    if ($is_locked_attendance) {
-        Display::display_warning_message(get_lang('TheAttendanceSheetIsLocked'), false);
+        Display::addFlash(Display::return_message(get_lang('TheAttendanceSheetIsLocked'), 'warning', false));
    }

    $param_filter = '&filter='.Security::remove_XSS($default_filter).'&group_id='.$groupId;
--- a/main/course_description/add.php
+++ b/main/course_description/add.php
@ -38,7 +38,7 @@ echo '</div>';

 // error messages
 if (isset($error) && intval($error) == 1) {
-	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
+	Display::addFlash(Display::return_message(get_lang('FormHasErrorsPleaseComplete'), 'error', false));
 }

 // default header title form
@ -75,6 +75,6 @@ $form->addButtonCreate(get_lang('Save'));
 if (isset ($question[$description_type])) {
 	$message = '<strong>'.get_lang('QuestionPlan').'</strong><br />';
 	$message .= $question[$description_type];
-	Display::display_normal_message($message, false);
+	Display::addFlash(Display::return_message($message, 'normal', false));
 }
 $form->display();
--- a/main/course_description/edit.php
+++ b/main/course_description/edit.php
@ -56,7 +56,7 @@ echo '</div>';

 // error messages
 if (isset($error) && intval($error) == 1) {
-	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
+	Display::addFlash(Display::return_message(get_lang('FormHasErrorsPleaseComplete'), 'error', false));
 }

 // default header title form
@ -106,6 +106,6 @@ $form->setDefaults($default);
 if (isset ($question[$description_type])) {
 	$message = '<strong>'.get_lang('QuestionPlan').'</strong><br />';
 	$message .= $question[$description_type];
-	Display::display_normal_message($message, false);
+	Display::addFlash(Display::return_message($message, 'normal', false));
 }
 $form->display();
--- a/main/course_info/infocours.php
+++ b/main/course_info/infocours.php
@ -786,7 +786,7 @@ if ($form->validate() && is_settings_editable()) {
 /*	Header */
 Display :: display_header($nameTools, MODULE_HELP_NAME);
 if ($show_delete_watermark_text_message) {
-    Display :: display_normal_message(get_lang('FileDeleted'));
+    Display::addFlash(Display::return_message(get_lang('FileDeleted'), 'normal'));
 }

 // Display the form
--- a/main/course_progress/thematic_plan.php
+++ b/main/course_progress/thematic_plan.php
@ -32,7 +32,7 @@ echo Display::tag('h2', $thematic_data['title']);
 echo $thematic_data['content'];

 if (isset($message) && $message == 'ok') {
-    Display::display_normal_message(get_lang('ThematicSectionHasBeenCreatedSuccessfull'));
+    Display::addFlash(Display::return_message(get_lang('ThematicSectionHasBeenCreatedSuccessfull'), 'normal'));
 }

 if ($action === 'thematic_plan_list') {
@ -152,12 +152,12 @@ if ($action === 'thematic_plan_list') {
    if (isset($default_thematic_plan_question[$description_type])) {
        $message = '<strong>'.get_lang('QuestionPlan').'</strong><br />';
        $message .= $default_thematic_plan_question[$description_type];
-        Display::display_normal_message($message, false);
+        Display::addFlash(Display::return_message($message, 'normal', false));
    }

    // error messages
    if ($error) {
-        Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
+        Display::addFlash(Display::return_message(get_lang('FormHasErrorsPleaseComplete'), 'error', false));
    }
    $form->display();
 }
--- a/main/coursecopy/copy_course.php
+++ b/main/coursecopy/copy_course.php
@ -58,12 +58,13 @@ if (Security::check_token('post') && (
    $cr = new CourseRestorer($course);
    $cr->set_file_option($_POST['same_file_name_option']);
    $cr->restore($_POST['destination_course']);
-    Display::display_normal_message(
+    Display::addFlash(Display::return_message(
        get_lang('CopyFinished').': <a href="'.api_get_course_url($_POST['destination_course']).'">'.
        Security::remove_XSS($_POST['destination_course']).
        '</a>',
+        'normal',
        false
-    );
+    ));
 } elseif (Security::check_token('post') && (
        isset($_POST['copy_option']) &&
        $_POST['copy_option'] == 'select_items'
@ -95,7 +96,7 @@ if (Security::check_token('post') && (
    );

    if (empty($courseList)) {
-        Display::display_normal_message(get_lang('NoDestinationCoursesAvailable'));
+        Display::addFlash(Display::return_message(get_lang('NoDestinationCoursesAvailable'), 'normal'));
    } else {
        $options = array();
        foreach ($courseList as $courseItem) {
--- a/main/coursecopy/copy_course_session.php
+++ b/main/coursecopy/copy_course_session.php
@ -293,7 +293,7 @@ if (Security::check_token('post') && (
        $cr = new CourseRestorer($course);
        //$cr->set_file_option($_POST['same_file_name_option']);
        $cr->restore($destination_course, $destination_session);
-        Display::display_confirmation_message(get_lang('CopyFinished'));
+        Display::addFlash(Display::return_message(get_lang('CopyFinished'), 'confirmation'));
        display_form();
    } else {
        $arr_course_origin = array();
@ -347,7 +347,7 @@ if (Security::check_token('post') && (

    // Else, if a CourseSelectForm is requested, show it
    if (api_get_setting('show_glossary_in_documents') != 'none') {
-        Display::display_normal_message(get_lang('ToExportDocumentsWithGlossaryYouHaveToSelectGlossary'));
+        Display::addFlash(Display::return_message(get_lang('ToExportDocumentsWithGlossaryYouHaveToSelectGlossary'), 'normal'));
    }

    $arr_course_origin = array();
@ -369,7 +369,7 @@ if (Security::check_token('post') && (
    }

    if ((is_array($arr_course_origin) && count($arr_course_origin) > 0) && !empty($destination_session)) {
-        Display::display_normal_message(get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz'));
+        Display::addFlash(Display::return_message(get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz'), 'normal'));
        $course_origin = api_get_course_info($arr_course_origin[0]);
        $cb = new CourseBuilder('', $course_origin);
        $course = $cb->build($origin_session, $arr_course_origin[0], $with_base_content);
--- a/main/coursecopy/copy_course_session_selected.php
+++ b/main/coursecopy/copy_course_session_selected.php
@ -351,9 +351,10 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') ||
 } elseif (isset($_POST['copy_option']) && $_POST['copy_option'] == 'select_items') {
    // Else, if a CourseSelectForm is requested, show it
    if (api_get_setting('show_glossary_in_documents') != 'none') {
-        Display::display_normal_message(
-            get_lang('ToExportDocumentsWithGlossaryYouHaveToSelectGlossary')
-        );
+        Display::addFlash(Display::return_message(
+            get_lang('ToExportDocumentsWithGlossaryYouHaveToSelectGlossary'),
+            'normal'
+        ));
    }

    $arrCourseDestination = array();
@ -367,9 +368,10 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') ||
    }

    if (!empty($destinationSession)) {
-        Display::display_normal_message(
-            get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz')
-        );
+        Display::addFlash(Display::return_message(
+            get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz'),
+            'normal'
+        ));

        $cb = new CourseBuilder('', $courseInfo);
        $course = $cb->build($sessionId, $courseCode);
--- a/main/document/create_document.php
+++ b/main/document/create_document.php
@ -502,7 +502,7 @@ if ($form->validate()) {

    if (file_exists($filepath.$filename.'.'.$extension)) {
        Display:: display_header($nameTools, 'Doc');
-        Display:: display_error_message(get_lang('FileExists').' '.$title, false);
+        Display::addFlash(Display::return_message(get_lang('FileExists').' '.$title, 'error', false));
        Display:: display_footer();
        exit;
    }
@ -586,12 +586,12 @@ if ($form->validate()) {
            exit();
        } else {
            Display :: display_header($nameTools, 'Doc');
-            Display :: display_error_message(get_lang('Impossible'));
+            Display::addFlash(Display::return_message(get_lang('Impossible'), 'error'));
            Display :: display_footer();
        }
    } else {
        Display :: display_header($nameTools, 'Doc');
-        Display :: display_error_message(get_lang('Impossible'));
+        Display::addFlash(Display::return_message(get_lang('Impossible'), 'error'));
        Display :: display_footer();
    }
 } else {
@ -646,7 +646,7 @@ if ($form->validate()) {
            $str_info .= $info_value.'<br/>';
        }
        $create_certificate = get_lang('CreateCertificateWithTags');
-        Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info, false);
+        Display::addFlash(Display::return_message($create_certificate.': <br /><br/>'.$str_info, 'normal', false));
    }

    // HTML-editor
--- a/main/document/edit_document.php
+++ b/main/document/edit_document.php
@ -521,14 +521,15 @@ if ($owner_id == api_get_user_id() ||
 			$str_info .= $info_value.'<br/>';
 		}
 		$create_certificate = get_lang('CreateCertificateWithTags');
-		Display::display_normal_message(
-			$create_certificate.': <br /><br />'.$str_info,
-			false
-		);
+		Display::addFlash(Display::return_message(
+		    $create_certificate.': <br /><br />'.$str_info,
+            'normal',
+            false
+        ));
 	}

 	if ($extension == 'svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true') {
-		Display::display_warning_message(get_lang('BrowserDontSupportsSVG'));
+		Display::addFlash(Display::return_message(get_lang('BrowserDontSupportsSVG'), 'warning'));
 	}
    // HTML-editor
    echo '<div class="page-create">
--- a/main/dropbox/index.php
+++ b/main/dropbox/index.php
@ -93,10 +93,10 @@ if (isset($_POST['StoreCategory'])) {
    }
    $return_information = store_addcategory();
    if ($return_information['type'] == 'confirmation') {
-        Display :: display_confirmation_message($return_information['message']);
+        Display::addFlash(Display::return_message($return_information['message'], 'confirmation'));
    }
    if ($return_information['type'] == 'error') {
-        Display :: display_error_message(get_lang('FormHasErrorsPleaseComplete').'<br />'.$return_information['message']);
+        Display::addFlash(Display::return_message(get_lang('FormHasErrorsPleaseComplete').'<br />'.$return_information['message'], 'error'));
        display_addcategory_form($_POST['category_name'], $_POST['edit_id'], $postAction);
    }
 }
@ -117,7 +117,7 @@ if (($action == 'movesent' || $action == 'movereceived') && isset($_GET['move_id
    );
 }
 if (isset($_POST['do_move'])) {
-    Display :: display_confirmation_message(store_move($_POST['id'], $_POST['move_target'], $_POST['part']));
+    Display::addFlash(Display::return_message(store_move($_POST['id'], $_POST['move_target'], $_POST['part']), 'confirm'));
 }

 // Delete a file
@ -134,7 +134,7 @@ if (($action == 'deletereceivedfile' || $action == 'deletesentfile') && isset($_
        $dropboxfile->deleteSentWork($_GET['id']);
        $message = get_lang('SentFileDeleted');
    }
-    Display :: display_confirmation_message($message);
+    Display::addFlash(Display::return_message($message, 'confirmation'));
 }

 // Delete a category
@ -143,7 +143,7 @@ if (($action == 'deletereceivedcategory' || $action == 'deletesentcategory') &&
        api_not_allowed();
    }
    $message = delete_category($action, $_GET['id']);
-    Display :: display_confirmation_message($message);
+    Display::addFlash(Display::return_message($message, 'confirmation'));
 }

 // Do an action on multiple files
@ -158,7 +158,7 @@ if (!isset($_POST['feedback']) && (
    $postAction == 'download_sent')
 ) {
    $display_message = handle_multiple_actions();
-    Display :: display_normal_message($display_message);
+    Display::addFlash(Display::return_message($display_message, 'normal'));
 }

 // Store Feedback
@ -170,14 +170,14 @@ if (isset($_POST['feedback'])) {
    $check = Security::check_token();
    if ($check) {
        $display_message = store_feedback();
-        Display :: display_normal_message($display_message);
+        Display::addFlash(Display::return_message($display_message, 'normal'));
        Security::check_token();
    }
 }

 // Error Message
 if (isset($_GET['error']) && !empty($_GET['error'])) {
-    Display :: display_normal_message(get_lang($_GET['error']));
+    Display::addFlash(Display::return_message(get_lang($_GET['error']), 'normal'));
 }

 $dropbox_data_sent = array();