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;
         }
@@ -219,14 +219,14 @@ 
             $dn = 'uid='.$name.','.$this->server->user_base;
         }
         $propName   = false;
-        $rawMembers = $this->getMembersField($propName);;
-        if(in_array($dn, $rawMembers) || in_array($name, $rawMembers))
+        $rawMembers = $this->getMembersField($propName); ;
+        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');
             }
@@ -238,7 +238,7 @@ 
         }
         $tmp = strtolower($propName);
         $this->ldapObj->$tmp = $rawMembers;
-        if($flush === true)
+        if ($flush === true)
         {
             $obj = array('dn'=>$this->ldapObj->dn);
             $obj[$propName] = $rawMembers;
@@ -250,29 +250,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;
         }

Braces +13 added lines, -21 removed lines

@@ -3,8 +3,7 @@ 
 if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
 {
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
-}
-else
+} else
 {
     require_once('/var/www/secure_settings/class.FlipsideSettings.php');
 }
@@ -85,8 +84,7 @@ 
                 {
                     $members = array_merge($members, $child->members());
                 }
-            }
-            else
+            } else
             {
                 array_push($members, $rawMembers[$i]);
             }
@@ -130,12 +128,10 @@ 
                 {
                     $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
-            }
-            else
+            } else
             {
                 array_push($members, $rawMembers[$i]);
             }
@@ -167,8 +163,7 @@ 
             if(strncmp($members[$i], "uid=", 4) == 0)
             {
                 $userFilter.='(!('.$dnComps[0].'))';
-            }
-            else
+            } else
             {
                 $groupFilter.='(!('.$dnComps[0].'))';
             }
@@ -179,7 +174,9 @@ 
         $count = count($groups);
         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);
@@ -196,12 +193,10 @@ 
         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();
         }
@@ -213,8 +208,7 @@ 
         if($isGroup)
         {
             $dn = 'cn='.$name.','.$this->server->group_base;
-        }
-        else
+        } else
         {
             $dn = 'uid='.$name.','.$this->server->user_base;
         }
@@ -231,8 +225,7 @@ 
                 throw new \Exception('Unable to add a group as a child of this group type');
             }
             array_push($rawMembers, $name);
-        }
-        else
+        } else
         {
             array_push($rawMembers, $dn);
         }
@@ -243,8 +236,7 @@ 
             $obj = array('dn'=>$this->ldapObj->dn);
             $obj[$propName] = $rawMembers;
             return $this->server->update($obj);
-        }
-        else
+        } else
         {
             return true;
         }

Auth/class.LDAPCachableObject.php

Spacing +21 added lines, -21 removed lines

@@ -9,11 +9,11 @@ 
         {
             return $this->server->update($obj);
         }
-        catch(\Exception $ex)
+        catch (\Exception $ex)
         {
             $auth = \AuthProvider::getInstance();
             $ldap = $auth->getAuthenticator('Auth\LDAPAuthenticator');
-            if($ldap === false) return false;
+            if ($ldap === false) return false;
             $this->server = $ldap->get_and_bind_server(true);
             return $this->server->update($obj);
         }
