fixes from uid/gid change

Author: simonLeary42

resources/lib/UnityGroup.php

@@ -31,7 +31,7 @@ class UnityGroup
     public function __construct($gid, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK)
     {
         $this->gid = $gid;
-        $this->entry = $LDAP->getPIGroupEntry($pi_uid);
+        $this->entry = $LDAP->getPIGroupEntry($gid);
 
         $this->LDAP = $LDAP;
         $this->SQL = $SQL;
@@ -537,19 +537,19 @@ private function init()
     private function addUserToGroup($new_user)
     {
         // Add to LDAP Group
-        $this->entry->appendAttribute("memberuid", $new_user->getUID());
+        $this->entry->appendAttribute("memberuid", $new_user->uid);
         $this->entry->write();
-        $this->REDIS->appendCacheArray($this->getPIUID(), "members", $new_user->uid);
-        $this->REDIS->appendCacheArray($new_user->getUID(), "groups", $this->gid);
+        $this->REDIS->appendCacheArray($this->gid, "members", $new_user->uid);
+        $this->REDIS->appendCacheArray($new_user->uid, "groups", $this->gid);
     }
 
     private function removeUserFromGroup($old_user)
     {
         // Remove from LDAP Group
         $this->entry->removeAttributeEntryByValue("memberuid", $old_user->uid);
         $this->entry->write();
-        $this->REDIS->removeCacheArray($this->getPIUID(), "members", $old_user->uid);
-        $this->REDIS->removeCacheArray($old_user->getUID(), "groups", $this->gid);
+        $this->REDIS->removeCacheArray($this->gid, "members", $old_user->uid);
+        $this->REDIS->removeCacheArray($old_user->uid, "groups", $this->gid);
     }
 
     public function userExists($user)
@@ -578,7 +578,7 @@ public function getOwner()
         );
     }
 
-    public static function getPIUIDfromUID($uid)
+    public static function ownerUID2GID($uid)
     {
         return self::PI_PREFIX . $uid;
     }

resources/lib/UnityUser.php

@@ -198,7 +198,7 @@ public function getOrg($ignorecache = false)
     public function setFirstname($firstname, $operator = null)
     {
         $this->entry->setAttribute("givenname", $firstname);
-        $operator = is_null($operator) ? $this->getUID() : $operator->uid;
+        $operator = is_null($operator) ? $this->uid : $operator->uid;
 
         $this->SQL->addLog(
             $operator,
@@ -247,7 +247,7 @@ public function getFirstname($ignorecache = false)
     public function setLastname($lastname, $operator = null)
     {
         $this->entry->setAttribute("sn", $lastname);
-        $operator = is_null($operator) ? $this->getUID() : $operator->uid;
+        $operator = is_null($operator) ? $this->uid : $operator->uid;
 
         $this->SQL->addLog(
             $operator,
@@ -302,7 +302,7 @@ public function getFullname()
     public function setMail($email, $operator = null)
     {
         $this->entry->setAttribute("mail", $email);
-        $operator = is_null($operator) ? $this->getUID() : $operator->uid;
+        $operator = is_null($operator) ? $this->uid : $operator->uid;
 
         $this->SQL->addLog(
             $operator,
@@ -350,7 +350,7 @@ public function getMail($ignorecache = false)
      */
     public function setSSHKeys($keys, $operator = null, $send_mail = true)
     {
-        $operator = is_null($operator) ? $this->getUID() : $operator->uid;
+        $operator = is_null($operator) ? $this->uid : $operator->uid;
         $keys_filt = array_values(array_unique($keys));
         if ($this->entry->exists()) {
             $this->entry->setAttribute("sshpublickey", $keys_filt);
@@ -486,7 +486,7 @@ public function setHomeDir($home, $operator = null)
         if ($this->entry->exists()) {
             $this->entry->setAttribute("homedirectory", $home);
             $this->entry->write();
-            $operator = is_null($operator) ? $this->getUID() : $operator->uid;
+            $operator = is_null($operator) ? $this->uid : $operator->uid;
 
             $this->SQL->addLog(
                 $operator,

test/functional/NewUserTest.php

@@ -65,7 +65,7 @@ private function ensureUserDoesNotExist()
                 $org->removeUser($USER);
                 assert(!$org->inOrg($USER));
             }
-            $LDAP->getUserEntry($USER->getUID())->delete();
+            $LDAP->getUserEntry($USER->uid)->delete();
             assert(!$USER->exists());
         }
         $all_users_group = $LDAP->getUserGroup();
@@ -104,7 +104,7 @@ private function ensurePIGroupDoesNotExist()
     {
         global $USER, $LDAP;
         if ($USER->getPIGroup()->exists()) {
-            $LDAP->getPIGroupEntry($USER->getPIGroup()->getPIUID())->delete();
+            $LDAP->getPIGroupEntry($USER->getPIGroup()->gid)->delete();
             assert(!$USER->getPIGroup()->exists());
         }
     }