enwikipedia-acc / waca

includes/BootstrapSkin.php

Spacing +4 added lines, -4 removed lines

@@ -118,13 +118,13 @@ 
 
 		// not equal to one, as zero uses the plural form too.
 		if ($resultSetCount != 1) {
-			$onlinemessage = $resultSetCount . " Account Creators currently online (past 5 minutes): $creators";
+			$onlinemessage = $resultSetCount." Account Creators currently online (past 5 minutes): $creators";
 		}
 		else {
-			$onlinemessage = $resultSetCount . " Account Creator currently online (past 5 minutes): $creators";
+			$onlinemessage = $resultSetCount." Account Creator currently online (past 5 minutes): $creators";
 		}
 
-		$online = '<p class="span6 text-right"><small>' . $onlinemessage . '</small></p>';
+		$online = '<p class="span6 text-right"><small>'.$onlinemessage.'</small></p>';
 
 		if (isset($_SESSION['user'])) {
 			$smarty->assign("onlineusers", $online);
@@ -171,7 +171,7 @@ 
 		$returnData = $smarty->fetch("alert.tpl");
 
 		if ($centre) {
-			$returnData = '<div class="row-fluid"><div class="span8 offset2">' . $returnData . '</div></div>';
+			$returnData = '<div class="row-fluid"><div class="span8 offset2">'.$returnData.'</div></div>';
 		}
 
 		if ($return) {

includes/Helpers/Logger.php

Spacing +1 added lines, -1 removed lines

@@ -292,7 +292,7 @@
 			$template = EmailTemplate::getById((int)$id, $entry->getDatabase());
 			
 			if ($template != false) {
-				return "closed (" . $template->getName() . ")";
+				return "closed (".$template->getName().")";
 			}
 			
 		}

includes/Helpers/DebugHelper.php

Spacing +2 added lines, -2 removed lines

@@ -26,10 +26,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/Validation/RequestValidationHelper.php

Spacing +4 added lines, -4 removed lines

@@ -61,7 +61,7 @@ 
 		}
 
 		// username can't contain #@/<>[]|{}
