mdaniels5757 / waca

users.php

Spacing +10 added lines, -10 removed lines

@@ -106,7 +106,7 @@ 
 	$user->approve();
 
 	BootstrapSkin::displayAlertBox(
-		"Approved user " . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'), 
+		"Approved user ".htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'), 
 		"alert-info", 
 		"", 
 		false);
@@ -115,7 +115,7 @@ 
 
 	$headers = 'From: accounts-enwiki-l@lists.wikimedia.org';
 	// TODO: move to template?
-	mail($user->getEmail(), "ACC Account Approved", "Dear " . $user->getOnWikiName() . ",\nYour account " . $user->getUsername() . " has been approved by " . User::getCurrent()->getUsername() . ". To login please go to $baseurl/acc.php.\nPlease note that if you cannot login immediately, we may be updating your identification information in the system.  Please let us know if you continue to have issues if you cannot login after 12 hours pass from the time you receive this approval.\n- The English Wikipedia Account Creation Team", $headers);
+	mail($user->getEmail(), "ACC Account Approved", "Dear ".$user->getOnWikiName().",\nYour account ".$user->getUsername()." has been approved by ".User::getCurrent()->getUsername().". To login please go to $baseurl/acc.php.\nPlease note that if you cannot login immediately, we may be updating your identification information in the system.  Please let us know if you continue to have issues if you cannot login after 12 hours pass from the time you receive this approval.\n- The English Wikipedia Account Creation Team", $headers);
 	BootstrapSkin::displayInternalFooter();
 	die();
 }
@@ -159,7 +159,7 @@ 
 		$user->demote($_POST['reason']);
 
 		BootstrapSkin::displayAlertBox( 
-			"Changed " . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8') . "'s access to 'User'", 
+			"Changed ".htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8')."'s access to 'User'", 
 			"alert-info", 
 			"", 
 			false);
@@ -169,7 +169,7 @@ 
 		$headers = 'From: accounts-enwiki-l@lists.wikimedia.org';
         
 		// TODO: move to template?
-		mail($user->getEmail(), "ACC Account Demoted", "Dear " . $user->getOnWikiName() . ",\nYour account " . $user->getUsername() . " has been demoted by " . User::getCurrent()->getUsername() . " because " . User::getCurrent()->getUsername() . ". To contest this demotion please email accounts-enwiki-l@lists.wikimedia.org.\n- The English Wikipedia Account Creation Team", $headers);
+		mail($user->getEmail(), "ACC Account Demoted", "Dear ".$user->getOnWikiName().",\nYour account ".$user->getUsername()." has been demoted by ".User::getCurrent()->getUsername()." because ".User::getCurrent()->getUsername().". To contest this demotion please email accounts-enwiki-l@lists.wikimedia.org.\n- The English Wikipedia Account Creation Team", $headers);
 		BootstrapSkin::displayInternalFooter();
 		die();
 	}
@@ -213,7 +213,7 @@ 
 
 		Notification::userSuspended($user, $_POST['reason']);
 		BootstrapSkin::displayAlertBox(
-			"Suspended user " . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'), 
+			"Suspended user ".htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'), 
 			"alert-info", 
 			"", 
 			false);
@@ -221,7 +221,7 @@ 
 		$headers = 'From: accounts-enwiki-l@lists.wikimedia.org';
         
 		// TODO: move to template?
-		mail($user->getEmail(), "ACC Account Suspended", "Dear " . $user->getOnWikiName() . ",\nYour account " . $user->getUsername() . " has been suspended by " . User::getCurrent()->getUsername() . " because " . $_POST['reason'] . ". To contest this suspension please email accounts-enwiki-l@lists.wikimedia.org.\n- The English Wikipedia Account Creation Team", $headers);
+		mail($user->getEmail(), "ACC Account Suspended", "Dear ".$user->getOnWikiName().",\nYour account ".$user->getUsername()." has been suspended by ".User::getCurrent()->getUsername()." because ".$_POST['reason'].". To contest this suspension please email accounts-enwiki-l@lists.wikimedia.org.\n- The English Wikipedia Account Creation Team", $headers);
 		BootstrapSkin::displayInternalFooter();
 		die();
 	}
@@ -257,7 +257,7 @@ 
 	Notification::userPromoted($user);
 
 	BootstrapSkin::displayAlertBox(
-		htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8') . " promoted to 'Admin'", 
+		htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8')." promoted to 'Admin'", 
 		"alert-info", 
 		"", 
 		false);
@@ -265,7 +265,7 @@ 
 	$headers = 'From: accounts-enwiki-l@lists.wikimedia.org';
     
 	// TODO: move to template?