@@ -21,7 +21,7 @@ 
 
     protected function getField($fieldName)
     {
-        if(!is_object($this->ldapObj))
+        if (!is_object($this->ldapObj))
         {
             return $this->getFieldLocal($fieldName);
         }
@@ -30,7 +30,7 @@ 
 
     protected function getFieldSingleValue($fieldName)
     {
-        if(!is_object($this->ldapObj))
+        if (!is_object($this->ldapObj))
         {
             return $this->getFieldLocalSingleValue($fieldName);
         }
@@ -39,7 +39,7 @@ 
 
     protected function setField($fieldName, $fieldValue)
     {
-        if(!is_object($this->ldapObj))
+        if (!is_object($this->ldapObj))
         {
             return $this->setFieldLocal($fieldName, $fieldValue);
         }
@@ -48,7 +48,7 @@ 
 
     protected function appendField($fieldName, $fieldValue)
     {
-        if(!is_object($this->ldapObj))
+        if (!is_object($this->ldapObj))
         {
             return $this->appendFieldLocal($fieldName, $fieldValue);
         }
@@ -57,11 +57,11 @@ 
 
     private function getFieldLocal($fieldName)
     {
-        if($this->ldapObj === false)
+        if ($this->ldapObj === false)
         {
             return false;
         }
-        if(!isset($this->ldapObj[$fieldName]))
+        if (!isset($this->ldapObj[$fieldName]))
         {
             return false;
         }
@@ -71,7 +71,7 @@ 
     private function getFieldServer($fieldName)
     {
         $lowerName = strtolower($fieldName);
-        if(!isset($this->ldapObj->{$lowerName}))
+        if (!isset($this->ldapObj->{$lowerName}))
         {
             return false;
         }
@@ -80,15 +80,15 @@ 
 
     private function getFieldLocalSingleValue($fieldName)
     {
-        if($this->ldapObj === false)
+        if ($this->ldapObj === false)
         {
             return false;
         }
-        if(!isset($this->ldapObj[$fieldName]))
+        if (!isset($this->ldapObj[$fieldName]))
         {
             return false;
         }
-        if(is_array($this->ldapObj[$fieldName]))
+        if (is_array($this->ldapObj[$fieldName]))
         {
             return $this->ldapObj[$fieldName][0];
         }
@@ -98,12 +98,12 @@ 
     private function getFieldServerSingleValue($fieldName)
     {
         $lowerName = strtolower($fieldName);
-        if(!isset($this->ldapObj->{$lowerName}))
+        if (!isset($this->ldapObj->{$lowerName}))
         {
             return false;
         }
         $field = $this->ldapObj->{$lowerName};
-        if(!isset($field[0]))
+        if (!isset($field[0]))
         {
             return false;
         }
@@ -113,7 +113,7 @@ 
     private function setFieldServer($fieldName, $fieldValue)
     {
         $obj = array('dn'=>$this->ldapObj->dn);
-        if($fieldValue !== null && strlen($fieldValue) > 0)
+        if ($fieldValue !== null && strlen($fieldValue) > 0)
         {
             $obj[$fieldName] = $fieldValue;
         }
@@ -129,7 +129,7 @@ 
     private function appendFieldServer($fieldName, $fieldValue)
     {
         $obj = array('dn'=>$this->ldapObj->dn);
-        if(isset($this->ldapObj->{$fieldName}))
+        if (isset($this->ldapObj->{$fieldName}))
         {
             $obj[$fieldName] = $this->ldapObj->{$fieldName};
             $obj[$fieldName][$obj[$fieldName]['count']] = $fieldValue;
@@ -144,13 +144,13 @@ 
 
     private function setFieldLocal($fieldName, $fieldValue)
     {
-        if($this->ldapObj === false)
+        if ($this->ldapObj === false)
         {
             $this->ldapObj = array();
         }
-        if($fieldValue === null || strlen($fieldValue) === 0)
+        if ($fieldValue === null || strlen($fieldValue) === 0)
         {
-            if(isset($this->ldapObj[$fieldName]))
+            if (isset($this->ldapObj[$fieldName]))
             {
                 unset($this->ldapObj[$fieldName]);
             }
@@ -162,11 +162,11 @@ 
 
     private function appendFieldLocal($fieldName, $fieldValue)
     {
-        if($this->ldapObj === false)
+        if ($this->ldapObj === false)
         {
             $this->ldapObj = array();
         }
-        if(!isset($this->ldapObj[$fieldName]))
+        if (!isset($this->ldapObj[$fieldName]))
         {
             $this->ldapObj[$fieldName] = array();
         }

Braces +6 added lines, -7 removed lines

@@ -8,12 +8,13 @@ 
         try
         {
             return $this->server->update($obj);
-        }
-        catch(\Exception $ex)
+        } catch(\Exception $ex)
         {
             $auth = \AuthProvider::getInstance();
             $ldap = $auth->getAuthenticator('Auth\LDAPAuthenticator');
-            if($ldap === false) return false;
+            if($ldap === false) {
+                return false;
+            }
             $this->server = $ldap->get_and_bind_server(true);
             return $this->server->update($obj);
         }
@@ -116,8 +117,7 @@ 
         if($fieldValue !== null && strlen($fieldValue) > 0)
         {
             $obj[$fieldName] = $fieldValue;
-        }
-        else
+        } else
         {
             $obj[$fieldName] = null;
         }
@@ -134,8 +134,7 @@ 
             $obj[$fieldName] = $this->ldapObj->{$fieldName};
             $obj[$fieldName][$obj[$fieldName]['count']] = $fieldValue;
             $obj[$fieldName]['count']++;
-        }
-        else
+        } else
         {
             $obj[$fieldName] = $fieldValue;
         }

class.AuthProvider.php

Spacing +53 added lines, -53 removed lines

@@ -18,7 +18,7 @@ 
 /**
  * Require the FlipsideSettings file
  */
-if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
+if (isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
 {
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
 }
@@ -43,11 +43,11 @@ 
     protected function __construct()
     {
         $this->methods = array();
-        if(isset(FlipsideSettings::$authProviders))
+        if (isset(FlipsideSettings::$authProviders))
         {
             $keys = array_keys(FlipsideSettings::$authProviders);
             $count = count($keys);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
                 $class = $keys[$i];
                 array_push($this->methods, new $class(FlipsideSettings::$authProviders[$keys[$i]]));
@@ -65,9 +65,9 @@ 
     public function getAuthenticator($methodName)
     {
         $count = count($this->methods);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if(strcasecmp(get_class($this->methods[$i]), $methodName) === 0)
+            if (strcasecmp(get_class($this->methods[$i]), $methodName) === 0)
             {
                 return $this->methods[$i];
             }
@@ -89,10 +89,10 @@ 
     {
         $res = false;
         $count = count($this->methods);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $res = $this->methods[$i]->login($username, $password);
-            if($res !== false)
+            if ($res !== false)
             {
                 return $this->methods[$i]->getUser($res);
             }
@@ -112,10 +112,10 @@ 
     {
         $res = false;
         $count = count($this->methods);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $res = $this->methods[$i]->login($username, $password);
-            if($res !== false)
+            if ($res !== false)
             {
                 FlipSession::setVar('AuthMethod', get_class($this->methods[$i]));
                 FlipSession::setVar('AuthData', $res);
@@ -163,11 +163,11 @@ 
      */
     private function mergeResult(&$returnValue, $res)
     {
-        if($res === false)
+        if ($res === false)
         {
             return;
         }
-        if($returnValue === false)
+        if ($returnValue === false)
         {
             $returnValue = $res;
             return;
@@ -189,11 +189,11 @@ 
     {
         $ret = false;
         $count = count($this->methods);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if($checkField)
+            if ($checkField)
             {
-                if($this->methods[$i]->{$checkField} === $checkValue)
+                if ($this->methods[$i]->{$checkField} === $checkValue)
                 {
                     continue;
                 }
@@ -217,11 +217,11 @@ 
     {
         $retCount = 0;
         $count = count($this->methods);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if($checkField)
+            if ($checkField)
             {
-                if($this->methods[$i]->{$checkField} === $checkValue)
+                if ($this->methods[$i]->{$checkField} === $checkValue)
                 {
                     continue;
                 }
@@ -242,7 +242,7 @@ 
      */
     public function getGroupByName($name, $methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             return $this->callOnEach('getGroupByName', array($name));
         }
@@ -262,9 +262,9 @@ 
      *
      * @return array|false An array of Auth\User objects or false if no users were found
      */
-    public function getUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false, $methodName = false)
+    public function getUsersByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false, $methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             return $this->callOnEach('getUsersByFilter', array($filter, $select, $top, $skip, $orderby), 'current');
         }
@@ -284,9 +284,9 @@ 
      *
      * @return array|false An array of Auth\PendingUser objects or false if no pending users were found
      */
-    public function getPendingUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false, $methodName = false)
+    public function getPendingUsersByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false, $methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             return $this->callOnEach('getPendingUsersByFilter', array($filter, $select, $top, $skip, $orderby), 'pending');
         }
@@ -306,9 +306,9 @@ 
      *
      * @return array|false An array of Auth\Group objects or false if no pending users were found
      */
-    public function getGroupsByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false, $methodName = false)
+    public function getGroupsByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false, $methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             return $this->callOnEach('getGroupsByFilter', array($filter, $select, $top, $skip, $orderby), 'current');
         }
@@ -325,7 +325,7 @@ 
      */
     public function getActiveUserCount($methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             return $this->addFromEach('getActiveUserCount', 'current');
         }
@@ -342,7 +342,7 @@ 
      */
     public function getPendingUserCount($methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             return $this->addFromEach('getPendingUserCount', 'pending');
         }
@@ -359,7 +359,7 @@ 
      */
     public function getGroupCount($methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             return $this->addFromEach('getGroupCount', 'current');
         }
@@ -379,9 +379,9 @@ 
     {
         $ret = array();
         $count = count($this->methods);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if($this->methods[$i]->supplement === false) continue;
+            if ($this->methods[$i]->supplement === false) continue;
 
             array_push($ret, $this->methods[$i]->getSupplementLink());
         }
@@ -398,7 +398,7 @@ 
      */
     public function impersonateUser($userArray)
     {
-        if(!is_object($userArray))
+        if (!is_object($userArray))
         {
             $user = new $userArray['class']($userArray);
         }
@@ -415,15 +415,15 @@ 
      */
     public function getTempUserByHash($hash, $methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             $count = count($this->methods);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->pending === false) continue;
+                if ($this->methods[$i]->pending === false) continue;
 
                 $ret = $this->methods[$i]->getTempUserByHash($hash);
-                if($ret !== false)
+                if ($ret !== false)
                 {
                     return $ret;
                 }
@@ -444,15 +444,15 @@ 
      */
     public function createPendingUser($user, $methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             $count = count($this->methods);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->pending === false) continue;
+                if ($this->methods[$i]->pending === false) continue;
 
                 $ret = $this->methods[$i]->createPendingUser($user);
-                if($ret !== false)
+                if ($ret !== false)
                 {
                     return true;
                 }
@@ -476,15 +476,15 @@ 
      */
     public function activatePendingUser($user, $methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             $count = count($this->methods);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->current === false) continue;
+                if ($this->methods[$i]->current === false) continue;
 
                 $ret = $this->methods[$i]->activatePendingUser($user);
-                if($ret !== false)
+                if ($ret !== false)
                 {
                     $this->impersonateUser($ret);
                     return true;
@@ -506,15 +506,15 @@ 
      */
     public function getUserByResetHash($hash, $methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             $count = count($this->methods);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->current === false) continue;
+                if ($this->methods[$i]->current === false) continue;
 
                 $ret = $this->methods[$i]->getUserByResetHash($hash);
-                if($ret !== false)
+                if ($ret !== false)
                 {
                     return $ret;
                 }
@@ -522,7 +522,7 @@ 
             return false;
         }
         $auth = $this->getAuthenticator($methodName);
-        if($auth === false)
+        if ($auth === false)
         {
             return $this->getUserByResetHash($hash, false);
         }
@@ -539,11 +539,11 @@ 
     public function getSuplementalProviderByHost($host)
     {
         $count = count($this->methods);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if($this->methods[$i]->supplement === false) continue;
+            if ($this->methods[$i]->supplement === false) continue;
 
-            if($this->methods[$i]->getHostName() === $host)
+            if ($this->methods[$i]->getHostName() === $host)
             {
                 return $this->methods[$i];
             }
@@ -551,15 +551,15 @@ 
         return false;
     }
 
-    public function deletePendingUsersByFilter($filter, $methodName=false)
+    public function deletePendingUsersByFilter($filter, $methodName = false)
     {
         $users = $this->getPendingUsersByFilter($filter, false, false, false, false, $methodName);
-        if($users === false)
+        if ($users === false)
         {
             return false;
         }
         $count = count($users);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $users[$i]->delete();
         }

Braces +19 added lines, -8 removed lines

@@ -21,8 +21,7 @@ 
 if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
 {
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
-}
-else
+} else
 {
     require_once('/var/www/secure_settings/class.FlipsideSettings.php');
 }
@@ -381,7 +380,9 @@ 
         $count = count($this->methods);
         for($i = 0; $i < $count; $i++)
         {
-            if($this->methods[$i]->supplement === false) continue;
+            if($this->methods[$i]->supplement === false) {
+                continue;
+            }
 
             array_push($ret, $this->methods[$i]->getSupplementLink());
         }
@@ -420,7 +421,9 @@ 
             $count = count($this->methods);
             for($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->pending === false) continue;
+                if($this->methods[$i]->pending === false) {
+                    continue;
+                }
 
                 $ret = $this->methods[$i]->getTempUserByHash($hash);
                 if($ret !== false)
@@ -449,7 +452,9 @@ 
             $count = count($this->methods);
             for($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->pending === false) continue;
+                if($this->methods[$i]->pending === false) {
+                    continue;
+                }
 
                 $ret = $this->methods[$i]->createPendingUser($user);
                 if($ret !== false)
@@ -481,7 +486,9 @@ 
             $count = count($this->methods);
             for($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->current === false) continue;
+                if($this->methods[$i]->current === false) {
+                    continue;
+                }
 
                 $ret = $this->methods[$i]->activatePendingUser($user);
                 if($ret !== false)
@@ -511,7 +518,9 @@ 
             $count = count($this->methods);
             for($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->current === false) continue;
+                if($this->methods[$i]->current === false) {
+                    continue;
+                }
 
                 $ret = $this->methods[$i]->getUserByResetHash($hash);
                 if($ret !== false)
@@ -541,7 +550,9 @@ 
         $count = count($this->methods);
         for($i = 0; $i < $count; $i++)
         {
-            if($this->methods[$i]->supplement === false) continue;
+            if($this->methods[$i]->supplement === false) {
+                continue;
+            }
 
             if($this->methods[$i]->getHostName() === $host)
             {