smrealms / smr

htdocs/login_processing.php

Indentation +2 added lines, -2 removed lines

@@ -88,7 +88,7 @@ 
 			exit;
 		}
 		$account->addAuthMethod($_SESSION['socialLogin']->getLoginType(),
-		                        $_SESSION['socialLogin']->getUserID());
+								$_SESSION['socialLogin']->getUserID());
 		session_destroy();
 	}
 
@@ -113,7 +113,7 @@ 
 		// save session (incase we forward)
 		SmrSession::update();
 		if (($disabled['Reason'] != CLOSE_ACCOUNT_INVALID_EMAIL_REASON) &&
-		    ($disabled['Reason'] != CLOSE_ACCOUNT_BY_REQUEST_REASON)) {
+			($disabled['Reason'] != CLOSE_ACCOUNT_BY_REQUEST_REASON)) {
 			forward(create_container('disabled.php'));
 		}
 	}

htdocs/loader.php

Indentation +9 added lines, -9 removed lines

@@ -4,16 +4,16 @@
 	
 	
 	if (get_magic_quotes_gpc()) {
-	    function stripslashes_array($array)
-	    {
-	        return is_array($array) ? array_map('stripslashes_array', $array) : stripslashes($array);
-	    }
+		function stripslashes_array($array)
+		{
+			return is_array($array) ? array_map('stripslashes_array', $array) : stripslashes($array);
+		}
 	
-	    $_COOKIE = stripslashes_array($_COOKIE);
-	    $_FILES = stripslashes_array($_FILES);
-	    $_GET = stripslashes_array($_GET);
-	    $_POST = stripslashes_array($_POST);
-	    $_REQUEST = stripslashes_array($_REQUEST);
+		$_COOKIE = stripslashes_array($_COOKIE);
+		$_FILES = stripslashes_array($_FILES);
+		$_GET = stripslashes_array($_GET);
+		$_POST = stripslashes_array($_POST);
+		$_REQUEST = stripslashes_array($_REQUEST);
 	}
 	
 	header('Cache-Control: no-cache, must-revalidate');

tools/discord/commands/turns.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 function get_turns_message($player) {
 	// turns only update when the player is active, so calculate current turns
 	$turns = min($player->getTurns() + $player->getTurnsGained(time(), true),
-	             $player->getMaxTurns());
+				 $player->getMaxTurns());
 	$msg = $player->getPlayerName() . " has $turns/" . $player->getMaxTurns() . " turns.";
 
 	// Calculate time to max turns if under the max

tools/discord/GameLink.inc

Spacing +6 added lines, -6 removed lines

@@ -3,11 +3,11 @@ 
 // Holds information linking the received message and the game data
 class GameLink
 {
-	public $valid = false;  // identifies if the message is linked to game data
-	public $user;           // Discord user associated with the message
-	public $account;        // SmrAccount instance
-	public $alliance;       // SmrAlliance instance
-	public $player;         // SmrPlayer instance
+	public $valid = false; // identifies if the message is linked to game data
+	public $user; // Discord user associated with the message
+	public $account; // SmrAccount instance
+	public $alliance; // SmrAlliance instance
+	public $player; // SmrPlayer instance
 
 	// Takes the following arguments:
 	//	channel = Discord\Parts\Channel\Channel instance
@@ -60,7 +60,7 @@ 
 
 			$this->player = SmrPlayer::getPlayer($this->account->getAccountID(), $this->alliance->getGameID(), true);
 			if ($this->player->getAllianceID() != $this->alliance->getAllianceID()) {
-				$channel->sendMessage("Player `".$this->player->getPlayerName()."` is not a member of alliance `".$this->alliance->getAllianceName()."`");
+				$channel->sendMessage("Player `" . $this->player->getPlayerName() . "` is not a member of alliance `" . $this->alliance->getAllianceName() . "`");
 				return;
 			}
 		}

tools/chat_helpers/channel_msg_op_turns.php

