enwikipedia-acc / waca

includes/Security/CredentialProviders/TotpCredentialProvider.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
      */
     public function setCredential(User $user, $factor, $data)
     {
-        $issuer = 'ACC - ' . $this->getConfiguration()->getIrcNotificationsInstance();
+        $issuer = 'ACC - '.$this->getConfiguration()->getIrcNotificationsInstance();
         $totp = TOTP::create();
         $totp->setLabel($user->getUsername());
         $totp->setIssuer($issuer);

includes/Helpers/IrcNotificationHelper.php

Spacing +25 added lines, -25 removed lines

@@ -89,7 +89,7 @@ 
         $blacklist = array("DCC", "CCTP", "PRIVMSG");
         $message = str_replace($blacklist, "(IRC Blacklist)", $message); // Lets stop DCC etc
 
-        $msg = IrcColourCode::RESET . IrcColourCode::BOLD . "[$instanceName]" . IrcColourCode::RESET . ": $message";
+        $msg = IrcColourCode::RESET.IrcColourCode::BOLD."[$instanceName]".IrcColourCode::RESET.": $message";
 
         try {
             $notification = new Notification();
@@ -127,7 +127,7 @@ 
      */
     public function userApproved(User $user)
     {
-        $this->send("{$user->getUsername()} approved by " . $this->currentUser->getUsername());
+        $this->send("{$user->getUsername()} approved by ".$this->currentUser->getUsername());
     }
 
     /**
@@ -138,7 +138,7 @@ 
      */
     public function userDeclined(User $user, $reason)
     {
-        $this->send("{$user->getUsername()} declined by " . $this->currentUser->getUsername() . " ($reason)");
+        $this->send("{$user->getUsername()} declined by ".$this->currentUser->getUsername()." ($reason)");
     }
 
     /**
@@ -149,7 +149,7 @@ 
      */
     public function userSuspended(User $user, $reason)
     {
-        $this->send("{$user->getUsername()} suspended by " . $this->currentUser->getUsername() . " ($reason)");
+        $this->send("{$user->getUsername()} suspended by ".$this->currentUser->getUsername()." ($reason)");
     }
 
     /**
@@ -159,7 +159,7 @@ 
      */
     public function userPrefChange(User $user)
     {
-        $this->send("{$user->getUsername()}'s preferences were changed by " . $this->currentUser->getUsername());
+        $this->send("{$user->getUsername()}'s preferences were changed by ".$this->currentUser->getUsername());
     }
 
     /**
@@ -170,7 +170,7 @@ 
      */
     public function userRenamed(User $user, $old)
     {
-        $this->send($this->currentUser->getUsername() . " renamed $old to {$user->getUsername()}");
+        $this->send($this->currentUser->getUsername()." renamed $old to {$user->getUsername()}");
     }
 
     /**
@@ -180,7 +180,7 @@ 
     public function userRolesEdited(User $user, $reason)
     {
         $currentUser = $this->currentUser->getUsername();
-        $this->send("Active roles for {$user->getUsername()} changed by " . $currentUser . " ($reason)");
+        $this->send("Active roles for {$user->getUsername()} changed by ".$currentUser." ($reason)");
     }
 
     #endregion
@@ -192,7 +192,7 @@ 
      */
     public function siteNoticeEdited()
     {
-        $this->send("Site notice edited by " . $this->currentUser->getUsername());
+        $this->send("Site notice edited by ".$this->currentUser->getUsername());
     }
     #endregion
 
@@ -204,7 +204,7 @@ 
      */
     public function welcomeTemplateCreated(WelcomeTemplate $template)
     {
-        $this->send("Welcome template {$template->getId()} created by " . $this->currentUser->getUsername());
+        $this->send("Welcome template {$template->getId()} created by ".$this->currentUser->getUsername());
     }
 
     /**
@@ -214,7 +214,7 @@ 
      */
     public function welcomeTemplateDeleted($templateid)
     {
-        $this->send("Welcome template {$templateid} deleted by " . $this->currentUser->getUsername());
+        $this->send("Welcome template {$templateid} deleted by ".$this->currentUser->getUsername());
     }
 
     /**
@@ -224,7 +224,7 @@ 
      */
     public function welcomeTemplateEdited(WelcomeTemplate $template)
     {
-        $this->send("Welcome template {$template->getId()} edited by " . $this->currentUser->getUsername());
+        $this->send("Welcome template {$template->getId()} edited by ".$this->currentUser->getUsername());
     }
 
     #endregion
@@ -241,7 +241,7 @@ 
             $duration = "indefinitely";
         }
         else {
-            $duration = "until " . date("F j, Y, g:i a", $ban->getDuration());
+            $duration = "until ".date("F j, Y, g:i a", $ban->getDuration());
         }
 
         $username = $this->currentUser->getUsername();
@@ -257,8 +257,8 @@ 
      */
     public function unbanned(Ban $ban, $unbanreason)
     {
-        $this->send($ban->getTarget() . " unbanned by " . $this->currentUser
-                ->getUsername() . " (" . $unbanreason . ")");
+        $this->send($ban->getTarget()." unbanned by ".$this->currentUser
+                ->getUsername()." (".$unbanreason.")");
     }
 
     #endregion
@@ -273,15 +273,15 @@ 
     public function requestReceived(Request $request)
     {
         $this->send(
-            IrcColourCode::DARK_GREY . "[["
-            . IrcColourCode::DARK_GREEN . "acc:"
-            . IrcColourCode::ORANGE . $request->getId()
-            . IrcColourCode::DARK_GREY . "]]"
-            . IrcColourCode::RED . " N "
-            . IrcColourCode::DARK_BLUE . $this->baseUrl . "/internal.php/viewRequest?id={$request->getId()} "
-            . IrcColourCode::DARK_RED . "* "
-            . IrcColourCode::DARK_GREEN . $request->getName()
-            . IrcColourCode::DARK_RED . " * "
+            IrcColourCode::DARK_GREY."[["
+            . IrcColourCode::DARK_GREEN."acc:"
+            . IrcColourCode::ORANGE.$request->getId()
+            . IrcColourCode::DARK_GREY."]]"
+            . IrcColourCode::RED." N "
+            . IrcColourCode::DARK_BLUE.$this->baseUrl."/internal.php/viewRequest?id={$request->getId()} "
+            . IrcColourCode::DARK_RED."* "
+            . IrcColourCode::DARK_GREEN.$request->getName()
+            . IrcColourCode::DARK_RED." * "
             . IrcColourCode::RESET
         );
     }
@@ -442,7 +442,7 @@ 
     public function emailCreated(EmailTemplate $template)
     {
         $username = $this->currentUser->getUsername();
-        $this->send("Email {$template->getId()} ({$template->getName()}) created by " . $username);
+        $this->send("Email {$template->getId()} ({$template->getName()}) created by ".$username);
     }
 
     /**
@@ -453,7 +453,7 @@ 
     public function emailEdited(EmailTemplate $template)
     {
         $username = $this->currentUser->getUsername();
-        $this->send("Email {$template->getId()} ({$template->getName()}) edited by " . $username);
+        $this->send("Email {$template->getId()} ({$template->getName()}) edited by ".$username);
     }
     #endregion
 }

includes/Security/CredentialProviders/PasswordCredentialProvider.php

Spacing +2 added lines, -2 removed lines

@@ -30,13 +30,13 @@
     public function authenticate(User $user, $data)
     {
         $storedData = $this->getCredentialData($user->getId());
-        if($storedData === null)
+        if ($storedData === null)
         {
             // No available credential matching these parameters
             return false;
         }
 
-        if($storedData->getVersion() !== 2) {
+        if ($storedData->getVersion() !== 2) {
             // Non-2 versions are not supported.
             return false;
         }

Braces +1 added lines, -2 removed lines

@@ -30,8 +30,7 @@
     public function authenticate(User $user, $data)
     {
         $storedData = $this->getCredentialData($user->getId());
-        if($storedData === null)
-        {
+        if($storedData === null) {
             // No available credential matching these parameters
             return false;
         }

config.inc.php

Indentation +1 added lines, -1 removed lines

@@ -263,7 +263,7 @@
         "dsrcname" => "mysql:host=" . $toolserver_host . ";dbname=" . $toolserver_database,
         "username" => $toolserver_username,
         "password" => $toolserver_password,
-		"options"  => array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'),
+        "options"  => array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'),
     ),
     "wikipedia"     => array(
         "dsrcname" => "mysql:host=" . $antispoof_host . ";dbname=" . $antispoof_db,

Spacing +8 added lines, -8 removed lines

@@ -241,7 +241,7 @@ 
 $curlDisableSSLVerifyPeer = false;
 
 // Change this to be outside the web directory.
-$curlCookieJar = __DIR__ . '/../cookies.txt';
+$curlCookieJar = __DIR__.'/../cookies.txt';
 
 $yubicoApiId = 0;
 $yubicoApiKey = "";
@@ -260,19 +260,19 @@ 
 
 $cDatabaseConfig = array(
     "acc"           => array(
-        "dsrcname" => "mysql:host=" . $toolserver_host . ";dbname=" . $toolserver_database,
+        "dsrcname" => "mysql:host=".$toolserver_host.";dbname=".$toolserver_database,
         "username" => $toolserver_username,
         "password" => $toolserver_password,
 		"options"  => array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'),
     ),
     "wikipedia"     => array(
-        "dsrcname" => "mysql:host=" . $antispoof_host . ";dbname=" . $antispoof_db,
+        "dsrcname" => "mysql:host=".$antispoof_host.";dbname=".$antispoof_db,
         "username" => $toolserver_username,
         "password" => $toolserver_password,
         "options"  => array(),
     ),
     "notifications" => array(
-        "dsrcname" => "mysql:host=" . $toolserver_notification_dbhost . ";dbname=" . $toolserver_notification_database,
+        "dsrcname" => "mysql:host=".$toolserver_notification_dbhost.";dbname=".$toolserver_notification_database,
         "username" => $notifications_username,
         "password" => $notifications_password,
         "options"  => array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'),
@@ -303,13 +303,13 @@ 
 }
 
 // Set up the AutoLoader
-require_once(__DIR__ . "/includes/AutoLoader.php");
+require_once(__DIR__."/includes/AutoLoader.php");
 spl_autoload_register('Waca\\AutoLoader::load');
-require_once(__DIR__ . '/vendor/autoload.php');
+require_once(__DIR__.'/vendor/autoload.php');
 
 // Extra includes which are just plain awkward wherever they are.
-require_once(__DIR__ . '/lib/mediawiki-extensions-OAuth/lib/OAuth.php');
-require_once(__DIR__ . '/lib/mediawiki-extensions-OAuth/lib/JWT.php');
+require_once(__DIR__.'/lib/mediawiki-extensions-OAuth/lib/OAuth.php');
+require_once(__DIR__.'/lib/mediawiki-extensions-OAuth/lib/JWT.php');
 
 // Crap that's needed for libraries. >:(
 /**

includes/Pages/Registration/PageRegisterBase.php

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/Pages/PageMain.php

Spacing +2 added lines, -2 removed lines

@@ -106,7 +106,7 @@ 
         /** @var Request[] $results */
         $results = $search->getRecordCount($requestCount)->fetch();
 
-        if($requestCount > 0) {
+        if ($requestCount > 0) {
             $requestSectionData['Hospital - Requests failed auto-creation'] = array(
                 'requests' => $this->prepareRequestData($results),
                 'total'    => $requestCount,
@@ -140,7 +140,7 @@ 
         /** @var Request[] $results */
         $results = $search->getRecordCount($requestCount)->fetch();
 
-        if($requestCount > 0) {
+        if ($requestCount > 0) {
             $requestSectionData['Requests queued in the Job Queue'] = array(
                 'requests' => $this->prepareRequestData($results),
                 'total'    => $requestCount,

includes/DataObjects/Request.php

Indentation +10 added lines, -10 removed lines

@@ -241,19 +241,19 @@
      */
     public function setForwardedIp($forwardedip)
     {
-		// Verify that the XFF chain only contains valid IP addresses, and silently discard anything that isn't.
+        // Verify that the XFF chain only contains valid IP addresses, and silently discard anything that isn't.
 
-		$xff = explode(',', $forwardedip);
-		$valid = array();
+        $xff = explode(',', $forwardedip);
+        $valid = array();
 
-		foreach ($xff as $ip) {
-			$ip = trim($ip);
-			if (filter_var($ip, FILTER_VALIDATE_IP)) {
-				$valid[] = $ip;
-			}
-		}
+        foreach ($xff as $ip) {
+            $ip = trim($ip);
+            if (filter_var($ip, FILTER_VALIDATE_IP)) {
+                $valid[] = $ip;
+            }
+        }
 
-		$this->forwardedip = implode(", ", $valid);
+        $this->forwardedip = implode(", ", $valid);
     }
 
     /**

includes/Offline.php

Indentation +9 added lines, -9 removed lines

@@ -28,15 +28,15 @@
         return (bool)$dontUseDb;
     }
 
-	/**
-	 * Gets the offline message
-	 *
-	 * @param bool        $external
-	 * @param null|string $message
-	 *
-	 * @return string
-	 * @throws SmartyException
-	 */
+    /**
+     * Gets the offline message
+     *
+     * @param bool        $external
+     * @param null|string $message
+     *
+     * @return string
+     * @throws SmartyException
+     */
     public static function getOfflineMessage($external, $message = null)
     {
         global $dontUseDbCulprit, $dontUseDbReason, $baseurl;

includes/IdentificationVerifier.php

Spacing +2 added lines, -2 removed lines

@@ -183,7 +183,7 @@ 
         $onWikiName = $strings->upperCaseFirst($onWikiName);
 
         $parameters = self::$apiQueryParameters;
-        $parameters['pltitles'] = "User:" . $onWikiName;
+        $parameters['pltitles'] = "User:".$onWikiName;
         $parameters['titles'] = $this->siteConfiguration->getIdentificationNoticeboardPage();
 
         try {
@@ -200,6 +200,6 @@ 
 
         $page = @array_pop($response['query']['pages']);
 
-        return @$page['links'][0]['title'] === "User:" . $onWikiName;
+        return @$page['links'][0]['title'] === "User:".$onWikiName;
     }
 }

Braces +2 added lines, -1 removed lines

@@ -190,7 +190,8 @@
             $endpoint = $this->siteConfiguration->getMetaWikimediaWebServiceEndpoint();
             $response = $this->httpHelper->get($endpoint, $parameters);
             $response = json_decode($response, true);
-        } catch (CurlException $ex) {
+        }
+        catch (CurlException $ex) {
             // failed getting identification status, so throw a nicer error.
             $message = 'Could not contact metawiki API to determine user\' identification status. '
                 . 'This is probably a transient error, so please try again.';