BurningFlipside / CommonCode

Data/class.SQLDataSet.php

Braces +5 added lines, -10 removed lines

@@ -10,8 +10,7 @@ 
         if(isset($params['user']))
         {
             $this->pdo = new \PDO($params['dsn'], $params['user'], $params['pass']);
-        }
-        else
+        } else
         {
             $this->pdo = new \PDO($params['dsn']);
         }
@@ -38,8 +37,7 @@ 
         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;
         }
@@ -51,8 +49,7 @@ 
         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;
         }
@@ -64,8 +61,7 @@ 
         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;
         }
@@ -122,8 +118,7 @@ 
             if($skip === false)
             {
                 $sql.=' LIMIT '.(int)$count;
-            }
-            else
+            } else
             {
                 $sql.=" LIMIT $skip, $count";
             }

Data/class.Filter.php

Braces +20 added lines, -25 removed lines

@@ -30,11 +30,15 @@ 
             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;
     }
 
@@ -47,16 +51,13 @@ 
             if($this->children[$i] === '(' || $this->children[$i] === ')')
             {
                 $ret.=$this->children[$i];
-            }
-            else if($this->children[$i] === 'and')
+            } else if($this->children[$i] === 'and')
             {
                 $ret.=' AND ';
-            }
-            else if($this->children[$i] === 'or')
+            } else if($this->children[$i] === 'or')
             {
                 $ret.=' OR ';
-            }
-            else
+            } else
             {
                 $ret.=$this->children[$i]->to_sql_string();
             }
@@ -78,16 +79,14 @@ 
                     throw new \Exception('Do not support both and or');
                 }
                 $prefix = '&';
-            }
-            else if($this->children[$i] === 'or')
+            } else if($this->children[$i] === 'or')
             {
                 if($prefix == '&')
                 {
                     throw new \Exception('Do not support both and or');
                 }
                 $prefix = '|';
-            }
-            else
+            } else
             {
                 $ret.=$this->children[$i]->to_ldap_string();
             }
@@ -109,13 +108,11 @@ 
             {
                 $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())));
-            }
-            else
+            } else
             {
                 array_push($ret, $this->children[$i]->to_mongo_filter());
             }
@@ -140,12 +137,10 @@ 
                 if($this->children[$i] === 'and')
                 {
                     $search = $res;
-                }
-                else if($this->children[$i] === 'or')
+                } else if($this->children[$i] === 'or')
                 {
                     $search = $array;
-                }
-                else
+                } else
                 {
                     foreach($search as $subarray)
                     {
@@ -173,7 +168,9 @@ 
         $count = count($this->children);
         for($i = 0; $i < $count; $i++)
         {
-            if(!is_object($this->children[$i])) continue;
+            if(!is_object($this->children[$i])) {
+                continue;
+            }
             if(strstr($this->children[$i]->var1, $substr) !== false ||
                strstr($this->children[$i]->var2, $substr) !== false)
             {
@@ -193,12 +190,10 @@ 
         {
             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);
-        }
-        else
+        } else
         {
             $this->children = array_merge($this->children, self::process_string($child));
         }

Data/class.MongoDataTable.php

Braces +5 added lines, -10 removed lines

@@ -11,8 +11,7 @@ 
         if($collection_name !== false)
         {
             $this->namespace = $collection.'.'.$collection_name;
-        }
-        else
+        } else
         {
             $this->collection = $collection;
         }
@@ -26,8 +25,7 @@ 
             if($filter instanceof \Data\Filter)
             {
                 $criteria = $filter->to_mongo_filter();
-            }
-            else
+            } else
             {
                 $criteria = $filter;
             }
@@ -44,8 +42,7 @@ 
             if(is_array($filter))
             {
                 $criteria = $filter;
-            }
-            else
+            } else
             {
                 $criteria = $filter->to_mongo_filter();
             }
@@ -97,8 +94,7 @@ 
             if(is_array($filter))
             {
                 $criteria = $filter;
-            }
-            else
+            } else
             {
                 $criteria = $filter->to_mongo_filter();
             }
@@ -123,8 +119,7 @@ 
             if(is_array($filter))
             {
                 $criteria = $filter;
-            }
-            else
+            } else
             {
                 $criteria = $filter->to_mongo_filter();
             }

Data/class.MongoDataSet.php

Braces +6 added lines, -12 removed lines

@@ -40,19 +40,16 @@ 
         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
+        } else
         {
             require __DIR__.'/../libs/mongofill/src/functions.php';
             if(version_compare(PHP_VERSION, '5.3.0', '>='))
             {
                 spl_autoload_register('\Data\MongofillAutoload', true, true);
-            }
-            else
+            } else
             {
                 spl_autoload_register('\Data\MongofillAutoload');
             }
@@ -75,8 +72,7 @@ 
         if($this->db !== null)
         {
             return new MongoDataTable($this->db->selectCollection($name));
-        }
-        else
+        } else
         {
             return new MongoDataTable($this->db_name, $name);
         }
