enwikipedia-acc / waca

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

config.inc.php

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/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/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;
     }
 }

includes/Exceptions/NotIdentifiedException.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
         $currentUser = User::getCurrent($database);
         $this->assign('currentUser', $currentUser);
 
-        if($this->securityManager !== null) {
+        if ($this->securityManager !== null) {
             $this->setupNavMenuAccess($currentUser);
         }
 

includes/Helpers/SearchHelpers/SearchHelperBase.php

Spacing +10 added lines, -10 removed lines

@@ -84,8 +84,8 @@ 
     {
         $this->whereClause .= $whereClauseSection;
 
-        $countQuery = 'SELECT /* SearchHelper */ COUNT(*) FROM ' . $this->table . ' origin ';
-        $countQuery .= $this->joinClause . $this->whereClause;
+        $countQuery = 'SELECT /* SearchHelper */ COUNT(*) FROM '.$this->table.' origin ';
+        $countQuery .= $this->joinClause.$this->whereClause;
 
         $query = $this->buildQuery(array('*'));
         $query .= $this->applyOrder();
@@ -147,7 +147,7 @@ 
                 throw new ApplicationLogicException('Cannot apply distinct to column fetch already using group by');
             }
 
-            $this->groupByClause = ' GROUP BY origin.' . $column;
+            $this->groupByClause = ' GROUP BY origin.'.$column;
         }
 
         $statement = $this->getData(array($column));
@@ -176,8 +176,8 @@ 
      */
     public function getRecordCount(&$count)
     {
-        $query = 'SELECT /* SearchHelper */ COUNT(*) FROM ' . $this->table . ' origin ';
-        $query .= $this->joinClause . $this->whereClause;
+        $query = 'SELECT /* SearchHelper */ COUNT(*) FROM '.$this->table.' origin ';
+        $query .= $this->joinClause.$this->whereClause;
 
         $statement = $this->database->prepare($query);
         $statement->execute($this->parameterList);
@@ -224,7 +224,7 @@ 
     private function applyOrder()
     {
         if ($this->orderBy !== null) {
-            return ' ORDER BY ' . $this->orderBy;
+            return ' ORDER BY '.$this->orderBy;
         }
 
         return '';
@@ -257,11 +257,11 @@ 
     {
         $colData = array();
         foreach ($columns as $c) {
-            $colData[] = 'origin.' . $c;
+            $colData[] = 'origin.'.$c;
         }
 
-        $query = "SELECT {$this->modifiersClause} /* SearchHelper */ " . implode(', ', $colData) . ' FROM ' . $this->table . ' origin ';
-        $query .= $this->joinClause . $this->whereClause . $this->groupByClause;
+        $query = "SELECT {$this->modifiersClause} /* SearchHelper */ ".implode(', ', $colData).' FROM '.$this->table.' origin ';
+        $query .= $this->joinClause.$this->whereClause.$this->groupByClause;
 
         return $query;
     }
@@ -282,7 +282,7 @@ 
         // You can't use IN() with parameters directly, so let's munge something together.
         // Let's create a string of question marks, which will do as positional parameters.
         $valueCount = count($values);
-        $inSection = str_repeat('?,', $valueCount - 1) . '?';
+        $inSection = str_repeat('?,', $valueCount - 1).'?';
 
         $this->whereClause .= " AND {$column} IN ({$inSection})";
         $this->parameterList = array_merge($this->parameterList, $values);

includes/Exceptions/AccessDeniedException.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
         $currentUser = User::getCurrent($database);
         $this->assign('currentUser', $currentUser);
 
-        if($this->securityManager !== null) {
+        if ($this->securityManager !== null) {
             $this->setupNavMenuAccess($currentUser);
         }