BurningFlipside / CommonCode

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

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

class.FlipREST.php

Spacing +31 added lines, -31 removed lines

@@ -25,7 +25,7 @@ 
 
     private function getUserFromSession()
     {
-        if(FlipSession::isLoggedIn())
+        if (FlipSession::isLoggedIn())
         {
             return FlipSession::getUser();
         }
@@ -41,7 +41,7 @@ 
         $auth = \AuthProvider::getInstance();
         $auth->login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
         $user = FlipSession::getUser();
-        if($user === false)
+        if ($user === false)
         {
             $data = substr($header['Authorization'], 6);
             $userpass = explode(':', base64_decode($data));
@@ -62,7 +62,7 @@ 
 
     private function getUserFromHeader($header)
     {
-        if(strncmp($header, 'Basic', 5) == 0)
+        if (strncmp($header, 'Basic', 5) == 0)
         {
             return $this->getUserFromBasicAuth($header);
         }
@@ -72,7 +72,7 @@ 
     public function call()
     {
         // no auth header
-        if(!isset($this->headers['Authorization']))
+        if (!isset($this->headers['Authorization']))
         {
             $this->app->user = $this->getUserFromSession();
         } 
@@ -82,7 +82,7 @@ 
             $this->app->user = $this->getUserFromHeader($header);
         }
 
-        if($this->app->user === false)
+        if ($this->app->user === false)
         {
             $this->app->getLog()->error("No user found for call");
         }
@@ -96,19 +96,19 @@ 
 {
     private function fix_encoded_element($key, $value, &$array, $prefix = '')
     {
-        if(is_array($value))
+        if (is_array($value))
         {
             $array[$key] = implode(';', $value);
         }
-        else if($key === '_id' && is_object($value))
+        else if ($key === '_id' && is_object($value))
         {
             $array[$key] = $value->{'$id'};
         }
-        else if(is_object($value))
+        else if (is_object($value))
         {
             $array[$key] = $this->app->request->getUrl().$this->app->request->getPath().$prefix.'/'.$key;
         }
-        else if(strncmp($value, 'data:', 5) === 0)
+        else if (strncmp($value, 'data:', 5) === 0)
         {
             $array[$key] = $this->app->request->getUrl().$this->app->request->getPath().$prefix.'/'.$key;
         }
@@ -122,40 +122,40 @@ 
         }
         ob_start();
         $df = fopen("php://output", 'w');
-        if(is_array($array))
+        if (is_array($array))
         {
             $first = reset($array);
             $keys = FALSE;
-            if(is_array($first))
+            if (is_array($first))
             {
                 $keys = array_keys($first);
             }
-            else if(is_object($first))
+            else if (is_object($first))
             {
                 $keys = array_keys(get_object_vars($first));
             }
             fputcsv($df, $keys);
             foreach ($array as $row)
             {
-                if(is_array($row))
+                if (is_array($row))
                 {
                     $id = $row[$keys[0]];
-                    foreach($row as $key=>$value)
+                    foreach ($row as $key=>$value)
                     {
                         $this->fix_encoded_element($key, $value, $row, '/'.$id);
                     }
                     fputcsv($df, $row);
                 }
-                else if(is_object($row))
+                else if (is_object($row))
                 {
                     $keyName = $keys[0];
                     $id = $row->$keyName;
-                    if(is_object($id))
+                    if (is_object($id))
                     {
                         $id = $id->{'$id'};
                     }
                     $values = get_object_vars($row);
-                    foreach($values as $key=>$value)
+                    foreach ($values as $key=>$value)
                     {
                         $this->fix_encoded_element($key, $value, $values, '/'.$id);
                     }
@@ -167,7 +167,7 @@ 
         {
             $array = get_object_vars($array);
             fputcsv($df, array_keys($array));
-            foreach($array as $key=>$value)
+            foreach ($array as $key=>$value)
             {
                 $this->fix_encoded_element($key, $value, $array);
             }
@@ -185,34 +185,34 @@ 
 
     public function call()
     {
-        if($this->app->request->isOptions())
+        if ($this->app->request->isOptions())
         {
             return;
         }
         $params = $this->app->request->params();
         $fmt = null;
-        if(isset($params['fmt']))
+        if (isset($params['fmt']))
         {
             $fmt = $params['fmt'];
         }
-        if($fmt === null && isset($params['$format']))
+        if ($fmt === null && isset($params['$format']))
         {
             $fmt = $params['$format'];
-            if(strstr($fmt, 'odata.streaming=true'))
+            if (strstr($fmt, 'odata.streaming=true'))
             {
                 $this->app->response->setStatus(406);
                 return;
             }
         }
-        if($fmt === null)
+        if ($fmt === null)
         {
             $mimeType = $this->app->request->headers->get('Accept');
-            if(strstr($mimeType, 'odata.streaming=true'))
+            if (strstr($mimeType, 'odata.streaming=true'))
             {
                 $this->app->response->setStatus(406);
                 return;
             }
-            switch($mimeType)
+            switch ($mimeType)
             {
                 case 'text/csv':
                     $fmt = 'csv';
@@ -232,11 +232,11 @@ 
 
         $this->next->call();
 
-        if($this->app->response->getStatus() == 200 && $this->app->fmt !== 'json')
+        if ($this->app->response->getStatus() == 200 && $this->app->fmt !== 'json')
         {
             $data = json_decode($this->app->response->getBody());
             $text = false;
-            switch($this->app->fmt)
+            switch ($this->app->fmt)
             {
                 case 'data-table':
                     $this->app->response->headers->set('Content-Type', 'application/json');
@@ -263,7 +263,7 @@ 
             }
             $this->app->response->setBody($text);
         }
-        else if($this->app->response->getStatus() == 200)
+        else if ($this->app->response->getStatus() == 200)
         {
             $this->app->response->headers->set('Content-Type', 'application/json;odata.metadata=none');
         }
@@ -277,7 +277,7 @@ 
         parent::__construct();
         $this->config('debug', false);
         $headers = array();
-        if(php_sapi_name() !== "cli")
+        if (php_sapi_name() !== "cli")
         {
             $headers = apache_request_headers();
         }
@@ -297,12 +297,12 @@ 
         return $this->post($uri, $handler);
     }
 
-    function get_json_body($array=false)
+    function get_json_body($array = false)
     {
         return $this->getJsonBody($array);
     }
 
-    function getJsonBody($array=false)
+    function getJsonBody($array = false)
     {
         $body = $this->request->getBody();
         return json_decode($body, $array);

Auth/class.SQLUser.php

Spacing +6 added lines, -6 removed lines

@@ -5,13 +5,13 @@ 
 {
     private $data;
 
-    function __construct($data=false)
+    function __construct($data = false)
     {
         $this->data = array();
-        if($data !== false)
+        if ($data !== false)
         {
             $this->data = $data;
-            if(isset($data['extended']))
+            if (isset($data['extended']))
             {
                 $this->data = $data['extended'];
             }
@@ -25,7 +25,7 @@ 
         $uid = $this->getUid();
         $filter = new \Data\Filter("uid eq '$uid' and gid eq '$name'");
         $groups = $group_data_table->read($filter);
-        if($groups === false || !isset($groups[0]))
+        if ($groups === false || !isset($groups[0]))
         {
             return false;
         }
@@ -35,7 +35,7 @@ 
 
     function getEmail()
     {
-        if(isset($this->data['mail']))
+        if (isset($this->data['mail']))
         {
              return $this->data['mail'];
         }
@@ -44,7 +44,7 @@ 
 
     function getUid()
     {
-        if(isset($this->data['uid']))
+        if (isset($this->data['uid']))
         {
             return $this->data['uid'];
         }

Auth/class.SQLGroup.php

Spacing +4 added lines, -4 removed lines

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

Auth/class.LDAPAuthenticator.php

Spacing +47 added lines, -47 removed lines

@@ -14,7 +14,7 @@ 
 namespace Auth;
 
 /** We need the FlipsideSettings class to determine how to connect to the LDAP server */
-if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
+if (isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
 {
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
 }
@@ -33,18 +33,18 @@ 
 {
     $count = count($array);
     $keys  = array_keys($orderby);
-    for($i = 0; $i < $count; $i++)
+    for ($i = 0; $i < $count; $i++)
     {
-        for($j = $i; $j < $count; $j++)
+        for ($j = $i; $j < $count; $j++)
         {
             $d = strcasecmp($array[$i][$keys[0]][0], $array[$j][$keys[0]][0]);
-            switch($orderby[$keys[0]])
+            switch ($orderby[$keys[0]])
             {
                 case 1:
-                    if($d > 0) swap($array, $i, $j);
+                    if ($d > 0) swap($array, $i, $j);
                     break;
                 case 0:
-                    if($d < 0) swap($array, $i, $j);
+                    if ($d < 0) swap($array, $i, $j);
                     break;
             }
         }
@@ -92,7 +92,7 @@ 
         $this->host       = $this->getHostParam($params);
         $this->user_base  = $this->getParam($params, 'user_base');
         $this->group_base = $this->getParam($params, 'group_base');
-        $this->bind_dn    = $this->getParam($params, 'bind_dn',   '$ldap_auth', 'read_write_pass');
+        $this->bind_dn    = $this->getParam($params, 'bind_dn', '$ldap_auth', 'read_write_pass');
         $this->bind_pass  = $this->getParam($params, 'bind_pass', '$ldap_auth', 'read_write_user');
     }
 
@@ -107,11 +107,11 @@ 
      */
     private function getHostParam($params)
     {
-        if(isset($params['host']))
+        if (isset($params['host']))
         {
             return $params['host'];
         }
-        if(isset(\FlipsideSettings::$ldap['proto']))
+        if (isset(\FlipsideSettings::$ldap['proto']))
         {
             return \FlipsideSettings::$ldap['proto'].'://'.\FlipsideSettings::$ldap['host'];
         }
@@ -130,17 +130,17 @@ 
      *
      * @SuppressWarnings("StaticAccess")
      */
-    private function getParam($params, $paramName, $settingsLocation='$ldap', $settingsName=false)
+    private function getParam($params, $paramName, $settingsLocation = '$ldap', $settingsName = false)
     {
-        if($settingsName === false)
+        if ($settingsName === false)
         {
             $settingsName = $paramName;
         }
-        if(isset($params[$paramName]))
+        if (isset($params[$paramName]))
         {
             return $params[$paramName];
         }
-        if($settingsLocation === '$ldap')
+        if ($settingsLocation === '$ldap')
         {
             return \FlipsideSettings::$ldap[$settingsName];
         }
@@ -156,13 +156,13 @@ 
      *
      * @SuppressWarnings("StaticAccess")
      */
-    public function get_and_bind_server($bind_write=false)
+    public function get_and_bind_server($bind_write = false)
     {
         $server = \LDAP\LDAPServer::getInstance();
         $server->user_base = $this->user_base;
         $server->group_base = $this->group_base;
         $server->connect($this->host);
-        if($bind_write === false)
+        if ($bind_write === false)
         {
             $ret = $server->bind();
         }
@@ -170,7 +170,7 @@ 
         {
             $ret = $server->bind($this->bind_dn, $this->bind_pass);
         }
-        if($ret === false)
+        if ($ret === false)
         {
             return false;
         }
@@ -188,20 +188,20 @@ 
     public function login($username, $password)
     {
         $server = $this->get_and_bind_server();
-        if($server === false)
+        if ($server === false)
         {
             return false;
         }
         $filter = new \Data\Filter("uid eq $username or mail eq $username");
         $user = $server->read($this->user_base, $filter);
-        if($user === false || count($user) === 0)
+        if ($user === false || count($user) === 0)
         {
             return false;
         }
         $user = $user[0];
         $server->unbind();
         $ret = $server->bind($user->dn, $password);
-        if($ret !== false)
+        if ($ret !== false)
         {
             return array('res'=>true, 'extended'=>$user); 
         }
@@ -217,7 +217,7 @@ 
      */
     public function isLoggedIn($data)
     {
-        if(isset($data['res']))
+        if (isset($data['res']))
         {
             return $data['res'];
         }
@@ -239,35 +239,35 @@ 
     public function getGroupByName($name)
     {
         $server = $this->get_and_bind_server();
-        if($server === false)
+        if ($server === false)
         {
             return false;
         }
         return LDAPGroup::from_name($name, $server);
     }
 
-    public function getGroupsByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
+    public function getGroupsByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
     {
         $server = $this->get_and_bind_server();
-        if($server === false)
+        if ($server === false)
         {
             return false;
         }
-        if($filter === false)
+        if ($filter === false)
         {
             $filter = new \Data\Filter('cn eq *');
         }
         $groups = $server->read($this->group_base, $filter);
-        if($groups === false)
+        if ($groups === false)
         {
             return false;
         }
         $this->processFilteringParams($groups, $select, $top, $skip, $orderby);
         $count = count($groups);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $groups[$i] = new LDAPGroup($groups[$i]);
-            if($select !== false)
+            if ($select !== false)
             {
                 $groups[$i] = json_decode(json_encode($groups[$i]), true);
                 $groups[$i] = array_intersect_key($groups[$i], array_flip($select));
@@ -279,7 +279,7 @@ 
     public function getActiveUserCount()
     {
         $server = $this->get_and_bind_server();
-        if($server === false)
+        if ($server === false)
         {
             return false;
         }
@@ -288,50 +288,50 @@ 
 
     private function processFilteringParams(&$data, &$select, $top, $skip, $orderby)
     {
-        if($orderby !== false)
+        if ($orderby !== false)
         {
             sort_array($data, $orderby);
         }
-        if($select !== false)
+        if ($select !== false)
         {
             $select = array_flip($select);
         }
-        if($skip !== false && $top !== false)
+        if ($skip !== false && $top !== false)
         {
             $data = array_slice($data, $skip, $top);
         }
-        else if($top !== false)
+        else if ($top !== false)
         {
             $data = array_slice($data, 0, $top);
         }
-        else if($skip !== false)
+        else if ($skip !== false)
         {
             $data = array_slice($data, $skip);
         }
     }
 
-    public function getUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
+    public function getUsersByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
     {
         $server = $this->get_and_bind_server();
-        if($server === false)
+        if ($server === false)
         {
             return false;
         }
-        if($filter === false)
+        if ($filter === false)
         {
             $filter = new \Data\Filter('cn eq *');
         }
         $users = $server->read($this->user_base, $filter, false, $select);
-        if($users === false)
+        if ($users === false)
         {
             return false;
         }
         $this->processFilteringParams($users, $select, $top, $skip, $orderby);
         $count = count($users);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $tmp = new LDAPUser($users[$i]);
-            if($select !== false)
+            if ($select !== false)
             {
                 $tmp = $tmp->jsonSerialize();
                 $tmp = array_intersect_key($tmp, $select);
@@ -349,36 +349,36 @@ 
         $email = $user->getEmail();
         $new_user->setEmail($email);
         $pass = $user->getPassword();
-        if($pass !== false)
+        if ($pass !== false)
         {
             $new_user->setPass($pass);
         }
         $sn = $user->getLastName();
-        if($sn !== false)
+        if ($sn !== false)
         {
             $new_user->setLastName($sn);
         }
         $givenName = $user->getGivenName();
-        if($givenName !== false)
+        if ($givenName !== false)
         {
             $new_user->setGivenName($givenName);
         }
         $hosts = $user->getLoginProviders();
-        if($hosts !== false)
+        if ($hosts !== false)
         {
             $count = count($hosts);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
                 $new_user->addLoginProvider($hosts[$i]);
             }
         }
         $ret = $new_user->flushUser();
-        if($ret)
+        if ($ret)
         {
             $user->delete();
         }
         $users = $this->getUsersByFilter(new \Data\Filter('mail eq '.$email));
-        if($users === false || !isset($users[0]))
+        if ($users === false || !isset($users[0]))
         {
             throw new \Exception('Error creating user!');
         }
@@ -388,7 +388,7 @@ 
     public function getUserByResetHash($hash)
     {
         $users = $this->getUsersByFilter(new \Data\Filter("uniqueIdentifier eq $hash"));
-        if($users === false || !isset($users[0]))
+        if ($users === false || !isset($users[0]))
         {
             return false;
         }