remove useless group ou

Author: simonLeary42

defaults/config.ini.default

@@ -20,7 +20,7 @@ pass = "password"  ; Admin bind password
 basedn = "dc=unityhpc,dc=test"  ; Base search DN
 user_ou = "ou=users,dc=unityhpc,dc=test"  ; User organizational unit (may contain more than user group)
 user_group = "cn=unityusers,dc=unityhpc,dc=test" ; User group
-group_ou = "ou=groups,dc=unityhpc,dc=test"  ; Group organizational unit
+; group_ou = "ou=groups,dc=unityhpc,dc=test"  ; Group organizational unit
 pigroup_ou = "ou=pi_groups,dc=unityhpc,dc=test"  ; PI Group organizational unit
 orggroup_ou = "ou=org_groups,dc=unityhpc,dc=test"  ; ORG group organizational unit
 admin_group = "cn=web_admins,dc=unityhpc,dc=test"  ; admin dn (members of this group are admins on the web portal)

resources/init.php

@@ -41,7 +41,7 @@
     $CONFIG["ldap"]["pass"],
     __DIR__ . "/../deployment/custom_user_mappings",
     $CONFIG["ldap"]["user_ou"],
-    $CONFIG["ldap"]["group_ou"],
+    // $CONFIG["ldap"]["group_ou"],
     $CONFIG["ldap"]["pigroup_ou"],
     $CONFIG["ldap"]["orggroup_ou"],
     $CONFIG["ldap"]["admin_group"],

resources/lib/UnityLDAP.php

@@ -27,14 +27,14 @@ class UnityLDAP extends ldapConn
 
   // string vars for OUs
     private $STR_USEROU;
-    private $STR_GROUPOU;
+    // private $STR_GROUPOU;
     private $STR_PIGROUPOU;
     private $STR_ORGGROUPOU;
     private $STR_ADMINGROUP;
 
   // Instance vars for various ldapEntry objects
     private $userOU;
-    private $groupOU;
+    // private $groupOU;
     private $pi_groupOU;
     private $org_groupOU;
     private $adminGroup;
@@ -49,7 +49,7 @@ public function __construct(
         $pass,
         $custom_user_mappings,
         $user_ou,
-        $group_ou,
+        // $group_ou,
         $pigroup_ou,
         $orggroup_ou,
         $admin_group,
@@ -59,14 +59,14 @@ public function __construct(
         parent::__construct($host, $dn, $pass);
 
         $this->STR_USEROU = $user_ou;
-        $this->STR_GROUPOU = $group_ou;
+        // $this->STR_GROUPOU = $group_ou;
         $this->STR_PIGROUPOU = $pigroup_ou;
         $this->STR_ORGGROUPOU = $orggroup_ou;
         $this->STR_ADMINGROUP = $admin_group;
 
       // Get Global Entries
         $this->userOU = $this->getEntry($user_ou);
-        $this->groupOU = $this->getEntry($group_ou);
+        // $this->groupOU = $this->getEntry($group_ou);
         $this->pi_groupOU = $this->getEntry($pigroup_ou);
         $this->org_groupOU = $this->getEntry($orggroup_ou);
         $this->adminGroup = $this->getEntry($admin_group);
@@ -85,10 +85,10 @@ public function getUserOU()
         return $this->userOU;
     }
 
-    public function getGroupOU()
-    {
-        return $this->groupOU;
-    }
+    // public function getGroupOU()
+    // {
+    //     return $this->groupOU;
+    // }
 
     public function getPIGroupOU()
     {
@@ -186,13 +186,12 @@ private function PIGIDNumInUse($id)
 
     private function GIDNumInUse($id)
     {
-        $groups = $this->groupOU->getChildrenArray(true);
-        foreach ($groups as $group) {
-            if ($group["gidnumber"][0] == $id) {
-                return true;
-            }
-        }
-
+        // $groups = $this->groupOU->getChildrenArray(true);
+        // foreach ($groups as $group) {
+        //     if ($group["gidnumber"][0] == $id) {
+        //         return true;
+        //     }
+        // }
         return false;
     }