Indentation +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 			continue;
 		}
 		$turns = min($attendeePlayer->getTurns() + $attendeePlayer->getTurnsGained(time(), true),
-		             $attendeePlayer->getMaxTurns());
+					 $attendeePlayer->getMaxTurns());
 		$oppers[$attendeePlayer->getPlayerName()] = $turns;
 	}
 

tools/reserializeCombatLogs.php

Spacing +2 added lines, -2 removed lines

@@ -21,6 +21,6 @@
 //}
 
 $db->query('SELECT result,log_id FROM combat_logs');
-while($db->nextRecord()) {
-	$db2->query('UPDATE combat_logs SET result='.$db2->escapeBinary(gzcompress(serialize(unserialize(gzuncompress($db->getField('result')))))).' WHERE log_id='.$db->getField('log_id'));
+while ($db->nextRecord()) {
+	$db2->query('UPDATE combat_logs SET result=' . $db2->escapeBinary(gzcompress(serialize(unserialize(gzuncompress($db->getField('result')))))) . ' WHERE log_id=' . $db->getField('log_id'));
 }

tools/irc/irc.php

Indentation +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
 
 			safefputs($fp, 'NICKSERV IDENTIFY ' . IRC_BOT_PASS . EOL);
 
-            sleep(5);
+			sleep(5);
 
 			// join our public channel
 			if (!IRC_DEBUGGING) {

engine/Default/rankings_alliance_vs_alliance.php

Indentation +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	foreach ($alliance_vs_ids as $id) {
 		$row_alliance = SmrAlliance::getAlliance($id, $player->getGameID());
 		$showRed = (!$curr_alliance->isNone() && $curr_alliance->hasDisbanded()) ||
-		           (!$row_alliance->isNone() && $row_alliance->hasDisbanded());
+				   (!$row_alliance->isNone() && $row_alliance->hasDisbanded());
 		$showBold = $curr_id == $player->getAllianceID() || $id == $player->getAllianceID();
 		$style = '';
 		if ($curr_id == $id && !$row_alliance->isNone()) {

engine/Default/chat_sharing.php

Indentation +4 added lines, -4 removed lines

@@ -19,8 +19,8 @@ 
 	$shareFrom[$fromAccountId] = array(
 		'Player ID'   => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(),
 		'Player Name' => $otherPlayer == null ?
-		                 '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofName() :
-		                 $otherPlayer->getPlayerName(),
+						 '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofName() :
+						 $otherPlayer->getPlayerName(),
 		'All Games'   => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>',
 		'Game ID'     => $gameId,
 	);
@@ -40,8 +40,8 @@ 
 	$shareTo[$toAccountId] = array(
 		'Player ID'   => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(),
 		'Player Name' => $otherPlayer == null ?
-		                 '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofName() :
-		                 $otherPlayer->getPlayerName(),
+						 '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofName() :
+						 $otherPlayer->getPlayerName(),
 		'All Games'   => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>',
 		'Game ID'     => $gameId,
 	);

Spacing +2 added lines, -4 removed lines

@@ -19,8 +19,7 @@ 
 	$shareFrom[$fromAccountId] = array(
 		'Player ID'   => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(),
 		'Player Name' => $otherPlayer == null ?
-		                 '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofName() :
-		                 $otherPlayer->getPlayerName(),
+		                 '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofName() : $otherPlayer->getPlayerName(),
 		'All Games'   => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>',
 		'Game ID'     => $gameId,
 	);
@@ -40,8 +39,7 @@ 
 	$shareTo[$toAccountId] = array(
 		'Player ID'   => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(),
 		'Player Name' => $otherPlayer == null ?
-		                 '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofName() :
-		                 $otherPlayer->getPlayerName(),
+		                 '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofName() : $otherPlayer->getPlayerName(),
 		'All Games'   => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>',
 		'Game ID'     => $gameId,
 	);