mdaniels5757 / waca

includes/Pages/Request/PageConfirmEmail.php

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
 
         if ($request->getEmailConfirm() === $si) {
             $request->setEmailConfirm('Confirmed');
-        }
-        else {
+        } else {
             throw new ApplicationLogicException('The confirmation value does not appear to match the expected value');
         }
 

includes/Pages/PageTeam.php

Braces +1 added lines, -2 removed lines

@@ -29,8 +29,7 @@
         foreach ($teamData as $name => $item) {
             if (count($item['Role']) == 0) {
                 $inactive[$name] = $item;
-            }
-            else {
+            } else {
                 $active[$name] = $item;
             }
         }

includes/Pages/RequestAction/PageCustomClose.php

Braces +4 added lines, -8 removed lines

@@ -42,8 +42,7 @@ 
             $this->doCustomClose($currentUser, $request, $database);
 
             $this->redirect();
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->showCustomCloseForm($database, $request);
         }
@@ -185,16 +184,14 @@ 
 
             // Send the mail after the save, since save can be rolled back
             $this->sendMail($request, $messageBody, $currentUser, $ccMailingList);
-        }
-        else {
+        } else {
             if (array_key_exists($action, $availableRequestStates)) {
                 // Defer to other state
                 $this->deferRequest($request, $database, $action, $availableRequestStates, $messageBody);
 
                 // Send the mail after the save, since save can be rolled back
                 $this->sendMail($request, $messageBody, $currentUser, $ccMailingList);
-            }
-            else {
+            } else {
                 $request->setReserved(null);
                 $request->setUpdateVersion(WebRequest::postInt('updateversion'));
                 $request->save();
@@ -236,8 +233,7 @@ 
         if ($action == EmailTemplate::CREATED) {
             $logCloseType = 'custom-y';
             $notificationCloseType = "Custom, Created";
-        }
-        else {
+        } else {
             $logCloseType = 'custom-n';
             $notificationCloseType = "Custom, Not Created";
         }

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/Security/CredentialProviders/ScratchTokenCredentialProvider.php

Braces +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 
         $usedToken = null;
         foreach ($scratchTokens as $scratchToken) {
-            if (password_verify($data, $scratchToken)){
+            if (password_verify($data, $scratchToken)) {
                 $usedToken = $scratchToken;
                 SessionAlert::quick("Hey, it looks like you used a scratch token to log in. Would you like to change your multi-factor authentication configuration?", 'alert-warning');
                 WebRequest::setPostLoginRedirect($this->getConfiguration()->getBaseUrl() . "/internal.php/multiFactor");