BurningFlipside / CommonCode

Auth/class.User.php

Spacing +41 added lines, -41 removed lines

@@ -128,26 +128,26 @@ 
     function getTitleNames()
     {
         $titles = $this->getTitles();
-        if($titles === false)
+        if ($titles === false)
         {
             return false;
         }
-        if(self::$titlenames === null)
+        if (self::$titlenames === null)
         {
             $dataSet = \DataSetFactory::get_data_set('profiles');
             $dataTable = $dataSet['position'];
             $titlenames = $dataTable->read();
             self::$titlenames = array();
             $count = count($titlenames);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
                 self::$titlenames[$titlenames[$i]['short_name']] = $titlenames[$i];
             }
         }
         $count = count($titles);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if(isset(self::$titlenames[$titles[$i]]))
+            if (isset(self::$titlenames[$titles[$i]]))
             {
                 $title = self::$titlenames[$titles[$i]];
                 $titles[$i] = $title['name'];
@@ -280,11 +280,11 @@ 
     function canLoginWith($provider)
     {
         $hosts = $this->getLoginProviders();
-        if($hosts === false) return false;
+        if ($hosts === false) return false;
         $count = count($hosts);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if(strcasecmp($hosts[$i], $provider) === 0) return true;
+            if (strcasecmp($hosts[$i], $provider) === 0) return true;
         }
         return false;
     }
