mdaniels5757 / waca

includes/ConsoleTasks/MigrateToRoles.php

Braces +3 added lines, -3 removed lines

@@ -29,11 +29,11 @@ 
         foreach ($users as $user) {
             $toAdd = array('user');
 
-            if($user['status'] === 'Admin'){
+            if($user['status'] === 'Admin') {
                 $toAdd[] = 'admin';
             }
 
-            if($user['checkuser'] == 1){
+            if($user['checkuser'] == 1) {
                 $toAdd[] = 'checkuser';
             }
 
@@ -60,7 +60,7 @@ 
             $log->setComment($logData);
             $log->save();
 
-            if($user['status'] === 'Admin' || $user['status'] === 'User'){
+            if($user['status'] === 'Admin' || $user['status'] === 'User') {
                 $update->execute(array('id' => $user['id']));
             }
         }

includes/ApplicationBase.php

Braces +1 added lines, -2 removed lines

@@ -142,8 +142,7 @@
 
         if ($siteConfiguration->getLocationProviderApiKey() === null) {
             $page->setLocationProvider(new FakeLocationProvider());
-        }
-        else {
+        } else {
             $page->setLocationProvider(
                 new IpLocationProvider(
                     $database,

includes/Tasks/InternalPageBase.php

Braces +4 added lines, -8 removed lines

@@ -99,8 +99,7 @@ 
         if ($securityResult === SecurityManager::ALLOWED) {
             // We're allowed to run the page, so let's run it.
             $this->runPage();
-        }
-        else {
+        } else {
             $this->handleAccessDenied($securityResult);
 
             // Send the headers
@@ -158,19 +157,16 @@ 
             $this->redirect("login");
 
             return;
-        }
-        else {
+        } else {
             // Decide whether this was a rights failure, or an identification failure.
 
             if ($denyReason === SecurityManager::ERROR_NOT_IDENTIFIED) {
                 // Not identified
                 throw new NotIdentifiedException($this->getSecurityManager());
-            }
-            elseif ($denyReason === SecurityManager::ERROR_DENIED) {
+            } elseif ($denyReason === SecurityManager::ERROR_DENIED) {
                 // Nope, plain old access denied
                 throw new AccessDeniedException($this->getSecurityManager());
-            }
-            else {
+            } else {
                 throw new Exception('Unknown response from security manager.');
             }
         }

includes/Tasks/PageBase.php

Braces +7 added lines, -6 removed lines

@@ -217,8 +217,7 @@ 
         // Are we changing script?
         if ($script === null || substr($currentScriptName, -1 * count($script)) === $script) {
             $targetScriptName = $currentScriptName;
-        }
-        else {
+        } else {
             $targetScriptName = $this->getSiteConfiguration()->getBaseUrl() . '/' . $script;
         }
 
@@ -277,8 +276,9 @@ 
      *
      * @param string $path The path (relative to the application root) of the file
      */
-    final protected function addCss($path) {
-        if(in_array($path, $this->extraCss)){
+    final protected function addCss($path)
+    {
+        if(in_array($path, $this->extraCss)) {
             // nothing to do
             return;
         }
@@ -291,8 +291,9 @@ 
      *
      * @param string $path The path (relative to the application root) of the file
      */
-    final protected function addJs($path){
-        if(in_array($path, $this->extraJs)){
+    final protected function addJs($path)
+    {
+        if(in_array($path, $this->extraJs)) {
             // nothing to do
             return;
         }

includes/PdoDatabase.php

Braces +1 added lines, -2 removed lines

@@ -89,8 +89,7 @@
         // all over the rest of the code
         if ($this->hasActiveTransaction) {
             return false;
-        }
-        else {
+        } else {
             // set the transaction isolation level for every transaction.
             $this->exec("SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;");
 

includes/DataObjects/GeoLocation.php

Braces +2 added lines, -4 removed lines

@@ -60,12 +60,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // update
             $statement = $this->dbObject->prepare(<<<SQL
 UPDATE `geolocation`

includes/DataObjects/RDnsCache.php

Braces +2 added lines, -4 removed lines

@@ -59,12 +59,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // update
             $statement = $this->dbObject->prepare(<<<SQL
 UPDATE `rdnscache`

includes/DataObjects/Comment.php

Braces +3 added lines, -6 removed lines

@@ -41,8 +41,7 @@ 
     {
         if ($showAll) {
             $statement = $database->prepare('SELECT * FROM comment WHERE request = :target;');
-        }
-        else {
+        } else {
             $statement = $database->prepare(<<<SQL
 SELECT * FROM comment
 WHERE request = :target AND (visibility = 'user' OR user = :userid);
@@ -84,12 +83,10 @@ 
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // update
             $statement = $this->dbObject->prepare(<<<SQL
 UPDATE comment

includes/DataObjects/UserRole.php

Braces +2 added lines, -4 removed lines

@@ -61,12 +61,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // update
             throw new Exception('Updating roles is not available');
         }