-		if (preg_match("/[" . preg_quote("#@/<>[]|{}", "/") . "]/", $this->request->getName()) === 1) {
+		if (preg_match("/[".preg_quote("#@/<>[]|{}", "/")."]/", $this->request->getName()) === 1) {
 			$errorList[ValidationError::NAME_INVALIDCHAR] = new ValidationError(ValidationError::NAME_INVALIDCHAR);
 		}
 
@@ -176,7 +176,7 @@ 
 	{
 		global $enableTitleblacklist;
 		if ($enableTitleblacklist == 1) {
-			$apiResult = file_get_contents("https://en.wikipedia.org/w/api.php?action=titleblacklist&tbtitle=" . urlencode($this->request->getName()) . "&tbaction=new-account&tbnooverride&format=php");
+			$apiResult = file_get_contents("https://en.wikipedia.org/w/api.php?action=titleblacklist&tbtitle=".urlencode($this->request->getName())."&tbaction=new-account&tbnooverride&format=php");
 
 			$data = unserialize($apiResult);
 
@@ -192,7 +192,7 @@ 
 	{
 		global $mediawikiWebServiceEndpoint;
 
-		$userexist = file_get_contents($mediawikiWebServiceEndpoint . "?action=query&list=users&ususers=" . urlencode($this->request->getName()) . "&format=php");
+		$userexist = file_get_contents($mediawikiWebServiceEndpoint."?action=query&list=users&ususers=".urlencode($this->request->getName())."&format=php");
 		$ue = unserialize($userexist);
 		if (!isset ($ue['query']['users']['0']['missing']) && isset ($ue['query']['users']['0']['userid'])) {
 			return true;
@@ -206,7 +206,7 @@ 
 		global $mediawikiWebServiceEndpoint;
 
 		$reqname = str_replace("_", " ", $this->request->getName());
-		$userexist = file_get_contents($mediawikiWebServiceEndpoint . "?action=query&meta=globaluserinfo&guiuser=" . urlencode($reqname) . "&format=php");
+		$userexist = file_get_contents($mediawikiWebServiceEndpoint."?action=query&meta=globaluserinfo&guiuser=".urlencode($reqname)."&format=php");
 		$ue = unserialize($userexist);
 		if (isset ($ue['query']['globaluserinfo']['id'])) {
 			return true;

functions.php

Spacing +16 added lines, -16 removed lines

@@ -37,7 +37,7 @@ 
 	// Get the closing user's Email signature and append it to the Email.
 	if (User::getCurrent()->getEmailSig() != "") {
 		$emailsig = html_entity_decode(User::getCurrent()->getEmailSig(), ENT_QUOTES, "UTF-8");
-		mail($target, "RE: [ACC #$id] English Wikipedia Account Request", $template->getText() . "\n\n" . $emailsig, $headers);
+		mail($target, "RE: [ACC #$id] English Wikipedia Account Request", $template->getText()."\n\n".$emailsig, $headers);
 	}
 	else {
 		mail($target, "RE: [ACC #$id] English Wikipedia Account Request", $template->getText(), $headers);
@@ -106,8 +106,8 @@ 
 		}
 		else {
 			// This is the login form, not the request form. We need protection here.
-			$path = 'https://' . $_SERVER["SERVER_NAME"] . $_SERVER["REQUEST_URI"];
-			header("Location: " . $path);
+			$path = 'https://'.$_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
+			header("Location: ".$path);
 		}
 	}
 
@@ -203,7 +203,7 @@ 
 
 function displayPreview($wikicode)
 {
-	$parseresult = unserialize(file_get_contents('http://en.wikipedia.org/w/api.php?action=parse&format=php&text=' . urlencode($wikicode)));
+	$parseresult = unserialize(file_get_contents('http://en.wikipedia.org/w/api.php?action=parse&format=php&text='.urlencode($wikicode)));
 	$out = "<br />\n<h3>Preview</h3>\n<div style=\"border: 2px dashed rgb(26, 79, 133);\">\n<div style=\"margin: 20px;\">";
 	$out .= $parseresult['parse']['text']['*'];
 	$out .= '</div></div>';
@@ -293,8 +293,8 @@ 
  */
 function welcomerbotRenderSig($creator, $sig)
 {
-	$signature = html_entity_decode($sig) . ' ~~~~~';
-	if (!preg_match("/((\[\[[ ]*(w:)?[ ]*(en:)?)|(\{\{subst:))[ ]*User[ ]*:[ ]*" . $creator . "[ ]*(\]\]|\||\}\}|\/)/i", $signature)) {
+	$signature = html_entity_decode($sig).' ~~~~~';
+	if (!preg_match("/((\[\[[ ]*(w:)?[ ]*(en:)?)|(\{\{subst:))[ ]*User[ ]*:[ ]*".$creator."[ ]*(\]\]|\||\}\}|\/)/i", $signature)) {
 		$signature = "--[[User:$creator|$creator]] ([[User talk:$creator|talk]]) ~~~~~";
 	}
 	return $signature;
@@ -332,25 +332,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 < $month) {
-		$output = round($secs / $week) . " week";
+		$output = round($secs / $week)." week";
 	}
 	elseif ($secs >= $month && $secs < $year) {
-		$output = round($secs / $month) . " month";
+		$output = round($secs / $month)." month";
 	}
 	elseif ($secs >= $year && $secs < $year * 10) {
-		$output = round($secs / $year) . " year";
+		$output = round($secs / $year)." year";
 	}
 	else {
 		$output = "a long time ago";
@@ -358,7 +358,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;
@@ -404,9 +404,9 @@ 
 {
 	$userList = "";
 	foreach ($users as $v) {
-		$userList .= "\"" . htmlentities($v) . "\", ";
+		$userList .= "\"".htmlentities($v)."\", ";
 	}
-	$userList = "[" . rtrim($userList, ", ") . "]";
+	$userList = "[".rtrim($userList, ", ")."]";
 	$tailscript = <<<JS
 $('.username-typeahead').typeahead({
 	source: {$userList}

zoompage.php

Spacing +5 added lines, -5 removed lines

@@ -65,7 +65,7 @@ 
 	$viewableDataStatement->bindValue(":email", $request->getEmail());
 	$viewableDataStatement->bindValue(":reserved", User::getCurrent()->getId());
 	$viewableDataStatement->bindValue(":trustedIp", $request->getTrustedIp());
-	$viewableDataStatement->bindValue(":trustedProxy", '%' . $request->getTrustedIp() . '%');
+	$viewableDataStatement->bindValue(":trustedProxy", '%'.$request->getTrustedIp().'%');
     
 	$viewableDataStatement->execute();
     
@@ -77,11 +77,11 @@ 
 	#endregion
 	
 	if ($request->getStatus() == "Closed") {
-		$hash = md5($request->getId() . $request->getEmail() . $request->getTrustedIp() . microtime()); //If the request is closed, change the hash based on microseconds similar to the checksums.
+		$hash = md5($request->getId().$request->getEmail().$request->getTrustedIp().microtime()); //If the request is closed, change the hash based on microseconds similar to the checksums.
 		$smarty->assign("isclosed", true);
 	}
 	else {
-		$hash = md5($request->getId() . $request->getEmail() . $request->getTrustedIp());
+		$hash = md5($request->getId().$request->getEmail().$request->getTrustedIp());
 		$smarty->assign("isclosed", false);
 	}
 	$smarty->assign("hash", $hash);
@@ -257,10 +257,10 @@ 
 	$userListData = $userListResult->fetchAll(PDO::FETCH_COLUMN);
 	$userListProcessedData = array();
 	foreach ($userListData as $userListItem) {
-		$userListProcessedData[] = "\"" . htmlentities($userListItem) . "\"";
+		$userListProcessedData[] = "\"".htmlentities($userListItem)."\"";
 	}
     
-	$userList = '[' . implode(",", $userListProcessedData) . ']';	
+	$userList = '['.implode(",", $userListProcessedData).']';	
 	$smarty->assign("jsuserlist", $userList);
 	// end: assign to user
     

index.php

Spacing +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
 		if (count($validationErrors) > 0) {
 			foreach ($validationErrors as $validationError) {
 				BootstrapSkin::displayAlertBox(
-					$smarty->fetch("validation/" . $validationError->getErrorCode() . ".tpl"),
+					$smarty->fetch("validation/".$validationError->getErrorCode().".tpl"),
 					"alert-error");
 			}
             

oauth/OAuthUtility.php

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
 	{
 		global $toolUserAgent;
 
-		$endpoint = $this->baseUrlInternal . '/initiate&format=json&oauth_callback=oob';
+		$endpoint = $this->baseUrlInternal.'/initiate&format=json&oauth_callback=oob';
 
 		$c = new OAuthConsumer($this->consumerToken, $this->consumerSecret);
 		$parsed = parse_url($endpoint);
@@ -43,7 +43,7 @@ 
 		$data = curl_exec($ch);
 
 		if (!$data) {
-			throw new Exception('Curl error: ' . curl_error($ch));
+			throw new Exception('Curl error: '.curl_error($ch));
 		}
 
 		$token = json_decode($data);
@@ -64,7 +64,7 @@ 
 	{
 		global $toolUserAgent;
 
-		$endpoint = $this->baseUrlInternal . '/token&format=json';
+		$endpoint = $this->baseUrlInternal.'/token&format=json';
 
 		$c = new OAuthConsumer($this->consumerToken, $this->consumerSecret);
 		$rc = new OAuthConsumer($requestToken, $requestSecret);
@@ -88,7 +88,7 @@ 
 		$data = curl_exec($ch);
 
 		if (!$data) {
-			throw new Exception('Curl error: ' . curl_error($ch));
+			throw new Exception('Curl error: '.curl_error($ch));
 		}
 
 		$token = json_decode($data);
@@ -120,7 +120,7 @@ 
 
 		$ch = curl_init();
 		if ($method == "GET") {
-			curl_setopt($ch, CURLOPT_URL, $mediawikiWebServiceEndpoint . "?" . http_build_query($apiParams));
+			curl_setopt($ch, CURLOPT_URL, $mediawikiWebServiceEndpoint."?".http_build_query($apiParams));
 		}
         
 		if ($method == "POST") {
@@ -138,7 +138,7 @@ 
 		$data = curl_exec($ch);
 
 		if (!$data) {
-			throw new Exception('Curl error: ' . curl_error($ch));
+			throw new Exception('Curl error: '.curl_error($ch));
 		}
 
 		return json_decode($data);
@@ -149,7 +149,7 @@ 
 
 		global $toolUserAgent;
 
-		$endpoint = $this->baseUrlInternal . '/identify&format=json';
+		$endpoint = $this->baseUrlInternal.'/identify&format=json';
 
 		$c = new OAuthConsumer($this->consumerToken, $this->consumerSecret);
 		$rc = new OAuthToken($accessToken, $accessSecret);
@@ -172,7 +172,7 @@ 
 		$data = curl_exec($ch);
 
 		if (!$data) {
-			throw new Exception('Curl error: ' . curl_error($ch));
+			throw new Exception('Curl error: '.curl_error($ch));
 		}
 
 		$decodedData = json_decode($data);

includes/DataObjects/User.php

Spacing +4 added lines, -4 removed lines

@@ -654,7 +654,7 @@ 
     
 	public function isCheckuser()
 	{
-	    if($this->isCheckuserCache === null) {
+	    if ($this->isCheckuserCache === null) {
 	        $this->isCheckuserCache = $this->checkuser == 1 || $this->oauthCanCheckUser();
         }
 
@@ -794,7 +794,7 @@ 
 				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());
 		}   
 	}
     
@@ -869,7 +869,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);
 	}
 
 	public function getApprovalDate()
@@ -894,6 +894,6 @@ 
 	
 	public function getObjectDescription()
 	{
-		return '<a href="statistics.php?page=Users&amp;user=' . $this->getId() . '">' . htmlentities($this->username) . "</a>";
+		return '<a href="statistics.php?page=Users&amp;user='.$this->getId().'">'.htmlentities($this->username)."</a>";
 	}
 }