smrealms / smr

src/admin/Default/1.6/game_edit_processing.php

Spacing +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 // Get the dates ("|" sets hr/min/sec to 0)
 $join = DateTime::createFromFormat('d/m/Y|', Request::get('game_join'));
-$start = empty(Request::get('game_start')) ? $join :
-         DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
+$start = empty(Request::get('game_start')) ? $join : DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
 $end = DateTime::createFromFormat('d/m/Y|', Request::get('game_end'));
 
 $game = SmrGame::getGame($var['game_id']);

src/engine/Default/hall_of_fame_player_detail.php

Spacing +2 added lines, -2 removed lines

@@ -20,13 +20,13 @@
 const USER_SCORE_NAME = 'User Score';
 $hofTypes = array(DONATION_NAME=>true, USER_SCORE_NAME=>true);
 while ($db->nextRecord()) {
-	$hof =& $hofTypes;
+	$hof = & $hofTypes;
 	$typeList = explode(':', $db->getField('type'));
 	foreach ($typeList as $type) {
 		if (!isset($hof[$type])) {
 			$hof[$type] = array();
 		}
-		$hof =& $hof[$type];
+		$hof = & $hof[$type];
 	}
 	$hof = true;
 }

src/engine/Default/chat_sharing.php

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)->getHofDisplayName() :
-		                 $otherPlayer->getDisplayName(),
+		                 '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() : $otherPlayer->getDisplayName(),
 		'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)->getHofDisplayName() :
-		                 $otherPlayer->getDisplayName(),
+		                 '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() : $otherPlayer->getDisplayName(),
 		'All Games'   => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>',
 		'Game ID'     => $gameId,
 	);

src/engine/Default/hall_of_fame_new.php

Spacing +2 added lines, -2 removed lines

@@ -20,13 +20,13 @@
 const USER_SCORE_NAME = 'User Score';
 $hofTypes = array(DONATION_NAME=>true, USER_SCORE_NAME=>true);
 while ($db->nextRecord()) {
-	$hof =& $hofTypes;
+	$hof = & $hofTypes;
 	$typeList = explode(':', $db->getField('type'));
 	foreach ($typeList as $type) {
 		if (!isset($hof[$type])) {
 			$hof[$type] = array();
 		}
-		$hof =& $hof[$type];
+		$hof = & $hof[$type];
 	}
 	$hof = true;
 }

src/engine/Default/message_view.php

Spacing +1 added lines, -1 removed lines