-	mail($user->getEmail(), "ACC Account Promoted", "Dear " . $user->getOnWikiName() . ",\nYour account " . $user->getUsername() . " has been promted to admin status by " . User::getCurrent()->getUsername() . ".\n- The English Wikipedia Account Creation Team", $headers);
+	mail($user->getEmail(), "ACC Account Promoted", "Dear ".$user->getOnWikiName().",\nYour account ".$user->getUsername()." has been promted to admin status by ".User::getCurrent()->getUsername().".\n- The English Wikipedia Account Creation Team", $headers);
 	die();
 }
 
@@ -308,7 +308,7 @@ 
 		Notification::userDeclined($user, $_POST['reason']);
 
 		BootstrapSkin::displayAlertBox(
-			"Declined user " . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'), 
+			"Declined user ".htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'), 
 			"alert-info", 
 			"", 
 			false);
@@ -316,7 +316,7 @@ 
 		$headers = 'From: accounts-enwiki-l@lists.wikimedia.org';
         
 		// TODO: move to template?
-		mail($user->getEmail(), "ACC Account Declined", "Dear " . $user->getOnWikiName() . ",\nYour account " . $user->getUsername() . " has been declined access to the account creation tool by " . User::getCurrent()->getUsername() . " because " . $_POST['reason'] . ". For more infomation please email accounts-enwiki-l@lists.wikimedia.org.\n- The English Wikipedia Account Creation Team", $headers);
+		mail($user->getEmail(), "ACC Account Declined", "Dear ".$user->getOnWikiName().",\nYour account ".$user->getUsername()." has been declined access to the account creation tool by ".User::getCurrent()->getUsername()." because ".$_POST['reason'].". For more infomation please email accounts-enwiki-l@lists.wikimedia.org.\n- The English Wikipedia Account Creation Team", $headers);
 		BootstrapSkin::displayInternalFooter();
 		die();
 	}

Braces +6 added lines, -12 removed lines

@@ -154,8 +154,7 @@ 
 		$smarty->display("usermanagement/changelevel-reason.tpl");
 		BootstrapSkin::displayInternalFooter();
 		die();
