mdaniels5757 / waca

search.php

Spacing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
 			die();
 		}			
 
-		$qterm = '%' . $term . '%';
+		$qterm = '%'.$term.'%';
         
 		$statement = gGetDb()->prepare("SELECT * FROM request WHERE email LIKE :term;");
 		$statement->bindValue(":term", $qterm);
@@ -98,7 +98,7 @@ 
 		$smarty->display("search/searchresult.tpl");
 	}
 	elseif ($_GET['type'] == 'IP') {
-		$qterm = '%' . $term . '%';
+		$qterm = '%'.$term.'%';
         
 		$statement = gGetDb()->prepare("SELECT * FROM request WHERE email <> 'acc@toolserver.org' and ip <> '127.0.0.1' and ip LIKE :term or forwardedip LIKE :term2;");
 		$statement->bindValue(":term", $qterm);
@@ -117,7 +117,7 @@ 
 		$smarty->display("search/searchresult.tpl");
 	}
 	elseif ($_GET['type'] == 'Request') {
-		$qterm = '%' . $term . '%';
+		$qterm = '%'.$term.'%';
         
 		$statement = gGetDb()->prepare("SELECT * FROM request WHERE name LIKE :term;");
 		$statement->bindValue(":term", $qterm);

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/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/Providers/IpLocationProvider.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 	{
 		try {
 			if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-				$xml = @file_get_contents($this->getApiBase() . '?key=' . $this->apikey . '&ip=' . $ip . '&format=xml');
+				$xml = @file_get_contents($this->getApiBase().'?key='.$this->apikey.'&ip='.$ip.'&format=xml');
 
 				$response = @new SimpleXMLElement($xml);
 

includes/DataObjects/Request.php

Spacing +12 added lines, -12 removed lines

@@ -63,11 +63,11 @@ 
 		if ($this->isNew) {
 // insert
 			$statement = $this->dbObject->prepare(
-				"INSERT INTO `request` (" .
-				"email, ip, name, comment, status, date, checksum, emailsent, emailconfirm, reserved, useragent, forwardedip" .
-				") VALUES (" .
-				":email, :ip, :name, :comment, :status, CURRENT_TIMESTAMP(), :checksum, :emailsent," .
-				":emailconfirm, :reserved, :useragent, :forwardedip" .
+				"INSERT INTO `request` (".
+				"email, ip, name, comment, status, date, checksum, emailsent, emailconfirm, reserved, useragent, forwardedip".
+				") VALUES (".
+				":email, :ip, :name, :comment, :status, CURRENT_TIMESTAMP(), :checksum, :emailsent,".
+				":emailconfirm, :reserved, :useragent, :forwardedip".
 				");");
 			$statement->bindValue(":email", $this->email);
 			$statement->bindValue(":ip", $this->ip);
@@ -90,9 +90,9 @@ 
 		}
 		else {
 // update
-			$statement = $this->dbObject->prepare("UPDATE `request` SET " .
-				"status = :status, checksum = :checksum, emailsent = :emailsent, emailconfirm = :emailconfirm, " .
-				"reserved = :reserved " .
+			$statement = $this->dbObject->prepare("UPDATE `request` SET ".
+				"status = :status, checksum = :checksum, emailsent = :emailsent, emailconfirm = :emailconfirm, ".
+				"reserved = :reserved ".
 				"WHERE id = :id;");
 			$statement->bindValue(":id", $this->id);
 			$statement->bindValue(":status", $this->status);
@@ -196,7 +196,7 @@ 
 
 	public function updateChecksum()
 	{
-		$this->checksum = md5($this->id . $this->name . $this->email . microtime());
+		$this->checksum = md5($this->id.$this->name.$this->email.microtime());
 	}
 
 	public function getEmailSent()
@@ -323,7 +323,7 @@ 
 			$query = $this->dbObject->prepare("SELECT * FROM request WHERE (ip = :ip OR forwardedip LIKE :forwarded) AND ip != :clearedip AND id != :id AND emailconfirm = 'Confirmed';");
 
 			$trustedIp = $this->getTrustedIp();
-			$trustedFilter = '%' . $trustedIp . '%';
+			$trustedFilter = '%'.$trustedIp.'%';
 
 			$query->bindValue(":id", $this->id);
 			$query->bindValue(":ip", $trustedIp);
@@ -351,7 +351,7 @@ 
 			return false;
 		}
 
-		$apiResult = file_get_contents("https://en.wikipedia.org/w/api.php?action=titleblacklist&tbtitle=" . urlencode($this->name) . "&tbaction=new-account&tbnooverride&format=php");
+		$apiResult = file_get_contents("https://en.wikipedia.org/w/api.php?action=titleblacklist&tbtitle=".urlencode($this->name)."&tbaction=new-account&tbnooverride&format=php");
 
 		$data = unserialize($apiResult);
 
@@ -423,7 +423,7 @@ 
 	
 	public function getObjectDescription()
 	{
-		return '<a href="acc.php?action=zoom&amp;id=' . $this->getId() . '">Request #' . $this->getId() . " (" . htmlentities($this->name) . ")</a>";
+		return '<a href="acc.php?action=zoom&amp;id='.$this->getId().'">Request #'.$this->getId()." (".htmlentities($this->name).")</a>";
 	}
 
 	public function getClosureReason()

includes/DataObjects/User.php

Spacing +4 added lines, -4 removed lines

@@ -653,7 +653,7 @@ 
     
 	public function isCheckuser()
 	{
-	    if($this->isCheckuserCache === null) {
+	    if ($this->isCheckuserCache === null) {
 	        $this->isCheckuserCache = $this->checkuser == 1 || $this->oauthCanCheckUser();
         }
 
@@ -788,7 +788,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());
 		}   
 	}
     
@@ -863,7 +863,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()
@@ -888,6 +888,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>";
 	}
 }

acc.php

Spacing +21 added lines, -21 removed lines

@@ -349,7 +349,7 @@ 
 	$user = User::getByUsername($_POST['username'], gGetDb());
     
 	if ($user == false || !$user->authenticate($_POST['password'])) {
-		header("Location: $baseurl/acc.php?error=authfail&tplUsername=" . urlencode($_POST['username']));
+		header("Location: $baseurl/acc.php?error=authfail&tplUsername=".urlencode($_POST['username']));
 		die();
 	}
     
@@ -902,7 +902,7 @@ 
 				Logger::unbanned($database, $ban, $_POST['unbanreason']);
 			});
         
