BurningFlipside / CommonCode

Auth/class.LDAPUser.php

Spacing +41 added lines, -41 removed lines

@@ -8,15 +8,15 @@ 
     private $ldapObj;
     private $server;
 
-    function __construct($data=false)
+    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;
@@ -54,14 +54,14 @@ 
     {
         $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];
-            if(isset($group['member']))
+            if (isset($group['member']))
             {
-                if(in_array($dn, $group['member']))
+                if (in_array($dn, $group['member']))
                 {
                     return true;
                 }
@@ -70,9 +70,9 @@ 
                     return $this->check_child_group($group['member']);
                 }
             }
-            else if(isset($group['uniquemember']))
+            else if (isset($group['uniquemember']))
             {
-                if(in_array($dn, $group['uniquemember']))
+                if (in_array($dn, $group['uniquemember']))
                 {
                     return true;
                 }
@@ -81,7 +81,7 @@ 
                     return $this->check_child_group($group['uniquemember']);
                 }
             }
-            else if(isset($group['memberUid']) && in_array($uid, $group['memberUid']))
+            else if (isset($group['memberUid']) && in_array($uid, $group['memberUid']))
             {
                 return true;
             }
@@ -122,7 +122,7 @@ 
     function getOrganization()
     {
         $org = $this->getFieldSingleValue('o');
-        if($org === false)
+        if ($org === false)
         {
             return 'Volunteer';
         }
@@ -132,7 +132,7 @@ 
     function getTitles()
     {
         $titles = $this->getField('title');
-        if(isset($titles['count']))
+        if (isset($titles['count']))
         {
             unset($titles['count']);
         }
@@ -177,7 +177,7 @@ 
     function getOrganizationUnits()
     {
         $units = $this->getField('ou');
-        if(isset($units['count']))
+        if (isset($units['count']))
         {
             unset($units['count']);
         }
@@ -187,7 +187,7 @@ 
     function getLoginProviders()
     {
         $hosts = $this->getField('host');
-        if(isset($hosts['count']))
+        if (isset($hosts['count']))
         {
             unset($hosts['count']);
         }
@@ -198,12 +198,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]));
                 }