-	}
-	else {
+	} else {
 		$user->demote($_POST['reason']);
 
 		BootstrapSkin::displayAlertBox( 
@@ -198,8 +197,7 @@ 
 			false);
 		BootstrapSkin::displayInternalFooter();
 		die();
-	}
-	elseif (!isset($_POST['reason'])) {
+	} elseif (!isset($_POST['reason'])) {
 		global $smarty;
 		$smarty->assign("user", $user);
 		$smarty->assign("status", "Suspended");
@@ -207,8 +205,7 @@ 
 		$smarty->display("usermanagement/changelevel-reason.tpl");
 		BootstrapSkin::displayInternalFooter();
 		die();
-	}
-	else {
+	} else {
 		$user->suspend($_POST['reason']);
 
 		Notification::userSuspended($user, $_POST['reason']);
@@ -301,8 +298,7 @@ 
 		$smarty->display("usermanagement/changelevel-reason.tpl");
 		BootstrapSkin::displayInternalFooter();
 		die();
-	}
-	else {
+	} else {
 		$user->decline($_POST['reason']);
 
 		Notification::userDeclined($user, $_POST['reason']);
@@ -346,8 +342,7 @@ 
 		$smarty->display("usermanagement/renameuser.tpl");
 		BootstrapSkin::displayInternalFooter();
 		die();
-	}
-	else {
+	} else {
 		if (!isset($_POST['newname']) || trim($_POST['newname']) == "") {
 			BootstrapSkin::displayAlertBox("The new username cannot be empty.", "alert-error", "Error", true, false);
 			BootstrapSkin::displayInternalFooter();
@@ -429,8 +424,7 @@ 
 		global $smarty;
 		$smarty->assign("user", $user);
 		$smarty->display("usermanagement/edituser.tpl");
-	}
-	else {
+	} else {
 		$database = gGetDb();
 		if (!$database->beginTransaction()) {
 			BootstrapSkin::displayAlertBox(

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

Braces +5 added lines, -10 removed lines

@@ -32,8 +32,7 @@ 
 
 if (isset($_SESSION['user'])) {
 	$sessionuser = $_SESSION['user'];
-}
-else {
+} else {
 	$sessionuser = "";
 }
 
@@ -96,8 +95,7 @@ 
 		$smarty->assign("target", $target);
         
 		$smarty->display("search/searchresult.tpl");
-	}
-	elseif ($_GET['type'] == 'IP') {
+	} elseif ($_GET['type'] == 'IP') {
 		$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;");
@@ -115,8 +113,7 @@ 
 		$smarty->assign("target", $target);
         
 		$smarty->display("search/searchresult.tpl");
-	}
-	elseif ($_GET['type'] == 'Request') {
+	} elseif ($_GET['type'] == 'Request') {
 		$qterm = '%' . $term . '%';
         
 		$statement = gGetDb()->prepare("SELECT * FROM request WHERE name LIKE :term;");
@@ -133,15 +130,13 @@ 
 		$smarty->assign("target", $target);
         
 		$smarty->display("search/searchresult.tpl");
-	}
-	else {
+	} else {
 		BootstrapSkin::displayAlertBox("Unknown search type", "alert-error", "Error");
 		$smarty->display("search/searchform.tpl");
 		BootstrapSkin::displayInternalFooter();
 		die();
 	}
-}
-else {
+} else {
 	$smarty->display("search/searchform.tpl");
 }
 

acc.php

Indentation +25 added lines, -25 removed lines

@@ -2043,41 +2043,41 @@
 	});
 }
 elseif ($action == "listall") {
-    global $availableRequestStates, $enableEmailConfirm;
+	global $availableRequestStates, $enableEmailConfirm;
 
 	if (isset($_GET['status']) && isset($availableRequestStates[$_GET['status']])) {
 		$type = $_GET['status']; // safe, we've verified it's sane in the above if statement.
 
-	    $database = gGetDb();
+		$database = gGetDb();
 
-	    if ($enableEmailConfirm == 1) {
-	        $query = "SELECT * FROM request WHERE status = :type AND emailconfirm = 'Confirmed';";
-	    } else {
-	        $query = "SELECT * FROM request WHERE status = :type;";
-	    }
+		if ($enableEmailConfirm == 1) {
+			$query = "SELECT * FROM request WHERE status = :type AND emailconfirm = 'Confirmed';";
+		} else {
+			$query = "SELECT * FROM request WHERE status = :type;";
+		}
 
-	    $statement = $database->prepare($query);
+		$statement = $database->prepare($query);
 
-        $statement->bindValue(":type", $type);
-        $statement->execute();
+		$statement->bindValue(":type", $type);
+		$statement->execute();
 
-        $requests = $statement->fetchAll(PDO::FETCH_CLASS, "Request");
-        foreach ($requests as $req) {
-        	/** @var Request $req */
-            $req->setDatabase($database);
-        }
+		$requests = $statement->fetchAll(PDO::FETCH_CLASS, "Request");
+		foreach ($requests as $req) {
+			/** @var Request $req */
+			$req->setDatabase($database);
+		}
 
-        global $smarty;
-        $smarty->assign("requests", $requests);
-        $smarty->assign("showStatus", false);
-        $html = $smarty->fetch("mainpage/requesttable.tpl");
-        echo $html;
-    } else {
-        echo defaultpage();
-    }
+		global $smarty;
+		$smarty->assign("requests", $requests);
+		$smarty->assign("showStatus", false);
+		$html = $smarty->fetch("mainpage/requesttable.tpl");
+		echo $html;
+	} else {
+		echo defaultpage();
+	}
 
-    BootstrapSkin::displayInternalFooter();
-    die();
+	BootstrapSkin::displayInternalFooter();
+	die();
 }
 # If the action specified does not exist, goto the default page.
 else {

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

Braces +72 added lines, -144 removed lines

@@ -77,8 +77,7 @@ 
 		echo showlogin();
 		BootstrapSkin::displayInternalFooter();
 		die();
-	}
-	else {
+	} else {
 		// A content block is created if the action is none of the above.
 		// This block would later be used to keep all the HTML except the header and footer.
 		$out = "<div id=\"content\">";
@@ -101,8 +100,7 @@ 
 	echo defaultpage();
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "sreg") {
+} elseif ($action == "sreg") {
 	global $useOauthSignup, $smarty;
         
 	// TODO: check blocked
@@ -196,8 +194,7 @@ 
 					0, 
 					$ex);
 			}
-		}
-		else {
+		} else {
 			global $baseurl;
 			Notification::userNew($newUser);
 			header("Location: {$baseurl}/acc.php?action=registercomplete");
@@ -205,19 +202,16 @@ 
 	});
     
 	die();
