enwikipedia-acc / waca

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

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/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();

includes/Providers/CachedApiAntispoofProvider.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
             $cacheResult->delete();
 
             if (isset($result['error']['info'])) {
-                throw new Exception("Unrecognised API response to query: " . $result['error']['info']);
+                throw new Exception("Unrecognised API response to query: ".$result['error']['info']);
             }
 
             throw new Exception("Unrecognised API response to query.");
@@ -90,7 +90,7 @@ 
 
         if ($result['antispoof']['result'] == "error") {
             // we've got conflicts, let's do something with them.
-            throw new Exception("Encountered error while getting result: " . $result['antispoof']['error']);
+            throw new Exception("Encountered error while getting result: ".$result['antispoof']['error']);
         }
 
         throw new Exception("Unrecognised API response to query.");

includes/Providers/TorExitProvider.php

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
         $statement = $database->prepare($query);
 
         foreach ($destinationIps as $ip) {
-            echo 'Fetching data for ' . $ip . PHP_EOL;
+            echo 'Fetching data for '.$ip.PHP_EOL;
 
             $statement->bindValue(':exitaddr', $ip);
 
@@ -81,7 +81,7 @@ 
                 ));
 
             foreach (array(80 => $http, 443 => $https) as $port => $response) {
-                echo '  Running for port ' . $ip . ':' . $port . PHP_EOL;
+                echo '  Running for port '.$ip.':'.$port.PHP_EOL;
 
                 $statement->bindValue(':exitport', $port);
 
@@ -99,7 +99,7 @@ 
                 }
             }
 
-            echo 'Done for ' . $ip . PHP_EOL;
+            echo 'Done for '.$ip.PHP_EOL;
         }
 
         // kill old cached entries

includes/Security/SecurityManager.php

Spacing +1 added lines, -1 removed lines

@@ -207,7 +207,7 @@
         }
     }
 
-    public function getRoleConfiguration(){
+    public function getRoleConfiguration() {
         return $this->roleConfiguration;
     }
 }

Braces +2 added lines, -1 removed lines

@@ -207,7 +207,8 @@
         }
     }
 
-    public function getRoleConfiguration(){
+    public function getRoleConfiguration()
+    {
         return $this->roleConfiguration;
     }
 }

includes/ConsoleTasks/MigrateToRoles.php

Spacing +3 added lines, -3 removed lines

@@ -29,11 +29,11 @@ 
         foreach ($users as $user) {
             $toAdd = array('user');
 
-            if($user['status'] === 'Admin'){
+            if ($user['status'] === 'Admin') {
                 $toAdd[] = 'admin';
             }
 
-            if($user['checkuser'] == 1){
+            if ($user['checkuser'] == 1) {
                 $toAdd[] = 'checkuser';
             }
 
@@ -60,7 +60,7 @@ 
             $log->setComment($logData);
             $log->save();
 
-            if($user['status'] === 'Admin' || $user['status'] === 'User'){
+            if ($user['status'] === 'Admin' || $user['status'] === 'User') {
                 $update->execute(array('id' => $user['id']));
             }
         }

Braces +3 added lines, -3 removed lines

@@ -29,11 +29,11 @@ 
         foreach ($users as $user) {
             $toAdd = array('user');
 
-            if($user['status'] === 'Admin'){
+            if($user['status'] === 'Admin') {
                 $toAdd[] = 'admin';
             }
 
-            if($user['checkuser'] == 1){
+            if($user['checkuser'] == 1) {
                 $toAdd[] = 'checkuser';
             }
 
@@ -60,7 +60,7 @@ 
             $log->setComment($logData);
             $log->save();
 
-            if($user['status'] === 'Admin' || $user['status'] === 'User'){
+            if($user['status'] === 'Admin' || $user['status'] === 'User') {
                 $update->execute(array('id' => $user['id']));
             }
         }

includes/Pages/PageSearch.php

Spacing +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
      */
     private function getNameSearchResults($searchTerm)
     {
-        $padded = '%' . $searchTerm . '%';
+        $padded = '%'.$searchTerm.'%';
 
         /** @var Request[] $requests */
         $requests = RequestSearchHelper::get($this->getDatabase())
@@ -116,7 +116,7 @@ 
             throw new ApplicationLogicException('The search term "@" is not valid for email address searches!');
         }
 
-        $padded = '%' . $searchTerm . '%';
+        $padded = '%'.$searchTerm.'%';
 
         /** @var Request[] $requests */
         $requests = RequestSearchHelper::get($this->getDatabase())