BurningFlipside / CommonCode

Auth/class.LDAPGroup.php

Spacing +48 added lines, -48 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace Auth;
-if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
+if (isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
 {
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
 }
@@ -20,7 +20,7 @@ 
     {
         $this->ldapObj = $data;
         $this->server = \LDAP\LDAPServer::getInstance();
-        if(!is_object($data))
+        if (!is_object($data))
         {
             throw new \Exception('Unable to setup LDAPGroup!');
         }
@@ -45,17 +45,17 @@ 
     {
         $rawMembers = $this->getField('member');
         $fieldName  = 'member';
-        if($rawMembers === false)
+        if ($rawMembers === false)
         {
             $rawMembers = $this->getField('uniqueMember');
             $fieldName  = 'uniqueMember';
         }
-        if($rawMembers === false)
+        if ($rawMembers === false)
         {
             $rawMembers = $this->getField('memberUid');
             $fieldName  = 'memberUid';
         }
-        if(!isset($rawMembers['count']))
+        if (!isset($rawMembers['count']))
         {
             $rawMembers['count'] = count($rawMembers);
         }
@@ -65,23 +65,23 @@ 
     private function getIDFromDN($dn)
     {
         $split = explode(',', $dn);
-        if(strncmp('cn=', $split[0], 3) === 0)
+        if (strncmp('cn=', $split[0], 3) === 0)
         {
             return substr($split[0], 3);
         }
         return substr($split[0], 4);
     }
 
-    public function getMemberUids($recursive=true)
+    public function getMemberUids($recursive = true)
     {
         $members = array();
         $rawMembers = $this->getMembersField();
-        for($i = 0; $i < $rawMembers['count']; $i++)
+        for ($i = 0; $i < $rawMembers['count']; $i++)
         {
-            if($recursive && strncmp($rawMembers[$i], 'cn=', 3) === 0)
+            if ($recursive && strncmp($rawMembers[$i], 'cn=', 3) === 0)
             {
                 $child = self::from_dn($rawMembers[$i], $this->server);
-                if($child !== false)
+                if ($child !== false)
                 {
                     $members = array_merge($members, $child->members());
                 }
@@ -92,7 +92,7 @@ 
             }
         }
         $count = count($members);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $members[$i] = $this->getIDFromDN($members[$i]);
         }
@@ -102,36 +102,36 @@ 
     private function getObjectFromDN($dn)
     {
         $split = explode(',', $dn);
-        if(strncmp('cn=', $dn, 3) === 0)
+        if (strncmp('cn=', $dn, 3) === 0)
         {
-            if(count($split) === 1)
+            if (count($split) === 1)
             {
                 return LDAPGroup::from_name($dn, $this->server);
             }
             return LDAPGroup::from_name(substr($split[0], 3), $this->server);
         }
-        if(count($split) === 1)
+        if (count($split) === 1)
         {
             return LDAPUser::from_name($dn, $this->server);
         }
         return LDAPUser::from_name(substr($split[0], 4), $this->server);
     }
 
-    public function members($details=false, $recursive=true, $includeGroups=true)
+    public function members($details = false, $recursive = true, $includeGroups = true)
     {
         $members = array();
         $rawMembers = $this->getMembersField();
-        for($i = 0; $i < $rawMembers['count']; $i++)
+        for ($i = 0; $i < $rawMembers['count']; $i++)
         {
-            if($recursive && strncmp($rawMembers[$i], 'cn=', 3) === 0)
+            if ($recursive && strncmp($rawMembers[$i], 'cn=', 3) === 0)
             {
                 $child = self::from_dn($rawMembers[$i], $this->server);
-                if($child !== false)
+                if ($child !== false)
                 {
                     $members = array_merge($members, $child->members());
                 }
             }
-            else if($includeGroups === false && strncmp($rawMembers[$i], 'cn=', 3) === 0)
+            else if ($includeGroups === false && strncmp($rawMembers[$i], 'cn=', 3) === 0)
             {
                 //Drop this member
             }
@@ -140,11 +140,11 @@ 
                 array_push($members, $rawMembers[$i]);
             }
         }
-        if($details === true)
+        if ($details === true)
         {
             $details = array();
             $count = count($members);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
                 $details[$i] = $this->getObjectFromDN($members[$i]);
             }
@@ -154,37 +154,37 @@ 
         return $members;
     }
 
-    public function getNonMemebers($select=false)
+    public function getNonMemebers($select = false)
     {
         $data = array();
         $groupFilter = '(&(cn=*)(!(cn='.$this->getGroupName().'))';
         $userFilter = '(&(cn=*)';
         $members = $this->members();
         $count = count($members);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            $dnComps = explode(',',$members[$i]);
-            if(strncmp($members[$i], "uid=", 4) == 0)
+            $dnComps = explode(',', $members[$i]);
+            if (strncmp($members[$i], "uid=", 4) == 0)
             {
-                $userFilter.='(!('.$dnComps[0].'))';
+                $userFilter .= '(!('.$dnComps[0].'))';
             }
             else
             {
-                $groupFilter.='(!('.$dnComps[0].'))';
+                $groupFilter .= '(!('.$dnComps[0].'))';
             }
         }
-        $userFilter.=')';
-        $groupFilter.=')';
+        $userFilter .= ')';
+        $groupFilter .= ')';
         $groups = $this->server->read($this->server->group_base, $groupFilter);
         $count = count($groups);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if($groups[$i] === false || $groups[$i] === null) continue;
+            if ($groups[$i] === false || $groups[$i] === null) continue;
             array_push($data, new LDAPGroup($groups[$i]));
         }
         $users = $this->server->read($this->server->user_base, $userFilter, false, $select);
         $count = count($users);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             array_push($data, new LDAPUser($users[$i]));
         } 
