enwikipedia-acc / waca

includes/Security/CredentialProviders/ScratchTokenCredentialProvider.php

Spacing +3 added lines, -3 removed lines

@@ -62,15 +62,15 @@
 
         $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");
+                WebRequest::setPostLoginRedirect($this->getConfiguration()->getBaseUrl()."/internal.php/multiFactor");
                 break;
             }
         }
 
-        if($usedToken === null) {
+        if ($usedToken === null) {
             return false;
         }
 

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

includes/Pages/PageUserManagement.php

Spacing +6 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
         $userSearchRequest = WebRequest::getString('usersearch');
         if ($userSearchRequest !== null) {
             $searchedUser = User::getByUsername($userSearchRequest, $database);
-            if($searchedUser !== false) {
+            if ($searchedUser !== false) {
                 $this->redirect('statistics/users', 'detail', ['user' => $searchedUser->getId()]);
                 return;
             }
@@ -134,7 +134,7 @@ 
                     continue;
                 }
 
-                $newValue = WebRequest::postBoolean('role-' . $name) ? 1 : 0;
+                $newValue = WebRequest::postBoolean('role-'.$name) ? 1 : 0;
                 if ($newValue !== $r['active']) {
                     if ($newValue === 0) {
                         $delete[] = $r['object'];
@@ -177,7 +177,7 @@ 
             $user->save();
 
             $this->getNotificationHelper()->userRolesEdited($user, $reason);
-            SessionAlert::quick('Roles changed for user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
+            SessionAlert::quick('Roles changed for user '.htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
 
             $this->redirect('statistics/users', 'detail', array('user' => $user->getId()));
 
@@ -230,7 +230,7 @@ 
             Logger::suspendedUser($database, $user, $reason);
 
             $this->getNotificationHelper()->userSuspended($user, $reason);
-            SessionAlert::quick('Suspended user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
+            SessionAlert::quick('Suspended user '.htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
 
             // send email
             $this->sendStatusChangeEmail(
@@ -291,7 +291,7 @@ 
             Logger::declinedUser($database, $user, $reason);
 
             $this->getNotificationHelper()->userDeclined($user, $reason);
-            SessionAlert::quick('Declined user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
+            SessionAlert::quick('Declined user '.htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
 
             // send email
             $this->sendStatusChangeEmail(
@@ -346,7 +346,7 @@ 
             Logger::approvedUser($database, $user);
 
             $this->getNotificationHelper()->userApproved($user);
-            SessionAlert::quick('Approved user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
+            SessionAlert::quick('Approved user '.htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
 
             // send email
             $this->sendStatusChangeEmail(

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

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
             $CORSallowed = $this->getSiteConfiguration()->getCrossOriginResourceSharingHosts();
 
             if (in_array($httpOrigin, $CORSallowed)) {
-                header("Access-Control-Allow-Origin: " . $httpOrigin);
+                header("Access-Control-Allow-Origin: ".$httpOrigin);
             }
         }
 
@@ -70,7 +70,7 @@ 
 
         $targetVar = WebRequest::getString('targetVariable');
         if ($targetVar !== null && preg_match('/^[a-z]+$/', $targetVar)) {
-            $data = $targetVar . ' = ' . $data . ';';
+            $data = $targetVar.' = '.$data.';';
             header("Content-Type: text/javascript");
         } else {
             header("Content-Type: application/json");

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

includes/Tasks/PageBase.php

Spacing +5 added lines, -5 removed lines

@@ -249,7 +249,7 @@ 
             $targetScriptName = $currentScriptName;
         }
         else {
-            $targetScriptName = $this->getSiteConfiguration()->getBaseUrl() . '/' . $script;
+            $targetScriptName = $this->getSiteConfiguration()->getBaseUrl().'/'.$script;
         }
 
         $pathInfo = array($targetScriptName);
@@ -263,7 +263,7 @@ 
         $url = implode('/', $pathInfo);
 
         if (is_array($parameters) && count($parameters) > 0) {
-            $url .= '?' . http_build_query($parameters);
+            $url .= '?'.http_build_query($parameters);
         }
 
         $this->redirectUrl($url);
@@ -307,8 +307,8 @@ 
      *
      * @param string $path The path (relative to the application root) of the file
      */
-    final protected function addJs($path){
-        if(in_array($path, $this->extraJs)){
+    final protected function addJs($path) {
+        if (in_array($path, $this->extraJs)) {
             // nothing to do
             return;
         }
@@ -331,7 +331,7 @@ 
      */
     final protected function setHtmlTitle($title)
     {
-        $this->htmlTitle = $this->smarty->fetch('string:' . $title);
+        $this->htmlTitle = $this->smarty->fetch('string:'.$title);
     }
 
     public function execute()

Braces +3 added lines, -2 removed lines

@@ -307,8 +307,9 @@
      *
      * @param string $path The path (relative to the application root) of the file
      */
-    final protected function addJs($path){
-        if(in_array($path, $this->extraJs)){
+    final protected function addJs($path)
+    {
+        if(in_array($path, $this->extraJs)) {
             // nothing to do
             return;
         }

smarty-plugins/modifier.relativedate.php

Spacing +9 added lines, -9 removed lines

@@ -27,7 +27,7 @@ 
         try {
             $then = new DateTime($input);
         }
-        catch(Exception $ex) {
+        catch (Exception $ex) {
             return $input;
         }
     }
@@ -55,25 +55,25 @@ 
         $pluralise = false;
     }
     elseif ($secs > 10 && $secs < $minuteCut) {
-        $output = round($secs / $second) . " second";
+        $output = round($secs / $second)." second";
     }
     elseif ($secs >= $minuteCut && $secs < $hourCut) {
-        $output = round($secs / $minute) . " minute";
+        $output = round($secs / $minute)." minute";
     }
     elseif ($secs >= $hourCut && $secs < $dayCut) {
-        $output = round($secs / $hour) . " hour";
+        $output = round($secs / $hour)." hour";
     }
     elseif ($secs >= $dayCut && $secs < $weekCut) {
-        $output = round($secs / $day) . " day";
+        $output = round($secs / $day)." day";
     }
     elseif ($secs >= $weekCut && $secs < $monthCut) {
-        $output = round($secs / $week) . " week";
+        $output = round($secs / $week)." week";
     }
     elseif ($secs >= $monthCut && $secs < $yearCut) {
-        $output = round($secs / $month) . " month";
+        $output = round($secs / $month)." month";
     }
     elseif ($secs >= $yearCut && $secs < $year * 10) {
-        $output = round($secs / $year) . " year";
+        $output = round($secs / $year)." year";
     }
     else {
         $output = "a long time ago";
@@ -81,7 +81,7 @@ 
     }
 
     if ($pluralise) {
-        $output = (substr($output, 0, 2) <> "1 ") ? $output . "s ago" : $output . " ago";
+        $output = (substr($output, 0, 2) <> "1 ") ? $output."s ago" : $output." ago";
     }
 
     return $output;

includes/DataObjects/User.php

Braces +2 added lines, -1 removed lines

@@ -549,7 +549,8 @@
      *
      * @return bool|null
      */
-    public function getForceIdentified() {
+    public function getForceIdentified()
+    {
         return $this->forceidentified;
     }