smrealms / smr

htdocs/weapon_list.php

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
 	$weapons = [];
 	$db->query('SELECT * FROM weapon_type JOIN race USING(race_id)');
 	while ($db->nextRecord()) {
-		switch($db->getInt('buyer_restriction')) {
+		switch ($db->getInt('buyer_restriction')) {
 			case BUYER_RESTRICTION_GOOD:
 				$restriction = '<span class="dgreen">Good</span>';
 			break;
@@ -46,15 +46,15 @@ 
 
 	$template->display('weapon_list.php');
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	handleException($e);
 }
 
 function buildSelector($db, $name, $table) {
 	$selector = '<select onchange="filterSelect(this)"><option>All</option>';
-	$db->query("SELECT DISTINCT ".$name." FROM ".$table." ORDER BY ".$name);
+	$db->query("SELECT DISTINCT " . $name . " FROM " . $table . " ORDER BY " . $name);
 	while ($db->nextRecord()) {
-		$selector .= '<option>'.$db->getField($name).'</option>';
+		$selector .= '<option>' . $db->getField($name) . '</option>';
 	}
 	$selector .= '</select>';
 	return $selector;
@@ -66,8 +66,8 @@ 
 	foreach (Globals::getRaces() as $raceID => $raceData) {
 		$raceName = $raceData['Race Name'];
 		$racebox .= '
-			<input type="checkbox" id="race'.$raceID.'" name="races" value="'.$raceName.'" onClick="raceToggle()">
-			<label for="race'.$raceID.'" class="race'.$raceID.'">'.$raceName.'</label>&thinsp;';
+			<input type="checkbox" id="race'.$raceID . '" name="races" value="' . $raceName . '" onClick="raceToggle()">
+			<label for="race'.$raceID . '" class="race' . $raceID . '">' . $raceName . '</label>&thinsp;';
 	}
 	$racebox .= '</form>';
 	return $racebox;

lib/Default/SmrForce.class.php

Spacing +3 added lines, -3 removed lines

@@ -446,20 +446,20 @@
 
 		if ($this->hasMines()) {
 			$thisMines = new SmrMines($this->getGameID(), $this->getMines());
-			$results['Results']['Mines'] =& $thisMines->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)], $minesAreAttacker);
+			$results['Results']['Mines'] = & $thisMines->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)], $minesAreAttacker);
 			$results['TotalDamage'] += $results['Results']['Mines']['ActualDamage']['TotalDamage'];
 		}
 
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Results']['Drones'] =& $thisCDs->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)]);
+			$results['Results']['Drones'] = & $thisCDs->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)]);
 			$results['TotalDamage'] += $results['Results']['Drones']['ActualDamage']['TotalDamage'];
 		}
 
 		if (!$minesAreAttacker) {
 			if ($this->hasSDs()) {
 				$thisSDs = new SmrScoutDrones($this->getGameID(), $this->getSDs());
-				$results['Results']['Scouts'] =& $thisSDs->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)]);
+				$results['Results']['Scouts'] = & $thisSDs->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)]);
 				$results['TotalDamage'] += $results['Results']['Scouts']['ActualDamage']['TotalDamage'];
 			}
 		}

lib/Default/Menu.class.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,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->assign('MenuItems', $menuItems);
 	}
@@ -107,7 +107,7 @@ 
 		$menuItems[] = ['Link' => SmrSession::getNewHREF($container),
 		                'Text' => 'Game News'];
 		// make the selected index bold
-		$boldItem =& $menuItems[$selected_index]['Text'];
+		$boldItem = & $menuItems[$selected_index]['Text'];
 		$boldItem = '<b>' . $boldItem . '</b>';
 		$template->assign('MenuItems', $menuItems);
 	}

lib/Default/SmrPlanetType.class.php

Spacing +26 added lines, -26 removed lines

@@ -40,7 +40,7 @@ 
 	/**
 	 * Access properties of structures that this planet type can build.
 	 */
