rename confusing variables

Author: simonLeary42

Diff for: resources/lib/UnityLDAP.php

@@ -193,7 +193,7 @@ private function GIDNumInUse($id)
         return false;
     }
 
-    public function getUnassignedID($uid, $UnitySQL)
+    public function getUnassignedIDNum($uid, $UnitySQL)
     {
         $netid = strtok($uid, "_");  // extract netid
       // scrape all files in custom folder
@@ -203,13 +203,12 @@ public function getUnassignedID($uid, $UnitySQL)
                 // found csv file
                 $handle = fopen($fileinfo->getPathname(), "r");
                 while (($data = fgetcsv($handle, 1000, ",")) !== false) {
-                    $netid_match = $data[0];
-                    $uid_match = $data[1];
-
-                    if ($uid == $netid_match || $netid == $netid_match) {
+                    $customMappingNetID = $data[0];
+                    $customMappingIDNumber = $data[1];
+                    if ($uid == $customMappingNetID || $netid == $customMappingNetID) {
                         // found a match
-                        if (!$this->UIDNumInUse($uid_match) && !$this->GIDNumInUse($uid_match)) {
-                            return $uid_match;
+                        if (!$this->UIDNumInUse($customMappingIDNumber) && !$this->GIDNumInUse($customMappingIDNumber)) {
+                            return $CustomMappingIDNumber;
                         }
                     }
                 }

Diff for: resources/lib/UnityUser.php

@@ -53,7 +53,7 @@ public function init($send_mail = true)
         // Create LDAP group
         //
         $ldapGroupEntry = $this->getLDAPGroup();
-        $id = $this->LDAP->getUnassignedID($this->getUID(), $this->SQL);
+        $id = $this->LDAP->getUnassignedIDNum($this->getUID(), $this->SQL);
 
         if (!$ldapGroupEntry->exists()) {
             $ldapGroupEntry->setAttribute("objectclass", UnityLDAP::POSIX_GROUP_CLASS);