@@ -223,23 +223,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;
     }
 
     function setPass($password)
     {
-        if(!is_object($this->ldap_obj))
+        if (!is_object($this->ldap_obj))
         {
-            return $this->setFieldLocal('userPassword',  $this->generateLDAPPass($password));
+            return $this->setFieldLocal('userPassword', $this->generateLDAPPass($password));
         }
         else
         {
             $obj = array('dn'=>$this->ldap_obj->dn);
             $obj['userPassword'] = $this->generateLDAPPass($password);
-            if(isset($this->ldap_obj->uniqueidentifier))
+            if (isset($this->ldap_obj->uniqueidentifier))
             {
                $obj['uniqueIdentifier'] = null;
             }
@@ -253,7 +253,7 @@ 
 
     function validate_password($password)
     {
-        if($this->server->bind($this->ldap_obj->dn, $password))
+        if ($this->server->bind($this->ldap_obj->dn, $password))
         {
             return true;
         }
@@ -262,37 +262,37 @@ 
 
     function validate_reset_hash($hash)
     {
-        if(isset($this->ldap_obj->uniqueidentifier) && strcmp($this->ldap_obj->uniqueidentifier[0], $hash) === 0)
+        if (isset($this->ldap_obj->uniqueidentifier) && strcmp($this->ldap_obj->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;
         }
@@ -321,7 +321,7 @@ 
 
     function setUid($uid)
     {
-        if(!is_object($this->ldapObj))
+        if (!is_object($this->ldapObj))
         {
             return $this->setFieldLocal('uid', $uid);
         }
@@ -369,7 +369,7 @@ 
 
     function setTitles($titles)
     {
-        if(!is_array($titles))
+        if (!is_array($titles))
         {
             $titles = array($titles);
         }
@@ -378,7 +378,7 @@ 
 
     function setOrganizationUnits($ous)
     {
-        if(!is_array($ous))
+        if (!is_array($ous))
         {
             $ous = array($ous);
         }
@@ -387,7 +387,7 @@ 
 
     function flushUser()
     {
-        if(is_object($this->ldapObj))
+        if (is_object($this->ldapObj))
         {
             //In this mode we are always up to date
             return true;
@@ -395,11 +395,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'];
         }
@@ -416,7 +416,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]);
         }
@@ -426,7 +426,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!');
         }

Auth/class.SQLAuthenticator.php

Spacing +48 added lines, -48 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace Auth;
 
-if(!function_exists('password_hash') || !function_exists('password_verify')) 
+if (!function_exists('password_hash') || !function_exists('password_verify')) 
 {
     define('PASSWORD_BCRYPT', 1);
     define('PASSWORD_DEFAULT', PASSWORD_BCRYPT);
@@ -9,22 +9,22 @@ 
 
     function password_hash($password, $algo = PASSWORD_DEFAULT)
     {
-        if(is_null($password) || is_int($password))
+        if (is_null($password) || is_int($password))
         {
             $password = (string)$password;
         }
-        if(!is_string($password))
+        if (!is_string($password))
         {
             trigger_error("password_hash(): Password must be a string", E_USER_WARNING);
             return false;
         }
-        if(!is_int($algo))
+        if (!is_int($algo))
         {
-            trigger_error("password_hash() expects parameter 2 to be long, " . gettype($algo) . " given", E_USER_WARNING);
+            trigger_error("password_hash() expects parameter 2 to be long, ".gettype($algo)." given", E_USER_WARNING);
             return false;
         }
         $resultLength = 0;
-        switch($algo)
+        switch ($algo)
         {
             case PASSWORD_BCRYPT:
                 $cost = PASSWORD_BCRYPT_DEFAULT_COST;
@@ -43,9 +43,9 @@ 
         $base64String = base64_encode($salt);
         $salt = strtr(rtrim($base64String, '='), $base64Digits, $bcrypt64Digits);
         $salt = substr($salt, 0, $requiredSaltLen);
-        $hash = $hashFormat . $salt;
+        $hash = $hashFormat.$salt;
         $ret = crypt($password, $hash);
-        if(!is_string($ret) || strlen($ret) != $resultLength)
+        if (!is_string($ret) || strlen($ret) != $resultLength)
         {
             return false;
         }
@@ -55,13 +55,13 @@ 
     function password_verify($password, $hash)
     {
         $ret = crypt($password, $hash);
-        if(!is_string($ret) || strlen($ret) != strlen($hash) || strlen($ret) <= 13)
+        if (!is_string($ret) || strlen($ret) != strlen($hash) || strlen($ret) <= 13)
         {
             return false;
         }
         $status = 0;
         $count  = strlen($ret);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $status |= (ord($ret[$i]) ^ ord($hash[$i]));
         }
@@ -80,11 +80,11 @@ 
     {
         parent::__construct($params);
         $this->params = $params;
-        if($this->current)
+        if ($this->current)
         {
             $this->dataSet = $this->getCurrentDataSet();
         }
-        if($this->pending)
+        if ($this->pending)
         {
             $this->pendingDataSet = $this->getPendingDataSet();
         }
@@ -95,7 +95,7 @@ 
      */
     private function getCurrentDataSet()
     {
-        if(isset($this->params['current_data_set']))
+        if (isset($this->params['current_data_set']))
         {
             return \DataSetFactory::get_data_set($this->params['current_data_set']);
         }
@@ -107,30 +107,30 @@ 
      */
     private function getPendingDataSet()
     {
-        if(isset($this->params['pending_data_set']))
+        if (isset($this->params['pending_data_set']))
         {
             return \DataSetFactory::get_data_set($this->params['pending_data_set']);
         }
         return \DataSetFactory::get_data_set('pending_authentication');
     }
 
-    private function getDataTable($name, $pending=false)
+    private function getDataTable($name, $pending = false)
     {
-         if(isset($this->dataTables[$name]) && isset($this->dataTables[$name][$pending]))
+         if (isset($this->dataTables[$name]) && isset($this->dataTables[$name][$pending]))
          {
              return $this->dataTables[$name][$pending];
          }
          $dataSet = $this->dataSet;
-         if($pending)
+         if ($pending)
          {
              $dataSet = $this->pendingDataSet;
          }
-         if($dataSet === null)
+         if ($dataSet === null)
          {
              throw new \Exception('Unable to obtain dataset for SQL Authentication!');
          }
          $dataTable = $dataSet[$name];
-         if(!isset($this->dataTables[$name]))
+         if (!isset($this->dataTables[$name]))
          {
              $this->dataTables[$name] = array();
          }
@@ -140,7 +140,7 @@ 
 
     private function getPendingUserDataTable()
     {
-        if(isset($this->params['pending_user_table']))
+        if (isset($this->params['pending_user_table']))
         {
             return $this->getDataTable($this->params['pending_user_table'], true);
         }
@@ -149,15 +149,15 @@ 
 
     public function login($username, $password)
     {
-        if($this->current === false) return false;
+        if ($this->current === false) return false;
         $userDataTable = $this->getDataTable('user');
         $filter = new \Data\Filter("uid eq '$username'");
         $users = $userDataTable->read($filter, 'uid,pass');
-        if($users === false || !isset($users[0]))
+        if ($users === false || !isset($users[0]))
         {
             return false;
         }
-        if(password_verify($password, $users[0]['pass']))
+        if (password_verify($password, $users[0]['pass']))
         {
             return array('res'=>true, 'extended'=>$users[0]['uid']);
         }
@@ -166,7 +166,7 @@ 
 
     public function isLoggedIn($data)
     {
-        if(isset($data['res']))
+        if (isset($data['res']))
         {
             return $data['res'];
         }
@@ -183,7 +183,7 @@ 
         $groupDataTable = $this->getDataTable('group');
         $filter = new \Data\Filter("gid eq '$name'");
         $groups = $groupDataTable->read($filter);
-        if($groups === false || !isset($groups[0]))
+        if ($groups === false || !isset($groups[0]))
         {
             return false;
         }
@@ -195,7 +195,7 @@ 
         $userDataTable = $this->getDataTable('user');
         $filter = new \Data\Filter("uid eq '$name'");
         $users = $userDataTable->read($filter);
-        if($users === false || !isset($users[0]))
+        if ($users === false || !isset($users[0]))
         {
             return false;
         }
@@ -211,33 +211,33 @@ 
     private function convertDataToClass($dataTableName, $className, $filter, $select, $top, $skip, $orderby)
     {
         $data = $this->getDataByFilter($dataTableName, $filter, $select, $top, $skip, $orderby);
-        if($data === false)
+        if ($data === false)
         {
             return false;
         }
         $count = count($data);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $data[$i] = new $className($groups[$i]);
         }
         return $data;
     }
 
-    public function getGroupsByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
+    public function getGroupsByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
     {
         return $this->convertDataToClass('group', 'SQLGroup', $filter, $select, $top, $skip, $orderby);
     }
 
-    public function getUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
+    public function getUsersByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
     {
         return $this->convertDataToClass('group', 'SQLUser', $filter, $select, $top, $skip, $orderby);
     }
 
     public function getPendingUserCount()
     {
-        if($this->pending === false) return 0;
+        if ($this->pending === false) return 0;
         $dataTable = $this->getPendingUserDataTable();
-        if($dataTable === null) return 0;
+        if ($dataTable === null) return 0;
         return $dataTable->count();
     }
 
@@ -245,26 +245,26 @@ 
     {
         $userDataTable = $this->getPendingUserDataTable();
         $fieldData = $filter->to_mongo_filter();
-        $firstFilter = new \Data\Filter('substringof(data,"'.implode($fieldData,' ').'")');
+        $firstFilter = new \Data\Filter('substringof(data,"'.implode($fieldData, ' ').'")');
         $users = $userDataTable->read($firstFilter, $select, $top, $skip, $orderby);
-        if($users === false)
+        if ($users === false)
         {
             return false;
         }
         $ret = array();
         $count = count($users);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $user = new SQLPendingUser($users[$i], $userDataTable);
             $err = false;
-            foreach($fieldData as $field=>$data)
+            foreach ($fieldData as $field=>$data)
             {
-                if(strcasecmp($user[$field], $data) !== 0)
+                if (strcasecmp($user[$field], $data) !== 0)
                 {
                     $err = true; break;
                 }
             }
-            if(!$err)
+            if (!$err)
             {
                 array_push($ret, $user);
             }
@@ -272,22 +272,22 @@ 
         return $ret;
     }
 
-    public function getPendingUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
+    public function getPendingUsersByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
 
     {
-        if($this->pending === false) return false;
-        if($filter !== false && !$filter->contains('hash'))
+        if ($this->pending === false) return false;
+        if ($filter !== false && !$filter->contains('hash'))
         {
             return $this->searchPendingUsers($filter, $select, $top, $skip, $orderby);
         }
         $userDataTable = $this->getPendingUserDataTable();
         $users = $userDataTable->read($filter, $select, $top, $skip, $orderby);
-        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] = new SQLPendingUser($users[$i], $userDataTable);
         }
@@ -296,9 +296,9 @@ 
 
     public function createPendingUser($user)
     {
-        if($this->pending === false) return false;
+        if ($this->pending === false) return false;
         $userDataTable = $this->getPendingUserDataTable();
-        if(isset($user->password2))
+        if (isset($user->password2))
         {
             unset($user->password2);
         }
@@ -306,10 +306,10 @@ 
         $hash = hash('sha512', $json);
         $array = array('hash'=>$hash, 'data'=>$json);
         $ret = $userDataTable->create($array);
-        if($ret !== false)
+        if ($ret !== false)
         {
             $users = $this->getPendingUsersByFilter(new \Data\Filter("hash eq '$hash'"));
-            if($users === false || !isset($users[0]))
+            if ($users === false || !isset($users[0]))
             {
                 throw new \Exception('Error retreiving user object after successful create!');
             }
@@ -321,7 +321,7 @@ 
     public function getTempUserByHash($hash)
     {
         $users = $this->getPendingUsersByFilter(new \Data\Filter("hash eq '$hash'"));
-        if($users === false || !isset($users[0]))
+        if ($users === false || !isset($users[0]))
         {
             return false;
         }

Auth/class.GoogleAuthenticator.php

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;

         }

Auth/OAuth2/class.LiveAuthenticator.php

Spacing +1 added lines, -1 removed lines

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

Auth/OAuth2/class.OAuth2Authenticator.php

Spacing +7 added lines, -7 removed lines

@@ -14,7 +14,7 @@ 
 namespace Auth\OAuth2;
 
 /** Only load the HTTPFul bootstrap if it isn't already loaded*/
-if(!class_exists('Httpful\Request'))
+if (!class_exists('Httpful\Request'))
 {
     require('/var/www/common/libs/httpful/bootstrap.php');
 }
@@ -37,7 +37,7 @@ 
     public function __construct($params)
     {
         parent::__construct($params);
-        if(!isset($params['redirect_url']))
+        if (!isset($params['redirect_url']))
         {
             $this->redirect_uri = 'https://'.$_SERVER['HTTP_HOST'].'/oauth/callbacks/'.$this->getHostName();
         }
@@ -115,21 +115,21 @@ 
     public function authenticate($params, &$current_user)
     {
         $resp = $this->doAuthPost($params);
-        if($resp->hasErrors())
+        if ($resp->hasErrors())
         {
             return self::LOGIN_FAILED; 
         }
         \FlipSession::setVar('OAuthToken', $resp->body);
         $user = $this->getUserFromToken($resp->body);
-        if($user === false)
+        if ($user === false)
         {
             return self::LOGIN_FAILED;
         }
         $auth = \AuthProvider::getInstance();
         $local_users = $auth->getUsersByFilter(new \Data\Filter('mail eq '.$user->getEmail()));
-        if($local_users !== false && isset($local_users[0]))
+        if ($local_users !== false && isset($local_users[0]))
         {
-            if($local_users[0]->canLoginWith($this->getHostName()))
+            if ($local_users[0]->canLoginWith($this->getHostName()))
             {
                 $auth->impersonateUser($local_users[0]);
                 return self::SUCCESS;
@@ -138,7 +138,7 @@ 
             return self::ALREADY_PRESENT;
         }
         $ret = $auth->activatePendingUser($user);
-        if($ret === false)
+        if ($ret === false)
         {
             throw new \Exception('Unable to create user! '.$res);
         }

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]);

Auth/class.NullAuthenticator.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 

     public function isLoggedIn($data)

     {

-        if(isset($data['res']))

+        if (isset($data['res']))

         {

             return $data['res'];

         }