BurningFlipside / CommonCode

Auth/class.PendingUser.php

Spacing +6 added lines, -6 removed lines

@@ -49,7 +49,7 @@ 
      */
     public function getEmail()
     {
-        if(isset($this->email))
+        if (isset($this->email))
         {
             return $this->email;
         }
@@ -63,7 +63,7 @@ 
      */
     public function getGivenName()
     {
-        if(isset($this->givenName))
+        if (isset($this->givenName))
         {
             return $this->givenName;
         }
@@ -77,7 +77,7 @@ 
      */
     public function getLastName()
     {
-        if(isset($this->sn))
+        if (isset($this->sn))
         {
             return $this->sn;
         }
@@ -104,7 +104,7 @@ 
      */
     function getLoginProviders()
     {
-        if(isset($this->host))
+        if (isset($this->host))
         {
             return $this->host;
         }
@@ -120,7 +120,7 @@ 
      */
     function addLoginProvider($provider)
     {
-        if(isset($this->host))
+        if (isset($this->host))
         {
             array_push($this->host, $provider);
         }
@@ -199,7 +199,7 @@ 
                 Burning Flipside Technology Team');
         $email_msg->setSubject('Burning Flipside Registration');
         $email_provider = \EmailProvider::getInstance();
-        if($email_provider->sendEmail($email_msg) === false)
+        if ($email_provider->sendEmail($email_msg) === false)
         {
             throw new \Exception('Unable to send email!');
         }

Auth/class.SQLUser.php

Spacing +4 added lines, -4 removed lines

@@ -5,17 +5,17 @@ 
 {
     private $uid;
 
-    function __construct($data=false)
+    function __construct($data = false)
     {
         $this->uid = false;
-        if($data !== false && !isset($data['extended']))
+        if ($data !== false && !isset($data['extended']))
         {
             //Generic user object
             //TODO get from DB
         }
         else
         {
-            if(isset($data['extended']))
+            if (isset($data['extended']))
             {
                 $this->uid = $data['extended'];
             }
@@ -28,7 +28,7 @@ 
         $group_data_table = $auth_data_set['group'];
         $filter = new \Data\Filter("uid eq '$this->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;
         }

Auth/class.FlipsideAPIUser.php

Spacing +24 added lines, -24 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace Auth;
-if(!class_exists('Httpful\Request'))
+if (!class_exists('Httpful\Request'))
 {
     require(realpath(dirname(__FILE__)).'/../libs/httpful/bootstrap.php');
 }
@@ -10,16 +10,16 @@ 
     private $userData;
     private $groupData = null;
 
-    public function __construct($data=false)
+    public function __construct($data = false)
     {
-        if($data !== false && !isset($data['extended']))
+        if ($data !== false && !isset($data['extended']))
         {
             //Generic user object
             //TODO get from API
         }
         else
         {
-            if(isset($data['extended']))
+            if (isset($data['extended']))
             {
                 $this->userData = $data['extended'];
             }
@@ -28,19 +28,19 @@ 
 
     function isInGroupNamed($name)
     {
-        if($this->groupData === null)
+        if ($this->groupData === null)
         {
             $resp = \Httpful\Request::get('https://profiles.test.burningflipside.com/api/v1/users/me/groups')->authenticateWith($this->userData->uid, $this->userData->userPassword)->send();
-            if($resp->hasErrors())
+            if ($resp->hasErrors())
             {
                 return false;
             }
             $this->groupData = $resp->body;
         }
         $count = count($this->groupData);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if($this->groupData[$i]->cn === $name)
+            if ($this->groupData[$i]->cn === $name)
             {
                 return true;
             }
@@ -50,7 +50,7 @@ 
 
     function getDisplayName()
     {
-        if($this->userData === null)
+        if ($this->userData === null)
         {
             return parent::getDisplayName();
         }
@@ -59,7 +59,7 @@ 
 
     function getGivenName()
     {
-        if($this->userData === null)
+        if ($this->userData === null)
         {
             return parent::getGivenName();
         }
@@ -68,7 +68,7 @@ 
 
     function getEmail()
     {
-        if($this->userData === null)
+        if ($this->userData === null)
         {
             return parent::getEmail();
         }
@@ -77,7 +77,7 @@ 
 
     function getUid()
     {
-        if($this->userData === null)
+        if ($this->userData === null)
         {
             return parent::getUid();
         }
@@ -86,7 +86,7 @@ 
 
     function getPhoneNumber()
     {
-        if($this->userData === null)
+        if ($this->userData === null)
         {
             return parent::getPhoneNumber();
         }
@@ -95,7 +95,7 @@ 
 
     function getOrganization()
     {
-        if($this->userData === null)
+        if ($this->userData === null)
         {
             return parent::getOrganization();
         }
@@ -104,7 +104,7 @@ 
 
     function getTitles()
     {
-        if($this->userData === null)
+        if ($this->userData === null)
         {
             return parent::getTitles();
         }
@@ -113,7 +113,7 @@ 
 
     function getState()
     {
-        if($this->userData === null)
+        if ($this->userData === null)
         {
             return parent::getState();
         }
@@ -122,7 +122,7 @@ 
 
     function getCity()
     {
-        if($this->userData === null)
+        if ($this->userData === null)
         {
             return parent::getCity();
         }
@@ -131,7 +131,7 @@ 
 
     function getLastName()
     {
-        if($this->userData === null)
+        if ($this->userData === null)
         {
             return parent::getLastName();
         }
@@ -140,7 +140,7 @@ 
 
     function getNickName()
     {
-        if($this->userData === null)
+        if ($this->userData === null)
         {
             return parent::getNickName();
         }
@@ -149,7 +149,7 @@ 
 
     function getAddress()
     {
-        if($this->userData === null)
+        if ($this->userData === null)
         {
             return parent::getAddress();
         }
@@ -158,7 +158,7 @@ 
 
     function getPostalCode()
     {
-        if($this->userData === null)
+        if ($this->userData === null)
         {
             return parent::getPostalCode();
         }
@@ -167,7 +167,7 @@ 
 
     function getCountry()
     {
-        if($this->userData === null)
+        if ($this->userData === null)
         {
             return parent::getCountry();
         }
@@ -176,7 +176,7 @@ 
 
     function getOrganizationUnits()
     {
-        if($this->userData === null)
+        if ($this->userData === null)
         {
             return parent::getOrganizationUnits();
         }
@@ -185,7 +185,7 @@ 
 
     function getLoginProviders()
     {
-        if($this->userData === null)
+        if ($this->userData === null)
         {
             return parent::getLoginProviders();
         }

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

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.LDAPAuthenticator.php

Spacing +46 added lines, -46 removed lines

@@ -26,18 +26,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;
             }
         }
@@ -85,7 +85,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');
     }
 
@@ -100,11 +100,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'];
         }
@@ -123,17 +123,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];
         }
@@ -149,13 +149,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();
         }
@@ -163,7 +163,7 @@ 
         {
             $ret = $server->bind($this->bind_dn, $this->bind_pass);
         }
-        if($ret === false)
+        if ($ret === false)
         {
             return false;
         }
@@ -181,20 +181,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); 
         }
@@ -210,7 +210,7 @@ 
      */
     public function isLoggedIn($data)
     {
-        if(isset($data['res']))
+        if (isset($data['res']))
         {
             return $data['res'];
         }
@@ -232,35 +232,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));
@@ -272,7 +272,7 @@ 
     public function getActiveUserCount()
     {
         $server = $this->get_and_bind_server();
-        if($server === false)
+        if ($server === false)
         {
             return false;
         }
@@ -281,50 +281,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);
@@ -342,36 +342,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!');
         }
@@ -381,7 +381,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;
         }

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;

         }