-	public function structureTypes($structureID=false) {
+	public function structureTypes($structureID = false) {
 		if (!isset($this->structures)) {
 			foreach (static::STRUCTURES as $ID => $Info) {
 				$this->structures[$ID] = new SmrPlanetStructureType($ID, $Info);
@@ -77,12 +77,12 @@ 
 			'exp_gain' => 540,
 		],
 	];
-	public function name()         { return "Terran Planet"; }
-	public function imageLink()    { return "images/planet1.png"; }
-	public function description()  { return "A lush world, with forests, seas, sweeping meadows, and indigenous lifeforms."; }
+	public function name() { return "Terran Planet"; }
+	public function imageLink() { return "images/planet1.png"; }
+	public function description() { return "A lush world, with forests, seas, sweeping meadows, and indigenous lifeforms."; }
 	public function maxAttackers() { return 10; }
-	public function maxLanded()    { return self::MAX_LANDED_UNLIMITED; }
-	public function menuOptions()  { return self::DEFAULT_MENU_OPTIONS; }
+	public function maxLanded() { return self::MAX_LANDED_UNLIMITED; }
+	public function menuOptions() { return self::DEFAULT_MENU_OPTIONS; }
 }
 
 class AridPlanet extends SmrPlanetType {
@@ -106,12 +106,12 @@ 
 			'exp_gain' => 180,
 		],
 	];
-	public function name()         { return "Arid Planet"; }
-	public function imageLink()    { return "images/planet2.png"; }
-	public function description()  { return "A world mostly devoid of surface water, but capable of supporting life."; }
+	public function name() { return "Arid Planet"; }
+	public function imageLink() { return "images/planet2.png"; }
+	public function description() { return "A world mostly devoid of surface water, but capable of supporting life."; }
 	public function maxAttackers() { return 5; }
-	public function maxLanded()    { return 5; }
-	public function menuOptions()  { return ['CONSTRUCTION', 'DEFENSE', 'STOCKPILE', 'OWNERSHIP']; }
+	public function maxLanded() { return 5; }
+	public function menuOptions() { return ['CONSTRUCTION', 'DEFENSE', 'STOCKPILE', 'OWNERSHIP']; }
 }
 
 class DwarfPlanet extends SmrPlanetType {
@@ -135,12 +135,12 @@ 
 			'exp_gain' => 540,
 		],
 	];
-	public function name()         { return "Dwarf Planet"; }
-	public function imageLink()    { return "images/planet3.png"; }
-	public function description()  { return "A smaller than usual planet, with no native life present."; }
+	public function name() { return "Dwarf Planet"; }
+	public function imageLink() { return "images/planet3.png"; }
+	public function description() { return "A smaller than usual planet, with no native life present."; }
 	public function maxAttackers() { return 5; }
-	public function maxLanded()    { return self::MAX_LANDED_UNLIMITED; }
-	public function menuOptions()  { return self::DEFAULT_MENU_OPTIONS; }
+	public function maxLanded() { return self::MAX_LANDED_UNLIMITED; }
+	public function menuOptions() { return self::DEFAULT_MENU_OPTIONS; }
 }
 
 class ProtoPlanet extends SmrPlanetType {
@@ -170,12 +170,12 @@ 
 			'exp_gain' => 540,
 		],
 	];
-	public function name()         { return "Protoplanet"; }
-	public function imageLink()    { return "images/planet5.png"; }
-	public function description()  { return "A developing planet, not yet able to support the infrastructure of advanced technologies."; }
+	public function name() { return "Protoplanet"; }
+	public function imageLink() { return "images/planet5.png"; }
+	public function description() { return "A developing planet, not yet able to support the infrastructure of advanced technologies."; }
 	public function maxAttackers() { return 5; }
-	public function maxLanded()    { return 5; }
-	public function menuOptions()  { return self::DEFAULT_MENU_OPTIONS; }
+	public function maxLanded() { return 5; }
+	public function menuOptions() { return self::DEFAULT_MENU_OPTIONS; }
 }
 
 class DefenseWorld extends SmrPlanetType {
@@ -205,10 +205,10 @@ 
 			'exp_gain' => 9,
 		],
 	];
-	public function name()         { return "Defense World"; }
-	public function imageLink()    { return "images/planet4.png"; }
-	public function description()  { return "A fully armed and operational battle station loaded with excessive firepower."; }
+	public function name() { return "Defense World"; }
+	public function imageLink() { return "images/planet4.png"; }
+	public function description() { return "A fully armed and operational battle station loaded with excessive firepower."; }
 	public function maxAttackers() { return 10; }
-	public function maxLanded()    { return self::MAX_LANDED_UNLIMITED; }
-	public function menuOptions()  { return self::DEFAULT_MENU_OPTIONS; }
+	public function maxLanded() { return self::MAX_LANDED_UNLIMITED; }
+	public function menuOptions() { return self::DEFAULT_MENU_OPTIONS; }
 }

lib/Default/Sorter.class.php

Spacing +3 added lines, -3 removed lines