-			BootstrapSkin::displayAlertBox("Unbanned " . $ban->getTarget(), "alert-info", "", false, false);
+			BootstrapSkin::displayAlertBox("Unbanned ".$ban->getTarget(), "alert-info", "", false, false);
 			BootstrapSkin::displayInternalFooter();
 			Notification::unbanned($ban, $_POST['unbanreason']);
 			die();
@@ -1034,7 +1034,7 @@ 
         
 		if ($request->getStatus() == $_GET['target']) {
 			SessionAlert::error(
-				"Cannot set status, target already deferred to " . htmlentities($_GET['target']), 
+				"Cannot set status, target already deferred to ".htmlentities($_GET['target']), 
 				"Error");
 			header("Location: acc.php?action=zoom&id={$request->getId()}");
 			die();
@@ -1150,7 +1150,7 @@ 
 	if ($request->getEmailSent() == "1" && !isset($_GET['override']) && $gem != 0) {
 		$alertContent = "<p>This request has already been closed in a manner that has generated an e-mail to the user, Proceed?</p><br />";
 		$alertContent .= "<div class=\"row-fluid\">";
-		$alertContent .= "<a class=\"btn btn-success offset3 span3\"  href=\"$baseurl/acc.php?sum=" . $_GET['sum'] . "&amp;action=done&amp;id=" . $_GET['id'] . "&amp;override=yes&amp;email=" . $_GET['email'] . "\">Yes</a>";
+		$alertContent .= "<a class=\"btn btn-success offset3 span3\"  href=\"$baseurl/acc.php?sum=".$_GET['sum']."&amp;action=done&amp;id=".$_GET['id']."&amp;override=yes&amp;email=".$_GET['email']."\">Yes</a>";
 		$alertContent .= "<a class=\"btn btn-danger span3\" href=\"$baseurl/acc.php\">No</a>";
 		$alertContent .= "</div>";
         
@@ -1161,9 +1161,9 @@ 
 	
 	// check the request is not reserved by someone else
 	if ($request->getReserved() != 0 && !isset($_GET['reserveoverride']) && $request->getReserved() != User::getCurrent()->getId()) {
-		$alertContent = "<p>This request is currently marked as being handled by " . $request->getReservedObject()->getUsername() . ", Proceed?</p><br />";
+		$alertContent = "<p>This request is currently marked as being handled by ".$request->getReservedObject()->getUsername().", Proceed?</p><br />";
 		$alertContent .= "<div class=\"row-fluid\">";
-		$alertContent .= "<a class=\"btn btn-success offset3 span3\"  href=\"$baseurl/acc.php?" . $_SERVER["QUERY_STRING"] . "&reserveoverride=yes\">Yes</a>";
+		$alertContent .= "<a class=\"btn btn-success offset3 span3\"  href=\"$baseurl/acc.php?".$_SERVER["QUERY_STRING"]."&reserveoverride=yes\">Yes</a>";
 		$alertContent .= "<a class=\"btn btn-danger span3\" href=\"$baseurl/acc.php\">No</a>";
 		$alertContent .= "</div>";
         
@@ -1179,7 +1179,7 @@ 
 	}
 	
 	// Checks whether the username is already in use on Wikipedia.
-	$userexist = file_get_contents("http://en.wikipedia.org/w/api.php?action=query&list=users&ususers=" . urlencode($request->getName()) . "&format=php");
+	$userexist = file_get_contents("http://en.wikipedia.org/w/api.php?action=query&list=users&ususers=".urlencode($request->getName())."&format=php");
 	$ue = unserialize($userexist);
 	if (!isset ($ue['query']['users']['0']['missing'])) {
 		$exists = true;
@@ -1200,7 +1200,7 @@ 
 	if ($isForCreated && !$exists && !isset($_GET['createoverride'])) {
 		$alertContent = "<p>You have chosen to mark this request as \"created\", but the account does not exist on the English Wikipedia, proceed?</p><br />";
 		$alertContent .= "<div class=\"row-fluid\">";
-		$alertContent .= "<a class=\"btn btn-success offset3 span3\"  href=\"$baseurl/acc.php?" . $_SERVER["QUERY_STRING"] . "&amp;createoverride=yes\">Yes</a>";
+		$alertContent .= "<a class=\"btn btn-success offset3 span3\"  href=\"$baseurl/acc.php?".$_SERVER["QUERY_STRING"]."&amp;createoverride=yes\">Yes</a>";
 		$alertContent .= "<a class=\"btn btn-danger span3\" href=\"$baseurl/acc.php\">No</a>";
 		$alertContent .= "</div>";
         
@@ -1245,26 +1245,26 @@ 
 			die();
 		}
 
-		$headers = 'From: accounts-enwiki-l@lists.wikimedia.org' . "\r\n";
+		$headers = 'From: accounts-enwiki-l@lists.wikimedia.org'."\r\n";
 
 		// CC mailing list option
 		if (User::getCurrent()->isAdmin() || User::getCurrent()->isCheckuser()) {
 			// these people get the choice
 			if (isset($_POST['ccmailist']) && $_POST['ccmailist'] == "on") {
-				$headers .= 'Cc: accounts-enwiki-l@lists.wikimedia.org' . "\r\n";
+				$headers .= 'Cc: accounts-enwiki-l@lists.wikimedia.org'."\r\n";
 			}
 		} else {
 			// these people do not.
-			$headers .= 'Cc: accounts-enwiki-l@lists.wikimedia.org' . "\r\n";
+			$headers .= 'Cc: accounts-enwiki-l@lists.wikimedia.org'."\r\n";
 		}
 
-		$headers .= 'X-ACC-Request: ' . $request->getId() . "\r\n";
-		$headers .= 'X-ACC-UserID: ' . User::getCurrent()->getId() . "\r\n";
+		$headers .= 'X-ACC-Request: '.$request->getId()."\r\n";
+		$headers .= 'X-ACC-UserID: '.User::getCurrent()->getId()."\r\n";
 
 		// 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($request->getEmail(), "RE: [ACC #{$request->getId()}] English Wikipedia Account Request", $_POST['msgbody'] . "\n\n" . $emailsig, $headers);
+			mail($request->getEmail(), "RE: [ACC #{$request->getId()}] English Wikipedia Account Request", $_POST['msgbody']."\n\n".$emailsig, $headers);
 		}
 		else {
 			mail($request->getEmail(), "RE: [ACC #{$request->getId()}] English Wikipedia Account Request", $_POST['msgbody'], $headers);
@@ -1289,7 +1289,7 @@ 
 			
 			Notification::requestClosed($request, $crea);
 			BootstrapSkin::displayAlertBox(
-				"Request " . $request->getId() . " (" . htmlentities($request->getName(), ENT_COMPAT, 'UTF-8') . ") marked as '" . htmlentities($crea, ENT_COMPAT, 'UTF-8') . "'.", 
+				"Request ".$request->getId()." (".htmlentities($request->getName(), ENT_COMPAT, 'UTF-8').") marked as '".htmlentities($crea, ENT_COMPAT, 'UTF-8')."'.", 
 				"alert-success");
 		}
 		else if ($_POST['action'] == "mail") {
@@ -1355,7 +1355,7 @@ 
 		}
 
 		Notification::requestClosed($request, $crea);
-		BootstrapSkin::displayAlertBox("Request " . $request->getId() . " (" . htmlentities($request->getName(), ENT_COMPAT, 'UTF-8') . ") marked as '" . htmlentities($crea, ENT_COMPAT, 'UTF-8') . "'.", "alert-success");
+		BootstrapSkin::displayAlertBox("Request ".$request->getId()." (".htmlentities($request->getName(), ENT_COMPAT, 'UTF-8').") marked as '".htmlentities($crea, ENT_COMPAT, 'UTF-8')."'.", "alert-success");
 		
 		$towhom = $request->getEmail();
 		if ($gem != "0") {
@@ -1524,7 +1524,7 @@ 
 			if (!isset($_GET['confclosed'])) {
 				if ($request->getStatus() == "Closed") {
 					// FIXME: bootstrappify properly
-					throw new TransactionException('This request is currently closed. Are you sure you wish to reserve it?<br /><ul><li><a href="' . $_SERVER["REQUEST_URI"] . '&confclosed=yes">Yes, reserve this closed request</a></li><li><a href="' . $baseurl . '/acc.php">No, return to main request interface</a></li></ul>', "Request closed", "alert-info");
+					throw new TransactionException('This request is currently closed. Are you sure you wish to reserve it?<br /><ul><li><a href="'.$_SERVER["REQUEST_URI"].'&confclosed=yes">Yes, reserve this closed request</a></li><li><a href="'.$baseurl.'/acc.php">No, return to main request interface</a></li></ul>', "Request closed", "alert-info");
 				}
 			}	
         
@@ -1595,7 +1595,7 @@ 
 			}
 		}
 		else {
-			echo "You cannot break " . htmlentities($reservedUser->getUsername()) . "'s reservation";
+			echo "You cannot break ".htmlentities($reservedUser->getUsername())."'s reservation";
 		}
 	}
 	else {
@@ -1695,7 +1695,7 @@ 
 	}
     
 	if (!isset($_POST['comment']) || $_POST['comment'] == "") {
-		header("Location: acc.php?action=zoom&id=" . $request->getId());
+		header("Location: acc.php?action=zoom&id=".$request->getId());
 		die(); 
 	}
     