@@ -87,8 +83,7 @@ 
         if(isset($params['user']))
         {
             $this->client = new \MongoClient('mongodb://'.$params['host'].'/'.$params['db'], array('username'=>$params['user'], 'password'=>$params['pass']));
-        }
-        else
+        } else
         {
             $this->client = new \MongoClient('mongodb://'.$params['host'].'/'.$params['db']);
         }
@@ -100,8 +95,7 @@ 
         if(isset($params['user']))
         {
             $this->manager = new \MongoDB\Driver\Manager('mongodb://'.$params['user'].':'.$params['pass'].'@'.$params['host'].'/'.$params['db']);
-        }
-        else
+        } else
         {
             $this->manager = new \MongoDB\Driver\Manager('mongodb://'.$params['host'].'/'.$params['db']);
         }

Data/class.SQLDataTable.php

Braces +3 added lines, -6 removed lines

@@ -38,13 +38,11 @@ 
                 if(isset($this->data[$array[$i][$key]][0]))
                 {
                     array_push($this->data[$array[$i][$key]], $array[$i]);
-                }
-                else
+                } else
                 {
                     $this->data[$array[$i][$key]] = array($array[$i]);
                 }
-            }
-            else
+            } else
             {
                 $this->data[$array[$i][$key]] = $array[$i];
             }
@@ -66,8 +64,7 @@ 
         if($ret === false || !isset($ret[0]) || !isset($ret[0]['COUNT(*)']))
         {
              return false;
-        }
-        else
+        } else
         {
              return $ret[0]['COUNT(*)'];
         }

Data/class.FilterClause.php

Braces +4 added lines, -3 removed lines

@@ -9,7 +9,9 @@ 
 
     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)
@@ -126,8 +128,7 @@ 
                 if($case)
                 {
                     return array($field=>array('$regex'=>new \MongoRegex('/'.$this->var2.'/i')));
-                }
-                else
+                } else
                 {
                     return array($field=>$this->var2);
                 }

class.FlipPage.php

Braces +6 added lines, -7 removed lines

@@ -19,8 +19,7 @@ 
 if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
 {
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
-}
-else
+} else
 {
     require_once('/var/www/secure_settings/class.FlipsideSettings.php');
 }
@@ -404,8 +403,7 @@ 
             {
                 $this->addLink('Login', $this->loginUrl);
             }
-        }
-        else
+        } else
         {
             $this->add_links();
             $this->addLink('Logout', $this->logoutUrl);
@@ -423,7 +421,9 @@ 
      */
     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))
@@ -834,8 +834,7 @@ 
         {
             $submenu['_'] = $url;
             $this->links[$name] = $submenu;
-        }
-        else
+        } else
         {
             $this->links[$name] = $url;
         }

class.FlipSession.php

Braces +9 added lines, -13 removed lines

@@ -32,8 +32,7 @@ 
         if(FlipSession::doesVarExist($name))
         {
             return $_SESSION[$name];
-        }
-        else
+        } else
         {
             return $default;
         }
@@ -59,13 +58,11 @@ 
         if(isset($_SESSION['flipside_user']))
         {
             return true;
-        }
-        else if(isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData']))
+        } else if(isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData']))
         {
             $auth = AuthProvider::getInstance();
             return $auth->isLoggedIn($_SESSION['AuthData'], $_SESSION['AuthMethod']);
-        }
-        else
+        } else
         {
             return false;
         }
@@ -81,8 +78,7 @@ 
         if(isset($_SESSION['flipside_user']))
         {
             return $_SESSION['flipside_user'];
-        }
-        else if(isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData']))
+        } else if(isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData']))
         {
             $auth = AuthProvider::getInstance();
             $user = $auth->getUser($_SESSION['AuthData'], $_SESSION['AuthMethod']);
@@ -91,8 +87,7 @@ 
                 $_SESSION['flipside_user'] = $user;
             }
             return $user;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -156,7 +151,9 @@ 
             $pos = strpos($sessionData, "|", $offset);
             $len = $pos - $offset;
             $name = substr($sessionData, $offset, $len);
-            if($name === false) break;
+            if($name === false) {
+                break;
+            }
             $offset += $len+1;
             $data = @unserialize(substr($sessionData, $offset));
             $res[$name] = $data;
@@ -181,8 +178,7 @@ 
             if($sessionData === false)
             {
                 array_push($res, array('sid' => $sessionId));
-            }
-            else
+            } else
             {
                 $tmp = FlipSession::unserializePhpSession($sessionData);
                 $tmp['sid' ] = $sessionId;

class.WebPage.php

Braces +1 added lines, -2 removed lines

@@ -61,8 +61,7 @@
         if($browserName === 'IE' && $this->getBrowserMajorVer() <= 7)
         {
             header( 'Location: /badbrowser.php' ) ;
-        }
-        else if($browserName === 'Chrome' && $this->getBrowserMajorVer() >= 36)
+        } else if($browserName === 'Chrome' && $this->getBrowserMajorVer() >= 36)
         {
             $this->importSupport = true;
         }