Fix messages.

main/user/subscribe_user.php

@@ -1,10 +1,12 @@
 <?php
 /* For licensing terms, see /license.txt*/
+
 /**
 * This script allows teachers to subscribe existing users
 * to their course.
 * @package chamilo.user
 */
+
 require_once '../inc/global.inc.php';
 $current_course_tool  = TOOL_USER;
 
@@ -152,18 +154,18 @@ if (isset($_POST['action'])) {
             }
 
 			if (!empty($list_register_user)) {
-				if ($is_suscribe_counter==1) {
-					$register_user_message=$temp_unique_user.' '.get_lang('AddedToCourse');
+                if ($is_suscribe_counter == 1) {
+					$register_user_message = $temp_unique_user.' '.get_lang('AddedToCourse');
 					Display::addFlash(Display::return_message($register_user_message));
 				} else {
-					$register_user_message='<br />'.get_lang('UsersRegistered').'<br/><br />'.$list_register_user;
-                    Display::addFlash(Display::return_message($register_user_message, false));
+					$register_user_message = get_lang('UsersRegistered').'<br/><br />'.$list_register_user;
+                    Display::addFlash(Display::return_message($register_user_message, 'normal', false));
 				}
 			}
 
 			if (!empty($list_not_register_user)) {
-				$not_register_user_message='<br />'.get_lang('UsersNotRegistered').'<br/><br /><br />'.$list_not_register_user;
-                Display::addFlash(Display::return_message($not_register_user_message, 'error'));
+				$not_register_user_message = get_lang('UsersNotRegistered').'<br/><br /><br />'.$list_not_register_user;
+                Display::addFlash(Display::return_message($not_register_user_message, 'error', false));
 			}
 
             header('Location:'.api_get_path(WEB_CODE_PATH).'user/user.php?'.api_get_cidreq().'&type='.$type);

main/user/user.php

@@ -52,7 +52,7 @@ if (api_is_allowed_to_edit(null, true)) {
                     $user_ids = array_diff($_POST['user'], array($user_id));
                     if (count($user_ids) > 0) {
                         CourseManager::unsubscribe_user($user_ids, $courseCode);
-                        $message = get_lang('UsersUnsubscribed');
+                        Display::addFlash(Display::return_message(get_lang('UsersUnsubscribed')));
                     }
                 }
         }
@@ -421,9 +421,9 @@ if (api_is_allowed_to_edit(null, true)) {
             $row = Database::fetch_array($result, 'ASSOC');
             if ($row['user_id'] == $user_id || $row['user_id'] == "") {
                 CourseManager::unsubscribe_user($_GET['user_id'], $courseCode);
-                $message = get_lang('UserUnsubscribed');
+                Display::addFlash(Display::return_message(get_lang('UserUnsubscribed')));
             } else {
-                $message = get_lang('ThisStudentIsSubscribeThroughASession');
+                Display::addFlash(Display::return_message(get_lang('ThisStudentIsSubscribeThroughASession')));
             }
         }
     }
@@ -982,10 +982,6 @@ if (api_is_allowed_to_edit(null, true)) {
 
 echo UserManager::getUserSubscriptionTab($selectedTab);
 
-if (isset($message)) {
-    Display::display_confirmation_message($message);
-}
-
 $table->display();
 
 if (!empty($_GET['keyword']) && !empty($_GET['submit'])) {