mdaniels5757 / waca

includes/Pages/PageSearch.php

Braces +1 added lines, -2 removed lines

@@ -62,8 +62,7 @@
 
             $this->assignCSRFToken();
             $this->setTemplate('search/searchResult.tpl');
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('search/searchForm.tpl');
         }

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];
             });
 

includes/Pages/UserAuth/PageOAuthCallback.php

Braces +1 added lines, -2 removed lines

@@ -116,8 +116,7 @@
         $redirectDestination = WebRequest::clearPostLoginRedirect();
         if ($redirectDestination !== null && !$user->isNewUser()) {
             $this->redirectUrl($redirectDestination);
-        }
-        else {
+        } else {
             $this->redirect('preferences', null, null, 'internal.php');
         }
     }

includes/Pages/UserAuth/PageChangePassword.php

Braces +1 added lines, -2 removed lines

@@ -52,8 +52,7 @@
             SessionAlert::success('Password changed successfully!');
 
             $this->redirect('preferences');
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('preferences/changePassword.tpl');
             $this->addJs("/vendor/dropbox/zxcvbn/dist/zxcvbn.js");

includes/Pages/UserAuth/PageForgotPassword.php

Braces +2 added lines, -4 removed lines

@@ -46,8 +46,7 @@ 
             SessionAlert::success('<strong>Your password reset request has been completed.</strong> If the details you have provided match our records, you should receive an email shortly.');
 
             $this->redirect('login');
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('forgot-password/forgotpw.tpl');
         }
@@ -130,8 +129,7 @@ 
 
                 return;
             }
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->assign('user', $user);
             $this->setTemplate('forgot-password/forgotpwreset.tpl');

includes/Pages/UserAuth/PagePreferences.php

Braces +1 added lines, -2 removed lines

@@ -46,8 +46,7 @@
             SessionAlert::success("Preferences updated!");
 
             $this->redirect('');
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('preferences/prefs.tpl');
             $this->assign("enforceOAuth", $enforceOAuth);

includes/Pages/UserAuth/MultiFactor/PageMultiFactor.php

Braces +17 added lines, -28 removed lines

@@ -94,13 +94,11 @@ 
                 }
 
                 $this->redirect('multiFactor');
-            }
-            else {
+            } else {
                 SessionAlert::error('Error enabling YubiKey OTP - invalid credentials.');
                 $this->redirect('multiFactor');
             }
-        }
-        else {
+        } else {
             if ($otpCredentialProvider->userIsEnrolled($currentUser->getId())) {
                 // user is not enrolled, we shouldn't have got here.
                 throw new ApplicationLogicException('User is already enrolled in the selected MFA mechanism');
@@ -162,8 +160,7 @@ 
                     $this->setTemplate('mfa/enableTotpEnroll.tpl');
 
                     return;
-                }
-                else {
+                } else {
                     SessionAlert::error('Error enabling TOTP - invalid credentials.');
                     $this->redirect('multiFactor');
 
@@ -188,8 +185,7 @@ 
                             $this->setTemplate('mfa/regenScratchTokens.tpl');
                             return;
                         }
-                    }
-                    else {
+                    } else {
                         $otpCredentialProvider->deleteCredential($currentUser);
                         SessionAlert::error('Error enabling TOTP: invalid token provided');
                     }
@@ -197,8 +193,7 @@ 
 
                     $this->redirect('multiFactor');
                     return;
