smrealms / smr

templates/Default/engine/Default/includes/Head.inc

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-<title><?php echo PAGE_TITLE; ?><?php if (isset($GameName)) echo ": $GameName"; ?></title>
+<title><?php echo PAGE_TITLE; ?><?php if (isset($GameName)) {
+	echo ": $GameName";
+}
+?></title>
 <meta http-equiv="pragma" content="no-cache" /><?php
 if (!is_object($ThisAccount) || $ThisAccount->isDefaultCSSEnabled()) { ?>
 	<link rel="stylesheet" type="text/css" href="<?php echo $CSSLink; ?>" />

engine/Default/shop_goods.php

Indentation +3 added lines, -3 removed lines

@@ -50,9 +50,9 @@
 			//get base for ports that dont happen to trade that good
 			$GOODS = Globals::getGoods();
 			$fine = $totalFine = $port->getLevel() *
-			    (($ship->getCargo(GOODS_SLAVES) * $GOODS[GOODS_SLAVES]['BasePrice']) +
-			     ($ship->getCargo(GOODS_WEAPONS) * $GOODS[GOODS_WEAPONS]['BasePrice']) +
-			     ($ship->getCargo(GOODS_NARCOTICS) * $GOODS[GOODS_NARCOTICS]['BasePrice']));
+				(($ship->getCargo(GOODS_SLAVES) * $GOODS[GOODS_SLAVES]['BasePrice']) +
+				 ($ship->getCargo(GOODS_WEAPONS) * $GOODS[GOODS_WEAPONS]['BasePrice']) +
+				 ($ship->getCargo(GOODS_NARCOTICS) * $GOODS[GOODS_NARCOTICS]['BasePrice']));
 			$player->increaseHOF($ship->getCargo(GOODS_SLAVES) + $ship->getCargo(GOODS_WEAPONS) + $ship->getCargo(GOODS_NARCOTICS), array('Trade', 'Search', 'Caught', 'Goods Confiscated'), HOF_PUBLIC);
 			$player->increaseHOF($totalFine, array('Trade', 'Search', 'Caught', 'Amount Fined'), HOF_PUBLIC);
 			$template->assign('TotalFine', $totalFine);

Braces +17 added lines, -15 removed lines

@@ -6,8 +6,9 @@ 
 $port = $player->getSectorPort();
 
 $tradeable = checkPortTradeable($port, $player);
-if ($tradeable !== true)
+if ($tradeable !== true) {
 	create_error($tradeable);
+}
 
 // topic
 $template->assign('PageTopic', 'Port In Sector #' . $player->getSectorID());
@@ -23,17 +24,19 @@ 
 //The player is sent here after trading and sees this if his offer is accepted.
 if (!empty($var['trade_msg'])) {
 	$template->assign('TradeMsg', $var['trade_msg']);
-}
-elseif ($player->getLastPort() != $player->getSectorID()) {
+} elseif ($player->getLastPort() != $player->getSectorID()) {
 	// test if we are searched, but only if we hadn't a previous trade here
 
 	$base_chance = 15;
-	if ($port->hasGood(GOODS_SLAVES))
-		$base_chance -= 4;
-	if ($port->hasGood(GOODS_WEAPONS))
-		$base_chance -= 4;
-	if ($port->hasGood(GOODS_NARCOTICS))
-		$base_chance -= 4;
+	if ($port->hasGood(GOODS_SLAVES)) {
+			$base_chance -= 4;
+	}
+	if ($port->hasGood(GOODS_WEAPONS)) {
+			$base_chance -= 4;
+	}
+	if ($port->hasGood(GOODS_NARCOTICS)) {
+			$base_chance -= 4;
+	}
 
 	if ($ship->isUnderground()) {
 		$base_chance -= 4;
@@ -64,11 +67,11 @@ 
 					// because credits is 0 it will take money from bank
 					$player->decreaseBank(min($fine, $player->getBank()));
 					// leave insurance
-					if ($player->getBank() < 5000)
-						$player->setBank(5000);
+					if ($player->getBank() < 5000) {
+											$player->setBank(5000);
+					}
 				}
-			}
-			else {
+			} else {
 				$player->decreaseCredits($fine);
 			}
 
@@ -80,8 +83,7 @@ 
 			$ship->setCargo(GOODS_NARCOTICS, 0);
 			$account->log(LOG_TYPE_TRADING, 'Player gets caught with illegals', $player->getSectorID());
 
-		}
-		else {
+		} else {
 			$template->assign('IllegalsFound', false);
 			$player->increaseHOF(1, array('Trade', 'Search', 'Times Found Innocent'), HOF_PUBLIC);
 			$player->increaseAlignment(1);

engine/Default/sector_jump_processing.php

Braces +20 added lines, -13 removed lines

@@ -4,8 +4,11 @@ 
 	create_error('You cannot move until the game has started!');
 }
 
