Insert user csv in platform in a class (usergroup) with class id - ref #6680

main/admin/user_import.php

@@ -71,7 +71,7 @@ function validate_data($users)
             $classId = explode('|', trim($user['ClassId']));
             foreach ($classId as $id) {
                 if (!UserGroup::usergroupIdExists($id)) {
-                    $user['error'] = get_lang('ClassNameNotAvailable');
+                    $user['error'] = sprintf(get_lang('ClassIdDoesntExists'), $id);
                     $errors[] = $user;
                 }
             }

main/admin/user_list.php

@@ -652,17 +652,16 @@ if (!empty($action)) {
                 }
                 break;
 			case 'show_message' :
-                if (!empty($_GET['message'])) {
-                    $message = Display::return_message(stripslashes($_GET['message']), 'confirmation');
-                } else {
-                    if (!empty($_GET['warn'])) {
-                        // to prevent too long messages
-                    	if ($_GET['warn'] == 'session_message'){
-                            $_GET['warn'] = $_SESSION['session_message_import_users'];
-                    	}
-                    	$message = Display::return_message(Security::remove_XSS($_GET['warn']), 'warning', false);
+                if (!empty($_GET['warn'])) {
+                    // to prevent too long messages
+                    if ($_GET['warn'] == 'session_message'){
+                        $_GET['warn'] = $_SESSION['session_message_import_users'];
                     }
-               }
+                    $message .= Display::return_message(Security::remove_XSS($_GET['warn']), 'warning', false);
+                }
+                if (!empty($_GET['message'])) {
+                    $message .= Display::return_message(stripslashes($_GET['message']), 'confirmation');
+                }
 
 				break;
 			case 'delete_user' :

main/inc/lib/usergroup.lib.php

@@ -866,7 +866,5 @@ class UserGroup extends Model
         return ($row['count'] > 0);
     }
 
-
-
 }
 /* CREATE TABLE IF NOT EXISTS access_url_rel_usergroup (access_url_id int unsigned NOT NULL, usergroup_id int unsigned NOT NULL, PRIMARY KEY (access_url_id, usergroup_id));*/