smrealms / smr

tools/discord/GameLink.inc

Spacing +6 added lines, -6 removed lines

@@ -3,11 +3,11 @@ 
 // Holds information linking the received message and the game data
 class GameLink
 {
-	public $valid = false;  // identifies if the message is linked to game data
-	public $user;           // Discord user associated with the message
-	public $account;        // SmrAccount instance
-	public $alliance;       // SmrAlliance instance
-	public $player;         // SmrPlayer instance
+	public $valid = false; // identifies if the message is linked to game data
+	public $user; // Discord user associated with the message
+	public $account; // SmrAccount instance
+	public $alliance; // SmrAlliance instance
+	public $player; // SmrPlayer instance
 
 	// Takes the following arguments:
 	//	channel = Discord\Parts\Channel\Channel instance
@@ -60,7 +60,7 @@ 
 
 			$this->player = SmrPlayer::getPlayer($this->account->getAccountID(), $this->alliance->getGameID(), true);
 			if ($this->player->getAllianceID() != $this->alliance->getAllianceID()) {
-				$channel->sendMessage("Player `".$this->player->getPlayerName()."` is not a member of alliance `".$this->alliance->getAllianceName()."`");
+				$channel->sendMessage("Player `" . $this->player->getPlayerName() . "` is not a member of alliance `" . $this->alliance->getAllianceName() . "`");
 				return;
 			}
 		}

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

config/SmrMySqlSecrets.sample.inc

Spacing +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 trait SmrMySqlSecrets {
 	protected static $databaseName = 'smr_live';
 	private static $host = 'smr-mysql'; // must match MYSQL_HOST in .env
-	private static $user = 'smr';       // must match MYSQL_USER in .env
-	private static $password = 'smr';   // must match MYSQL_PASSWORD in .env
+	private static $user = 'smr'; // must match MYSQL_USER in .env
+	private static $password = 'smr'; // must match MYSQL_PASSWORD in .env
 
 	// Set to null to use defaults
 	private static $port = null;

templates/Default/admin/Default/1.6/GameDetails.inc

Braces +4 added lines, -1 removed lines

@@ -44,7 +44,10 @@
 		<td>
 			<select name="game_type" class="InputFields"><?php
 			foreach (SmrGame::GAME_TYPES as $GameTypeID => $GameType) {
-				?><option value="<?php echo $GameTypeID; ?>" <?php if ($GameType == $Game['gameType']) echo 'selected'; ?>><?php echo $GameType; ?></option><?php
+				?><option value="<?php echo $GameTypeID; ?>" <?php if ($GameType == $Game['gameType']) {
+					echo 'selected';
+				}
+				?>><?php echo $GameType; ?></option><?php
 			} ?>
 			</select>
 		</td>

templates/Default/engine/Default/includes/CommonMessageSend.inc

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@
-<?php if(isset($Preview)) { ?><table class="standard"><tr><td><?php echo bbifyMessage($Preview); ?></td></tr></table><?php } ?>
+<?php if (isset($Preview)) { ?><table class="standard"><tr><td><?php echo bbifyMessage($Preview); ?></td></tr></table><?php } ?>
 <form name="MessageSendForm" method="POST" action="<?php echo $MessageSendFormHref; ?>">
 	<p>
 		<b>From: </b><?php echo $ThisPlayer->getDisplayName(); ?><br />
-		<b>To: </b><?php if(isset($Receiver) && is_object($Receiver)) {	echo $Receiver->getDisplayName(); } else { echo $Receiver; } ?>
+		<b>To: </b><?php if (isset($Receiver) && is_object($Receiver)) {	echo $Receiver->getDisplayName(); } else { echo $Receiver; } ?>
 	</p>
-	<textarea spellcheck="true" name="message" class="InputFields"><?php if(isset($Preview)) { echo $Preview; } ?></textarea><br />
+	<textarea spellcheck="true" name="message" class="InputFields"><?php if (isset($Preview)) { echo $Preview; } ?></textarea><br />
 	<br />
 	<input type="submit" name="action" value="Send message" class="InputFields" />&nbsp;<input type="submit" name="action" value="Preview message" class="InputFields" />
 </form>

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" class="InputFields"><?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" class="InputFields"><?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;

admin/Default/1.6/game_edit_processing.php

Spacing +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 // Get the dates ("|" sets hr/min/sec to 0)
 $join = DateTime::createFromFormat('d/m/Y|', $_REQUEST['game_join']);
-$start = empty($_REQUEST['game_start']) ? $join :
-         DateTime::createFromFormat('d/m/Y|', $_REQUEST['game_start']);
+$start = empty($_REQUEST['game_start']) ? $join : DateTime::createFromFormat('d/m/Y|', $_REQUEST['game_start']);
 $end = DateTime::createFromFormat('d/m/Y|', $_REQUEST['game_end']);
 
 $game = SmrGame::getGame($var['game_id']);

engine/Default/planet_attack_processing.php

Spacing +3 added lines, -3 removed lines

@@ -49,12 +49,12 @@
 }
 
 foreach ($attackers as $attacker) {
-	$playerResults =& $attacker->shootPlanet($planet, false);
-	$results['Attackers']['Traders'][$attacker->getAccountID()] =& $playerResults;
+	$playerResults = & $attacker->shootPlanet($planet, false);
+	$results['Attackers']['Traders'][$attacker->getAccountID()] = & $playerResults;
 	$results['Attackers']['TotalDamage'] += $playerResults['TotalDamage'];
 }
 $results['Attackers']['Downgrades'] = $planet->checkForDowngrade($results['Attackers']['TotalDamage']);
-$results['Planet'] =& $planet->shootPlayers($attackers);
+$results['Planet'] = & $planet->shootPlayers($attackers);
 
 $account->log(LOG_TYPE_PLANET_BUSTING, 'Player attacks planet, the planet does ' . $results['Planet']['TotalDamage'] . ', their team does ' . $results['Attackers']['TotalDamage'] . ' and downgrades: ' . var_export($results['Attackers']['Downgrades'], true), $planet->getSectorID());
 

engine/Default/port_attack_processing.php

Spacing +3 added lines, -3 removed lines

@@ -45,12 +45,12 @@
 }
 
 foreach ($attackers as $attacker) {
-	$playerResults =& $attacker->shootPort($port);
-	$results['Attackers']['Traders'][$attacker->getAccountID()] =& $playerResults;
+	$playerResults = & $attacker->shootPort($port);
+	$results['Attackers']['Traders'][$attacker->getAccountID()] = & $playerResults;
 	$results['Attackers']['TotalDamage'] += $playerResults['TotalDamage'];
 }
 $results['Attackers']['Downgrades'] = $port->checkForDowngrade($results['Attackers']['TotalDamage']);
-$results['Port'] =& $port->shootPlayers($attackers);
+$results['Port'] = & $port->shootPlayers($attackers);
 
 $account->log(LOG_TYPE_PORT_RAIDING, 'Player attacks port, the port does ' . $results['Port']['TotalDamage'] . ', their team does ' . $results['Attackers']['TotalDamage'] . ' and downgrades ' . $results['Attackers']['Downgrades'] . ' levels.', $port->getSectorID());