-}
-elseif ($action == "register") {
+} elseif ($action == "register") {
 	global $useOauthSignup, $smarty;
 	$smarty->assign("useOauthSignup", $useOauthSignup);
 	$smarty->display("registration/register.tpl");
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "registercomplete") {
+} elseif ($action == "registercomplete") {
 	$smarty->display("registration/alert-registrationcomplete.tpl");
 	BootstrapSkin::displayInternalFooter();
-}
-elseif ($action == "forgotpw") {
+} elseif ($action == "forgotpw") {
 	global $baseurl, $smarty;
     
 	if (isset ($_GET['si']) && isset ($_GET['id'])) {
@@ -246,14 +240,12 @@ 
                     
 					BootstrapSkin::displayInternalFooter();
 					die();
-				}
-				else {
+				} else {
 					BootstrapSkin::displayAlertBox("Passwords did not match!", "alert-error", "Error", true, false);
 					BootstrapSkin::displayInternalFooter();
 					die();
 				}
-			}
-			else {
+			} else {
 				BootstrapSkin::displayAlertBox("Invalid request<!-- 1 -->", "alert-error", "Error", true, false);
 				BootstrapSkin::displayInternalFooter();
 				die();
@@ -267,8 +259,7 @@ 
 			$smarty->assign('si', $_GET['si']);
 			$smarty->assign('id', $_GET['id']);
 			$smarty->display('forgot-password/forgotpwreset.tpl');
-		}
-		else {
+		} else {
 			BootstrapSkin::displayAlertBox(
 				"The hash supplied in the link did not match the hash in the database!", 
 				"alert-error", 
@@ -294,8 +285,7 @@ 
             
 			BootstrapSkin::displayInternalFooter();
 			die();
-		}
-		elseif (strtolower($_POST['email']) != strtolower($user->getEmail())) {
+		} elseif (strtolower($_POST['email']) != strtolower($user->getEmail())) {
 			BootstrapSkin::displayAlertBox("Could not find user with that username and email address!", 
 				"alert-error", 
 				"Error", 
@@ -304,8 +294,7 @@ 
             
 			BootstrapSkin::displayInternalFooter();
 			die();
-		}
-		else {
+		} else {
 			$hash = $user->getForgottenPasswordHash();
                        
 			$smarty->assign("user", $user);
@@ -337,8 +326,7 @@ 
 
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "login") {
+} elseif ($action == "login") {
 	global $baseurl, $smarty;
     
 	if (!isset($_POST['username'])) {
@@ -369,8 +357,7 @@ 
             
 			reattachOAuthAccount($user);
 		}
-	}
-	else {
+	} else {
 		global $enforceOAuth;
         
 		if ($enforceOAuth) {
@@ -453,8 +440,7 @@ 
 	}
     
 	header("Location: $baseurl/acc.php");
-}
-elseif ($action == "messagemgmt") {
+} elseif ($action == "messagemgmt") {
 	global $smarty;
     
 	if (isset($_GET['view'])) {
@@ -538,8 +524,7 @@ 
    
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "templatemgmt") {
+} elseif ($action == "templatemgmt") {
 	global $baseurl, $smarty;
     
 	if (isset($_GET['view'])) {
@@ -585,15 +570,13 @@ 
 				SessionAlert::success("Template successfully created.");
 				header("Location: $baseurl/acc.php?action=templatemgmt");
 			});
-		}
-		else {
+		} else {
 			
 			if (isset($_POST['preview'])) {
 				$usercode = $_POST['usercode'];
 				$botcode = $_POST['botcode'];
 				echo displayPreview($usercode);
-			}
-			else {
+			} else {
 				$usercode = '';
 				$botcode = '';
 			}
@@ -619,8 +602,7 @@ 
 			SessionAlert::success("Disabled automatic user welcoming.");
 			header("Location: {$baseurl}/acc.php?action=templatemgmt");
 			die();
-		}
-		else {
+		} else {
 			$template = WelcomeTemplate::getById($_GET['select'], gGetDb());
 			if ($template !== false) {
 				$user->setWelcomeTemplate($template->getId());
@@ -629,8 +611,7 @@ 
 				SessionAlert::success("Updated selected welcome template for automatic welcoming.");
 				header("Location: {$baseurl}/acc.php?action=templatemgmt");
 				die();
-			}
-			else {
+			} else {
 				SessionAlert::error("Something went wrong, we can't find the template you asked for!");
 				header("Location: {$baseurl}/acc.php?action=templatemgmt");
 				die();
@@ -707,8 +688,7 @@ 
             
 			header("Location: $baseurl/acc.php?action=templatemgmt");
 			die();
-		}
-		else {
+		} else {
 			$smarty->assign("template", $template);
 			$smarty->display("welcometemplate/edit.tpl");
             
@@ -724,8 +704,7 @@ 
     
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "sban") {
+} elseif ($action == "sban") {
 	global $smarty;
     
 	// Checks whether the current user is an admin.
@@ -753,21 +732,18 @@ 
     
 	if ($duration == "-1") {
 		$duration = -1;
-	}
-	elseif ($duration == "other") {
+	} elseif ($duration == "other") {
 		$duration = strtotime($_POST['otherduration']);
 		if (!$duration) {
 			BootstrapSkin::displayAlertBox("Invalid ban time", "alert-error", "", false, false);
 			BootstrapSkin::displayInternalFooter();
 			die();
-		}
-		elseif (time() > $duration) {
+		} elseif (time() > $duration) {
 			BootstrapSkin::displayAlertBox("Ban time has already expired!", "alert-error", "", false, false);
 			BootstrapSkin::displayInternalFooter();
 			die();
 		}
-	}
-	else {
+	} else {
 		$duration = $duration + time();
 	}
     
@@ -847,8 +823,7 @@ 
     
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "unban") {
+} elseif ($action == "unban") {
 	global $smarty;
     
 	if (!isset($_GET['id']) || $_GET['id'] == "") {
@@ -887,8 +862,7 @@ 
 			BootstrapSkin::displayAlertBox("You must enter an unban reason!", "alert-error", "", false, false);
 			BootstrapSkin::displayInternalFooter();
 			die();
-		}
-		else {
+		} else {
 			$database = gGetDb();
             
 			$database->transactionally(function() use ($database, $ban)
@@ -907,15 +881,13 @@ 
 			Notification::unbanned($ban, $_POST['unbanreason']);
 			die();
 		}
-	}
-	else {
+	} else {
 		$smarty->assign("ban", $ban);
 		$smarty->display("bans/unban.tpl");
         
 		BootstrapSkin::displayInternalFooter();
 	}
-}
-elseif ($action == "ban") {
+} elseif ($action == "ban") {
 	global $smarty;
     
 	if (isset ($_GET['ip']) || isset ($_GET['email']) || isset ($_GET['name'])) {
@@ -935,8 +907,7 @@ 
 			$row = $statement->fetch(PDO::FETCH_ASSOC);
 			$target = getTrustedClientIP($row['ip'], $row['forwardedip']);
 			$type = "IP";
-		}
-		elseif (isset($_GET['email'])) {
+		} elseif (isset($_GET['email'])) {
 			$query = "SELECT email FROM request WHERE id = :ip;";
 			$statement = $database->prepare($query);
 			$statement->bindValue(":ip", $_GET['email']);
@@ -944,8 +915,7 @@ 
 			$row = $statement->fetch(PDO::FETCH_ASSOC);
 			$target = $row['email'];
 			$type = "EMail";
-		}
-		elseif (isset($_GET['name'])) {
+		} elseif (isset($_GET['name'])) {
 			$query = "SELECT name FROM request WHERE id = :ip;";
 			$statement = $database->prepare($query);
 			$statement->bindValue(":ip", $_GET['name']);
@@ -953,8 +923,7 @@ 
 			$row = $statement->fetch(PDO::FETCH_ASSOC);
 			$target = $row['name'];
 			$type = "Name";
-		}
-		else {
+		} else {
 			BootstrapSkin::displayAlertBox("Unknown ban type.", "alert-error");
 			BootstrapSkin::displayInternalFooter();
 			die();    
@@ -969,8 +938,7 @@ 
 		$smarty->assign("bantype", $type);
 		$smarty->assign("bantarget", trim($target));
 		$smarty->display("bans/banform.tpl");
-	}
-	else {
+	} else {
 		$bans = Ban::getActiveBans();
   
 		$smarty->assign("activebans", $bans);
@@ -979,8 +947,7 @@ 
     
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "defer" && $_GET['id'] != "" && $_GET['sum'] != "") {
+} elseif ($action == "defer" && $_GET['id'] != "" && $_GET['sum'] != "") {
 	global $availableRequestStates;
 	
 	if (array_key_exists($_GET['target'], $availableRequestStates)) {
@@ -1061,14 +1028,12 @@ 
 		});
         
 		die();
-	}
-	else {
+	} else {
 		BootstrapSkin::displayAlertBox("Defer target not valid.", "alert-error", "Error", true, false);
 		BootstrapSkin::displayInternalFooter();
 		die();
 	}
-}
-elseif ($action == "prefs") {
+} elseif ($action == "prefs") {
 	global $smarty, $enforceOAuth;
     
 	if (isset ($_POST['sig'])) {
@@ -1082,8 +1047,7 @@ 
             
 			if ($mailisvalid === false) {
 				BootstrapSkin::displayAlertBox("Invalid email address", "alert-error", "Error!");
-			}
-			else {
+			} else {
 				$user->setEmail(trim($_POST['email']));
 			}
 		}
@@ -1104,20 +1068,17 @@ 
 	$smarty->display("prefs.tpl");
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "done" && $_GET['id'] != "") {
+} elseif ($action == "done" && $_GET['id'] != "") {
 	// check for valid close reasons
 	global $messages, $baseurl, $smarty;
 	
 	if (isset($_GET['email'])) {
 		if ($_GET['email'] == 0 || $_GET['email'] == "custom") {
 			$validEmail = true;
-		}
-		else {
+		} else {
 			$validEmail = EmailTemplate::getById($_GET['email'], gGetDb()) != false;
 		}
-	}
-	else {
+	} else {
 		$validEmail = false;
 	}
     
@@ -1183,8 +1144,7 @@ 
 	$ue = unserialize($userexist);
 	if (!isset ($ue['query']['users']['0']['missing'])) {
 		$exists = true;
-	}
-	else {
+	} else {
 		$exists = false;
 	}
 
@@ -1226,8 +1186,7 @@ 
 				$preloadTitle = $template->getName();
 				$preloadText = $template->getText();
 				$preloadAction = $template->getDefaultAction();
-			}
-			else {
+			} else {
 				$preloadText = "";
 				$preloadTitle = "";
 				$preloadAction = "";
@@ -1265,8 +1224,7 @@ 
 		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);
-		}
-		else {
+		} else {
 			mail($request->getEmail(), "RE: [ACC #{$request->getId()}] English Wikipedia Account Request", $_POST['msgbody'], $headers);
 		}
 
@@ -1279,8 +1237,7 @@ 
 			if ($_POST['action'] == EmailTemplate::CREATED) {
 				$gem  = 'custom-y';
 				$crea = "Custom, Created";
-			}
-			else {
+			} else {
 				$gem  = 'custom-n';
 				$crea = "Custom, Not Created";
 			}
@@ -1291,8 +1248,7 @@ 
 			BootstrapSkin::displayAlertBox(
 				"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") {
+		} else if ($_POST['action'] == "mail") {
 			// no action other than send mail!
 			Logger::sentMail(gGetDb(), $request, $messageBody);
 			Logger::unreserve(gGetDb(), $request);
@@ -1300,8 +1256,7 @@ 
 			Notification::sentMail($request);
 			BootstrapSkin::displayAlertBox("Sent mail to Request {$request->getId()}", 
 				"alert-success");
-		}
-		else if (array_key_exists($_POST['action'], $availableRequestStates)) {
+		} else if (array_key_exists($_POST['action'], $availableRequestStates)) {
 			// Defer
 
 			$request->setStatus($_POST['action']);
@@ -1314,8 +1269,7 @@ 
 			Notification::requestDeferredWithMail($request);
 			BootstrapSkin::displayAlertBox("Request {$request->getId()} deferred to $deto, sending an email.", 
 				"alert-success");
-		}
-		else {
+		} else {
 			// hmm. not sure what happened. Log that we sent the mail anyway.
 			Logger::sentMail(gGetDb(), $request, $messageBody);
 			Logger::unreserve(gGetDb(), $request);
@@ -1334,8 +1288,7 @@ 
 		echo defaultpage();
 		BootstrapSkin::displayInternalFooter();
 		die();		
-	}
-	else {
+	} else {
 		// Not a custom close, just a normal close
 	    
 		$request->setStatus('Closed');
@@ -1348,8 +1301,7 @@ 
 		
 		if ($gem == '0') {
 			$crea = "Dropped";
-		}
-		else {
+		} else {
 			$template = EmailTemplate::getById($gem, gGetDb());
 			$crea = $template->getName();
 		}
@@ -1370,8 +1322,7 @@ 
 		BootstrapSkin::displayInternalFooter();
 		die();
 	}
-}
-elseif ($action == "zoom") {
+} elseif ($action == "zoom") {
 	if (!isset($_GET['id'])) {
 		BootstrapSkin::displayAlertBox("No request specified!", "alert-error", "Error!", true, false);
 		BootstrapSkin::displayInternalFooter();
@@ -1380,8 +1331,7 @@ 
     
 	if (isset($_GET['hash'])) {
 		$urlhash = $_GET['hash'];
-	}
-	else {
+	} else {
 		$urlhash = "";
 	}
 	echo zoomPage($_GET['id'], $urlhash);
@@ -1389,8 +1339,7 @@ 
 	$tailscript = getTypeaheadSource(User::getAllUsernames(gGetDb()));
 	BootstrapSkin::displayInternalFooter($tailscript);
 	die();
-}
-elseif ($action == "logs") {
+} elseif ($action == "logs") {
 	global $baseurl;
 	
 	$filterUser = isset($_GET['filterUser']) && $_GET['filterUser'] != "" ? $_GET['filterUser'] : false;
@@ -1438,11 +1387,9 @@ 
 	if ($pageCount < $pageLimit) {
 		if ($pageData['lowpage'] == 1 && $pageData['hipage'] == $pageData['maxpage']) {
 			// nothing to do, we're already at max range.	
-		}
-		elseif ($pageData['lowpage'] == 1 && $pageData['hipage'] < $pageData['maxpage']) {
+		} elseif ($pageData['lowpage'] == 1 && $pageData['hipage'] < $pageData['maxpage']) {
 			$pageData['hipage'] = min($pageLimit, $pageData['maxpage']);
-		}
-		elseif ($pageData['lowpage'] > 1 && $pageData['hipage'] == $pageData['maxpage']) {
+		} elseif ($pageData['lowpage'] > 1 && $pageData['hipage'] == $pageData['maxpage']) {
 			$pageData['lowpage'] = max(1, $pageData['maxpage'] - $pageLimit + 1);
 		}
 	}
@@ -1465,8 +1412,7 @@ 
 	
 	BootstrapSkin::displayInternalFooter($tailscript);
 	die();
-}
-elseif ($action == "reserve") {
+} elseif ($action == "reserve") {
 	$database = gGetDb();
     
 	$database->transactionally(function() use ($database)
@@ -1542,8 +1488,7 @@ 
 	});
 	    
 	die();	
-}
-elseif ($action == "breakreserve") {
+} elseif ($action == "breakreserve") {
 	global $smarty;
     
 	$database = gGetDb();
@@ -1585,20 +1530,17 @@ 
 				});
                 
 				die();
