mdaniels5757 / waca

includes/DataObjects/RequestQueue.php

Braces +2 added lines, -4 removed lines

@@ -258,12 +258,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             $statement = $this->dbObject->prepare(<<<SQL
                 UPDATE requestqueue SET
                     enabled = :enabled,

includes/DataObjects/Domain.php

Braces +6 added lines, -9 removed lines

@@ -52,12 +52,10 @@ 
 
                 if ($domain === false) {
                     self::$currentDomain = self::getById(1, $database); // FIXME: #594 User::getCurrent($database)->getDefaultDomain();
-                }
-                else {
+                } else {
                     self::$currentDomain = $domain;
                 }
-            }
-            else {
+            } else {
                 self::$currentDomain = self::getById(1, $database); // FIXME: #594 User::getCurrent($database)->getDefaultDomain();
             }
         }
@@ -86,7 +84,8 @@ 
         return $result;
     }
 
-    public static function getAll(PdoDatabase $database) {
+    public static function getAll(PdoDatabase $database)
+    {
         $statement = $database->prepare("SELECT * FROM domain;");
         $statement->execute();
 
@@ -155,12 +154,10 @@ 
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             $statement = $this->dbObject->prepare(<<<SQL
                 UPDATE domain SET
                     longname = :longname,

includes/Tasks/PageBase.php

Braces +1 added lines, -2 removed lines

@@ -264,8 +264,7 @@
         // Are we changing script?
         if ($script === null || substr($currentScriptName, -1 * count($script)) === $script) {
             $targetScriptName = $currentScriptName;
-        }
-        else {
+        } else {
             $targetScriptName = $this->getSiteConfiguration()->getBaseUrl() . '/' . $script;
         }
 

includes/Tasks/JsonApiPageBase.php

Braces +1 added lines, -2 removed lines

@@ -72,8 +72,7 @@
         if ($targetVar !== null && preg_match('/^[a-z]+$/', $targetVar)) {
             $data = $targetVar . ' = ' . $data . ';';
             header("Content-Type: text/javascript");
-        }
-        else {
+        } else {
             header("Content-Type: application/json");
         }
 

includes/Tasks/PagedInternalPageBase.php

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
         if ($pageCount < $pageLimit) {
             if ($pageData['lowpage'] == 1 && $pageData['hipage'] < $pageData['maxpage']) {
                 $pageData['hipage'] = min($pageLimit, $pageData['maxpage']);
-            }
-            elseif ($pageData['lowpage'] > 1 && $pageData['hipage'] == $pageData['maxpage']) {
+            } elseif ($pageData['lowpage'] > 1 && $pageData['hipage'] == $pageData['maxpage']) {
                 $pageData['lowpage'] = max(1, $pageData['maxpage'] - $pageLimit + 1);
             }
         }

includes/Security/CredentialProviders/CredentialProviderBase.php

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
             $sql = 'UPDATE credential SET factor = factor - 1 WHERE user = :user AND factor > :factor';
             $statement = $this->database->prepare($sql);
             $statement->execute(array(':user' => $user->getId(), ':factor' => $stage));
-        }
-        else {
+        } else {
             // There are other auth factors at this point. Don't renumber the factors just yet.
         }
 

includes/Security/SecurityManager.php

Braces +2 added lines, -4 removed lines

@@ -197,12 +197,10 @@
             if ($this->roleConfiguration->roleNeedsIdentification($v)) {
                 if ($identified) {
                     $activeRoles[] = $v;
-                }
-                else {
+                } else {
                     $inactiveRoles[] = $v;
                 }
-            }
-            else {
+            } else {
                 $activeRoles[] = $v;
             }
         }

includes/Pages/PageBan.php

Braces +7 added lines, -14 removed lines

@@ -85,8 +85,7 @@ 
                 SessionAlert::error($ex->getMessage());
                 $this->redirect("bans", "set");
             }
-        }
-        else {
+        } else {
             $this->handleGetMethodForSetBan();
 
             $user = User::getCurrent($this->getDatabase());
@@ -134,8 +133,7 @@ 
                 SessionAlert::error($ex->getMessage());
                 $this->redirect("bans", "set");
             }
-        }
-        else {
+        } else {
             $this->handleGetMethodForSetBan();
 
             $user = User::getCurrent($database);
@@ -262,8 +260,7 @@ 
             $this->getNotificationHelper()->unbanned($ban, $unbanReason);
 
             $this->redirect('bans');
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->assign('ban', $ban);
             $this->setTemplate('bans/unban.tpl');
@@ -283,17 +280,14 @@ 
 
             if (!$duration) {
                 throw new ApplicationLogicException('Invalid ban time');
-            }
-            elseif (time() > $duration) {
+            } elseif (time() > $duration) {
                 throw new ApplicationLogicException('Ban time has already expired!');
             }
 
             return $duration;
-        }
-        elseif ($duration === "-1") {
+        } elseif ($duration === "-1") {
             return null;
-        }
-        else {
+        } else {
             return WebRequest::postInt('duration') + time();
         }
     }
@@ -585,8 +579,7 @@ 
             $ipParts = explode('/', $targetIp, 2);
             $targetIp = $ipParts[0];
             $targetMask = (int)$ipParts[1];
-        }
-        else {
+        } else {
             // Default the CIDR range based on the IP type
             $targetMask = filter_var($targetIp, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) ? 128 : 32;
         }

includes/Helpers/IrcNotificationHelper.php

Braces +3 added lines, -6 removed lines

@@ -111,8 +111,7 @@ 
             if ($amqpSiteConfig['tls']) {
                 $amqpConnectionConfig->setIsSecure(true);
                 $amqpConnectionConfig->setSslVerify(true);
-            }
-            else {
+            } else {
                 $amqpConnectionConfig->setIsSecure(false);
             }
 
@@ -268,8 +267,7 @@ 
     {
         if ($ban->getDuration() === null) {
             $duration = "indefinitely";
-        }
-        else {
+        } else {
             $duration = "until " . date("F j, Y, g:i a", $ban->getDuration());
         }
 
@@ -277,8 +275,7 @@ 
 
         if ($ban->getVisibility() == 'user') {
             $this->send("Ban {$ban->getId()} set by {$username} for '{$ban->getReason()}' {$duration}");
-        }
-        else {
+        } else {
             $this->send("Ban {$ban->getId()} set by {$username} {$duration}");
         }
     }