mdaniels5757 / waca

includes/Pages/Registration/PageRegisterBase.php

Braces +2 added lines, -4 removed lines

@@ -36,8 +36,7 @@ 
                 SessionAlert::error($ex->getMessage());
                 $this->redirect('register');
             }
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->assign("useOAuthSignup", $useOAuthSignup);
             $this->setTemplate($this->getRegistrationTemplate());
@@ -198,8 +197,7 @@ 
             WebRequest::setPartialLogin($user);
 
             $this->redirectUrl($oauthHelper->getAuthoriseUrl($requestToken->key));
-        }
-        else {
+        } else {
             // only notify if we're not using the oauth signup.
             $this->getNotificationHelper()->userNew($user);
             WebRequest::setLoggedInUser($user);

includes/Pages/PageSiteNotice.php

Braces +1 added lines, -2 removed lines

@@ -40,8 +40,7 @@
             $this->getNotificationHelper()->siteNoticeEdited();
 
             $this->redirect();
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
 
             $this->setTemplate('site-notice/edit-form.tpl');

includes/Pages/PageForgotPassword.php

Braces +2 added lines, -4 removed lines

@@ -41,8 +41,7 @@ 
             SessionAlert::success('<strong>Your password reset request has been completed.</strong> Please check your e-mail.');
 
             $this->redirect('login');
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('forgot-password/forgotpw.tpl');
         }
@@ -106,8 +105,7 @@ 
 
                 return;
             }
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->assign('user', $user);
             $this->setTemplate('forgot-password/forgotpwreset.tpl');

includes/Pages/PageWelcomeTemplateManagement.php

Braces +2 added lines, -4 removed lines

@@ -135,8 +135,7 @@ 
             SessionAlert::success("Template successfully created.");
 
             $this->redirect('welcomeTemplates');
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate("welcome-template/add.tpl");
         }
@@ -182,8 +181,7 @@ 
             $this->getNotificationHelper()->welcomeTemplateEdited($template);
 
             $this->redirect('welcomeTemplates');
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->assign('template', $template);
             $this->setTemplate('welcome-template/edit.tpl');

includes/Pages/Statistics/StatsUsers.php

Braces +1 added lines, -2 removed lines

@@ -128,8 +128,7 @@
 
         if ($logCount === 0) {
             $this->assign('accountlog', array());
-        }
-        else {
+        } else {
             list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration());
 
             $this->assign("accountlog", $logData);

includes/Pages/Request/PageRequestAccount.php

Braces +2 added lines, -4 removed lines

@@ -54,12 +54,10 @@
             // actually save the request to the database
             if ($this->getSiteConfiguration()->getEmailConfirmationEnabled()) {
                 $this->saveAsEmailConfirmation($request);
-            }
-            else {
+            } else {
                 $this->saveWithoutEmailConfirmation($request);
             }
-        }
-        else {
+        } else {
             // set the form values from the session context
             $context = WebRequest::getSessionContext('accountReq');
             if ($context !== null && is_array($context)) {

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/PageLogin.php

Braces +4 added lines, -8 removed lines

@@ -32,8 +32,7 @@ 
                 if (!headers_sent()) {
                     header("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());
 
@@ -94,8 +93,7 @@ 
             WebRequest::setLoggedInUser($user);
 
             $this->goBackWhenceYouCame($user);
-        }
-        else {
+        } else {
             // GET. Show the form
             $this->assignCSRFToken();
             $this->setTemplate("login.tpl");
@@ -141,13 +139,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('');
             }

includes/Pages/PageExpandedRequestList.php

Braces +3 added lines, -3 removed lines

@@ -39,8 +39,7 @@ 
             if ($config->getEmailConfirmationEnabled()) {
                 $query = "SELECT * FROM request WHERE status = :type AND emailconfirm = 'Confirmed';";
                 $totalQuery = "SELECT COUNT(id) FROM request WHERE status = :type AND emailconfirm = 'Confirmed';";
-            }
-            else {
+            } else {
                 $query = "SELECT * FROM request WHERE status = :type;";
                 $totalQuery = "SELECT COUNT(id) FROM request WHERE status = :type;";
             }
@@ -73,7 +72,8 @@ 
             $this->assign('totalRequests', $totalRequests);
 
             $userIds = array_map(
-                function(Request $entry) {
+                function(Request $entry)
+                {
                     return $entry->getReserved();
                 },
                 $requests