@@ -202,7 +202,7 @@
 					AND receiver_delete = ' . $db->escapeBoolean(false) . '
 					ORDER BY send_time DESC');
 	while ($db->nextRecord()) {
-		$groupBox =& $messageBox['GroupedMessages'][$db->getInt('sender_id')];
+		$groupBox = & $messageBox['GroupedMessages'][$db->getInt('sender_id')];
 		// Limit the number of messages in each group
 		if (!isset($groupBox['Messages']) || count($groupBox['Messages']) < MESSAGE_SCOUT_GROUP_LIMIT) {
 			displayMessage($groupBox, $db->getInt('message_id'), $db->getInt('account_id'), $db->getInt('sender_id'), stripslashes($db->getField('message_text')), $db->getInt('send_time'), $db->getBoolean('msg_read'), MSG_SCOUT);

src/tools/npc/npc.php

Spacing +8 added lines, -8 removed lines

@@ -119,7 +119,7 @@ 
 		}
 
 		try {
-			$TRADE_ROUTE =& $GLOBALS['TRADE_ROUTE'];
+			$TRADE_ROUTE = & $GLOBALS['TRADE_ROUTE'];
 			debug('Action #' . $actions);
 
 			//We have to reload player on each loop
@@ -138,14 +138,14 @@ 
 			}
 
 			if (!isset($TRADE_ROUTE)) { //We only want to change trade route if there isn't already one set.
-				$TRADE_ROUTES =& findRoutes($player);
-				$TRADE_ROUTE =& changeRoute($TRADE_ROUTES);
+				$TRADE_ROUTES = & findRoutes($player);
+				$TRADE_ROUTE = & changeRoute($TRADE_ROUTES);
 			}
 
 			if ($player->isDead()) {
 				debug('Some evil person killed us, let\'s move on now.');
 				$previousContainer = null; //We died, we don't care what we were doing beforehand.
-				$TRADE_ROUTE =& changeRoute($TRADE_ROUTES); //Change route
+				$TRADE_ROUTE = & changeRoute($TRADE_ROUTES); //Change route
 				processContainer(create_container('death_processing.php'));
 			}
 			if ($player->getNewbieTurns() <= NEWBIE_TURNS_WARNING_LIMIT && $player->getNewbieWarning()) {
@@ -227,7 +227,7 @@ 
 								processContainer(tradeGoods($goodID, $player, $port));
 							} else {
 								//Move to next route or fed.
-								if (($TRADE_ROUTE =& changeRoute($TRADE_ROUTES)) === false) {
+								if (($TRADE_ROUTE = & changeRoute($TRADE_ROUTES)) === false) {
 									debug('Changing Route Failed');
 									processContainer(plotToFed($player));
 								} else {
@@ -254,7 +254,7 @@ 
 							processContainer(tradeGoods($goodID, $player, $port));
 						} else {
 							//Move to next route or fed.
-							if (($TRADE_ROUTE =& changeRoute($TRADE_ROUTES)) === false) {
+							if (($TRADE_ROUTE = & changeRoute($TRADE_ROUTES)) === false) {
 								debug('Changing Route Failed');
 								processContainer(plotToFed($player));
 							} else {
@@ -586,9 +586,9 @@ 
 		return $false;
 	}
 	$routeKey = array_rand($tradeRoutes);
-	$tradeRoute =& $tradeRoutes[$routeKey];
+	$tradeRoute = & $tradeRoutes[$routeKey];
 	unset($tradeRoutes[$routeKey]);
-	$GLOBALS['TRADE_ROUTE'] =& $tradeRoute;
+	$GLOBALS['TRADE_ROUTE'] = & $tradeRoute;
 	debug('Switched route', $tradeRoute);
 	return $tradeRoute;
 }

src/tools/discord/GameLink.class.php

Spacing +4 added lines, -4 removed lines

@@ -3,10 +3,10 @@
 // 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 $account;        // SmrAccount instance
-	public $alliance;       // SmrAlliance instance
-	public $player;         // SmrPlayer instance
+	public $valid = false; // identifies if the message is linked to game data
+	public $account; // SmrAccount instance
+	public $alliance; // SmrAlliance instance
+	public $player; // SmrPlayer instance
 
 	// $author can be either Discord\Parts\User\{User,Member}
 	function __construct(Discord\Parts\Channel\Channel $channel, $author) {

src/admin/Default/1.6/game_create_processing.php

Spacing +1 added lines, -2 removed lines

@@ -18,8 +18,7 @@
 if ($join === false) {
 	create_error('Join Date is not valid!');
 }
-$start = empty(Request::get('game_start')) ? $join :
-         DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
+$start = empty(Request::get('game_start')) ? $join : DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
 if ($start === false) {
 	create_error('Start Date is not valid!');
 }

src/tools/npc/chess.php

Spacing +3 added lines, -3 removed lines

@@ -19,8 +19,8 @@ 
 		1 => array("pipe", "w")  // stdout is a pipe that the child will write to
 	);
 	$engine = proc_open(UCI_CHESS_ENGINE, $descriptorSpec, $pipes);
-	$toEngine =& $pipes[0];
-	$fromEngine =& $pipes[1];
+	$toEngine = & $pipes[0];
+	$fromEngine = & $pipes[1];
 
 	function readFromEngine($block = true) {
 		global $fromEngine;
@@ -84,5 +84,5 @@ 
 function debug($message, $debugObject = null) {
 	global $account, $var, $db;
 	echo date('Y-m-d H:i:s - ') . $message . ($debugObject !== null ? EOL . var_export($debugObject, true) : '') . EOL;
-	$db->query('INSERT INTO npc_logs (script_id, npc_id, time, message, debug_info, var) VALUES (' . (defined('SCRIPT_ID') ? SCRIPT_ID : 0) . ', ' . (is_object($account) ? $account->getAccountID() : 0) . ',NOW(),' . $db->escapeString($message) . ',' . $db->escapeString(var_export($debugObject,true)) . ',' . $db->escapeString(var_export($var, true)) . ')');
+	$db->query('INSERT INTO npc_logs (script_id, npc_id, time, message, debug_info, var) VALUES (' . (defined('SCRIPT_ID') ? SCRIPT_ID : 0) . ', ' . (is_object($account) ? $account->getAccountID() : 0) . ',NOW(),' . $db->escapeString($message) . ',' . $db->escapeString(var_export($debugObject, true)) . ',' . $db->escapeString(var_export($var, true)) . ')');
 }