-if (isset($_REQUEST['target'])) $target = trim($_REQUEST['target']);
-else $target = $var['target'];
+if (isset($_REQUEST['target'])) {
+	$target = trim($_REQUEST['target']);
+} else {
+	$target = $var['target'];
+}
 
 //allow hidden players (admins that don't play) to move without pinging, hitting mines, losing turns
 if (in_array($player->getAccountID(), Globals::getHiddenPlayers())) {
@@ -20,18 +23,22 @@ 
 }
 
 // you can't move while on planet
-if ($player->isLandedOnPlanet())
+if ($player->isLandedOnPlanet()) {
 	create_error('You are on a planet! You must launch first!');
+}
 
 // if no 'target' is given we forward to plot
-if (empty($target))
+if (empty($target)) {
 	create_error('Where do you want to go today?');
+}
 
-if (!is_numeric($target))
+if (!is_numeric($target)) {
 	create_error('Please enter only numbers!');
+}
 	
-if ($player->getSectorID() == $target)
+if ($player->getSectorID() == $target) {
 	create_error('Hmmmm...if ' . $player->getSectorID() . '=' . $target . ' then that means...YOU\'RE ALREADY THERE! *cough*you\'re real smart*cough*');
+}
 
 if (!SmrSector::sectorExists($player->getGameID(), $target)) {
 	create_error('The target sector doesn\'t exist!');
@@ -60,8 +67,9 @@ 
 $maxMisjump = $jumpInfo['max_misjump'];
 
 // check for turns
-if ($player->getTurns() < $turnsToJump)
+if ($player->getTurns() < $turnsToJump) {
 	create_error('You don\'t have enough turns for that jump!');
+}
 
 // send scout msg
 $sector->leavingSector($player, MOVEMENT_JUMP);
@@ -76,12 +84,12 @@ 
 	}
 		
 	$misjumpSector = array_rand($distances[$misjump]);
-	if ($misjumpSector == null)
-		throw new Exception('Misjump sector is null, distances: ' . var_export($distances, true));
+	if ($misjumpSector == null) {
+			throw new Exception('Misjump sector is null, distances: ' . var_export($distances, true));
+	}
 	$player->setSectorID($misjumpSector);
 	unset($distances);
-}
-else { // we hit it. exactly
+} else { // we hit it. exactly
 	$player->setSectorID($targetSector->getSectorID());
 }
 $player->takeTurns($turnsToJump, $turnsToJump);
@@ -118,8 +126,7 @@ 
 		$container = create_container('skeleton.php', 'current_sector.php');
 		$container['msg'] = 'You have just flown past a sprinkle of mines.<br />Because of your newbie status you have been spared from the harsh reality of the forces.';
 		forward($container);
