Merge pull request #59 from grycap/devel

Devel
grycap · May 10, 2018 · 57cdb75 · 57cdb75
2 parents 2350cd6 + f1888af
commit 57cdb75
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 22 deletions.
diff --git a/test/unit/test_userinfo.php b/test/unit/test_userinfo.php
@@ -24,7 +24,7 @@ public function testCreateIncorrectPass()
         $_SESSION = array("user"=>"admin", "password"=>"admin");
         $_GET = array("op"=>"add");
         $_POST = array("username"=>"userinfotest", "password"=>"passwordtest",
-                    "password2"=>"password", "user_groups"=>"users", "permissions"=>"0");
+                    "password2"=>"password", "user_groups"=>array("users"), "permissions"=>"0");
         include('../../userinfo.php');
         $this->assertEquals(array('Location: error.php?msg=The+passwords+are+not+equal.'),xdebug_get_headers());
 
@@ -41,7 +41,7 @@ public function testCreate()
         $_SESSION = array("user"=>"admin", "password"=>"admin");
         $_GET = array("op"=>"add");
         $_POST = array("username"=>"userinfotest", "password"=>"passwordtest",
-                    "password2"=>"passwordtest", "user_groups"=>"users", "permissions"=>"0");
+                    "password2"=>"passwordtest", "user_groups"=>array("users"), "permissions"=>"0");
         include('../../userinfo.php');
         $this->assertEquals(array('Location: user_list.php'),xdebug_get_headers());
 
@@ -60,7 +60,7 @@ public function testEdit()
         $_SESSION = array("user"=>"admin", "password"=>"admin");
         $_GET = array("op"=>"edit");
         $_POST = array("id"=>"userinfotest", "username"=>"newuserinfotest", "password"=>"passwordtest",
-                    "password2"=>"passwordtest", "user_groups"=>"users", "permissions"=>"0");
+                    "password2"=>"passwordtest", "user_groups"=>array("users"), "permissions"=>"0");
         include('../../userinfo.php');
         $this->assertEquals(array('Location: user_list.php'),xdebug_get_headers());
 

diff --git a/user.php b/user.php
@@ -137,16 +137,18 @@ function insert_user($username, $password, $groups, $permissions) {
 
     $all_ok = true;
     $error_msg = "";
-    foreach ($groups as $group) {
-	$fields = array();
-	$fields[] = "'" . $db->escapeString($group) . "'";
-	$fields[] = "'" . $db->escapeString($username) . "'";
-	$res = $db->insert_item_into_table("users_grp",$fields);
-        if ($res != "") {
-            $all_ok = false;
-            $error_msg = $res;
-        }
+    if (!is_null($groups)) {
+        foreach ($groups as $group) {
+        $fields = array();
+        $fields[] = "'" . $db->escapeString($group) . "'";
+        $fields[] = "'" . $db->escapeString($username) . "'";
+        $res = $db->insert_item_into_table("users_grp",$fields);
+            if ($res != "") {
+                $all_ok = false;
+                $error_msg = $res;
+            }
 
+        }
     }
     if (!$all_ok) {
         $res = "Error adding user groups: " . $error_msg;
@@ -197,14 +199,16 @@ function edit_user($username, $new_username, $password, $groups, $permissions) {
 
     $all_ok = true;
     $error_msg = "";
-    foreach ($groups as $group) {
-        $fields = array();
-        $fields[] = "'" . $db->escapeString($group) . "'";
-        $fields[] = "'" . $db->escapeString($username) . "'";
-        $grp_res = $db->insert_item_into_table("users_grp",$fields);
-        if ($grp_res != "") {
-            $all_ok = false;
-            $error_msg = $grp_res;
+    if (!is_null($groups)) {
+        foreach ($groups as $group) {
+            $fields = array();
+            $fields[] = "'" . $db->escapeString($group) . "'";
+            $fields[] = "'" . $db->escapeString($username) . "'";
+            $grp_res = $db->insert_item_into_table("users_grp",$fields);
+            if ($grp_res != "") {
+                $all_ok = false;
+                $error_msg = $grp_res;
+            }
         }
     }
     if (!$all_ok) {

diff --git a/userinfo.php b/userinfo.php
@@ -94,7 +94,7 @@
                 $username = $_POST['username'];
                 $password = $_POST['password'];
                 $password2 = $_POST['password2'];
-                $groups = explode(",", $_POST['user_groups']);
+                $groups = $_POST['user_groups'];
                 $permissions = $_POST['permissions'];
 
                 $err = "";
@@ -118,7 +118,7 @@
                     $new_username = $_POST['username'];
                     $password = $_POST['password'];
                     $password2 = $_POST['password2'];
-                    $groups = explode(",", $_POST['user_groups']);
+                    $groups = $_POST['user_groups'];
                     $permissions = $_POST['permissions'];
 
                     $err = "";