@@ -308,9 +308,9 @@ 
      */
     function isProfileComplete()
     {
-        if($this->getCountry() === false    || $this->getAddress() === false ||
+        if ($this->getCountry() === false || $this->getAddress() === false ||
            $this->getPostalCode() === false || $this->getCity() === false ||
-           $this->getState() === false      || $this->getPhoneNumber() === false)
+           $this->getState() === false || $this->getPhoneNumber() === false)
         {
             return false;
         }
@@ -354,17 +354,17 @@ 
      *
      * @return true|false true if the user's password was changed, false otherwise
      */
-    function change_pass($oldpass, $newpass, $isHash=false)
+    function change_pass($oldpass, $newpass, $isHash = false)
     {
-        if($isHash === false && $this->validate_password($oldpass) === false)
+        if ($isHash === false && $this->validate_password($oldpass) === false)
         {
             throw new \Exception('Invalid Password!', 3);
         }
-        if($isHash === true && $this->validate_reset_hash($oldpass) === false)
+        if ($isHash === true && $this->validate_reset_hash($oldpass) === false)
         {
             throw new \Exception('Invalid Reset Hash!', 3);
         }
-        if($this->setPass($newpass) === false)
+        if ($this->setPass($newpass) === false)
         {
             throw new \Exception('Unable to set password!', 6);
         }
@@ -602,99 +602,99 @@ 
         $auth = \AuthProvider::getInstance();
         $ldap = $auth->getAuthenticator('Auth\LDAPAuthenticator');
         $ldap->get_and_bind_server(true);
-        if(isset($data->oldpass) && isset($data->password))
+        if (isset($data->oldpass) && isset($data->password))
         {
             $this->change_pass($data->oldpass, $data->password);
             unset($data->oldpass);
             unset($data->password);
         }
-        else if(isset($data->hash) && isset($data->password))
+        else if (isset($data->hash) && isset($data->password))
         {
             $this->change_pass($data->hash, $data->password, true);
             return;
         }
-        if(isset($data->displayName))
+        if (isset($data->displayName))
         {
             $this->setDisplayName($data->displayName);
             unset($data->displayName);
         }
-        if(isset($data->givenName))
+        if (isset($data->givenName))
         {
             $this->setGivenName($data->givenName);
             unset($data->givenName);
         }
-        if(isset($data->jpegPhoto))
+        if (isset($data->jpegPhoto))
         {
             $this->setPhoto(base64_decode($data->jpegPhoto));
             unset($data->jpegPhoto);
         }
-        if(isset($data->mail))
+        if (isset($data->mail))
         {
-            if($data->mail !== $this->getEmail())
+            if ($data->mail !== $this->getEmail())
             {
                 throw new \Exception('Unable to change email!');
             }
             unset($data->mail);
         }
-        if(isset($data->uid))
+        if (isset($data->uid))
         {
-            if($data->uid !== $this->getUid())
+            if ($data->uid !== $this->getUid())
             {
                 throw new \Exception('Unable to change uid!');
             }
             unset($data->uid);
         }
-        if(isset($data->mobile))
+        if (isset($data->mobile))
         {
             $this->setPhoneNumber($data->mobile);
             unset($data->mobile);
         }
-        if(isset($data->o))
+        if (isset($data->o))
         {
             $this->setOrganization($data->o);
             unset($data->o);
         }
-        if(isset($data->title))
+        if (isset($data->title))
         {
             $this->setTitles($data->title);
             unset($data->title);
         }
-        if(isset($data->st))
+        if (isset($data->st))
         {
             $this->setState($data->st);
             unset($data->st);
         }
-        if(isset($data->l))
+        if (isset($data->l))
         {
             $this->setCity($data->l);
             unset($data->l);
         }
-        if(isset($data->sn))
+        if (isset($data->sn))
         {
             $this->setLastName($data->sn);
             unset($data->sn);
         }
-        if(isset($data->cn))
+        if (isset($data->cn))
         {
             $this->setNickName($data->cn);
             unset($data->cn);
         }
-        if(isset($data->postalAddress))
+        if (isset($data->postalAddress))
         {
             $this->setAddress($data->postalAddress);
             unset($data->postalAddress);
         }
-        if(isset($data->postalCode))
+        if (isset($data->postalCode))
         {
             $this->setPostalCode($data->postalCode);
             unset($data->postalCode);
         }
-        if(isset($data->c))
+        if (isset($data->c))
         {
             $this->setCountry($data->c);
             unset($data->c);
         }
-        if(isset($data->ou))
+        if (isset($data->ou))
         {
             $this->setOrganizationUnits($data->ou);
             unset($data->ou);
@@ -749,13 +749,13 @@ 
     public function getVcard()
     {
         $ret = "BEGIN:VCARD\nVERSION:2.1\n";
-        $ret.= 'N:'.$this->getLastName().';'.$this->getGivenName()."\n";
-        $ret.= 'FN:'.$this->getGivenName()."\n";
-        $ret.= 'TITLE:'.implode(',', $this->getTitles())."\n";
-        $ret.= "ORG: Austin Artistic Reconstruction\n";
-        $ret.= 'TEL;TYPE=MOBILE,VOICE:'.$this->getPhoneNumber()."\n";
-        $ret.= 'EMAIL;TYPE=PREF,INTERNET:'.$this->getEmail()."\n";
-        $ret.= "END:VCARD\n";
+        $ret .= 'N:'.$this->getLastName().';'.$this->getGivenName()."\n";
+        $ret .= 'FN:'.$this->getGivenName()."\n";
+        $ret .= 'TITLE:'.implode(',', $this->getTitles())."\n";
+        $ret .= "ORG: Austin Artistic Reconstruction\n";
+        $ret .= 'TEL;TYPE=MOBILE,VOICE:'.$this->getPhoneNumber()."\n";
+        $ret .= 'EMAIL;TYPE=PREF,INTERNET:'.$this->getEmail()."\n";
+        $ret .= "END:VCARD\n";
         return $ret;
     }
 }

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

Data/class.Filter.php

Spacing +38 added lines, -38 removed lines

@@ -9,7 +9,7 @@ 
 
     function __construct($string = false)
     {
-        if($string !== false)
+        if ($string !== false)
         {
             $this->string = $string;
             $this->children = self::process_string($this->string);
@@ -20,21 +20,21 @@ 
     {
         $parens = false;
         //First check for parenthesis...
-        if($string[0] === '(' && substr($string, -1) === ')')
+        if ($string[0] === '(' && substr($string, -1) === ')')
         {
-            $string = substr($string, 1, strlen($string)-2);
+            $string = substr($string, 1, strlen($string) - 2);
             $parens = true;
         }
-        if(preg_match('/(.+?)( and | or )(.+)/', $string, $clauses) === 0)
+        if (preg_match('/(.+?)( and | or )(.+)/', $string, $clauses) === 0)
         {
             return array(new FilterClause($string));
         }
         $children = array();
-        if($parens) array_push($children, '(');
+        if ($parens) array_push($children, '(');
         $children = array_merge($children, self::process_string($clauses[1]));
         array_push($children, trim($clauses[2]));
         $children = array_merge($children, self::process_string($clauses[3]));
-        if($parens) array_push($children, ')');
+        if ($parens) array_push($children, ')');
         return $children;
     }
 
@@ -42,23 +42,23 @@ 
     {
         $ret = '';
         $count = count($this->children);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if($this->children[$i] === '(' || $this->children[$i] === ')')
+            if ($this->children[$i] === '(' || $this->children[$i] === ')')
             {
-                $ret.=$this->children[$i];
+                $ret .= $this->children[$i];
             }
-            else if($this->children[$i] === 'and')
+            else if ($this->children[$i] === 'and')
             {
-                $ret.=' AND ';
+                $ret .= ' AND ';
             }
-            else if($this->children[$i] === 'or')
+            else if ($this->children[$i] === 'or')
             {
-                $ret.=' OR ';
+                $ret .= ' OR ';
             }
             else
             {
-                $ret.=$this->children[$i]->to_sql_string();
+                $ret .= $this->children[$i]->to_sql_string();
             }
         }
         return $ret.$this->sqlAppend;
@@ -69,19 +69,19 @@ 
         $ret = '';
         $count = count($this->children);
         $prefix = '';
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if($this->children[$i] === 'and')
+            if ($this->children[$i] === 'and')
             {
-                if($prefix == '|')
+                if ($prefix == '|')
                 {
                     throw new \Exception('Do not support both and or');
                 }
                 $prefix = '&';
             }
-            else if($this->children[$i] === 'or')
+            else if ($this->children[$i] === 'or')
             {
-                if($prefix == '&')
+                if ($prefix == '&')
                 {
                     throw new \Exception('Do not support both and or');
                 }
@@ -89,10 +89,10 @@ 
             }
             else
             {
-                $ret.=$this->children[$i]->to_ldap_string();
+                $ret .= $this->children[$i]->to_ldap_string();
             }
         }
-        if($count === 1 && $prefix === '')
+        if ($count === 1 && $prefix === '')
         {
             return $ret;
         }
@@ -103,14 +103,14 @@ 
     {
         $ret = array();
         $count = count($this->children);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if($this->children[$i] === 'and')
+            if ($this->children[$i] === 'and')
             {
                 $old = array_pop($ret);
                 array_push($ret, array('$and'=>array($old, $this->children[++$i]->to_mongo_filter())));
             }
-            else if($this->children[$i] === 'or')
+            else if ($this->children[$i] === 'or')
             {
                 $old = array_pop($ret);
                 array_push($ret, array('$or'=>array($old, $this->children[++$i]->to_mongo_filter())));
@@ -120,7 +120,7 @@ 
                 array_push($ret, $this->children[$i]->to_mongo_filter());
             }
         }
-        if(count($ret) == 1 && is_array($ret[0]))
+        if (count($ret) == 1 && is_array($ret[0]))
         {
             //print_r(json_encode($ret[0])); die();
             return $ret[0];
@@ -131,27 +131,27 @@ 
     function filter_array(&$array)
     {
         $res = array();
-        if(is_array($array))
+        if (is_array($array))
         {
             $search = $array;
             $count = count($this->children);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
-                if($this->children[$i] === 'and')
+                if ($this->children[$i] === 'and')
                 {
                     $search = $res;
                 }
-                else if($this->children[$i] === 'or')
+                else if ($this->children[$i] === 'or')
                 {
                     $search = $array;
                 }
                 else
                 {
-                    foreach($search as $subarray)
+                    foreach ($search as $subarray)
                     {
-                        if(isset($subarray[$this->children[$i]->var1]))
+                        if (isset($subarray[$this->children[$i]->var1]))
                         {
-                            if($this->children[$i]->php_compare($subarray[$this->children[$i]->var1]))
+                            if ($this->children[$i]->php_compare($subarray[$this->children[$i]->var1]))
                             {
                                 array_push($res, $subarray);
                             }
@@ -171,10 +171,10 @@ 
     public function getClause($substr)
     {
         $count = count($this->children);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if(!is_object($this->children[$i])) continue;
-            if(strstr($this->children[$i]->var1, $substr) !== false ||
+            if (!is_object($this->children[$i])) continue;
+            if (strstr($this->children[$i]->var1, $substr) !== false ||
                strstr($this->children[$i]->var2, $substr) !== false)
             {
                 return $this->children[$i];
@@ -184,17 +184,17 @@ 
 
     public function addToSQLString($string)
     {
-        $this->sqlAppend.=$string;
+        $this->sqlAppend .= $string;
     }
 
     public function appendChild($child)
     {
-        if($child === 'and' || $child === 'or')
+        if ($child === 'and' || $child === 'or')
         {
             array_push($this->children, $child);
             return;
         }
-        else if(is_a($child, '\Data\Filter'))
+        else if (is_a($child, '\Data\Filter'))
         {
             $this->children = array_merge($this->children, $child->children);
         }

Data/class.MongoDataTable.php

Spacing +24 added lines, -24 removed lines

@@ -6,9 +6,9 @@ 
     protected $collection;
     protected $namespace;
 
-    function __construct($collection, $collection_name=false)
+    function __construct($collection, $collection_name = false)
     {
-        if($collection_name !== false)
+        if ($collection_name !== false)
         {
             $this->namespace = $collection.'.'.$collection_name;
         }
@@ -18,12 +18,12 @@ 
         }
     }
 
-    function count($filter=false)
+    function count($filter = false)
     {
         $criteria = array();
-        if($filter !== false)
+        if ($filter !== false)
         {
-            if($filter instanceof \Data\Filter)
+            if ($filter instanceof \Data\Filter)
             {
                 $criteria = $filter->to_mongo_filter();
             }
@@ -35,13 +35,13 @@ 
         return $this->collection->count($criteria);
     }
 
-    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)
     {
         $fields   = array();
         $criteria = array();
-        if($filter !== false)
+        if ($filter !== false)
         {
-            if(is_array($filter))
+            if (is_array($filter))
             {
                 $criteria = $filter;
             }
@@ -50,29 +50,29 @@ 
                 $criteria = $filter->to_mongo_filter();
             }
         }
-        if($select !== false)
+        if ($select !== false)
         {
             $fields = array_fill_keys($select, 1);
         }
-        $cursor   = $this->collection->find($criteria, $fields);
-        if($params !== false && isset($params['fields']))
+        $cursor = $this->collection->find($criteria, $fields);
+        if ($params !== false && isset($params['fields']))
         {
             $cursor->fields($params['fields']);
         }
-        if($sort  !== false)
+        if ($sort !== false)
         {
             $cursor->sort($sort);
         }
-        if($skip  !== false)
+        if ($skip !== false)
         {
             $cursor->skip($skip);
         }
-        if($count !== false)
+        if ($count !== false)
         {
             $cursor->limit($count);
         }
-        $ret      = array();
-        foreach($cursor as $doc)
+        $ret = array();
+        foreach ($cursor as $doc)
         {
             array_push($ret, $doc);
         }
@@ -82,7 +82,7 @@ 
     function create($data)
     {
         $res = $this->collection->insert($data);
-        if($res === false || $res['err'] !== null)
+        if ($res === false || $res['err'] !== null)
         {
             return false;
         }
@@ -92,9 +92,9 @@ 
     function update($filter, $data)
     {
         $criteria = array();
-        if($filter !== false)
+        if ($filter !== false)
         {
-            if(is_array($filter))
+            if (is_array($filter))
             {
                 $criteria = $filter;
             }
@@ -103,12 +103,12 @@ 
                 $criteria = $filter->to_mongo_filter();
             }
         }
-        if(isset($data['_id']))
+        if (isset($data['_id']))
         {
             unset($data['_id']);
         }
         $res = $this->collection->update($criteria, array('$set' => $data));
-        if($res === false || $res['err'] !== null)
+        if ($res === false || $res['err'] !== null)
         {
             return false;
         }
@@ -118,9 +118,9 @@ 
     function delete($filter)
     {
         $criteria = array();
-        if($filter !== false)
+        if ($filter !== false)
         {
-            if(is_array($filter))
+            if (is_array($filter))
             {
                 $criteria = $filter;
             }
@@ -130,7 +130,7 @@ 
             }
         }
         $res = $this->collection->remove($criteria);
-        if($res === false || $res['err'] !== null)
+        if ($res === false || $res['err'] !== null)
         {
             return false;
         }

Data/class.MongoDataSet.php

Spacing +11 added lines, -11 removed lines

@@ -11,14 +11,14 @@ 
     {
         $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;
     }
-    if(strlen($namespace))
+    if (strlen($namespace))
     {
-        $namespace.=DIRECTORY_SEPARATOR;
+        $namespace .= DIRECTORY_SEPARATOR;
     }
     $filename = __DIR__.'/../libs/mongofill/src/'.$namespace.$classname.'.php';
-    if(is_readable($filename))
+    if (is_readable($filename))
     {
         require $filename;
     }
@@ -37,18 +37,18 @@ 
         $this->mangaer = null;
         $this->db = null;
         $this->db_name = null;
-        if(class_exists('MongoClient'))
+        if (class_exists('MongoClient'))
         {
             $this->setupMongoClient($params);
         }
-        else if(class_exists('\MongoDB\Driver\Manager'))
+        else if (class_exists('\MongoDB\Driver\Manager'))
         {
             $this->setupMongoManager($params);
         }
         else
         {
             require __DIR__.'/../libs/mongofill/src/functions.php';
-            if(version_compare(PHP_VERSION, '5.3.0', '>='))
+            if (version_compare(PHP_VERSION, '5.3.0', '>='))
             {
                 spl_autoload_register('\Data\MongofillAutoload', true, true);
             }
@@ -63,7 +63,7 @@ 
     function tableExists($name)
     {
         $collections = $this->db->getCollectionNames();
-        if(in_array($name, $collections))
+        if (in_array($name, $collections))
         {
              return true;
         }
@@ -72,7 +72,7 @@ 
 
     function getTable($name)
     {
-        if($this->db !== null)
+        if ($this->db !== null)
         {
             return new MongoDataTable($this->db->selectCollection($name));
         }
@@ -84,7 +84,7 @@ 
 
     private function setupMongoClient($params)
     {
-        if(isset($params['user']))
+        if (isset($params['user']))
         {
             $this->client = new \MongoClient('mongodb://'.$params['host'].'/'.$params['db'], array('username'=>$params['user'], 'password'=>$params['pass']));
         }
@@ -97,7 +97,7 @@ 
 
     private function setupMongoManager($params)
     {
-        if(isset($params['user']))
+        if (isset($params['user']))
         {
             $this->manager = new \MongoDB\Driver\Manager('mongodb://'.$params['user'].':'.$params['pass'].'@'.$params['host'].'/'.$params['db']);
         }

Data/class.SQLDataTable.php

Spacing +14 added lines, -14 removed lines

@@ -15,7 +15,7 @@ 
     function get_primary_key()
     {
         $res = $this->dataset->raw_query("SHOW INDEX FROM $this->tablename WHERE Key_name='PRIMARY'");
-        if($res === false)
+        if ($res === false)
         {
             return false;
         }
@@ -25,17 +25,17 @@ 
     function prefetch_all($key = false)
     {
         $array = $this->read(false, false);
-        if($key === false)
+        if ($key === false)
         {
             $key = $this->get_primary_key();
         }
         $count = count($array);
         $this->data = array();
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if(isset($this->data[$array[$i][$key]]))
+            if (isset($this->data[$array[$i][$key]]))
             {
-                if(isset($this->data[$array[$i][$key]][0]))
+                if (isset($this->data[$array[$i][$key]][0]))
                 {
                     array_push($this->data[$array[$i][$key]], $array[$i]);
                 }
@@ -51,19 +51,19 @@ 
         }
     }
 
-    function count($filter=false)
+    function count($filter = false)
     {
-        if($this->data !== null)
+        if ($this->data !== null)
         {
             return parent::count($filter);
         }
         $where = false;
-        if($filter !== false)
+        if ($filter !== false)
         {
             $where = $filter->to_sql_string();
         }
         $ret = $this->dataset->read($this->tablename, $where, 'COUNT(*)');
-        if($ret === false || !isset($ret[0]) || !isset($ret[0]['COUNT(*)']))
+        if ($ret === false || !isset($ret[0]) || !isset($ret[0]['COUNT(*)']))
         {
              return false;
         }
@@ -73,18 +73,18 @@ 
         }
     }
   
-    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)
         {
             return parent::search($filter, $select);
         }
         $where = false;
-        if($filter !== false)
+        if ($filter !== false)
         {
             $where = $filter->to_sql_string();
         }
-        if($select !== false && is_array($select))
+        if ($select !== false && is_array($select))
         {
             $select = implode(',', $select);
         }
@@ -105,7 +105,7 @@ 
     function delete($filter)
     {
         $where = false;
-        if($filter !== false)
+        if ($filter !== false)
         {
             $where = $filter->to_sql_string();
         }