mdaniels5757 / waca

includes/Offline.php

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
 
         if ($external) {
             return $smarty->fetch("offline/external.tpl");
-        }
-        else {
+        } else {
             $hideCulprit = true;
 
             // Use the provided message if possible

includes/Router/RequestRouter.php

Braces +5 added lines, -10 removed lines

@@ -340,8 +340,7 @@ 
         if (count($pathInfo) === 0) {
             // No pathInfo, so no page to load. Load the main page.
             return $this->getDefaultRoute();
-        }
-        elseif (count($pathInfo) === 1) {
+        } elseif (count($pathInfo) === 1) {
             // Exactly one path info segment, it's got to be a page.
             $classSegment = $pathInfo[0];
 
@@ -353,8 +352,7 @@ 
             // Let's handle more than two, and collapse it down into two.
             $requestedAction = array_pop($pathInfo);
             $classSegment = implode('/', $pathInfo);
-        }
-        else {
+        } else {
             // Two path info segments.
             $classSegment = $pathInfo[0];
             $requestedAction = $pathInfo[1];
@@ -383,8 +381,7 @@ 
             $action = 'main';
 
             return array($pageClass, $action);
-        }
-        else {
+        } else {
             // Doesn't exist in map. Fall back to 404
             $pageClass = Page404::class;
             $action = "main";
@@ -413,16 +410,14 @@ 
                 $action = $requestedAction;
 
                 return array($pageClass, $action);
-            }
-            else {
+            } else {
                 // Valid page, invalid action. 404 our way out.
                 $pageClass = Page404::class;
                 $action = 'main';
 
                 return array($pageClass, $action);
             }
-        }
-        else {
+        } else {
             // Class doesn't exist in map. Fall back to 404
             $pageClass = Page404::class;
             $action = 'main';

redir.php

Braces +2 added lines, -4 removed lines

@@ -40,13 +40,11 @@
             echo 'Error resolving hostname, it doesn\'t look like this domain exists.';
             die();
         }
-    }
-    else {
+    } else {
         $data = urlencode($data);
     }
 
     echo '<script>window.location.href=' . json_encode(str_replace("%DATA%", $data, $toolList[$tool])) . '</script>';
-}
-else {
+} else {
     header("Location: " . $_SERVER["REQUEST_URI"] . "&round2=true");
 }

smarty-plugins/modifier.relativedate.php

Braces +9 added lines, -18 removed lines

@@ -22,8 +22,7 @@ 
         && (get_class($input) === DateTime::class || get_class($input) === DateTimeImmutable::class)
     ) {
         $then = $input;
-    }
-    else {
+    } else {
         try {
             $then = new DateTime($input);
         }
@@ -53,29 +52,21 @@ 
     if ($secs <= 10) {
         $output = "just now";
         $pluralise = false;
-    }
-    elseif ($secs > 10 && $secs < $minuteCut) {
+    } elseif ($secs > 10 && $secs < $minuteCut) {
         $output = round($secs / $second) . " second";
-    }
-    elseif ($secs >= $minuteCut && $secs < $hourCut) {
+    } elseif ($secs >= $minuteCut && $secs < $hourCut) {
         $output = round($secs / $minute) . " minute";
-    }
-    elseif ($secs >= $hourCut && $secs < $dayCut) {
+    } elseif ($secs >= $hourCut && $secs < $dayCut) {
         $output = round($secs / $hour) . " hour";
-    }
-    elseif ($secs >= $dayCut && $secs < $weekCut) {
+    } elseif ($secs >= $dayCut && $secs < $weekCut) {
         $output = round($secs / $day) . " day";
-    }
-    elseif ($secs >= $weekCut && $secs < $monthCut) {
+    } elseif ($secs >= $weekCut && $secs < $monthCut) {
         $output = round($secs / $week) . " week";
-    }
-    elseif ($secs >= $monthCut && $secs < $yearCut) {
+    } elseif ($secs >= $monthCut && $secs < $yearCut) {
         $output = round($secs / $month) . " month";
-    }
-    elseif ($secs >= $yearCut && $secs < $year * 10) {
+    } elseif ($secs >= $yearCut && $secs < $year * 10) {
         $output = round($secs / $year) . " year";
-    }
-    else {
+    } else {
         $output = "a long time ago";
         $pluralise = false;
     }

includes/Security/ContentSecurityPolicyManager.php

Braces +1 added lines, -2 removed lines

@@ -94,8 +94,7 @@
                 if (!$policyIsSet) {
                     $constructedPolicy .= "'none' ";
                 }
-            }
-            else {
+            } else {
                 $constructedPolicy .= "'none' ";
             }
 

includes/DataObjects/OAuthIdentity.php

Braces +2 added lines, -4 removed lines

@@ -90,12 +90,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 oauthidentity SET
                       iss                     = :iss

includes/DataObjects/Credential.php

Braces +3 added lines, -6 removed lines

@@ -130,8 +130,7 @@ 
     {
         if ($timeout === null) {
             $this->timeout = null;
-        }
-        else {
+        } else {
             $this->timeout = $timeout->format('Y-m-d H:i:s');
         }
     }
@@ -188,12 +187,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 credential

includes/DataObjects/OAuthToken.php

Braces +2 added lines, -4 removed lines

@@ -42,12 +42,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 oauthtoken

includes/Pages/UserAuth/Login/LoginCredentialPageBase.php

Braces +8 added lines, -13 removed lines

@@ -65,8 +65,7 @@ 
                     }
 
                     $user = User::getByUsername($username, $database);
-                }
-                else {
+                } else {
                     $user = User::getById($partialId, $database);
                 }
 
@@ -105,8 +104,7 @@ 
 
                 return;
             }
-        }
-        else {
+        } else {
             $this->assign('showSignIn', true);
 
             $this->setupPartial();
@@ -131,8 +129,7 @@ 
             if (WebRequest::isHttps()) {
                 // Client can clearly use HTTPS, so let's enforce it for all connections.
                 $this->headerQueue[] = "Strict-Transport-Security: max-age=15768000";
-            }
-            else {
+            } else {
                 // This is the login form, not the request form. We need protection here.
                 $this->redirectUrl('https://' . WebRequest::serverName() . WebRequest::requestUri());
 
@@ -166,8 +163,7 @@ 
             $username = $this->partialUser->getUsername();
 
             $this->setupAlternates($this->partialUser, $partialStage, $database);
-        }
-        else {
+        } else {
             // No, see if we've preloaded a username
             $preloadUsername = WebRequest::getString('tplUsername');
             if ($preloadUsername !== null) {
@@ -194,13 +190,11 @@ 
         $redirectDestination = WebRequest::clearPostLoginRedirect();
         if ($redirectDestination !== null) {
             $this->redirectUrl($redirectDestination);
-        }
-        else {
+        } else {
             if ($user->isNewUser()) {
                 // home page isn't allowed, go to preferences instead
                 $this->redirect('preferences');
-            }
-            else {
+            } else {
                 // go to the home page
                 $this->redirect('');
             }
@@ -323,7 +317,8 @@ 
         if (isset($types[$type])) {
             $options = $types[$type];
 
-            array_walk($options, function(&$val) {
+            array_walk($options, function(&$val)
+            {
                 $val = $this->names[$val];
             });