@@ -1728,7 +1728,7 @@ 
     
 	Notification::commentCreated($comment);
     
-	header("Location: acc.php?action=zoom&id=" . $request->getId());
+	header("Location: acc.php?action=zoom&id=".$request->getId());
 }
 elseif ($action == "changepassword") {
 	if ((!isset($_POST['oldpassword'])) || $_POST['oldpassword'] == "") {
@@ -1806,7 +1806,7 @@ 
 			Notification::commentEdited($comment);
         
 			SessionAlert::success("Comment has been saved successfully");
-			header("Location: $baseurl/acc.php?action=zoom&id=" . $comment->getRequest());
+			header("Location: $baseurl/acc.php?action=zoom&id=".$comment->getRequest());
 		});
         
 		die();    

config.inc.php

Spacing +7 added lines, -7 removed lines

@@ -141,7 +141,7 @@ 
 
 $BUbasefile = "backup"; // The basefile's name.
 $BUdir = "/home/project/a/c/c/acc/backups"; // The directory where backups should be stored.
-$BUmonthdir = $BUdir . "/monthly"; // The directory where monthly backups should be stored.
+$BUmonthdir = $BUdir."/monthly"; // The directory where monthly backups should be stored.
 $BUdumper = "/opt/ts/mysql/5.1/bin/mysqldump --defaults-file=~/.my.cnf p_acc_live"; // Add parameters here if they are needed.
 $BUgzip = "/usr/bin/gzip"; // Add the gzip parameters here if needed.
 $BUtar = "/bin/tar -cvf"; // Add the tar parameters here if needed.
@@ -279,19 +279,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'),
@@ -314,11 +314,11 @@ 
 	"openssl", // email confirmation hash gen, oauth stuff
 	) as $x) {if (!extension_loaded($x)) {die("extension $x is required."); }}
 
-require_once($filepath . "includes/AutoLoader.php");
+require_once($filepath."includes/AutoLoader.php");
 
 spl_autoload_register("AutoLoader::load");
 
-require_once($filepath . 'vendor/autoload.php')
+require_once($filepath.'vendor/autoload.php')
 
 // Extra includes which are just plain awkward wherever they are.
-require_once($filepath . 'oauth/OAuthUtility.php');
+require_once($filepath.'oauth/OAuthUtility.php');