BurningFlipside / CommonCode

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.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'];

         }

Auth/class.Authenticator.php

Spacing +6 added lines, -6 removed lines

@@ -102,7 +102,7 @@ 
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
-    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 false;
     }
@@ -120,7 +120,7 @@ 
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
-    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 false;
     }
@@ -138,7 +138,7 @@ 
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
-    public function getPendingUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
+    public function getPendingUsersByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
     {
         return false;
     }
@@ -151,7 +151,7 @@ 
     public function getActiveUserCount()
     {
         $users = $this->getUsersByFilter(false);
-        if($users === false)
+        if ($users === false)
         {
             return 0;
         }
@@ -166,7 +166,7 @@ 
     public function getPendingUserCount()
     {
         $users = $this->getPendingUsersByFilter(false);
-        if($users === false)
+        if ($users === false)
         {
             return 0;
         }
@@ -181,7 +181,7 @@ 
     public function getGroupCount()
     {
         $groups = $this->getGroupsByFilter(false);
-        if($groups === false)
+        if ($groups === false)
         {
             return 0;
         }

class.FlipREST.php

Spacing +30 added lines, -30 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 = '';
-            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');
         }
@@ -293,12 +293,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);

Autoload.php

Spacing +3 added lines, -3 removed lines

@@ -26,16 +26,16 @@
     {
         $namespace = substr($classname, 0, $lastNsPos);
         $classname = substr($classname, $lastNsPos + 1);
-        $filename  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
+        $filename  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR;
     }
     $filename = __DIR__.DIRECTORY_SEPARATOR.$filename.'class.'.$classname.'.php';
-    if(is_readable($filename))
+    if (is_readable($filename))
     {
         require $filename;
     }
 }
 
-if(version_compare(PHP_VERSION, '5.3.0', '>='))
+if (version_compare(PHP_VERSION, '5.3.0', '>='))
 {
     spl_autoload_register('FlipsideAutoload', true, true);
 }