-                }
-                else {
+                } else {
                     SessionAlert::error('Error enabling TOTP - no enrollment found or enrollment expired.');
                     $this->redirect('multiFactor');
 
@@ -208,8 +203,7 @@ 
 
             // urgh, dunno what happened, but it's not something expected.
             throw new ApplicationLogicException();
-        }
-        else {
+        } else {
             if ($otpCredentialProvider->userIsEnrolled($currentUser->getId())) {
                 // user is not enrolled, we shouldn't have got here.
                 throw new ApplicationLogicException('User is already enrolled in the selected MFA mechanism');
@@ -236,7 +230,8 @@ 
         $this->deleteCredential($database, $currentUser, $otpCredentialProvider, $factorType);
     }
 
-    protected function enableU2F() {
+    protected function enableU2F()
+    {
         $database = $this->getDatabase();
         $currentUser = User::getCurrent($database);
 
@@ -289,8 +284,7 @@ 
                     $this->setTemplate('mfa/enableU2FEnroll.tpl');
 
                     return;
-                }
-                else {
+                } else {
                     SessionAlert::error('Error enabling TOTP - invalid credentials.');
                     $this->redirect('multiFactor');
 
@@ -320,8 +314,7 @@ 
 
                     $this->redirect('multiFactor');
                     return;
-                }
-                else {
+                } else {
                     SessionAlert::error('Error enabling TOTP - no enrollment found or enrollment expired.');
                     $this->redirect('multiFactor');
 
@@ -331,8 +324,7 @@ 
 
             // urgh, dunno what happened, but it's not something expected.
             throw new ApplicationLogicException();
-        }
-        else {
+        } else {
             if ($otpCredentialProvider->userIsEnrolled($currentUser->getId())) {
                 // user is not enrolled, we shouldn't have got here.
                 throw new ApplicationLogicException('User is already enrolled in the selected MFA mechanism');
@@ -347,7 +339,8 @@ 
         }
     }
 
-    protected function disableU2F() {
+    protected function disableU2F()
+    {
         $database = $this->getDatabase();
         $currentUser = User::getCurrent($database);
 
@@ -381,13 +374,11 @@ 
                 $tokens = $otpCredentialProvider->getTokens();
                 $this->assign('tokens', $tokens);
                 $this->setTemplate('mfa/regenScratchTokens.tpl');
-            }
-            else {
+            } else {
                 SessionAlert::error('Error refreshing scratch tokens - invalid credentials.');
                 $this->redirect('multiFactor');
             }
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
 
             $this->assign('alertmessage', 'To regenerate your emergency scratch tokens, please prove you are who you say you are by providing the information below. Note that continuing will invalidate all remaining scratch tokens, and provide a set of new ones.');
@@ -425,13 +416,11 @@ 
                 $otpCredentialProvider->deleteCredential($currentUser);
                 SessionAlert::success('Disabled ' . $factorType . '.');
                 $this->redirect('multiFactor');
-            }
-            else {
+            } else {
                 SessionAlert::error('Error disabling ' . $factorType . ' - invalid credentials.');
                 $this->redirect('multiFactor');
             }
-        }
-        else {
+        } else {
             if (!$otpCredentialProvider->userIsEnrolled($currentUser->getId())) {
                 // user is not enrolled, we shouldn't have got here.
                 throw new ApplicationLogicException('User is not enrolled in the selected MFA mechanism');

includes/Pages/Registration/PageRegisterBase.php

Braces +2 added lines, -4 removed lines

@@ -53,8 +53,7 @@ 
                 $this->setTemplate($this->getRegistrationTemplate());
                 $this->addJs("/vendor/dropbox/zxcvbn/dist/zxcvbn.js");
             }
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->assign("useOAuthSignup", $useOAuthSignup);
             $this->setTemplate($this->getRegistrationTemplate());
@@ -214,8 +213,7 @@ 
             $authoriseUrl = $oauth->getRequestToken();
             WebRequest::setOAuthPartialLogin($user);
             $this->redirectUrl($authoriseUrl);
-        }
-        else {
+        } else {
             // only notify if we're not using the oauth signup.
             $this->getNotificationHelper()->userNew($user);
             WebRequest::setLoggedInUser($user);

includes/Pages/PageJobQueue.php

Braces +3 added lines, -3 removed lines

@@ -116,7 +116,8 @@ 
             $job->setDatabase($database);
         }
 
-        $this->getTypeAheadHelper()->defineTypeAheadSource('username-typeahead', function() use ($database) {
+        $this->getTypeAheadHelper()->defineTypeAheadSource('username-typeahead', function() use ($database)
+        {
             return UserSearchHelper::get($database)->fetchColumn('username');
         });
 
@@ -158,8 +159,7 @@ 
             ->byObjectId($job->getId())->getRecordCount($logCount)->fetch();
         if ($logCount === 0) {
             $this->assign('log', array());
-        }
-        else {
+        } else {
             list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration());
 
             $this->assign("log", $logData);