BurningFlipside / CommonCode

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

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

Data/class.FilterClause.php

Spacing +16 added lines, -16 removed lines

@@ -7,9 +7,9 @@ 
     public $var2;
     public $op;
 
-    function __construct($string=false)
+    function __construct($string = false)
     {
-        if($string !== false) $this->process_filter_string($string);
+        if ($string !== false) $this->process_filter_string($string);
     }
 
     static function str_startswith($haystack, $needle)
@@ -19,7 +19,7 @@ 
 
     protected function process_filter_string($string)
     {
-        if(self::str_startswith($string, 'substringof') || self::str_startswith($string, 'contains') || 
+        if (self::str_startswith($string, 'substringof') || self::str_startswith($string, 'contains') || 
            self::str_startswith($string, 'indexof'))
         {
             $this->op   = strtok($string, '(');
@@ -30,7 +30,7 @@ 
         $field = strtok($string, ' ');
         $op = strtok(' ');
         $rest = strtok("\0");
-        switch($op)
+        switch ($op)
         {
             case 'ne':
                 $op = '!=';
@@ -59,11 +59,11 @@ 
     function to_sql_string()
     {
         $str = '';
-        switch($this->op)
+        switch ($this->op)
         {
             case 'substringof':
             case 'contains':
-                $str = $this->var1.' LIKE \'%'.trim($this->var2,"'").'%\'';
+                $str = $this->var1.' LIKE \'%'.trim($this->var2, "'").'%\'';
                 break;
             default:
                 $str = $this->var1.$this->op.$this->var2;
@@ -75,17 +75,17 @@ 
     function to_ldap_string()
     {
         $str = '(';
-        switch($this->op)
+        switch ($this->op)
         {
             case 'substringof':
             case 'contains':
-                $str.=$this->var1.$this->op.'*'.trim($this->var2,"'").'*';
+                $str .= $this->var1.$this->op.'*'.trim($this->var2, "'").'*';
                 break;
             case '!=':
-                $str.='!('.$this->var1.'='.$this->var2.')';
+                $str .= '!('.$this->var1.'='.$this->var2.')';
                 break;
             default:
-                $str.=$this->var1.$this->op.$this->var2;
+                $str .= $this->var1.$this->op.$this->var2;
                 break;
         }
         return $str.')';
@@ -94,11 +94,11 @@ 
     function to_mongo_filter()
     {
         $this->var2 = trim($this->var2, "'");
-        if($this->var1 === '_id')
+        if ($this->var1 === '_id')
         {
             $this->var2 = new \MongoId($this->var2);
         }
-        switch($this->op)
+        switch ($this->op)
         {
             case '!=':
                 return array($this->var1=>array('$ne'=>$this->var2));
@@ -117,13 +117,13 @@ 
             case 'indexof':
                 $field = $this->var1;
                 $case  = false;
-                if(self::str_startswith($this->var1, 'tolower'))
+                if (self::str_startswith($this->var1, 'tolower'))
                 {
-                    $field = substr($this->var1, strpos($this->var1, '(')+1);
+                    $field = substr($this->var1, strpos($this->var1, '(') + 1);
                     $field = substr($field, 0, strpos($field, ')'));
                     $case = true;
                 }
-                if($case)
+                if ($case)
                 {
                     return array($field=>array('$regex'=>new \MongoRegex('/'.$this->var2.'/i')));
                 }
@@ -136,7 +136,7 @@ 
 
     function php_compare($value)
     {
-        switch($this->op)
+        switch ($this->op)
         {
             case '!=':
                 return $value != $this->var2;

class.FlipPage.php

Spacing +73 added lines, -73 removed lines

@@ -16,7 +16,7 @@ 
  * We use the FlipsideSettings class for a list of sites and settings
  * about CDNs and minified JS/CSS
  */
-if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
+if (isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
 {
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
 }
@@ -30,32 +30,32 @@ 
  */
 require_once('class.WebPage.php');
 
-define('JS_JQUERY',       0);
-define('JS_JQUERY_UI',    1);
-define('JS_BOOTSTRAP',    2);
+define('JS_JQUERY', 0);
+define('JS_JQUERY_UI', 1);
+define('JS_BOOTSTRAP', 2);
 define('JQUERY_VALIDATE', 3);
-define('JQUERY_TOUCH',    4);
-define('JS_TINYNAV',      5);
+define('JQUERY_TOUCH', 4);
+define('JS_TINYNAV', 5);
 define('JS_BOOTSTRAP_FH', 6);
 define('JS_BOOTSTRAP_SW', 7);
-define('JS_DATATABLE',    8);
-define('JS_CHART',        9);
-define('JS_METISMENU',    10);
-define('JS_BOOTBOX',         11);
+define('JS_DATATABLE', 8);
+define('JS_CHART', 9);
+define('JS_METISMENU', 10);
+define('JS_BOOTBOX', 11);
 define('JS_DATATABLE_ODATA', 12);
-define('JS_CRYPTO_MD5_JS',   13);
-define('JS_JCROP',           14);
-define('JS_TYPEAHEAD',       15);
-define('JS_FLIPSIDE',     20);
-define('JS_LOGIN',        21);
-
-define('CSS_JQUERY_UI',    0);
-define('CSS_BOOTSTRAP',    1);
+define('JS_CRYPTO_MD5_JS', 13);
+define('JS_JCROP', 14);
+define('JS_TYPEAHEAD', 15);
+define('JS_FLIPSIDE', 20);
+define('JS_LOGIN', 21);
+
+define('CSS_JQUERY_UI', 0);
+define('CSS_BOOTSTRAP', 1);
 define('CSS_BOOTSTRAP_FH', 2);
 define('CSS_BOOTSTRAP_SW', 3);
-define('CSS_DATATABLE',    4);
-define('CSS_JCROP',        5);
-define('CSS_FONTAWESOME',  6);
+define('CSS_DATATABLE', 4);
+define('CSS_JCROP', 5);
+define('CSS_FONTAWESOME', 6);
 
 global $jsArray;
 $jsArray = array(
@@ -349,7 +349,7 @@ 
      *
      * @SuppressWarnings("StaticAccess")
      */
-    function __construct($title, $header=true)
+    function __construct($title, $header = true)
     {
         parent::__construct($title);
         $this->setupVars();
@@ -361,13 +361,13 @@ 
         $this->notifications = array();
         $this->loginUrl = 'login.php';
         $this->logoutUrl = 'logout.php';
-        if(isset(FlipsideSettings::$global))
+        if (isset(FlipsideSettings::$global))
         {
-            if(isset(FlipsideSettings::$global['login_url']))
+            if (isset(FlipsideSettings::$global['login_url']))
             {
                 $this->loginUrl = FlipsideSettings::$global['login_url'];
             }
-            if(isset(FlipsideSettings::$global['logout_url']))
+            if (isset(FlipsideSettings::$global['logout_url']))
             {
                 $this->logoutUrl = FlipsideSettings::$global['logout_url'];
             }
@@ -382,7 +382,7 @@ 
      */
     protected function getSites()
     {
-        if(isset(FlipsideSettings::$sites))
+        if (isset(FlipsideSettings::$sites))
         {
             return FlipsideSettings::$sites;
         }
@@ -398,9 +398,9 @@ 
      */
     protected function addAllLinks()
     {
-        if($this->user === false || $this->user === null)
+        if ($this->user === false || $this->user === null)
         {
-            if(isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false)
+            if (isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false)
             {
                 $this->addLink('Login', $this->loginUrl);
             }
@@ -423,16 +423,16 @@ 
      */
     private function setupVars()
     {
-        if($this->minified !== null && $this->cdn !== null) return;
+        if ($this->minified !== null && $this->cdn !== null) return;
         $this->minified = 'min';
         $this->cdn      = 'cdn';
-        if(isset(FlipsideSettings::$global))
+        if (isset(FlipsideSettings::$global))
         {
-            if(isset(FlipsideSettings::$global['use_minified']) && !FlipsideSettings::$global['use_minified'])
+            if (isset(FlipsideSettings::$global['use_minified']) && !FlipsideSettings::$global['use_minified'])
             {
                 $this->minified = 'no';
             }
-            if(isset(FlipsideSettings::$global['use_cdn']) && !FlipsideSettings::$global['use_cdn'])
+            if (isset(FlipsideSettings::$global['use_cdn']) && !FlipsideSettings::$global['use_cdn'])
             {
                 $this->cdn = 'no';
             }
@@ -447,7 +447,7 @@ 
      *
      * @deprecated 2.0.0 Please use addJSByURI() instead
      */
-    function add_js_from_src($src, $async=true)
+    function add_js_from_src($src, $async = true)
     {
         $this->addJSByURI($src, $async);
     }
@@ -458,10 +458,10 @@ 
      * @param string $uri The webpath to the JavaScript file
      * @param boolean $async Can the JavaScript be loaded asynchronously?
      */
-    public function addJSByURI($uri, $async=true)
+    public function addJSByURI($uri, $async = true)
     {
         $attributes = array('src'=>$uri, 'type'=>'text/javascript');
-        if($async === true)
+        if ($async === true)
         {
             $attributes['async'] = true;
         }
@@ -479,7 +479,7 @@ 
      *
      * @deprecated 2.0.0 Please use addCSSByURI() instead
      */
-    function add_css_from_src($src, $import=false)
+    function add_css_from_src($src, $import = false)
     {
         $this->addCSSByURI($src, $import);
     }
@@ -490,10 +490,10 @@ 
      * @param string $src The webpath to the Cascading Style Sheet file
      * @param boolean $async Can the CSS be loaded asynchronously?
      */
-    public function addCSSByURI($uri, $async=false)
+    public function addCSSByURI($uri, $async = false)
     {
         $attributes = array('rel'=>'stylesheet', 'href'=>$uri, 'type'=>'text/css');
-        if($async === true && $this->importSupport === true)
+        if ($async === true && $this->importSupport === true)
         {
             $attributes['rel'] = 'import';
         }
@@ -509,12 +509,12 @@ 
      *
      * @deprecated 2.0.0 Please use addWellKnownJS() instead
      */
-    function addJS($type, $async=true)
+    function addJS($type, $async = true)
     {
         $this->addWellKnownJS($type, $async);
     }
 
-    function add_js($type, $async=true)
+    function add_js($type, $async = true)
     {
         $this->addWellKnownJS($type, $async);
     }
@@ -525,7 +525,7 @@ 
      * @param string $jsFileID the ID of the JS file
      * @param boolean $async Can the JS file be loaded asynchronously?
      */
-    public function addWellKnownJS($jsFileID, $async=true)
+    public function addWellKnownJS($jsFileID, $async = true)
     {
         global $jsArray;
         $this->setupVars();
@@ -541,7 +541,7 @@ 
      *
      * @deprecated 2.0.0 Please use addWellKnownCSS() instead
      */
-    function add_css($type, $import=false)
+    function add_css($type, $import = false)
     {
         $this->addWellKnownCSS($type, $import);
     }
@@ -552,7 +552,7 @@ 
      * @param string $cssFileID the ID of the CSS file
      * @param boolean $async Can the CSS file be loaded asynchronously?
      */
-    public function addWellKnownCSS($cssFileID, $async=true)
+    public function addWellKnownCSS($cssFileID, $async = true)
     {
         global $cssArray;
         $this->setupVars();
@@ -575,16 +575,16 @@ 
         $sites = $this->getSites();
         $names = array_keys($sites);
         $ret = '';
-        foreach($names as $name)
+        foreach ($names as $name)
         {
-            $ret.='<li>'.$this->createLink($name, $sites[$name]).'</li>';
+            $ret .= '<li>'.$this->createLink($name, $sites[$name]).'</li>';
         }
         return $ret;
     }
 
     protected function getHrefForDropdown(&$link)
     {
-        if(isset($link['_']))
+        if (isset($link['_']))
         {
             $ret = $link['_'];
             unset($link['_']);
@@ -597,24 +597,24 @@ 
     {
         $ret = '<li class="dropdown">';
         $href = $this->getHrefForDropdown($link);
-        $ret.= '<a href="'.$href.'" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'.$name.' <span class="caret"></span></a>';
-        $ret.='<ul class="dropdown-menu">';
+        $ret .= '<a href="'.$href.'" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'.$name.' <span class="caret"></span></a>';
+        $ret .= '<ul class="dropdown-menu">';
         $subNames = array_keys($link);
-        foreach($subNames as $subName)
+        foreach ($subNames as $subName)
         {
-            $ret.=$this->getLinkByName($subName, $link);
+            $ret .= $this->getLinkByName($subName, $link);
         }
-        $ret.='</ul></li>';
+        $ret .= '</ul></li>';
         return $ret;
     }
 
     protected function getLinkByName($name, $links)
     {
-        if(is_array($links[$name]))
+        if (is_array($links[$name]))
         {
             return $this->getDropdown($links[$name], $name);
         }
-        if($links[$name] === false)
+        if ($links[$name] === false)
         {
             return '<li>'.$name.'</li>';
         }
@@ -625,9 +625,9 @@ 
     {
         $names = array_keys($this->links);
         $ret = '';
-        foreach($names as $name)
+        foreach ($names as $name)
         {
-            $ret.=$this->getLinkByName($name, $this->links);
+            $ret .= $this->getLinkByName($name, $this->links);
         }
         return $ret;
     }
@@ -639,7 +639,7 @@ 
     {
         $sites = $this->getSiteLinksForHeader();
         $links = $this->getLinksMenus();
-        $header ='<nav class="navbar navbar-default navbar-fixed-top">
+        $header = '<nav class="navbar navbar-default navbar-fixed-top">
                       <div class="container-fluid">
                           <!-- Brand and toggle get grouped for better mobile display -->
                           <div class="navbar-header">
@@ -668,7 +668,7 @@ 
                       </div>
                   </nav>';
         $this->body = $header.$this->body;
-        $this->body_tags.='style="padding-top: 60px;"';
+        $this->body_tags .= 'style="padding-top: 60px;"';
     }
 
     /** Notification that is green for success */
@@ -689,7 +689,7 @@ 
      *
      * @deprecated 2.0.0 Use the addNotification function instead 
      */
-    function add_notification($msg, $sev=self::NOTIFICATION_INFO, $dismissible=1)
+    function add_notification($msg, $sev = self::NOTIFICATION_INFO, $dismissible = 1)
     {
         $notice = array('msg'=>$msg, 'sev'=>$sev, 'dismissible'=>$dismissible);
         array_push($this->notifications, $notice);
@@ -704,7 +704,7 @@ 
      *
      * @deprecated 2.0.0 Use the addNotification function instead
      */
-    public function addNotification($message, $severity=self::NOTIFICATION_INFO, $dismissible=true)
+    public function addNotification($message, $severity = self::NOTIFICATION_INFO, $dismissible = true)
     {
         array_push($this->notificatons, array('msg'=>$message, 'sev'=>$severity, 'dismissible'=>$dismissible)); 
     }
@@ -715,21 +715,21 @@ 
     private function renderNotifications()
     {
         $count = count($this->notifications);
-        if($count === 0)
+        if ($count === 0)
         {
             return;
         }
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $class = 'alert '.$this->notifications[$i]['sev'];
             $button = '';
-            if($this->notifications[$i]['dismissible'])
+            if ($this->notifications[$i]['dismissible'])
             {
                 $class .= ' alert-dismissible';
                 $button = '<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>';
             }
             $prefix = '';
-            switch($this->notifications[$i]['sev'])
+            switch ($this->notifications[$i]['sev'])
             {
                 case self::NOTIFICATION_INFO:
                     $prefix = '<strong>Notice:</strong> '; 
@@ -742,10 +742,10 @@ 
                     break;
             }
             $style = '';
-            if($i+1 < count($this->notifications))
+            if ($i + 1 < count($this->notifications))
             {
                 //Not the last notification, remove the end margin
-                $style='style="margin: 0px;"';
+                $style = 'style="margin: 0px;"';
             }
             $this->body = '
                 <div class="'.$class.'" role="alert" '.$style.'>
@@ -773,7 +773,7 @@ 
      */
     private function addAnalyticsBlock()
     {
-        if($this->analytics === false)
+        if ($this->analytics === false)
         {
             return;
         }
@@ -795,12 +795,12 @@ 
      * @param boolean $header Draw the header
      * @param boolean $analytics Include analytics on the page
      */
-    public function printPage($header=true)
+    public function printPage($header = true)
     {
         $this->renderNotifications();
         $this->addNoScript();
         $this->addAnalyticsBlock();
-        if($this->header || $header)
+        if ($this->header || $header)
         {
             $this->addHeader();
         }
@@ -816,7 +816,7 @@ 
      *
      * @deprecated 1.0.0 Use addLink instead
      */
-    function add_link($name, $url=false, $submenu=false)
+    function add_link($name, $url = false, $submenu = false)
     {
         $this->addLink($name, $url, $submenu);
     }
@@ -828,9 +828,9 @@ 
      * @param false|string $url The URL to link to
      * @param false|array $subment Any submenu items for the dropdown
      */
-    public function addLink($name, $url=false, $submenu=false)
+    public function addLink($name, $url = false, $submenu = false)
     {
-        if(is_array($submenu))
+        if (is_array($submenu))
         {
             $submenu['_'] = $url;
             $this->links[$name] = $submenu;
@@ -852,11 +852,11 @@ 
         $authLinks = $auth->getSupplementaryLinks();
         $authLinksStr = '';
         $count = count($authLinks);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $authLinksStr .= $authLinks[$i];
         }
-        if($count > 0)
+        if ($count > 0)
         {
             $authLinksStr = 'Sign in with '.$authLinksStr;
         }