Reformat SQL statements and add "order by" to selects

Author: max-m

file/acp/be.bastelstu.max.wcf.otu.install.php

@@ -15,12 +15,10 @@
 if (!defined('OTU_BLACKLIST_LIFETIME')) define('OTU_BLACKLIST_LIFETIME', 182);
 
 // We don't check for "lastUsernameChange > 0", if this isn't set (how ever this may happen) TIME_NOW will be used.
-$sql = "SELECT
-		oldUsername, lastUsernameChange
-	FROM
-		wcf".WCF_N."_user
-	WHERE
-		oldUsername <> ?";
+$sql = "SELECT	oldUsername, lastUsernameChange
+	FROM	wcf".WCF_N."_user
+	WHERE	oldUsername <> ?
+	ORDER	BY oldUsername ASC";
 $stmt = \wcf\system\WCF::getDB()->prepareStatement($sql);
 $stmt->execute(array(''));
 $usernames = array();
@@ -30,9 +28,9 @@
 
 // blacklist the usernames that have been used before
 \wcf\system\WCF::getDB()->beginTransaction();
-$sql = "INSERT INTO
-		wcf".WCF_N."_otu_blacklist (username, time)
-	VALUES (?, ?)";
+$sql = "INSERT INTO	wcf".WCF_N."_otu_blacklist
+			(username, time)
+	VALUES		(?, ?)";
 $stmt = \wcf\system\WCF::getDB()->prepareStatement($sql);
 foreach ($usernames as $user) {
 	$stmt->execute(array($user['username'], ($user['time'] > 0) ? $user['time'] : TIME_NOW));

file/lib/system/user/OTUHandler.class.php

@@ -32,17 +32,16 @@ public function blacklistUsernames(array $usernames) {
 		\wcf\system\WCF::getDB()->beginTransaction();
 		$condition = new \wcf\system\database\util\PreparedStatementConditionBuilder();
 		$condition->add('username IN (?)', array($usernames));
-		$sql = "DELETE FROM
-				wcf".WCF_N."_otu_blacklist
+		$sql = "DELETE FROM	wcf".WCF_N."_otu_blacklist
 			".$condition;
 
 		// save username on One-Time Username blacklist
 		$stmt = \wcf\system\WCF::getDB()->prepareStatement($sql);
 		$stmt->execute($condition->getParameters());
 
-		$sql = "INSERT INTO
-				wcf".WCF_N."_otu_blacklist (username, time)
-			VALUES (?, ?)";
+		$sql = "INSERT INTO	wcf".WCF_N."_otu_blacklist
+					(username, time)
+			VALUES		(?, ?)";
 		$stmt = \wcf\system\WCF::getDB()->prepareStatement($sql);
 		foreach ($usernames as $username) {
 			$stmt->execute(array($username, TIME_NOW));
@@ -59,9 +58,8 @@ public function blacklistUsernames(array $usernames) {
 	public function prune() {
 		if (OTU_BLACKLIST_LIFETIME == -1) return;
 
-		$sql = "DELETE FROM
-				wcf".WCF_N."_otu_blacklist
-			WHERE time < ?";
+		$sql = "DELETE FROM	wcf".WCF_N."_otu_blacklist
+			WHERE		time < ?";
 		$stmt = \wcf\system\WCF::getDB()->prepareStatement($sql);
 		$stmt->execute(array(TIME_NOW - OTU_BLACKLIST_LIFETIME * 86400));
 
@@ -87,11 +85,10 @@ public function rebuildOption() {
 		if (OTU_BLACKLIST_LIFETIME > -1) $condition->add('time > ?', array(TIME_NOW - OTU_BLACKLIST_LIFETIME * 86400));
 		else $condition->add('1 = 1');
 
-		$sql = "SELECT
-				username
-			FROM
-				wcf".WCF_N."_otu_blacklist
-			".$condition;
+		$sql = "SELECT	username
+			FROM	wcf".WCF_N."_otu_blacklist
+			".$condition."
+			ORDER	BY username ASC";
 		$stmt = \wcf\system\WCF::getDB()->prepareStatement($sql);
 		$stmt->execute($condition->getParameters());