some fixes -refs #6680

main/admin/user_import.php

@@ -17,6 +17,7 @@ require '../inc/global.inc.php';
 require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
 require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
 require_once api_get_path(LIBRARY_PATH).'classmanager.lib.php';
+require_once api_get_path(LIBRARY_PATH).'usergroup.lib.php';
 require_once api_get_path(LIBRARY_PATH).'import.lib.php';
 
 // Set this option to true to enforce strict purification for usenames.
@@ -65,10 +66,11 @@ function validate_data($users) {
             $errors[] = $user;
         }
         // 4. Check classname
+        $usergroup = new UserGroup();
         if (!empty($user['ClassName'])) {
             $class_name = explode('|', trim($user['ClassName']));
             foreach ($class_name as $class) {
-                if (!UserGroup :: usergroup_exists($class)) {
+                if (!$usergroup -> usergroup_exists($class)) {
                     $user['error'] = get_lang('ClassNameNotAvailable');
                     $errors[] = $user;
                 }
@@ -154,11 +156,12 @@ function save_data($users) {
                     }
                 }
             }
+            $usergroup = new UserGroup();
             if (!empty($user['ClassName'])) {
                 $class_name = explode('|', trim($user['ClassName']));
                 foreach ($class_name as $class) {
-                    $class_id = UserGroup :: get_class_id($class);
-                    UserGroup :: add_user($user_id, $class_id);
+                    $class_id = $usergroup -> get_id_by_name($class);
+                    $usergroup -> add_user($user_id, $class_id);
                 }
                 
             }

main/inc/lib/usergroup.lib.php

@@ -781,29 +781,16 @@ class UserGroup extends Model
 	 * @param int $user_id The user id
 	 * @param int $class_id The class id
 	 */
-	function add_user($user_id, $class_id) {
-	    $table_class_user = Database :: get_main_table(TABLE_USERGROUP_REL_USER);
-        $user_id  = intval($user_id);
-        $class_id = intval($class_id);
-	    $sql = "INSERT INTO $table_class_user SET user_id = '".$user_id."', usergroup_id='".$class_id."'";
-	    Database::query($sql);
+	function add_user($user_id, $class_id)
+    {        
+	     $table_rel_user = Database::get_main_table(TABLE_USERGROUP_REL_USER);
+         $user_id  = intval($user_id);
+         $class_id = intval($class_id);
+	     $sql = "INSERT INTO $table_rel_user SET user_id = '".$user_id."', usergroup_id='".$class_id."'";
+	     Database::query($sql);
 		
 	}
     
-    /**
-	 * Get the class-id
-	 * @param string $name The class name
-	 * @return int the ID of the class
-	 */
-	function get_class_id($name)
-    {
-        $name = Database::escape_string($name);
-        $table_class = Database :: get_main_table(TABLE_USERGROUP);
-		    $sql = "SELECT * FROM $table_class WHERE name='".$name."'";
-		    $res = Database::query($sql);
-		    $obj = Database::fetch_object($res);
-		    return $obj->id;
-	}
-    
+       
 }
 /* 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));*/