-			}
-			else {
+			} else {
 				global $baseurl;
 				$smarty->assign("reservedUser", $reservedUser);
 				$smarty->assign("request", $request);
                 
 				$smarty->display("confirmations/breakreserve.tpl");
 			}
-		}
-		else {
+		} else {
 			echo "You cannot break " . htmlentities($reservedUser->getUsername()) . "'s reservation";
 		}
-	}
-	else {
+	} else {
 		$database->transactionally(function() use ($database, $request)
 		{
 			$request->setReserved(0);
@@ -1615,8 +1557,7 @@ 
     
 	BootstrapSkin::displayInternalFooter();
 	die();		
-}
-elseif ($action == "comment") {
+} elseif ($action == "comment") {
 	global $smarty;
     
 	$request = Request::getById($_GET['id'], gGetDb());
@@ -1624,8 +1565,7 @@ 
 	$smarty->display("commentform.tpl");
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "comment-add") {
+} elseif ($action == "comment-add") {
 	global $baseurl, $smarty;
     
 	$request = Request::getById($_POST['id'], gGetDb());
@@ -1670,8 +1610,7 @@ 
     
 	if (isset($_GET['hash'])) {
 		$urlhash = urlencode(htmlentities($_GET['hash']));
-	}
-	else {
+	} else {
 		$urlhash = "";
 	}
 
@@ -1685,8 +1624,7 @@ 
         
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "comment-quick") {
+} elseif ($action == "comment-quick") {
 	$request = Request::getById($_POST['id'], gGetDb());
 	if ($request == false) {
 		BootstrapSkin::displayAlertBox("Could not find request!", "alert-error", "Error", true, false);
@@ -1729,8 +1667,7 @@ 
 	Notification::commentCreated($comment);
     
 	header("Location: acc.php?action=zoom&id=" . $request->getId());
-}
-elseif ($action == "changepassword") {
+} elseif ($action == "changepassword") {
 	if ((!isset($_POST['oldpassword'])) || $_POST['oldpassword'] == "") {
 		//Throw an error if old password is not specified.
 		BootstrapSkin::displayAlertBox("You did not enter your old password.", "alert-error", "Error", true, false);
@@ -1767,8 +1704,7 @@ 
 	BootstrapSkin::displayAlertBox("Password successfully changed!", "alert-success", "", false, false);
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "ec") {
+} elseif ($action == "ec") {
 	// edit comment
   
 	global $smarty, $baseurl;
@@ -1810,15 +1746,13 @@ 
 		});
         
 		die();    
-	}
-	else {
+	} else {
 		$smarty->assign("comment", $comment);
 		$smarty->display("edit-comment.tpl");
 		BootstrapSkin::displayInternalFooter();
 		die();
 	}
-}
-elseif ($action == "sendtouser") {
+} elseif ($action == "sendtouser") {
 	global $baseurl;
     
 	$database = gGetDb();
@@ -1857,8 +1791,7 @@ 
 	Notification::requestReservationSent($requestObject, $user);
 	SessionAlert::success("Reservation sent successfully");
 	header("Location: $baseurl/acc.php?action=zoom&id=$request");
-}
-elseif ($action == "emailmgmt") {
+} elseif ($action == "emailmgmt") {
 	global $smarty, $createdid, $availableRequestStates;
     
 	/* New page for managing Emails, since I would rather not be handling editing
@@ -1935,8 +1868,7 @@ 
 				$emailTemplate->setDefaultAction(EmailTemplate::CREATED);
 				$emailTemplate->setActive(1);
 				$emailTemplate->setPreloadOnly(0);
-			}
-			else {
+			} else {
 				$emailTemplate->setDefaultAction($_POST['defaultaction']);
 				$emailTemplate->setActive(isset($_POST['active']));
 				$emailTemplate->setPreloadOnly(isset($_POST['preloadonly']));
@@ -1991,16 +1923,14 @@ 
  
 	if (count($inactiverows) > 0) {
 		$smarty->assign('displayinactive', true);
-	}
-	else {
+	} else {
 		$smarty->assign('displayinactive', false);
 	}
     
 	$smarty->display("email-management/main.tpl");
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "oauthdetach") {
+} elseif ($action == "oauthdetach") {
 	if ($enforceOAuth) {
 		BootstrapSkin::displayAccessDenied();
 		BootstrapSkin::displayInternalFooter();
@@ -2013,8 +1943,7 @@ 
 	$currentUser->detachAccount();
         
 	header("Location: {$baseurl}/acc.php?action=logout");
-}
-elseif ($action == "oauthattach") {
+} elseif ($action == "oauthattach") {
 	$database = gGetDb();
 	$database->transactionally(function() use ($database)
 	{
@@ -2041,8 +1970,7 @@ 
 			throw new TransactionException($ex->getMessage(), "Connection to Wikipedia failed.", "alert-error", 0, $ex);
 		}
 	});
-}
-elseif ($action == "listall") {
+} elseif ($action == "listall") {
     global $availableRequestStates, $enableEmailConfirm;
 
 	if (isset($_GET['status']) && isset($availableRequestStates[$_GET['status']])) {

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

RecreateTrustedIPs.php

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
 	$hashPos = strpos($rawline, '#');
 	if ($hashPos !== false) {
 		$line = substr($rawline, 0, $hashPos);
-	}
-	else {
+	} else {
 		$line = $rawline;
 	}
     

includes/session.php

Braces +5 added lines, -10 removed lines

@@ -69,8 +69,7 @@ 
 
 					reattachOAuthAccount(User::getCurrent());
 				}
-			}
-			else {
+			} else {
 				global $enforceOAuth;
 
 				if ($enforceOAuth) {
@@ -83,8 +82,7 @@ 
 			BootstrapSkin::displayAlertBox("I'm sorry, but, your account has not been approved by a site administrator yet. Please stand by.", "alert-error", "New account", true, false);
 			BootstrapSkin::displayInternalFooter();
 			die();
-		}
-		elseif (User::getCurrent()->isSuspended()) {
+		} elseif (User::getCurrent()->isSuspended()) {
 			$database = gGetDb();
 			$suspendstatement = $database->prepare(<<<SQL
 SELECT comment 
@@ -105,8 +103,7 @@ 
 			$smarty->display("login/suspended.tpl");
 			BootstrapSkin::displayInternalFooter();
 			die();
-		}
-		elseif (User::getCurrent()->isDeclined()) {
+		} elseif (User::getCurrent()->isDeclined()) {
 			$database = gGetDb();
 			$suspendstatement = $database->prepare(<<<SQL
 SELECT comment
@@ -127,11 +124,9 @@ 
 			$smarty->display("login/declined.tpl");
 			BootstrapSkin::displayInternalFooter();
 			die();
-		}
-		elseif ((!User::getCurrent()->isCommunityUser()) && (User::getCurrent()->isUser() || User::getCurrent()->isAdmin())) {
+		} elseif ((!User::getCurrent()->isCommunityUser()) && (User::getCurrent()->isUser() || User::getCurrent()->isAdmin())) {
 			$secure = 1;
-		}
-		else {
+		} else {
 			//die("Not logged in!");
 		}
 	}

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

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