@@ -4,7 +4,7 @@ 
 	private static $reverseOrder;
 
 	private static function cmpStrProp($a, $b) {
-		return (self::$reverseOrder?-1:1)*strcasecmp($a->{self::$sortKey}, $b->{self::$sortKey});
+		return (self::$reverseOrder ?-1 : 1) * strcasecmp($a->{self::$sortKey}, $b->{self::$sortKey});
 	}
 
 	private static function cmpNumElement($a, $b) {
@@ -20,8 +20,8 @@ 
 	}
 
 	public static function cmpNum($a, $b) {
-		if($a == $b) return 0;
-		return (self::$reverseOrder?-1:1)*($a < $b ? -1 : 1);
+		if ($a == $b) return 0;
+		return (self::$reverseOrder ?-1 : 1) * ($a < $b ? -1 : 1);
 	}
 
 	public static function sortByStrProp(array &$array, $property, $reverseOrder = false) {

lib/Default/AbstractSmrPort.class.php

Spacing +2 added lines, -2 removed lines

@@ -1180,7 +1180,7 @@ 
 			do {
 				$targetPlayer = $targetPlayers[array_rand($targetPlayers)];
 			} while ($results['TotalShotsPerTargetPlayer'][$targetPlayer->getAccountID()] > min($results['TotalShotsPerTargetPlayer']));
-			$results['Weapons'][$orderID] =& $weapon->shootPlayerAsPort($this, $targetPlayer);
+			$results['Weapons'][$orderID] = & $weapon->shootPlayerAsPort($this, $targetPlayer);
 			$results['TotalShotsPerTargetPlayer'][$targetPlayer->getAccountID()]++;
 			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
@@ -1189,7 +1189,7 @@ 
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs(), true);
-			$results['Drones'] =& $thisCDs->shootPlayerAsPort($this, $targetPlayers[array_rand($targetPlayers)]);
+			$results['Drones'] = & $thisCDs->shootPlayerAsPort($this, $targetPlayers[array_rand($targetPlayers)]);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 			$results['TotalDamagePerTargetPlayer'][$results['Drones']['TargetPlayer']->getAccountID()] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}

lib/Default/SmrPlanet.class.php

Spacing +2 added lines, -2 removed lines

@@ -1146,7 +1146,7 @@ 
 		$results['DeadBeforeShot'] = false;
 		$weapons = $this->getWeapons();
 		foreach ($weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootPlayerAsPlanet($this, $targetPlayers[array_rand($targetPlayers)]);
+			$results['Weapons'][$orderID] = & $weapon->shootPlayerAsPlanet($this, $targetPlayers[array_rand($targetPlayers)]);
 			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 				$results['TotalDamagePerTargetPlayer'][$results['Weapons'][$orderID]['TargetPlayer']->getAccountID()] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
@@ -1154,7 +1154,7 @@ 
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs(), true);
-			$results['Drones'] =& $thisCDs->shootPlayerAsPlanet($this, $targetPlayers[array_rand($targetPlayers)]);
+			$results['Drones'] = & $thisCDs->shootPlayerAsPlanet($this, $targetPlayers[array_rand($targetPlayers)]);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 			$results['TotalDamagePerTargetPlayer'][$results['Drones']['TargetPlayer']->getAccountID()] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}

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

engine/Default/combat_simulator.php

Spacing +37 added lines, -37 removed lines

@@ -1,91 +1,91 @@
 <?php declare(strict_types=1);
-$template->assign('PageTopic','Combat Simulator');
+$template->assign('PageTopic', 'Combat Simulator');
 
-$template->assign('EditDummysLink',SmrSession::getNewHREF(create_container('skeleton.php','edit_dummys.php')));
+$template->assign('EditDummysLink', SmrSession::getNewHREF(create_container('skeleton.php', 'edit_dummys.php')));
 $template->assign('DummyNames', DummyPlayer::getDummyPlayerNames());
 
 $duplicates = false;
 $usedNames = array();
 $realAttackers = array();
 $attackers = array();