-	}
-	else {
+	} else {
 		$container = create_container('forces_attack_processing.php');
 		$container['action'] = 'bump';
 		$container['owner_id'] = $mineOwnerID;

admin/Default/location_edit.php

Braces +19 added lines, -14 removed lines

@@ -5,21 +5,27 @@ 
 if (isset($var['location_type_id'])) {
 	$location = SmrLocation::getLocation($var['location_type_id']);
 	if (isset($_REQUEST['save'])) {
-		if ($_REQUEST['add_ship_id'] != 0)
-			$location->addShipSold($_REQUEST['add_ship_id']);
-		if ($_REQUEST['add_weapon_id'] != 0)
-			$location->addWeaponSold($_REQUEST['add_weapon_id']);
-		if ($_REQUEST['add_hardware_id'] != 0)
-			$location->addHardwareSold($_REQUEST['add_hardware_id']);
-		if (isset($_REQUEST['remove_ships']) && is_array($_REQUEST['remove_ships']))
-			foreach ($_REQUEST['remove_ships'] as $shipTypeID)
+		if ($_REQUEST['add_ship_id'] != 0) {
+					$location->addShipSold($_REQUEST['add_ship_id']);
+		}
+		if ($_REQUEST['add_weapon_id'] != 0) {
+					$location->addWeaponSold($_REQUEST['add_weapon_id']);
+		}
+		if ($_REQUEST['add_hardware_id'] != 0) {
+					$location->addHardwareSold($_REQUEST['add_hardware_id']);
+		}
+		if (isset($_REQUEST['remove_ships']) && is_array($_REQUEST['remove_ships'])) {
+					foreach ($_REQUEST['remove_ships'] as $shipTypeID)
 				$location->removeShipSold($shipTypeID);
-		if (isset($_REQUEST['remove_weapons']) && is_array($_REQUEST['remove_weapons']))
-			foreach ($_REQUEST['remove_weapons'] as $weaponTypeID)
+		}
+		if (isset($_REQUEST['remove_weapons']) && is_array($_REQUEST['remove_weapons'])) {
+					foreach ($_REQUEST['remove_weapons'] as $weaponTypeID)
 				$location->removeWeaponSold($weaponTypeID);
-		if (isset($_REQUEST['remove_hardware']) && is_array($_REQUEST['remove_hardware']))
-			foreach ($_REQUEST['remove_hardware'] as $hardwareTypeID)
+		}
+		if (isset($_REQUEST['remove_hardware']) && is_array($_REQUEST['remove_hardware'])) {
+					foreach ($_REQUEST['remove_hardware'] as $hardwareTypeID)
 				$location->removeHardwareSold($hardwareTypeID);
+		}
 
 		$location->setFed(isset($_REQUEST['fed']));
 		$location->setBar(isset($_REQUEST['bar']));
@@ -41,7 +47,6 @@ 
 														'Name' => $db->getField('hardware_name'));
 	}
 	$template->assign('AllHardware', $hardware);
-}
-else {
+} else {
 	$template->assign('Locations', SmrLocation::getAllLocations());
 }

htdocs/map_galaxy.php

Braces +6 added lines, -8 removed lines

@@ -35,8 +35,7 @@ 
 			header('location: /error.php?msg=Invalid sector ID');
 			exit;
 		}
-	}
-	else if (isset($_REQUEST['galaxy_id'])) {
+	} else if (isset($_REQUEST['galaxy_id'])) {
 		$galaxyID = $_REQUEST['galaxy_id'];
 		if (!is_numeric($galaxyID)) {
 			header('location: /error.php?msg=Galaxy ID was not a number.');
@@ -44,8 +43,7 @@ 
 		}
 		try {
 			$galaxy = SmrGalaxy::getGalaxy(SmrSession::getGameID(), $galaxyID);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			header('location: /error.php?msg=Invalid galaxy ID');
 			exit;
 		}
@@ -93,8 +91,9 @@ 
 
 	$template->assign('Title', 'Galaxy Map');
 
-	if ($account->getCssLink() != null)
-		$template->assign('ExtraCSSLink', $account->getCssLink());
+	if ($account->getCssLink() != null) {
+			$template->assign('ExtraCSSLink', $account->getCssLink());
+	}
 	$template->assign('CSSLink', $account->getCssUrl());
 	$template->assign('CSSColourLink', $account->getCssColourUrl());
 	$template->assign('FontSize', $account->getFontSize() - 20);
@@ -110,7 +109,6 @@ 
 	$template->assign('AJAX_ENABLE_REFRESH', false);
 
 	$template->display('GalaxyMap.inc');
-}
-catch (Throwable $e) {
+} catch (Throwable $e) {
 	handleException($e);
 }

engine/Default/forces_drop_processing.php

Braces +52 added lines, -46 removed lines

@@ -125,8 +125,7 @@ 
 	if ($change_combat_drones > 0) {
 		$ship->decreaseCDs($change_combat_drones, true);
 		$forces->addCDs($change_combat_drones);
-	}
-	else {
+	} else {
 		$ship->increaseCDs(-$change_combat_drones, true);
 		$forces->takeCDs(-$change_combat_drones);
 	}
@@ -136,8 +135,7 @@ 
 	if ($change_scout_drones > 0) {
 		$ship->decreaseSDs($change_scout_drones);
 		$forces->addSDs($change_scout_drones);
-	}
-	else {
+	} else {
 		$ship->increaseSDs(-$change_scout_drones);
 		$forces->takeSDs(-$change_scout_drones);
 	}
@@ -151,8 +149,7 @@ 
 			$ship->decloak();
 			$player->giveTurns(1);
 		}
