BurningFlipside / CommonCode

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

Data/class.DataTable.php

Spacing +5 added lines, -5 removed lines

@@ -5,18 +5,18 @@ 
 {
     protected $data = null;
 
-    function count($filter=false)
+    function count($filter = false)
     {
         throw new \Exception('Unimplemented');
     }
 
-    function search($filter=false, $select=false, $count=false, $skip=false, $sort=false, $params=false)
+    function search($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false)
     {
-        if($this->data === null)
+        if ($this->data === null)
         {
             throw new \Exception('Unimplemented');
         }
-        if($filter !== false)
+        if ($filter !== false)
         {
             $array = $filter->filter_array($this->data);
         }
@@ -28,7 +28,7 @@ 
         throw new \Exception('Unimplemented');
     }
 
-    function read($filter=false, $select=false, $count=false, $skip=false, $sort=false, $params=false)
+    function read($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false)
     {
         return $this->search($filter, $select, $count, $skip, $sort, $params);
     }

Data/class.SQLDataSet.php

Spacing +38 added lines, -38 removed lines

@@ -7,7 +7,7 @@ 
 
     function __construct($params)
     {
-        if(isset($params['user']))
+        if (isset($params['user']))
         {
             $this->pdo = new \PDO($params['dsn'], $params['user'], $params['pass']);
         }
@@ -20,12 +20,12 @@ 
     function _get_row_count_for_query($sql)
     {
         $stmt = $this->pdo->query($sql);
-        if($stmt === false)
+        if ($stmt === false)
         {
             return 0;
         }
         $count = $stmt->rowCount();
-        if($count === 0)
+        if ($count === 0)
         {
             $array = $stmt->fetchAll();
             $count = count($array);
@@ -35,11 +35,11 @@ 
 
     function _tableExistsNoPrefix($name)
     {
-        if($this->_get_row_count_for_query('SHOW TABLES LIKE '.$this->pdo->quote($name)) > 0)
+        if ($this->_get_row_count_for_query('SHOW TABLES LIKE '.$this->pdo->quote($name)) > 0)
         {
             return true;
         }
-        else if($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote($name)) > 0)
+        else if ($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote($name)) > 0)
         {
             return true;
         }
@@ -48,11 +48,11 @@ 
 
     function _tableExists($name)
     {
-        if($this->_get_row_count_for_query('SHOW TABLES LIKE '.$this->pdo->quote('tbl'.$name)) > 0)
+        if ($this->_get_row_count_for_query('SHOW TABLES LIKE '.$this->pdo->quote('tbl'.$name)) > 0)
         {
             return true;
         }
-        else if($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote('tbl'.$name)) > 0)
+        else if ($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote('tbl'.$name)) > 0)
         {
             return true;
         }
@@ -61,11 +61,11 @@ 
 
     function _viewExists($name)
     {
-        if($this->_get_row_count_for_query('SHOW TABLES LIKE '.$this->pdo->quote('v'.$name)) > 0)
+        if ($this->_get_row_count_for_query('SHOW TABLES LIKE '.$this->pdo->quote('v'.$name)) > 0)
         {
             return true;
         }
-        else if($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote('v'.$name)) > 0)
+        else if ($this->_get_row_count_for_query('SELECT * FROM sqlite_master WHERE name LIKE '.$this->pdo->quote('v'.$name)) > 0)
         {
             return true;
         }
@@ -74,15 +74,15 @@ 
 
     function tableExists($name)
     {
-        if($this->_tableExists($name))
+        if ($this->_tableExists($name))
         {
             return true;
         }
-        if($this->_tableExistsNoPrefix($name))
+        if ($this->_tableExistsNoPrefix($name))
         {
             return true;
         }
-        if($this->_viewExists($name))
+        if ($this->_viewExists($name))
         {
             return true;
         }
@@ -91,60 +91,60 @@ 
 
     function getTable($name)
     {
-        if($this->_tableExists($name))
+        if ($this->_tableExists($name))
         {
             return new SQLDataTable($this, 'tbl'.$name);
         }
-        if($this->_viewExists($name))
+        if ($this->_viewExists($name))
         {
             return new SQLDataTable($this, 'v'.$name);
         }
-        if($this->_tableExistsNoPrefix($name))
+        if ($this->_tableExistsNoPrefix($name))
         {
             return new SQLDataTable($this, $name);
         }
         throw new \Exception('No such table '.$name);
     }
 
-    function read($tablename, $where=false, $select='*', $count=false, $skip=false, $sort=false)
+    function read($tablename, $where = false, $select = '*', $count = false, $skip = false, $sort = false)
     {
-        if($select === false)
+        if ($select === false)
         {
             $select = '*';
         }
         $sql = "SELECT $select FROM $tablename";
-        if($where !== false)
+        if ($where !== false)
         {
-            $sql.=' WHERE '.$where;
+            $sql .= ' WHERE '.$where;
         }
-        if($count !== false)
+        if ($count !== false)
         {
-            if($skip === false)
+            if ($skip === false)
             {
-                $sql.=' LIMIT '.(int)$count;
+                $sql .= ' LIMIT '.(int)$count;
             }
             else
             {
-                $sql.=" LIMIT $skip, $count";
+                $sql .= " LIMIT $skip, $count";
             }
         }
-        if($sort !== false)
+        if ($sort !== false)
         {
-            $sql.=' ORDER BY ';
+            $sql .= ' ORDER BY ';
             $tmp = array();
-            foreach($sort as $sort_col=>$dir)
+            foreach ($sort as $sort_col=>$dir)
             {
-                array_push($tmp, $sort_col.' '.($dir === 1?'ASC':'DESC'));
+                array_push($tmp, $sort_col.' '.($dir === 1 ? 'ASC' : 'DESC'));
             }
-            $sql.=implode($tmp,',');
+            $sql .= implode($tmp, ',');
         }
         $stmt = $this->pdo->query($sql, \PDO::FETCH_ASSOC);
-        if($stmt === false)
+        if ($stmt === false)
         {
             return false;
         }
         $ret = $stmt->fetchAll();
-        if($ret === false || empty($ret))
+        if ($ret === false || empty($ret))
         {
             return false;
         }
@@ -154,19 +154,19 @@ 
     function update($tablename, $where, $data)
     {
         $set = array();
-        if(is_object($data))
+        if (is_object($data))
         {
             $data = (array)$data;
         }
         $cols = array_keys($data);
         $count = count($cols);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             array_push($set, $cols[$i].'='.$this->pdo->quote($data[$cols[$i]]));
         }
         $set = implode(',', $set);
         $sql = "UPDATE $tablename SET $set WHERE $where";
-        if($this->pdo->exec($sql) === false)
+        if ($this->pdo->exec($sql) === false)
         {
             return false;
         }
@@ -176,20 +176,20 @@ 
     function create($tablename, $data)
     {
         $set = array();
-        if(is_object($data))
+        if (is_object($data))
         {
             $data = (array)$data;
         }
         $cols = array_keys($data);
         $count = count($cols);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             array_push($set, $this->pdo->quote($data[$cols[$i]]));
         }
         $cols = implode(',', $cols);
         $set = implode(',', $set);
         $sql = "INSERT INTO $tablename ($cols) VALUES ($set);";
-        if($this->pdo->exec($sql) === false)
+        if ($this->pdo->exec($sql) === false)
         {
             return false;
         }
@@ -199,7 +199,7 @@ 
     function delete($tablename, $where)
     {
         $sql = "DELETE FROM $tablename WHERE $where";
-        if($this->pdo->exec($sql) === false)
+        if ($this->pdo->exec($sql) === false)
         {
             return false;
         }
@@ -209,7 +209,7 @@ 
     function raw_query($sql)
     {
         $stmt = $this->pdo->query($sql, \PDO::FETCH_ASSOC);
-        if($stmt === false)
+        if ($stmt === false)
         {
             return false;
         }