made new functions to keep consistency

Author: sheldor1510

resources/lib/UnityLDAP.php

@@ -120,9 +120,9 @@ public function getNextUIDNumber($UnitySQL)
         $max_uid = $UnitySQL->getSiteVar('MAX_UID');
         $new_uid = $max_uid + 1;
 
-       while ($this->UIDNumInUse($new_uid)) {
-           $new_uid++;
-       }
+        while ($this->UIDNumInUse($new_uid)) {
+            $new_uid++;
+        }
 
         $UnitySQL->updateSiteVar('MAX_UID', $new_uid);
 
@@ -134,12 +134,8 @@ public function getNextPiGIDNumber($UnitySQL)
         $max_pigid = $UnitySQL->getSiteVar('MAX_PIGID');
         $new_pigid = $max_pigid + 1;
 
-        $pi_groups = $this->pi_groupOU->getChildrenArray(true);
-
-        foreach ($pi_groups as $group) {
-            if ($group["gidnumber"][0] == $new_pigid) {
-                $new_pigid++;
-            }
+        while ($this->PiGIDNumInUse($new_pigid)) {
+            $new_pigid++;
         }
 
         $UnitySQL->updateSiteVar('MAX_PIGID', $new_pigid);
@@ -152,12 +148,8 @@ public function getNextOrgGIDNumber($UnitySQL)
         $max_gid = $UnitySQL->getSiteVar('MAX_GID');
         $new_gid = $max_gid + 1;
 
-        $groups = $this->org_groupOU->getChildrenArray(true);
-
-        foreach ($groups as $group) {
-            if ($group["gidnumber"][0] == $new_gid) {
-                $new_gid++;
-            }
+        while ($this->GIDNumInUse($new_gid)) {
+            $new_gid++;
         }
 
         $UnitySQL->updateSiteVar('MAX_GID', $new_gid);
@@ -177,11 +169,23 @@ private function UIDNumInUse($id)
         return false;
     }
 
+    private function PiGIDNumInUse($id)
+    {
+        $pi_groups = $this->pi_groupOU->getChildrenArray(true);
+        foreach ($pi_groups as $pi_group) {
+            if ($pi_group["gidnumber"][0] == $id) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     private function GIDNumInUse($id)
     {
-        $users = $this->groupOU->getChildrenArray(true);
-        foreach ($users as $user) {
-            if ($user["gidnumber"][0] == $id) {
+        $groups = $this->groupOU->getChildrenArray(true);
+        foreach ($groups as $group) {
+            if ($group["gidnumber"][0] == $id) {
                 return true;
             }
         }