BurningFlipside / CommonCode

Auth/class.Group.php

Spacing +13 added lines, -13 removed lines

@@ -23,12 +23,12 @@ 
         return false;
     }
 
-    public function getMemberUids($recursive=true)
+    public function getMemberUids($recursive = true)
     {
         return array();
     }
 
-    public function members($details=false, $recursive=true, $includeGroups=true)
+    public function members($details = false, $recursive = true, $includeGroups = true)
     {
         return array();
     }
@@ -46,20 +46,20 @@ 
     public function jsonSerialize()
     {
         $group = array();
-        try{
+        try {
         $group['cn'] = $this->getGroupName();
         $group['description'] = $this->getDescription();
         $group['member'] = $this->getMemberUids();
-        } catch(\Exception $e) {echo $e->getMessage(); die();}
+        } catch (\Exception $e) {echo $e->getMessage(); die(); }
         return $group;
     }
 
-    public function getNonMembers($select=false)
+    public function getNonMembers($select = false)
     {
         return array();
     }
 
-    public function addMember($name, $isGroup=false, $flush=true)
+    public function addMember($name, $isGroup = false, $flush = true)
     {
         return false;
     }
@@ -70,24 +70,24 @@ 
         $auth = \AuthProvider::getInstance();
         $ldap = $auth->getAuthenticator('Auth\LDAPAuthenticator');
         $ldap->get_and_bind_server(true);
-        if(isset($group->description))
+        if (isset($group->description))
         {
             $this->setDescription($group->description);
             unset($group->description);
         }
-        if(isset($group->member))
+        if (isset($group->member))
         {
             $this->clearMembers();
             $count = count($group->member);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
                 $isLast = false;
-                if($i === $count - 1)
+                if ($i === $count - 1)
                 {
                     $isLast = true;
                 }
-                if(!isset($group->member[$i]->type)) continue;
-                if($group->member[$i]->type === 'Group')
+                if (!isset($group->member[$i]->type)) continue;
+                if ($group->member[$i]->type === 'Group')
                 {
                     $this->addMember($group->member[$i]->cn, true, $isLast);
                 }
@@ -101,7 +101,7 @@ 
         return true;
     }
 
-    static function from_name($name, $data=false)
+    static function from_name($name, $data = false)
     {
         return false;
     }

Braces +4 added lines, -3 removed lines

@@ -86,12 +86,13 @@
                 {
                     $isLast = true;
                 }
-                if(!isset($group->member[$i]->type)) continue;
+                if(!isset($group->member[$i]->type)) {
+                    continue;
+                }
                 if($group->member[$i]->type === 'Group')
                 {
                     $this->addMember($group->member[$i]->cn, true, $isLast);
-                }
-                else
+                } else
                 {
                     $this->addMember($group->member[$i]->uid, false, $isLast);
                 }

