BurningFlipside / SecureFramework

api/v1/index.php

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
     if($res === false)
     {
         $app->response->setStatus(403);
-    }
-    else
+    } else
     {
         echo json_encode($res);
     }

themes/view.php

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
         </div>
     </div>
 ';
-}
-else
+} else
 {
 $page->body .= '
 <div id="content">

themes/api/v1/index.php

Braces +10 added lines, -20 removed lines

@@ -17,8 +17,7 @@ 
         if($key == '_id')
         {
             $obj['_id'] = (string)$obj['_id'];
-        }
-        else if(is_object($value) || is_array($value))
+        } else if(is_object($value) || is_array($value))
         {
             unset($obj[$key]);
         }
@@ -71,8 +70,7 @@ 
     if(count($params))
     {
         $objs = $db->searchFromCollection('themes', $params, $fields);
-    }
-    else
+    } else
     {
         $objs = $db->getAllFromCollection('themes', false, false, $fields);
     }
@@ -137,16 +135,14 @@ 
     if($obj === FALSE)
     {
         throw new Exception('Unable to obtain object!', INTERNAL_ERROR);
-    }
-    else
+    } else
     {
         if($app->request->params('full') === null)
         {
             if(!validate_user_is_admin($app->user))
             {
                trim_obj($obj);
-            }
-            else if($field === false)
+            } else if($field === false)
             {
                 trim_obj($obj);
             }
@@ -161,15 +157,13 @@ 
                     $str = strtok("\0");
                     print(base64_decode($str));
                     $app->response->headers->set('Content-Type', $type);
-                }
-                else
+                } else
                 {
                     echo json_encode($obj[$field]);
                 }
                 return;
             }
-        }
-        else
+        } else
         {
             if(validate_user_has_access($app->user, $obj) === FALSE)
             {
@@ -207,16 +201,14 @@ 
     {
         $app->redirect('themes/'.$obj['_id'], 307);
         return;
-    }
-    else
+    } else
     {
         $res = $db->addObjectToCollection('themes', $obj);
     }
     if($res === FALSE)
     {
         throw new Exception('Unable to add theme!', INTERNAL_ERROR);
-    }
-    else
+    } else
     {
         echo json_encode(array('_id'=>(string)$res, 'url'=>$app->request->getUrl().$app->request->getPath().'/'.(string)$res));
     }
@@ -269,8 +261,7 @@ 
     if($res === FALSE)
     {
         throw new Exception('Unable to update object!', INTERNAL_ERROR);
-    }
-    else
+    } else
     {
         echo json_encode(array('update'=>TRUE));
     }
@@ -293,8 +284,7 @@ 
     if($res === false)
     {
         throw new Exception('Unable to delete object!', INTERNAL_ERROR);
-    }
-    else
+    } else
     {
         echo json_encode(array('delete'=>TRUE));
     }

themes/class.ThemePage.php

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
         if(!FlipSession::isLoggedIn())
         {
             $this->add_link('Login', 'http://profiles.burningflipside.com/login.php?return='.$this->current_url());
-        }
-        else
+        } else
         {
             if($this->user->isInGroupNamed('ThemeAdmins'))
             { 

themes/class.ThemeDB.php

Braces +2 added lines, -4 removed lines

@@ -35,12 +35,10 @@
         if($year !== '*' && $uid !== false)
         {
             $filter = new \Data\Filter("year eq $year and registrars eq $uid");
-        }
-        else if($year !== '*')
+        } else if($year !== '*')
         {
             $filter = new \Data\Filter("year eq $year");
-        }
-        else if($uid !== false)
+        } else if($uid !== false)
         {
             $filter = new \Data\Filter("registrars eq $uid");
         }

class.SecurePage.php

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
         if($this->secure_root === false || strlen($this->secure_root) === 0)
         {
             $this->secure_root = '/';
-        }
-        else if($this->secure_root[strlen($this->secure_root)-1] !== '/')
+        } else if($this->secure_root[strlen($this->secure_root)-1] !== '/')
         {
             $this->secure_root.= '/';
         }