smrealms / smr

src/engine/Default/port_attack_processing.php

Spacing +3 added lines, -3 removed lines

@@ -53,8 +53,8 @@ 
 
 $totalShieldDamage = 0;
 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'];
 	foreach ($playerResults['Weapons'] as $weapon) {
 		if (isset($weapon['ActualDamage'])) { // Only set if the weapon hits
@@ -67,7 +67,7 @@ 
 $downgradeDamage = $results['Attackers']['TotalDamage'] - $totalShieldDamage;
 $results['Attackers']['Downgrades'] = $port->checkForDowngrade($downgradeDamage);
 
-$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());
 

src/engine/Default/trader_bounties.php

Indentation +1 added lines, -1 removed lines

@@ -15,4 +15,4 @@
 }
 
 $template->assign('AllClaims', array($player->getClaimableBounties('HQ'),
-                                     $player->getClaimableBounties('UG')));
+									 $player->getClaimableBounties('UG')));

src/engine/Default/rankings_alliance_vs_alliance.php

Indentation +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	foreach ($alliance_vs_ids as $id) {
 		$row_alliance = SmrAlliance::getAlliance($id, $player->getGameID());
 		$showRed = (!$curr_alliance->isNone() && $curr_alliance->hasDisbanded()) ||
-		           (!$row_alliance->isNone() && $row_alliance->hasDisbanded());
+				   (!$row_alliance->isNone() && $row_alliance->hasDisbanded());
 		$showBold = $curr_id == $player->getAllianceID() || $id == $player->getAllianceID();
 		$style = '';
 		if ($curr_id == $id && !$row_alliance->isNone()) {

src/engine/Default/shop_hardware_processing.php

Braces +10 added lines, -5 removed lines

@@ -32,11 +32,16 @@
 	$ship->increaseHardware($hardware_id, $amount);
 
 	//HoF
-	if ($hardware_id == HARDWARE_COMBAT) $player->increaseHOF($amount, array('Forces', 'Bought', 'Combat Drones'), HOF_ALLIANCE);
-	if ($hardware_id == HARDWARE_SCOUT) $player->increaseHOF($amount, array('Forces', 'Bought', 'Scout Drones'), HOF_ALLIANCE);
-	if ($hardware_id == HARDWARE_MINE) $player->increaseHOF($amount, array('Forces', 'Bought', 'Mines'), HOF_ALLIANCE);
-}
-elseif ($action == 'Sell') {
+	if ($hardware_id == HARDWARE_COMBAT) {
+		$player->increaseHOF($amount, array('Forces', 'Bought', 'Combat Drones'), HOF_ALLIANCE);
+	}
+	if ($hardware_id == HARDWARE_SCOUT) {
+		$player->increaseHOF($amount, array('Forces', 'Bought', 'Scout Drones'), HOF_ALLIANCE);
+	}
+	if ($hardware_id == HARDWARE_MINE) {
+		$player->increaseHOF($amount, array('Forces', 'Bought', 'Mines'), HOF_ALLIANCE);
+	}
+	} elseif ($action == 'Sell') {
 	// We only allow selling combat drones
 	if ($hardware_id != HARDWARE_COMBAT) {
 		throw new Exception('This item cannot be sold!');

src/engine/Default/message_view.php

Spacing +1 added lines, -1 removed lines

@@ -202,7 +202,7 @@
 					AND receiver_delete = ' . $db->escapeBoolean(false) . '
 					ORDER BY send_time DESC');
 	while ($db->nextRecord()) {
-		$groupBox =& $messageBox['GroupedMessages'][$db->getInt('sender_id')];
+		$groupBox = & $messageBox['GroupedMessages'][$db->getInt('sender_id')];
 		// Limit the number of messages in each group
 		if (!isset($groupBox['Messages']) || count($groupBox['Messages']) < MESSAGE_SCOUT_GROUP_LIMIT) {
 			displayMessage($groupBox, $db->getInt('message_id'), $db->getInt('account_id'), $db->getInt('sender_id'), stripslashes($db->getField('message_text')), $db->getInt('send_time'), $db->getBoolean('msg_read'), MSG_SCOUT);

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

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

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/admin/Default/1.6/GameDetails.inc

Braces +4 added lines, -1 removed lines

@@ -44,7 +44,10 @@
 		<td>
 			<select name="game_type"><?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>