enwikipedia-acc / waca

includes/ConsoleTasks/ClearOAuthDataTask.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         $users = UserSearchHelper::get($database)->inIds(
             $database->query('SELECT user FROM oauthtoken WHERE type = \'access\'')->fetchColumn());
 
-        foreach ($users as $u){
+        foreach ($users as $u) {
             $oauth = new OAuthUserHelper($u, $database, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
             $oauth->detach();
         }

Braces +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         $users = UserSearchHelper::get($database)->inIds(
             $database->query('SELECT user FROM oauthtoken WHERE type = \'access\'')->fetchColumn());
 
-        foreach ($users as $u){
+        foreach ($users as $u) {
             $oauth = new OAuthUserHelper($u, $database, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
             $oauth->detach();
         }

includes/Pages/UserAuth/MultiFactor/PageMultiFactor.php

Braces +4 added lines, -2 removed lines

@@ -229,7 +229,8 @@ 
         $this->deleteCredential($database, $currentUser, $otpCredentialProvider, $factorType);
     }
 
-    protected function enableU2F() {
+    protected function enableU2F()
+    {
         $database = $this->getDatabase();
         $currentUser = User::getCurrent($database);
 
@@ -336,7 +337,8 @@ 
         }
     }
 
-    protected function disableU2F() {
+    protected function disableU2F()
+    {
         $database = $this->getDatabase();
         $currentUser = User::getCurrent($database);
 

Spacing +4 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
                     SessionAlert::success('Enabled YubiKey OTP.');
 
                     $scratchProvider = new ScratchTokenCredentialProvider($database, $this->getSiteConfiguration());
-                    if($scratchProvider->getRemaining($currentUser->getId()) < 3) {
+                    if ($scratchProvider->getRemaining($currentUser->getId()) < 3) {
                         $scratchProvider->setCredential($currentUser, 2, null);
                         $tokens = $scratchProvider->getTokens();
                         $this->assign('tokens', $tokens);
@@ -181,7 +181,7 @@ 
                         SessionAlert::success('Enabled TOTP.');
 
                         $scratchProvider = new ScratchTokenCredentialProvider($database, $this->getSiteConfiguration());
-                        if($scratchProvider->getRemaining($currentUser->getId()) < 3) {
+                        if ($scratchProvider->getRemaining($currentUser->getId()) < 3) {
                             $scratchProvider->setCredential($currentUser, 2, null);
                             $tokens = $scratchProvider->getTokens();
                             $this->assign('tokens', $tokens);
@@ -261,7 +261,7 @@ 
 
                     list($data, $reqs) = $otpCredentialProvider->getRegistrationData();
 
-                    $u2fRequest =json_encode($data);
+                    $u2fRequest = json_encode($data);
                     $u2fSigns = json_encode($reqs);
 
                     $this->addJs('/vendor/yubico/u2flib-server/examples/assets/u2f-api.js');
@@ -310,7 +310,7 @@ 
                     SessionAlert::success('Enabled U2F.');
 
                     $scratchProvider = new ScratchTokenCredentialProvider($database, $this->getSiteConfiguration());
-                    if($scratchProvider->getRemaining($currentUser->getId()) < 3) {
+                    if ($scratchProvider->getRemaining($currentUser->getId()) < 3) {
                         $scratchProvider->setCredential($currentUser, 2, null);
                         $tokens = $scratchProvider->getTokens();
                         $this->assign('tokens', $tokens);

includes/Security/CredentialProviders/CredentialProviderBase.php

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
             ':t' => $this->type
         );
 
-        if($disabled !== null) {
+        if ($disabled !== null) {
             $sql .= ' AND disabled = :d';
             $parameters[':d'] = $disabled ? 1 : 0;
         }
@@ -109,7 +109,7 @@ 
         $alternates = $statement->fetchColumn();
         $statement->closeCursor();
 
-        if($alternates <= 1) {
+        if ($alternates <= 1) {
             // decrement the factor for every stage above this
             $sql = 'UPDATE credential SET factor = factor - 1 WHERE user = :user AND factor > :factor';
             $statement = $this->database->prepare($sql);

Braces +4 added lines, -2 removed lines

@@ -93,7 +93,8 @@ 
         return $this->configuration;
     }
 
-    public function deleteCredential(User $user) {
+    public function deleteCredential(User $user)
+    {
         // get this factor
         $statement = $this->database->prepare('SELECT * FROM credential WHERE user = :user AND type = :type');
         $statement->execute(array(':user' => $user->getId(), ':type' => $this->type));
@@ -143,7 +144,8 @@ 
      *
      * @return bool
      */
-    public function userIsEnrolled($userId) {
+    public function userIsEnrolled($userId)
+    {
         $cred = $this->getCredentialData($userId);
 
         return $cred !== null;

includes/Pages/Registration/PageRegisterBase.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     protected function main()
     {
         $useOAuthSignup = $this->getSiteConfiguration()->getUseOAuthSignup();
-        if (! $this->getSiteConfiguration()->isRegistrationAllowed()) {
+        if (!$this->getSiteConfiguration()->isRegistrationAllowed()) {
            throw new AccessDeniedException();
         }
 

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     {
         $useOAuthSignup = $this->getSiteConfiguration()->getUseOAuthSignup();
         if (! $this->getSiteConfiguration()->isRegistrationAllowed()) {
-           throw new AccessDeniedException();
+            throw new AccessDeniedException();
         }
 
         // Dual-mode page

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");

Spacing +2 added lines, -2 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");
@@ -70,7 +70,7 @@ 
             }
         }
 
-        if($usedToken === null) {
+        if ($usedToken === null) {
             return false;
         }
 

includes/Pages/PageXffDemo.php

Spacing +7 added lines, -7 removed lines

@@ -36,13 +36,13 @@ 
                 'ip' => '172.16.0.164',
                 'routable' => false,
 
-            ],[
+            ], [
                 'trust' => true,
                 'ip' => '198.51.100.123',
                 'routable' => true,
                 'rdns' => 'trustedproxy.example.com',
 
-            ],[
+            ], [
                 'trust' => true,
                 'ip' => '192.0.2.1',
                 'routable' => true,
@@ -63,14 +63,14 @@ 
                 'ip' => '172.16.0.164',
                 'routable' => false,
 
-            ],[
+            ], [
                 'trust' => false,
                 'ip' => '198.51.100.234',
                 'routable' => true,
                 'rdns' => 'sketchyproxy.example.com',
                 'showlinks' => true
 
-            ],[
+            ], [
                 'trust' => false,
                 'ip' => '192.0.2.1',
                 'routable' => true,
@@ -91,12 +91,12 @@ 
                 'ip' => '172.16.0.164',
                 'routable' => false,
 
-            ],[
+            ], [
                 'trust' => true,
                 'ip' => '198.51.100.123',
                 'routable' => true,
                 'rdns' => 'trustedproxy.example.com',
-            ],[
+            ], [
                 'trust' => false,
                 'ip' => '198.51.100.234',
                 'routable' => true,
@@ -109,7 +109,7 @@ 
                 'routable' => true,
                 'rdns' => 'trustedproxy2.example.com',
                 'showlinks' => true
-            ],[
+            ], [
                 'trust' => false,
                 'ip' => '192.0.2.1',
                 'routable' => true,

includes/Pages/UserAuth/PageForgotPassword.php

Spacing +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
     {
         $user = User::getById($id, $database);
 
-        if ($user === false ||  $user->isCommunityUser()) {
+        if ($user === false || $user->isCommunityUser()) {
             throw new ApplicationLogicException("Password reset failed. Please try again.");
         }
 

includes/Pages/PageLog.php

Braces +2 added lines, -1 removed lines

@@ -44,7 +44,8 @@
             $userObj = User::getByUsername($filterUser, $database);
             if ($userObj !== false) {
                 $logSearch->byUser($userObj->getId());
-            } else {
+            }
+            else {
                 $logSearch->byUser(-1);
             }
         }

includes/Tasks/JsonApiPageBase.php

Braces +2 added lines, -1 removed lines

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