smrealms / smr

test/SmrTest/lib/DefaultGame/AbstractSmrShipTest.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
 		$ship = new AbstractSmrShip($this->player);
 		$this->expectException(\Exception::class);
 		$this->expectExceptionMessage('Ship does not have the supported hardware!');
-		$ship->setIllusion(SHIP_TYPE_THIEF, 12, 13);;
+		$ship->setIllusion(SHIP_TYPE_THIEF, 12, 13); ;
 	}
 
 	public function test_hardware() {

src/lib/Default/SmrSession.class.php

Spacing +1 added lines, -2 removed lines

@@ -250,8 +250,7 @@
 				} elseif ($value['RemainingPageLoads'] < 0) {
 					//This link is no longer valid
 					unset(self::$var[$key]);
-				} else {
-					--self::$var[$key]['RemainingPageLoads'];
+				} else {--self::$var[$key]['RemainingPageLoads'];
 					if (isset($value['CommonID'])) {
 						self::$commonIDs[$value['CommonID']] = $key;
 					}

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