BurningFlipside / CommonCode

Auth/class.GoogleAuthenticator.php

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
             }

             $currentUser = $localUsers[0];

             return self::ALREADY_PRESENT;

-        }

-        else

+        } else

         {

             $user = new PendingUser();

             $user->setEmail($googleUser->email);

Auth/OAuth2/class.OAuth2Authenticator.php

Braces +1 added lines, -2 removed lines

@@ -40,8 +40,7 @@
         if(!isset($params['redirect_url']))
         {
             $this->redirect_uri = 'https://'.$_SERVER['HTTP_HOST'].'/oauth/callbacks/'.$this->getHostName();
-        }
-        else
+        } else
         {
             $this->redirect_uri = $params['redirect_url'];
         }

Auth/class.User.php

Braces +7 added lines, -4 removed lines

@@ -280,11 +280,15 @@ 
     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++)
         {
-            if(strcasecmp($hosts[$i], $provider) === 0) return true;
+            if(strcasecmp($hosts[$i], $provider) === 0) {
+                return true;
+            }
         }
         return false;
     }
@@ -607,8 +611,7 @@ 
             $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;

class.FlipREST.php

Braces +8 added lines, -16 removed lines

@@ -75,8 +75,7 @@ 
         if(!isset($this->headers['Authorization']))
         {
             $this->app->user = $this->getUserFromSession();
-        } 
-        else 
+        } else 
         {
             $header = $this->headers['Authorization'];
             $this->app->user = $this->getUserFromHeader($header);
@@ -99,16 +98,13 @@ 
         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;
         }
@@ -129,8 +125,7 @@ 
             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));
             }
@@ -145,8 +140,7 @@ 
                         $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;
@@ -162,8 +156,7 @@ 
                     fputcsv($df, $values);
                 }
             }
-        }
-        else
+        } else
         {
             $array = get_object_vars($array);
             fputcsv($df, array_keys($array));
@@ -262,8 +255,7 @@ 
                     break;
             }
             $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');
         }

Autoload.php

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
 if(version_compare(PHP_VERSION, '5.3.0', '>='))
 {
     spl_autoload_register('FlipsideAutoload', true, true);
-}
-else
+} else
 {
     spl_autoload_register('FlipsideAutoload');
 }

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