smrealms / smr

src/engine/Default/combat_simulator.php

Braces +14 added lines, -8 removed lines

@@ -9,10 +9,11 @@ 
 $realAttackers = array();
 $attackers = array();
 $i=1;
-if(isset($_POST['attackers']))
+if(isset($_POST['attackers'])) {
 	foreach($_POST['attackers'] as $attackerName) {
 		if($attackerName=='none')
 			continue;
+}
 		if(isset($usedNames[$attackerName])) {
 			$duplicates = true;
 			continue;
@@ -24,17 +25,19 @@ 
 		++$i;
 	}
 
-for(;$i<=10;++$i)
+for(;$i<=10;++$i) {
 	$attackers[$i] = null;
+}
 $template->assign('Attackers',$attackers);
 
 $i=1;
 $realDefenders = array();
 $defenders = array();
-if(isset($_POST['defenders']))
+if(isset($_POST['defenders'])) {
 	foreach($_POST['defenders'] as $defenderName) {
 		if($defenderName=='none')
 			continue;
+}
 		if(isset($usedNames[$defenderName])) {
 			$duplicates = true;
 			continue;
@@ -46,8 +49,9 @@ 
 		++$i;
 	}
 	
-for(;$i<=10;++$i)
+for(;$i<=10;++$i) {
 	$defenders[$i] = null;
+}
 $template->assign('Defenders',$defenders);
 
 $template->assign('Duplicates',$duplicates);
@@ -62,12 +66,14 @@ 
 		while(count($realAttackers)>0 && count($realDefenders)>0) {
 			runAnAttack($realAttackers,$realDefenders);
 			foreach($realAttackers as $key => &$teamPlayer) {
-				if($teamPlayer->isDead())
-					unset($realAttackers[$key]);
+				if($teamPlayer->isDead()) {
+									unset($realAttackers[$key]);
+				}
 			} unset($teamPlayer);
 			foreach($realDefenders as $key => &$teamPlayer) {
-				if($teamPlayer->isDead())
-					unset($realDefenders[$key]);
+				if($teamPlayer->isDead()) {
+									unset($realDefenders[$key]);
+				}
 			} unset($teamPlayer);
 		}
 	}

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

src/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);

src/templates/Default/admin/Default/ip_view_results.php

Indentation +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 	</center><?php
 
 } elseif (in_array($type, ['search', 'alliance_ips', 'wild_log', 'wild_in',
-                           'compare', 'compare_log', 'wild_ip', 'wild_host'])) { ?>
+						   'compare', 'compare_log', 'wild_ip', 'wild_host'])) { ?>
 
 	<center>
 		<?php echo $Summary; ?><br /><br />

src/templates/Default/engine/Default/beta_functions.php

Braces +14 added lines, -4 removed lines

@@ -76,8 +76,13 @@ 
 	<input type="number" name="amount" value="0" min="<?php echo MIN_GLOBAL_RELATIONS; ?>" max="<?php echo MAX_GLOBAL_RELATIONS; ?>" style="width:75px" />&nbsp;
 	<select name="race"><?php
 		foreach (Globals::getRaces() as $race) {
-			if ($race['Race ID'] == $ThisPlayer->getRaceID()) continue;
-			if ($race['Race ID'] == RACE_NEUTRAL) continue; ?>
+			if ($race['Race ID'] == $ThisPlayer->getRaceID()) {
+				continue;
+			}
+			if ($race['Race ID'] == RACE_NEUTRAL) {
+				continue;
+			}
+			?>
 			<option value="<?php echo $race['Race ID']; ?>"><?php echo $race['Race Name']; ?></option><?php
 		} ?>
 	</select>&nbsp;&nbsp;
@@ -88,8 +93,13 @@ 
 <form method="POST" action="<?php echo $ChangeRaceHREF; ?>">
 	<select name="race"><?php
 		foreach (Globals::getRaces() as $race) {
-			if ($race['Race ID'] == $ThisPlayer->getRaceID()) continue;
-			if ($race['Race ID'] == RACE_NEUTRAL) continue; ?>
+			if ($race['Race ID'] == $ThisPlayer->getRaceID()) {
+				continue;
+			}
+			if ($race['Race ID'] == RACE_NEUTRAL) {
+				continue;
+			}
+			?>
 			<option value="<?php echo $race['Race ID']; ?>"><?php echo $race['Race Name']; ?></option><?php
 		} ?>
 	</select>&nbsp;&nbsp;

src/templates/Default/engine/Default/map_local.php

Braces +4 added lines, -1 removed lines

@@ -10,7 +10,10 @@
 		<td style="width: 80%" class="center">
 			Local Map of the Known <span class="big bold"><?php echo $GalaxyName ?></span> Galaxy
 			<br /><br />
-			<?php if (isset($Error)) echo $Error; ?>
+			<?php if (isset($Error)) {
+	echo $Error;
+}
+?>
 		</td>
 		<td style="width: 10%"></td>
 	</tr>

src/templates/Default/engine/Default/preferences.php

Indentation +2 added lines, -2 removed lines

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

src/htdocs/manual_toc.php

Braces +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
 
 	</body>
 </html><?php
-}
-catch (Throwable $e) {
+} catch (Throwable $e) {
 	handleException($e);
 }
 ?>

src/htdocs/login_processing.php

Indentation +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 			exit;
 		}
 		$account->addAuthMethod($_SESSION['socialLogin']->getLoginType(),
-		                        $_SESSION['socialLogin']->getUserID());
+								$_SESSION['socialLogin']->getUserID());
 		session_destroy();
 	}
 

src/htdocs/login_create_processing.php

Indentation +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
 	$account->increaseSmrRewardCredits(2 * CREDITS_PER_DOLLAR); // Give $2 worth of "reward" credits for joining.
 	if ($socialLogin) {
 		$account->addAuthMethod($_SESSION['socialLogin']->getLoginType(),
-		                        $_SESSION['socialLogin']->getUserID());
+								$_SESSION['socialLogin']->getUserID());
 		if ($validatedBySocial) {
 			$account->setValidated(true);
 			$account->update();