-	}
-	else {
+	} else {
 		$ship->increaseMines(-$change_mines);
 		$forces->takeMines(-$change_mines);
 	}
@@ -161,61 +158,70 @@ 
 // message to send out
 if ($forces->getOwnerID() != $player->getAccountID() && $forces->getOwner()->isForceDropMessages()) {
 	$mines_message = '';
-	if ($change_mines > 0)
-		$mines_message = 'added ' . $change_mines . ' mine';
-	elseif ($change_mines < 0)
-		$mines_message = 'removed ' . abs($change_mines) . ' mine';
+	if ($change_mines > 0) {
+			$mines_message = 'added ' . $change_mines . ' mine';
+	} elseif ($change_mines < 0) {
+			$mines_message = 'removed ' . abs($change_mines) . ' mine';
+	}
 	//add s to mine if necesary
-	if (abs($change_mines) > 1)
-		$mines_message .= 's';
+	if (abs($change_mines) > 1) {
+			$mines_message .= 's';
+	}
 
-	if ($change_combat_drones > 0)
-		$combat_drones_message = ($change_mines <= 0 ? 'added ' : '') . $change_combat_drones . ' combat drone';
-	elseif ($change_combat_drones < 0)
-		$combat_drones_message = ($change_mines >= 0 ? 'removed ' : '') . abs($change_combat_drones) . ' combat drone';
+	if ($change_combat_drones > 0) {
+			$combat_drones_message = ($change_mines <= 0 ? 'added ' : '') . $change_combat_drones . ' combat drone';
+	} elseif ($change_combat_drones < 0) {
+			$combat_drones_message = ($change_mines >= 0 ? 'removed ' : '') . abs($change_combat_drones) . ' combat drone';
+	}
 	//add s to drone if necesary
-	if (abs($change_combat_drones) > 1)
-		$combat_drones_message .= 's';
+	if (abs($change_combat_drones) > 1) {
+			$combat_drones_message .= 's';
+	}
 
 	if ($change_scout_drones > 0) {
 		$scout_drones_message = '';
-		if ((isset($combat_drones_message) && $change_combat_drones < 0) || (!isset($combat_drones_message) && $change_mines <= 0))
-			$scout_drones_message = 'added ';
+		if ((isset($combat_drones_message) && $change_combat_drones < 0) || (!isset($combat_drones_message) && $change_mines <= 0)) {
+					$scout_drones_message = 'added ';
+		}
 		$scout_drones_message .= $change_scout_drones . ' scout drone';
-	}
-	elseif ($change_scout_drones < 0) {
+	} elseif ($change_scout_drones < 0) {
 		$scout_drones_message = '';
-		if ((isset($combat_drones_message) && $change_combat_drones > 0) || (!isset($combat_drones_message) && $change_mines >= 0))
-			$scout_drones_message = 'removed ';
+		if ((isset($combat_drones_message) && $change_combat_drones > 0) || (!isset($combat_drones_message) && $change_mines >= 0)) {
+					$scout_drones_message = 'removed ';
+		}
 		$scout_drones_message .= abs($change_scout_drones) . ' scout drone';
 	}
 	//add s to drone if necesary
-	if (abs($change_scout_drones) > 1)
-		$scout_drones_message .= 's';
+	if (abs($change_scout_drones) > 1) {
+			$scout_drones_message .= 's';
+	}
 
 	// now compile it together
 	$message = $player->getPlayerName() . ' has ' . $mines_message;
 
-	if (!empty($mines_message) && isset($combat_drones_message) && !isset($scout_drones_message))
-		$message .= ' and ' . $combat_drones_message;
-	elseif (!empty($mines_message) && isset($combat_drones_message))
-		$message .= ', ' . $combat_drones_message;
-	elseif (empty($mines_message) && isset($combat_drones_message))
-		$message .= $combat_drones_message;
-
-	if (!empty($mines_message) && isset($combat_drones_message) && isset($scout_drones_message))
-		$message .= ', and ' . $scout_drones_message;
-	elseif ((!empty($mines_message) || isset($combat_drones_message)) && isset($scout_drones_message))
-		$message .= ' and ' . $scout_drones_message;
-	elseif (empty($mines_message) && !isset($combat_drones_message) && isset($scout_drones_message))
-		$message .= $scout_drones_message;
-
-	if ($change_mines >= 0 && $change_combat_drones >= 0 && $change_scout_drones >= 0)
-		$message .= ' to';
-	elseif ($change_mines <= 0 && $change_combat_drones <= 0 && $change_scout_drones <= 0)
-		$message .= ' from';
-	else
-		$message .= ' from/to';
+	if (!empty($mines_message) && isset($combat_drones_message) && !isset($scout_drones_message)) {
+			$message .= ' and ' . $combat_drones_message;
+	} elseif (!empty($mines_message) && isset($combat_drones_message)) {
+			$message .= ', ' . $combat_drones_message;
+	} elseif (empty($mines_message) && isset($combat_drones_message)) {
+			$message .= $combat_drones_message;
+	}
+
+	if (!empty($mines_message) && isset($combat_drones_message) && isset($scout_drones_message)) {
+			$message .= ', and ' . $scout_drones_message;
+	} elseif ((!empty($mines_message) || isset($combat_drones_message)) && isset($scout_drones_message)) {
+			$message .= ' and ' . $scout_drones_message;
+	} elseif (empty($mines_message) && !isset($combat_drones_message) && isset($scout_drones_message)) {
+			$message .= $scout_drones_message;
+	}
+
+	if ($change_mines >= 0 && $change_combat_drones >= 0 && $change_scout_drones >= 0) {
+			$message .= ' to';
+	} elseif ($change_mines <= 0 && $change_combat_drones <= 0 && $change_scout_drones <= 0) {
+			$message .= ' from';
+	} else {
+			$message .= ' from/to';
+	}
 
 	$message .= ' your stack in sector ' . Globals::getSectorBBLink($forces->getSectorID());
 

templates/Default/engine/Default/preferences.php

Indentation +2 added lines, -2 removed lines

@@ -316,8 +316,8 @@
 					foreach (Globals::getAvailableTemplates() as $AvailableTemplate => $ColourSchemes) {
 						foreach ($ColourSchemes as $ColourScheme) {
 							$selected = ($ThisAccount->getTemplate() == $AvailableTemplate &&
-							             $ThisAccount->getColourScheme() == $ColourScheme &&
-							             $ThisAccount->isDefaultCSSEnabled()) ? 'selected' : '';
+										 $ThisAccount->getColourScheme() == $ColourScheme &&
+										 $ThisAccount->isDefaultCSSEnabled()) ? 'selected' : '';
 							$name = $AvailableTemplate . ' - ' . $ColourScheme;
 							?><option value="<?php echo $name; ?>" <?php echo $selected; ?>><?php echo $name; ?></option><?php
 						}

templates/Default/engine/Default/combat_log_viewer.php

Indentation +4 added lines, -4 removed lines

@@ -20,11 +20,11 @@
 	$this->includeTemplate('includes/ForceFullCombatResults.inc', array('FullForceCombatResults'=>$CombatResults));
 } else if ($CombatResultsType == 'PORT') {
 	$this->includeTemplate('includes/PortFullCombatResults.inc', array('FullPortCombatResults'=>$CombatResults,
-	                                                                  'MinimalDisplay'=>false,
-	                                                                  'AlreadyDestroyed'=>false));
+																	  'MinimalDisplay'=>false,
+																	  'AlreadyDestroyed'=>false));
 } else if ($CombatResultsType == 'PLANET') {
 	$this->includeTemplate('includes/PlanetFullCombatResults.inc', array('FullPlanetCombatResults'=>$CombatResults,
-	                                                                    'MinimalDisplay'=>false,
-	                                                                    'AlreadyDestroyed'=>false));
+																		'MinimalDisplay'=>false,
+																		'AlreadyDestroyed'=>false));
 }
 ?>

templates/Default/engine/Default/includes/SectorMap.inc

Indentation +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
 						if (!$UniGen) {
 							$CanScanSector = ($ThisShip->hasScanner() && $isLinkedSector) || $isCurrentSector;
 							$ShowFriendlyForces = isset($HideAlliedForces) && $HideAlliedForces ?
-							                      $Sector->hasPlayerForces($MapPlayer) : $Sector->hasFriendlyForces($MapPlayer);
+												  $Sector->hasPlayerForces($MapPlayer) : $Sector->hasFriendlyForces($MapPlayer);
 							if (($CanScanSector && ($Sector->hasForces() || $Sector->hasPlayers())) || $ShowFriendlyForces || $Sector->hasFriendlyTraders($MapPlayer)) { ?>
 								<div class="lmtf"><?php
 									if ($CanScanSector && $Sector->hasEnemyTraders($MapPlayer)) {