-$i=1;
-if(isset($_POST['attackers']))
-	foreach($_POST['attackers'] as $attackerName) {
-		if($attackerName=='none')
+$i = 1;
+if (isset($_POST['attackers']))
+	foreach ($_POST['attackers'] as $attackerName) {
+		if ($attackerName == 'none')
 			continue;
-		if(isset($usedNames[$attackerName])) {
+		if (isset($usedNames[$attackerName])) {
 			$duplicates = true;
 			continue;
 		}
 		$usedNames[$attackerName] = true;
-		$attackers[$i] =& DummyPlayer::getCachedDummyPlayer($attackerName);
+		$attackers[$i] = & DummyPlayer::getCachedDummyPlayer($attackerName);
 		$attackers[$i]->setAllianceID(1);
-		$realAttackers[$i] =& $attackers[$i];
+		$realAttackers[$i] = & $attackers[$i];
 		++$i;
 	}
 
-for(;$i<=10;++$i)
+for (;$i <= 10; ++$i)
 	$attackers[$i] = null;
-$template->assign('Attackers',$attackers);
+$template->assign('Attackers', $attackers);
 
-$i=1;
+$i = 1;
 $realDefenders = array();
 $defenders = array();
-if(isset($_POST['defenders']))
-	foreach($_POST['defenders'] as $defenderName) {
-		if($defenderName=='none')
+if (isset($_POST['defenders']))
+	foreach ($_POST['defenders'] as $defenderName) {
+		if ($defenderName == 'none')
 			continue;
-		if(isset($usedNames[$defenderName])) {
+		if (isset($usedNames[$defenderName])) {
 			$duplicates = true;
 			continue;
 		}
 		$usedNames[$attackerName] = true;
-		$defenders[$i] =& DummyPlayer::getCachedDummyPlayer($defenderName);
+		$defenders[$i] = & DummyPlayer::getCachedDummyPlayer($defenderName);
 		$defenders[$i]->setAllianceID(2);
-		$realDefenders[$i] =& $defenders[$i];
+		$realDefenders[$i] = & $defenders[$i];
 		++$i;
 	}
 	
-for(;$i<=10;++$i)
+for (;$i <= 10; ++$i)
 	$defenders[$i] = null;
-$template->assign('Defenders',$defenders);
+$template->assign('Defenders', $defenders);
 
-$template->assign('Duplicates',$duplicates);
+$template->assign('Duplicates', $duplicates);
 
-$template->assign('CombatSimHREF',SmrSession::getNewHREF(create_container('skeleton.php','combat_simulator.php')));
+$template->assign('CombatSimHREF', SmrSession::getNewHREF(create_container('skeleton.php', 'combat_simulator.php')));
 
 if (!empty($realAttackers) && !empty($realDefenders)) {
-	if(isset($_REQUEST['run'])) {
-		runAnAttack($realAttackers,$realDefenders);
+	if (isset($_REQUEST['run'])) {
+		runAnAttack($realAttackers, $realDefenders);
 	}
-	if(isset($_REQUEST['death_run'])) {
-		while(count($realAttackers)>0 && count($realDefenders)>0) {
-			runAnAttack($realAttackers,$realDefenders);
-			foreach($realAttackers as $key => &$teamPlayer) {
-				if($teamPlayer->isDead())
+	if (isset($_REQUEST['death_run'])) {
+		while (count($realAttackers) > 0 && count($realDefenders) > 0) {
+			runAnAttack($realAttackers, $realDefenders);
+			foreach ($realAttackers as $key => &$teamPlayer) {
+				if ($teamPlayer->isDead())
 					unset($realAttackers[$key]);
 			} unset($teamPlayer);
-			foreach($realDefenders as $key => &$teamPlayer) {
-				if($teamPlayer->isDead())
+			foreach ($realDefenders as $key => &$teamPlayer) {
+				if ($teamPlayer->isDead())
 					unset($realDefenders[$key]);
 			} unset($teamPlayer);
 		}
 	}
 }
 
-function runAnAttack($realAttackers,$realDefenders) {
+function runAnAttack($realAttackers, $realDefenders) {
 	global $template;
 	$results = array('Attackers' => array('Traders' => array(), 'TotalDamage' => 0), 
 					'Defenders' => array('Traders' => array(), 'TotalDamage' => 0));
 	foreach ($realAttackers as $accountID => $teamPlayer) {
-		$playerResults =& $teamPlayer->shootPlayers($realDefenders);
-		$results['Attackers']['Traders'][] =& $playerResults;
+		$playerResults = & $teamPlayer->shootPlayers($realDefenders);
+		$results['Attackers']['Traders'][] = & $playerResults;
 		$results['Attackers']['TotalDamage'] += $playerResults['TotalDamage'];
 	}
 	foreach ($realDefenders as $accountID => $teamPlayer) {
-		$playerResults =& $teamPlayer->shootPlayers($realAttackers);
-		$results['Defenders']['Traders'][]  =& $playerResults;
+		$playerResults = & $teamPlayer->shootPlayers($realAttackers);
+		$results['Defenders']['Traders'][] = & $playerResults;
 		$results['Defenders']['TotalDamage'] += $playerResults['TotalDamage'];
 	}
-	$template->assign('TraderCombatResults',$results);
+	$template->assign('TraderCombatResults', $results);
 }