enwikipedia-acc / waca

includes/Helpers/OAuthHelper.php

Spacing +9 added lines, -9 removed lines

@@ -76,7 +76,7 @@ 
      */
     public function getRequestToken()
     {
-        $endpoint = $this->oauthEndpoint . '/initiate&format=json&oauth_callback=oob';
+        $endpoint = $this->oauthEndpoint.'/initiate&format=json&oauth_callback=oob';
 
         $parsedUrl = parse_url($endpoint);
         $urlParameters = array();
@@ -91,7 +91,7 @@ 
         $data = $this->httpHelper->get($targetUrl, null);
 
         if ($data === false) {
-            throw new Exception('Curl error: ' . $this->httpHelper->getError());
+            throw new Exception('Curl error: '.$this->httpHelper->getError());
         }
 
         $token = json_decode($data);
@@ -101,7 +101,7 @@ 
         }
 
         if (isset($token->error)) {
-            throw new Exception('Error encountered while getting request token: ' . $token->error);
+            throw new Exception('Error encountered while getting request token: '.$token->error);
         }
 
         return $token;
@@ -128,7 +128,7 @@ 
      */
     public function callbackCompleted($oauthRequestToken, $oauthRequestSecret, $oauthVerifier)
     {
-        $endpoint = $this->oauthEndpoint . '/token&format=json';
+        $endpoint = $this->oauthEndpoint.'/token&format=json';
 
         $requestConsumer = new OAuthConsumer($oauthRequestToken, $oauthRequestSecret);
 
@@ -146,7 +146,7 @@ 
         $data = $this->httpHelper->get($targetUrl, null);
 
         if ($data === false) {
-            throw new Exception('Curl error: ' . $this->httpHelper->getError());
+            throw new Exception('Curl error: '.$this->httpHelper->getError());
         }
 
         $token = json_decode($data);
@@ -156,7 +156,7 @@ 
         }
 
         if (isset($token->error)) {
-            throw new Exception('Error encountered while getting access token: ' . $token->error);
+            throw new Exception('Error encountered while getting access token: '.$token->error);
         }
 
         return $token;
@@ -172,7 +172,7 @@ 
      */
     public function getIdentityTicket($oauthAccessToken, $oauthAccessSecret)
     {
-        $endpoint = $this->oauthEndpoint . '/identify&format=json';
+        $endpoint = $this->oauthEndpoint.'/identify&format=json';
 
         $oauthToken = new OAuthToken($oauthAccessToken, $oauthAccessSecret);
 
@@ -189,7 +189,7 @@ 
         $data = $this->httpHelper->get($targetUrl, null);
 
         if ($data === false) {
-            throw new Exception('Curl error: ' . $this->httpHelper->getError());
+            throw new Exception('Curl error: '.$this->httpHelper->getError());
         }
 
         $decodedData = json_decode($data);
@@ -243,7 +243,7 @@ 
         }
 
         if ($data === false) {
-            throw new Exception('Curl error: ' . $this->httpHelper->getError());
+            throw new Exception('Curl error: '.$this->httpHelper->getError());
         }
 
         return json_decode($data);

includes/Helpers/LogHelper.php

Spacing +4 added lines, -4 removed lines

@@ -120,7 +120,7 @@ 
             $template = EmailTemplate::getById((int)$id, $entry->getDatabase());
 
             if ($template != false) {
-                return "closed (" . $template->getName() . ")";
+                return "closed (".$template->getName().")";
             }
         }
 
@@ -237,7 +237,7 @@ 
                 /** @var Ban $ban */
                 $ban = Ban::getById($objectId, $database);
 
-                return 'Ban #' . $objectId . " (" . htmlentities($ban->getTarget()) . ")</a>";
+                return 'Ban #'.$objectId." (".htmlentities($ban->getTarget()).")</a>";
             case 'EmailTemplate':
                 /** @var EmailTemplate $emailTemplate */
                 $emailTemplate = EmailTemplate::getById($objectId, $database);
@@ -276,7 +276,7 @@ 
                     return "<a href=\"{$baseurl}/internal.php/welcomeTemplates/view?template={$objectId}\">{$userCode}</a>";
                 }
             default:
-                return '[' . $objectType . " " . $objectId . ']';
+                return '['.$objectType." ".$objectId.']';
         }
     }
 
@@ -323,7 +323,7 @@ 
                 $renameData = unserialize($logEntry->getComment());
                 $oldName = htmlentities($renameData['old'], ENT_COMPAT, 'UTF-8');
                 $newName = htmlentities($renameData['new'], ENT_COMPAT, 'UTF-8');