Auth/class.SQLPendingUser.php

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
 
     function getEmail()
     {
-        if(is_array($this->blob->mail))
+        if (is_array($this->blob->mail))
         {
             return $this->blob->mail[0];
         }
@@ -37,7 +37,7 @@ 
 
     function getUid()
     {
-        if(is_array($this->blob->uid))
+        if (is_array($this->blob->uid))
         {
             return $this->blob->uid[0];
         }
@@ -46,7 +46,7 @@ 
 
     function getPassword()
     {
-        if(is_array($this->blob->password))
+        if (is_array($this->blob->password))
         {
             return $this->blob->password[0];
         }

Auth/class.SQLGroup.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 
     public function getGroupName()
     {
-        if(isset($data['gid']))
+        if (isset($data['gid']))
         {
             return $data['gid'];
         }
@@ -21,7 +21,7 @@ 
 
     public function getDescription()
     {
-        if(isset($data['description']))
+        if (isset($data['description']))
         {
             return $data['description'];
         }
@@ -33,7 +33,7 @@ 
         return $this->members(false);
     }
 
-    public function members($details=false)
+    public function members($details = false)
     {
         //TODO
         return array();

Auth/class.LDAPGroup.php

Indentation +1 added lines, -1 removed lines

@@ -264,7 +264,7 @@
             throw new \Exception('data must be set for LDAPGroup');
         }
         $filter = new \Data\Filter("cn eq $name");
-	$group = $data->read($data->group_base, $filter);
+    $group = $data->read($data->group_base, $filter);
         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;
         }

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;
         }

Auth/class.LDAPUser.php

Indentation +1 added lines, -1 removed lines

@@ -241,7 +241,7 @@
             $obj['userPassword'] = $this->generateLDAPPass($password);
             if(isset($this->ldap_obj->uniqueidentifier))
             {
-               $obj['uniqueIdentifier'] = null;
+                $obj['uniqueIdentifier'] = null;
             }
             //Make sure we are bound in write mode
             $auth = \AuthProvider::getInstance();

Doc Comments +3 added lines

@@ -50,6 +50,9 @@
         return $res;
     }
 
+    /**
+     * @param string $listName
+     */
     private function isInListOrChild($listName, $group, $dn)
     {
         if(!isset($group[$listName]))

Spacing +40 added lines, -40 removed lines

@@ -8,15 +8,15 @@ 
     private $ldapObj;
     private $server;
 
-    public function __construct($data=false)
+    public function __construct($data = false)
     {
         $this->server = \LDAP\LDAPServer::getInstance();
-        if($data !== false && !isset($data['dn']) && !isset($data['extended']))
+        if ($data !== false && !isset($data['dn']) && !isset($data['extended']))
         {
             //Generic user object
             $filter = new \Data\Filter('mail eq '.$data['mail']);
             $users = $this->server->read($this->server->user_base, $filter);
-            if($users === false || !isset($users[0]))
+            if ($users === false || !isset($users[0]))
             {
                 throw new \Exception('No such LDAP User!');
             }
@@ -24,7 +24,7 @@ 
         }
         else
         {
-            if(isset($data['extended']))
+            if (isset($data['extended']))
             {
                 $this->ldapObj = $data['extended'];
             }
@@ -38,13 +38,13 @@ 
     private function check_child_group($array)
     {
         $res = false;
-        for($i = 0; $i < $array['count']; $i++)
+        for ($i = 0; $i < $array['count']; $i++)
         {
-            if(strpos($array[$i], $this->server->group_base) !== false)
+            if (strpos($array[$i], $this->server->group_base) !== false)
             {
                 $dn = explode(',', $array[$i]);
                 $res = $this->isInGroupNamed(substr($dn[0], 3));
-                if($res) return $res;
+                if ($res) return $res;
             }
         }
         return $res;
@@ -52,11 +52,11 @@ 
 
     private function isInListOrChild($listName, $group, $dn)
     {
-        if(!isset($group[$listName]))
+        if (!isset($group[$listName]))
         {
             return false;
         }
-        if(in_array($dn, $group[$listName]))
+        if (in_array($dn, $group[$listName]))
         {
             return true;
         }
@@ -67,17 +67,17 @@ 
     {
         $filter = new \Data\Filter('cn eq '.$name);
         $group = $this->server->read($this->server->group_base, $filter);
-        if(!empty($group))
+        if (!empty($group))
         {
             $group = $group[0];
             $dn  = $this->ldapObj->dn;
             $uid = $this->ldapObj->uid[0];
             $ret = $this->isInListOrChild('member', $group, $dn);
-            if($ret === false)
+            if ($ret === false)
             {
                 $ret = $this->isInListOrChild('uniquemember', $group, $dn);
             }
-            if($ret === false && isset($group['memberUid']) && in_array($uid, $group['memberUid']))
+            if ($ret === false && isset($group['memberUid']) && in_array($uid, $group['memberUid']))
             {
                 return true;
             }
@@ -119,7 +119,7 @@ 
     public function getOrganization()
     {
         $org = $this->getFieldSingleValue('o');
-        if($org === false)
+        if ($org === false)
         {
             return 'Volunteer';
         }
@@ -129,7 +129,7 @@ 
     public function getTitles()
     {
         $titles = $this->getField('title');
-        if(isset($titles['count']))
+        if (isset($titles['count']))
         {
             unset($titles['count']);
         }
@@ -174,7 +174,7 @@ 
     public function getOrganizationUnits()
     {
         $units = $this->getField('ou');
-        if(isset($units['count']))
+        if (isset($units['count']))
         {
             unset($units['count']);
         }
@@ -184,7 +184,7 @@ 
     public function getLoginProviders()
     {
         $hosts = $this->getField('host');
-        if(isset($hosts['count']))
+        if (isset($hosts['count']))
         {
             unset($hosts['count']);
         }
@@ -195,12 +195,12 @@ 
     {
         $res = array();
         $groups = $this->server->read($this->server->group_base);
-        if(!empty($groups))
+        if (!empty($groups))
         {
             $count = count($groups);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
-                if($this->isInGroupNamed($groups[$i]['cn'][0]))
+                if ($this->isInGroupNamed($groups[$i]['cn'][0]))
                 {
                     array_push($res, new LDAPGroup($groups[$i]));
                 }
@@ -220,23 +220,23 @@ 
 
     private function generateLDAPPass($pass)
     {
-        mt_srand((double)microtime()*1000000);
+        mt_srand((double)microtime() * 1000000);
         $salt = pack("CCCC", mt_rand(), mt_rand(), mt_rand(), mt_rand());
-        $hash = base64_encode(pack('H*',sha1($pass.$salt)).$salt);
+        $hash = base64_encode(pack('H*', sha1($pass.$salt)).$salt);
         return '{SSHA}'.$hash;
     }
 
     public function setPass($password)
     {
-        if(!is_object($this->ldapObj))
+        if (!is_object($this->ldapObj))
         {
-            return $this->setFieldLocal('userPassword',  $this->generateLDAPPass($password));
+            return $this->setFieldLocal('userPassword', $this->generateLDAPPass($password));
         }
         else
         {
             $obj = array('dn'=>$this->ldapObj->dn);
             $obj['userPassword'] = $this->generateLDAPPass($password);
-            if(isset($this->ldapObj->uniqueidentifier))
+            if (isset($this->ldapObj->uniqueidentifier))
             {
                $obj['uniqueIdentifier'] = null;
             }
@@ -250,7 +250,7 @@ 
 
     public function validate_password($password)
     {
-        if($this->server->bind($this->ldapObj->dn, $password))
+        if ($this->server->bind($this->ldapObj->dn, $password))
         {
             return true;
         }
@@ -259,37 +259,37 @@ 
 
     public function validate_reset_hash($hash)
     {
-        if(isset($this->ldapObj->uniqueidentifier) && strcmp($this->ldapObj->uniqueidentifier[0], $hash) === 0)
+        if (isset($this->ldapObj->uniqueidentifier) && strcmp($this->ldapObj->uniqueidentifier[0], $hash) === 0)
         {
             return true;
         }
         return false;
     }
 
-    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 LDAPUser');
         }
         $filter = new \Data\Filter("uid eq $name");
         $user = $data->read($data->user_base, $filter);
-        if($user === false || !isset($user[0]))
+        if ($user === false || !isset($user[0]))
         {
             return false;
         }
         return new static($user[0]);
     }
 
-    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 LDAPUser');
         }
         $filter = new \Data\Filter("dn eq $dn");
         $user = $data->read($data->user_base, $filter);
-        if($user === false || !isset($user[0]))
+        if ($user === false || !isset($user[0]))
         {
             return false;
         }
@@ -318,7 +318,7 @@ 
 
     public function setUid($uid)
     {
-        if(!is_object($this->ldapObj))
+        if (!is_object($this->ldapObj))
         {
             return $this->setFieldLocal('uid', $uid);
         }
@@ -366,7 +366,7 @@ 
 
     public function setTitles($titles)
     {
-        if(!is_array($titles))
+        if (!is_array($titles))
         {
             $titles = array($titles);
         }
@@ -375,7 +375,7 @@ 
 
     public function setOrganizationUnits($ous)
     {
-        if(!is_array($ous))
+        if (!is_array($ous))
         {
             $ous = array($ous);
         }
@@ -384,7 +384,7 @@ 
 
     public function flushUser()
     {
-        if(is_object($this->ldapObj))
+        if (is_object($this->ldapObj))
         {
             //In this mode we are always up to date
             return true;
@@ -392,11 +392,11 @@ 
         $obj = $this->ldapObj;
         $obj['objectClass'] = array('top', 'inetOrgPerson', 'extensibleObject');
         $obj['dn'] = 'uid='.$this->ldapObj['uid'].','.$this->server->user_base;
-        if(!isset($obj['sn']))
+        if (!isset($obj['sn']))
         {
             $obj['sn'] = $obj['uid'];
         }
-        if(!isset($obj['cn']))
+        if (!isset($obj['cn']))
         {
             $obj['cn'] = $obj['uid'];
         }
@@ -413,7 +413,7 @@ 
         $ldapObj = $this->server->read($ldap->user_base, new \Data\Filter('uid eq '.$this->getUid()));
         $ldapObj = $ldapObj[0];
         $hash = false;
-        if(isset($ldapObj->userpassword))
+        if (isset($ldapObj->userpassword))
         {
             $hash = hash('sha512', $ldapObj->dn.';'.$ldapObj->userpassword[0].';'.$ldapObj->mail[0]);
         }
@@ -423,7 +423,7 @@ 
         }
         $obj = array('dn'=>$this->ldapObj->dn);
         $obj['uniqueIdentifier'] = $hash;
-        if($this->server->update($obj) === false)
+        if ($this->server->update($obj) === false)
         {
             throw new \Exception('Unable to create hash in LDAP object!');
         }

Braces +9 added lines, -13 removed lines

@@ -21,14 +21,12 @@ 
                 throw new \Exception('No such LDAP User!');
             }
             $this->ldapObj = $users[0];
-        }
-        else
+        } else
         {
             if(isset($data['extended']))
             {
                 $this->ldapObj = $data['extended'];
-            }
-            else
+            } else
             {
                 $this->ldapObj = $data;
             }
@@ -44,7 +42,9 @@ 
             {
                 $dn = explode(',', $array[$i]);
                 $res = $this->isInGroupNamed(substr($dn[0], 3));
-                if($res) return $res;
+                if($res) {
+                    return $res;
+                }
             }
         }
         return $res;
@@ -206,8 +206,7 @@ 
                 }
             }
             return $res;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -231,8 +230,7 @@ 
         if(!is_object($this->ldapObj))
         {
             return $this->setFieldLocal('userPassword',  $this->generateLDAPPass($password));
-        }
-        else
+        } else
         {
             $obj = array('dn'=>$this->ldapObj->dn);
             $obj['userPassword'] = $this->generateLDAPPass($password);
@@ -321,8 +319,7 @@ 
         if(!is_object($this->ldapObj))
         {
             return $this->setFieldLocal('uid', $uid);
-        }
-        else
+        } else
         {
             throw new \Exception('Unsupported!');
         }
@@ -416,8 +413,7 @@ 
         if(isset($ldapObj->userpassword))
         {
             $hash = hash('sha512', $ldapObj->dn.';'.$ldapObj->userpassword[0].';'.$ldapObj->mail[0]);
-        }
-        else
+        } else
         {
             $hash = hash('sha512', $ldapObj->dn.';'.openssl_random_pseudo_bytes(10).';'.$ldapObj->mail[0]);
         }

Auth/class.GoogleAuthenticator.php

Indentation +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
             $ret = $auth->activatePendingUser($user);

             if($ret === false)

             {

-                 throw new \Exception('Unable to create user! '.$res);

+                    throw new \Exception('Unable to create user! '.$res);

             }

             return self::SUCCESS;

         }

Spacing +9 added lines, -9 removed lines

@@ -10,11 +10,11 @@ 
     public function __construct($params)

     {

         parent::__construct($params);

-        if(!isset($params['client_secrets_path']))

+        if (!isset($params['client_secrets_path']))

         {

             throw new \Exception('Missing required parameter client_secrets_path!');

         }

-        if(!isset($params['redirect_url']))

+        if (!isset($params['redirect_url']))

         {

             $params['redirect_url'] = 'https://'.$_SERVER['HTTP_HOST'].'/oauth2callback.php?src=google';

         }

@@ -34,21 +34,21 @@ 
     public function authenticate($code, &$currentUser = false)

     {

         $googleUser = false;

-        try{

+        try {

             $this->client->authenticate($code);

             $this->token = $this->client->getAccessToken();

             \FlipSession::setVar('GoogleToken', $this->token);

             $oauth2Service = new \Google_Service_Oauth2($this->client);

             $googleUser = $oauth2Service->userinfo->get();

-        } catch(\Exception $ex) {

+        } catch (\Exception $ex) {

             return self::LOGIN_FAILED;

         }

 

         $auth = \AuthProvider::getInstance();

         $localUsers = $auth->getUsersByFilter(new \Data\Filter('mail eq '.$googleUser->email));

-        if($localUsers !== false && isset($localUsers[0]))

+        if ($localUsers !== false && isset($localUsers[0]))

         {

-            if($localUsers[0]->canLoginWith('google.com'))

+            if ($localUsers[0]->canLoginWith('google.com'))

             {

                 $auth->impersonateUser($localUsers[0]);

                 return self::SUCCESS;

@@ -64,7 +64,7 @@ 
             $user->setLastName($googleUser->familyName);

             $user->addLoginProvider('google.com');

             $ret = $auth->activatePendingUser($user);

-            if($ret === false)

+            if ($ret === false)

             {

                  throw new \Exception('Unable to create user! '.$res);

             }

@@ -74,7 +74,7 @@ 
 

     public function getUser($data = false)

     {

-        if($data === false)

+        if ($data === false)

         {

             $data = $this->token;

         }

@@ -89,7 +89,7 @@ 
             $profileUser['displayName'] = $googleUser->name;

             $profileUser['jpegPhoto'] = base64_encode(file_get_contents($googleUser->picture));

             return $profileUser;

-        } catch(\Exception $e)

+        } catch (\Exception $e)

         {

             return false;

         }

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
             }

             $currentUser = $localUsers[0];

             return self::ALREADY_PRESENT;

-        }

-        else

+        } else

         {

             $user = new PendingUser();

             $user->setEmail($googleUser->email);

Auth/OAuth2/class.GitLabAuthenticator.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
     public function getUserFromToken($token)
     {
-        if($token === false)
+        if ($token === false)
         {
             $token = \FlipSession::getVar('OAuthToken');
         }

Auth/OAuth2/class.FlipsideAuthenticator.php

Spacing +5 added lines, -5 removed lines

@@ -25,14 +25,14 @@ 
 
     public function getUserFromToken($token)
     {
-        if($token === false)
+        if ($token === false)
         {
             $token = \FlipSession::getVar('OAuthToken');
         }
         $resp = \Httpful\Request::get('https://api.github.com/user')->addHeader('Authorization', 'token '.$token['access_token'])->send();
         $github_user = $resp->body;
         $user = new \Auth\PendingUser();
-        if(isset($github_user->name))
+        if (isset($github_user->name))
         {
             $name = explode(' ', $github_user->name);
             $user->setGivenName($name[0]);
@@ -47,7 +47,7 @@ 
     public function login($username, $password)
     {
         $resp = \Httpful\Request::post('https://profiles.test.burningflipside.com/api/v1/login?username='.urlencode($username).'&password='.urlencode($password))->send();
-        if($resp->hasErrors())
+        if ($resp->hasErrors())
         {
             return false;
         }
@@ -58,11 +58,11 @@ 
 
     public function isLoggedIn($data)
     {
-        if(isset($this->user))
+        if (isset($this->user))
         {
             return true;
         }
-        if(isset($data['res']))
+        if (isset($data['res']))
         {
             return $data['res'];
         }

Auth/OAuth2/class.GitHubAuthenticator.php

Spacing +2 added lines, -2 removed lines

@@ -30,14 +30,14 @@
 
     public function getUserFromToken($token)
     {
-        if($token === false)
+        if ($token === false)
         {
             $token = \FlipSession::getVar('OAuthToken');
         }
         $resp = \Httpful\Request::get('https://api.github.com/user')->addHeader('Authorization', 'token '.$token['access_token'])->send();
         $github_user = $resp->body;
         $user = new \Auth\PendingUser();
-        if(isset($github_user->name))
+        if (isset($github_user->name))
         {
             $name = explode(' ', $github_user->name);
             $user->setGivenName($name[0]);