@@ -193,24 +193,24 @@ 
 
     public function clearMembers()
     {
-        if(isset($this->ldapObj['member']))
+        if (isset($this->ldapObj['member']))
         {
             $this->ldapObj['member'] = array();
         }
-        else if(isset($this->ldapObj['uniquemember']))
+        else if (isset($this->ldapObj['uniquemember']))
         {
             $this->ldapObj['uniquemember'] = array();
         }
-        else if(isset($this->ldapObj['memberuid']))
+        else if (isset($this->ldapObj['memberuid']))
         {
             $this->ldapObj['memberuid'] = array();
         }
     }
 
-    public function addMember($name, $isGroup=false, $flush=true)
+    public function addMember($name, $isGroup = false, $flush = true)
     {
         $dn = false;
-        if($isGroup)
+        if ($isGroup)
         {
             $dn = 'cn='.$name.','.$this->server->group_base;
         }
@@ -220,17 +220,17 @@ 
         }
         $propName   = false;
         $rawMembers = $this->getMembersField($propName);
-        if(isset($rawMembers['count']))
+        if (isset($rawMembers['count']))
         {
             unset($rawMembers['count']);
         }
-        if(in_array($dn, $rawMembers) || in_array($name, $rawMembers))
+        if (in_array($dn, $rawMembers) || in_array($name, $rawMembers))
         {
             return true;
         }
-        if($propName === 'memberUid')
+        if ($propName === 'memberUid')
         {
-            if($isGroup)
+            if ($isGroup)
             {
                 throw new \Exception('Unable to add a group as a child of this group type');
             }
@@ -242,7 +242,7 @@ 
         }
         $tmp = strtolower($propName);
         $this->ldapObj->$tmp = $rawMembers;
-        if($flush === true)
+        if ($flush === true)
         {
             $obj = array('dn'=>$this->ldapObj->dn);
             $obj[$propName] = $rawMembers;
@@ -254,29 +254,29 @@ 
         }
     }
 
-    static function from_dn($dn, $data=false)
+    static function from_dn($dn, $data = false)
     {
-        if($data === false)
+        if ($data === false)
         {
             throw new \Exception('data must be set for LDAPGroup');
         }
         $group = $data->read($dn, false, true);
-        if($group === false || !isset($group[0]))
+        if ($group === false || !isset($group[0]))
         {
             return false;
         }
         return new static($group[0]);
     }
 
-    static function from_name($name, $data=false)
+    static function from_name($name, $data = false)
     {
-        if($data === false)
+        if ($data === false)
         {
             throw new \Exception('data must be set for LDAPGroup');
         }
         $filter = new \Data\Filter("cn eq $name");
 	$group = $data->read($data->group_base, $filter);
-        if($group === false || !isset($group[0]))
+        if ($group === false || !isset($group[0]))
         {
             return false;
         }