-                $comment = 'Renamed \'' . $oldName . '\' to \'' . $newName . '\'.';
+                $comment = 'Renamed \''.$oldName.'\' to \''.$newName.'\'.';
             }
             else {
                 $comment = $logEntry->getComment();

includes/Helpers/TypeAheadHelper.php

Spacing +3 added lines, -3 removed lines

@@ -22,9 +22,9 @@ 
     {
         $dataList = '';
         foreach ($generator() as $dataItem) {
-            $dataList .= '"' . htmlentities($dataItem) . '", ';
+            $dataList .= '"'.htmlentities($dataItem).'", ';
         }
-        $dataList = "[" . rtrim($dataList, ", ") . "]";
+        $dataList = "[".rtrim($dataList, ", ")."]";
 
         $script = <<<JS
 $('.{$class}').typeahead({
@@ -46,7 +46,7 @@ 
         }
 
         foreach ($this->definedClasses as $class => $js) {
-            $jsBlocks = $js . "\r\n\r\n";
+            $jsBlocks = $js."\r\n\r\n";
         }
 
         $data = <<<HTML

includes/Helpers/DebugHelper.php

Spacing +2 added lines, -2 removed lines

@@ -51,10 +51,10 @@
             $output .= "#{$count}: ";
 
             if (isset($line['type']) && $line['type'] != "") {
-                $output .= $line['class'] . $line['type'];
+                $output .= $line['class'].$line['type'];
             }
 
-            $output .= $line['function'] . "(...)";
+            $output .= $line['function']."(...)";
             $output .= " [{$line['file']}#{$line['line']}\r\n";
 
             $count++;

includes/Helpers/EmailHelper.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
         $headerString = '';
 
         foreach ($headers as $header => $headerValue) {
-            $headerString .= $header . ': ' . $headerValue . "\r\n";
+            $headerString .= $header.': '.$headerValue."\r\n";
         }
 
         mail($to, $subject, $content, $headerString);

includes/DataObjects/Request.php

Spacing +5 added lines, -5 removed lines

@@ -404,11 +404,11 @@
     public function getRevealHash()
     {
         $data = $this->id         // unique per request
-            . '|' . $this->ip           // }
-            . '|' . $this->forwardedip  // } private data not known to those without access
-            . '|' . $this->useragent    // }
-            . '|' . $this->email        // }
-            . '|' . $this->status;      // to rudimentarily invalidate the token on status change
+            . '|'.$this->ip           // }
+            . '|'.$this->forwardedip  // } private data not known to those without access
+            . '|'.$this->useragent    // }
+            . '|'.$this->email        // }
+            . '|'.$this->status; // to rudimentarily invalidate the token on status change
 
         return hash('sha256', $data);
     }

includes/DataObjects/User.php

Spacing +3 added lines, -3 removed lines

@@ -376,7 +376,7 @@ 
         $userCount = count($userIds);
 
         // Firstly, let's create a string of question marks, which will do as positional parameters.
-        $inSection = str_repeat('?,', $userCount - 1) . '?';
+        $inSection = str_repeat('?,', $userCount - 1).'?';
 
         // Now, let's put that into the query. Direct string building here is OK, we're not dealing with user input,
         // only the *count* of user input, which is safe.
@@ -1091,7 +1091,7 @@ 
             $this->dbObject->prepare("UPDATE user SET oauthidentitycache = NULL WHERE id = :id;")
                 ->execute(array(":id" => $this->id));
 
-            SessionAlert::warning("OAuth error getting identity from MediaWiki: " . $ex->getMessage());
+            SessionAlert::warning("OAuth error getting identity from MediaWiki: ".$ex->getMessage());
         }
     }
 
@@ -1174,7 +1174,7 @@ 
      */
     public function getForgottenPasswordHash()
     {
-        return md5($this->username . $this->email . $this->welcome_template . $this->id . $this->password);
+        return md5($this->username.$this->email.$this->welcome_template.$this->id.$this->password);
     }
 
     /**

includes/Fragments/TemplateOutput.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
     final protected function setUpSmarty()
     {
         $this->smarty = new Smarty();
-        $this->smarty->addPluginsDir($this->getSiteConfiguration()->getFilePath() . '/smarty-plugins');
+        $this->smarty->addPluginsDir($this->getSiteConfiguration()->getFilePath().'/smarty-plugins');
 
         $this->assign('currentUser', User::getCommunity());
         $this->assign('loggedIn', false);

includes/API/Actions/CountAction.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 
         $statement = $this->getDatabase()->prepare($query);
         $statement->bindValue(":username", $this->user->getUsername());
-        $statement->bindValue(":date", date('Y-m-d') . "%");
+        $statement->bindValue(":date", date('Y-m-d')."%");
         $statement->execute();
         $today = $statement->fetchColumn();
         $statement->closeCursor();