smrealms / smr

src/tools/npc/npc.php

Spacing +8 added lines, -8 removed lines

@@ -116,7 +116,7 @@ 
 		}
 
 		try {
-			$TRADE_ROUTE =& $GLOBALS['TRADE_ROUTE'];
+			$TRADE_ROUTE = & $GLOBALS['TRADE_ROUTE'];
 			debug('Action #' . $actions);
 
 			//We have to reload player on each loop
@@ -140,14 +140,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(Page::create('death_processing.php'));
 			}
 			if ($player->getNewbieTurns() <= NEWBIE_TURNS_WARNING_LIMIT && $player->getNewbieWarning()) {
@@ -223,7 +223,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 {
@@ -250,7 +250,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 {
@@ -582,9 +582,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/lib/Default/smr.inc.php

Braces +3 added lines, -2 removed lines

@@ -375,8 +375,9 @@
 
 		if (!$player->isDead() && $player->getNewbieTurns() <= NEWBIE_TURNS_WARNING_LIMIT &&
 			$player->getNewbieWarning() &&
-			$var['url'] != 'newbie_warning_processing.php')
-			Page::create('newbie_warning_processing.php')->go();
+			$var['url'] != 'newbie_warning_processing.php') {
+					Page::create('newbie_warning_processing.php')->go();
+		}
 	}
 
 	// Initialize the template

src/admin/Default/1.6/universe_create_planets.php

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 
 // Form to make planet changes
 $container = Page::create('1.6/universe_create_save_processing.php',
-                              '1.6/universe_create_sectors.php', $var);
+							  '1.6/universe_create_sectors.php', $var);
 $template->assign('CreatePlanetsFormHREF', $container->href());
 
 // HREF to cancel and return to the previous page

src/admin/Default/1.6/universe_create_locations.php

Indentation +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 
 // Form to make location changes
 $container = Page::create('1.6/universe_create_save_processing.php',
-                              '1.6/universe_create_sectors.php', $var);
+							  '1.6/universe_create_sectors.php', $var);
 $template->assign('CreateLocationsFormHREF', $container->href());
 
 // HREF to cancel and return to the previous page

src/admin/Default/enable_game_processing.php

Indentation +1 added lines, -1 removed lines

@@ -7,4 +7,4 @@
 $msg = '<span class="green">SUCCESS: </span>Enabled game ' . $game->getDisplayName();
 
 Page::create('skeleton.php', 'enable_game.php',
-             array('processing_msg' => $msg))->go();
+			 array('processing_msg' => $msg))->go();

src/lib/Default/AbstractMenu.class.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 		$menuItems[] = array('Link'=>Globals::getPlanetListHREF($alliance_id), 'Text'=>'Defense');
 		$menuItems[] = array('Link'=>Globals::getPlanetListFinancialHREF($alliance_id), 'Text'=>'Financial');
 		// make the selected index bold
-		$boldItem =& $menuItems[$selected_index]['Text'];
+		$boldItem = & $menuItems[$selected_index]['Text'];
 		$boldItem = '<span class="bold">' . $boldItem . '</span>';
 
 		$template = Smr\Template::getInstance();
@@ -146,7 +146,7 @@ 
 			'Text' => 'Game News',
 		];
 		// make the selected index bold
-		$boldItem =& $menuItems[$selected_index]['Text'];
+		$boldItem = & $menuItems[$selected_index]['Text'];
 		$boldItem = '<b>' . $boldItem . '</b>';
 
 		$template = Smr\Template::getInstance();

src/lib/Default/Page.class.php

Spacing +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
 
 		// transfer this value to next container
 		if (!isset($var[$source])) {
-			throw new Exception('Could not find "' . $source. '" in var!');
+			throw new Exception('Could not find "' . $source . '" in var!');
 		}
 		if ($dest === null) {
 			$dest = $source;

src/lib/Default/hof.inc.php

Indentation +3 added lines, -3 removed lines

@@ -55,9 +55,9 @@
 	$session = Smr\Session::getInstance();
 	$account = $session->getAccount();
 	if (($vis == HOF_PRIVATE && $account->getAccountID() != $accountID) ||
-	    ($vis == HOF_ALLIANCE && isset($gameID) &&
-	     !SmrGame::getGame($gameID)->hasEnded() &&
-	     !SmrPlayer::getPlayer($accountID, $gameID)->sameAlliance($session->getPlayer())))
+		($vis == HOF_ALLIANCE && isset($gameID) &&
+		 !SmrGame::getGame($gameID)->hasEnded() &&
+		 !SmrPlayer::getPlayer($accountID, $gameID)->sameAlliance($session->getPlayer())))
 	{
 		return '-';
 	} else {

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) {
 	echo date('Y-m-d H:i:s - ') . $message . ($debugObject !== null ? EOL . var_export($debugObject, true) : '') . EOL;
 	$db = Smr\Database::getInstance();
-	$db->query('INSERT INTO npc_logs (script_id, npc_id, time, message, debug_info, var) VALUES (' . (defined('SCRIPT_ID') ? SCRIPT_ID : 0) . ', 0, NOW(),' . $db->escapeString($message) . ',' . $db->escapeString(var_export($debugObject,true)) . ',' . $db->escapeString('') . ')');
+	$db->query('INSERT INTO npc_logs (script_id, npc_id, time, message, debug_info, var) VALUES (' . (defined('SCRIPT_ID') ? SCRIPT_ID : 0) . ', 0, NOW(),' . $db->escapeString($message) . ',' . $db->escapeString(var_export($debugObject, true)) . ',' . $db->escapeString('') . ')');
 }