smrealms / smr

lib/Default/AbstractSmrPlayer.class.php

Indentation +4 added lines, -4 removed lines

@@ -307,7 +307,7 @@ 
 		while ($this->db->nextRecord()) {
 			try {
 				$otherPlayer = SmrPlayer::getPlayer($this->db->getInt('from_account_id'), //TODO
-				                                    $this->getGameID(), $forceUpdate);
+													$this->getGameID(), $forceUpdate);
 			} catch (PlayerNotFoundException $e) {
 				// Skip players that have not joined this game
 				continue;
@@ -879,9 +879,9 @@ 
 	 */
 	public function canFight() {
 		return !($this->hasNewbieTurns() ||
-		         $this->isDead() ||
-		         $this->isLandedOnPlanet() ||
-		         $this->hasFederalProtection());
+				 $this->isDead() ||
+				 $this->isLandedOnPlanet() ||
+				 $this->hasFederalProtection());
 	}
 
 	public function setDead($bool) {

Spacing +12 added lines, -12 removed lines

@@ -259,7 +259,7 @@ 
 	/**
 	 * Insert a new player into the database. Returns the new player object.
 	 */
-	public static function createPlayer($accountID, $gameID, $playerName, $raceID, $isNewbie, $npc=false) {
+	public static function createPlayer($accountID, $gameID, $playerName, $raceID, $isNewbie, $npc = false) {
 		$db = new SmrMySqlDatabase();
 		$db->lockTable('player');
 
@@ -1694,7 +1694,7 @@ 
 			create_error('The saved sector must be in the box!');
 		}
 
-		$storedDestinations =& $this->getStoredDestinations();
+		$storedDestinations = & $this->getStoredDestinations();
 		foreach ($storedDestinations as &$sd) {
 			if ($sd['SectorID'] == $sectorID) {
 				$sd['OffsetTop'] = $offsetTop;
@@ -2021,13 +2021,13 @@ 
 			$this->db->query('SELECT type,amount FROM player_hof WHERE ' . $this->SQL);
 			$this->HOF = array();
 			while ($this->db->nextRecord()) {
-				$hof =& $this->HOF;
+				$hof = & $this->HOF;
 				$typeList = explode(':', $this->db->getField('type'));
 				foreach ($typeList as $type) {
 					if (!isset($hof[$type])) {
 						$hof[$type] = array();
 					}
-					$hof =& $hof[$type];
+					$hof = & $hof[$type];
 				}
 				$hof = $this->db->getFloat('amount');
 			}
@@ -2106,8 +2106,8 @@ 
 		}
 		self::$HOFVis[$hofType] = $visibility;
 
-		$hof =& $this->HOF;
-		$hofChanged =& $this->hasHOFChanged;
+		$hof = & $this->HOF;
+		$hofChanged = & $this->hasHOFChanged;
 		$new = false;
 		foreach ($typeList as $type) {
 			if (!isset($hofChanged[$type])) {
@@ -2117,8 +2117,8 @@ 
 				$hof[$type] = array();
 				$new = true;
 			}
-			$hof =& $hof[$type];
-			$hofChanged =& $hofChanged[$type];
+			$hof = & $hof[$type];
+			$hofChanged = & $hofChanged[$type];
 		}
 		if ($hofChanged == null) {
 			$hofChanged = self::HOF_CHANGED;
@@ -2721,7 +2721,7 @@ 
 	}
 
 	private function setupMissionStep($missionID) {
-		$mission =& $this->missions[$missionID];
+		$mission = & $this->missions[$missionID];
 		if ($mission['On Step'] >= count(MISSIONS[$missionID]['Steps'])) {
 			// Nothing to do if this mission is already completed
 			return;
@@ -2770,7 +2770,7 @@ 
 			'Starting Sector' => $this->getSectorID()
 		);
 
-		$this->missions[$missionID] =& $mission;
+		$this->missions[$missionID] = & $mission;
 		$this->setupMissionStep($missionID);
 		$this->rebuildMission($missionID);
 
@@ -2820,7 +2820,7 @@ 
 
 	public function claimMissionReward($missionID) {
 		$this->getMissions();
-		$mission =& $this->missions[$missionID];
+		$mission = & $this->missions[$missionID];
 		if ($mission === false) {
 			throw new Exception('Unknown mission: ' . $missionID);
 		}
@@ -3176,7 +3176,7 @@ 
 				$amount = $this->getHOF($tempTypeList);
 				if ($hofChanged == self::HOF_NEW) {
 					if ($amount > 0) {
-						$this->db->query('INSERT INTO player_hof (account_id,game_id,type,amount) VALUES (' . $this->db->escapeNumber($this->getAccountID()) . ',' . $this->db->escapeNumber($this->getGameID()) . ',' . $this->db->escapeArray($tempTypeList, false, true, ':', false) . ',' . $this->db->escapeNumber($amount) . ')');   //TODO
+						$this->db->query('INSERT INTO player_hof (account_id,game_id,type,amount) VALUES (' . $this->db->escapeNumber($this->getAccountID()) . ',' . $this->db->escapeNumber($this->getGameID()) . ',' . $this->db->escapeArray($tempTypeList, false, true, ':', false) . ',' . $this->db->escapeNumber($amount) . ')'); //TODO
 					}
 				} elseif ($hofChanged == self::HOF_CHANGED) {
 					$this->db->query('UPDATE player_hof

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

engine/Default/forces_attack_processing.php

Spacing +4 added lines, -4 removed lines

@@ -81,18 +81,18 @@
 
 // If mines are bumped, the forces shoot first. Otherwise player shoots first.
 if ($bump) {
-	$results['Forces'] =& $forces->shootPlayers($attackers, $bump);
+	$results['Forces'] = & $forces->shootPlayers($attackers, $bump);
 }
 
 $results['Attackers'] = array('TotalDamage' => 0);
 foreach ($attackers as $attacker) {
-	$playerResults =& $attacker->shootForces($forces);
-	$results['Attackers']['Traders'][$attacker->getPlayerID()] =& $playerResults;
+	$playerResults = & $attacker->shootForces($forces);
+	$results['Attackers']['Traders'][$attacker->getPlayerID()] = & $playerResults;
 	$results['Attackers']['TotalDamage'] += $playerResults['TotalDamage'];
 }
 
 if (!$bump) {
-	$results['Forces'] =& $forces->shootPlayers($attackers, $bump);
+	$results['Forces'] = & $forces->shootPlayers($attackers, $bump);
 	$forces->updateExpire();
 }
 

engine/Default/council_embassy_processing.php

Indentation +6 added lines, -6 removed lines

@@ -39,7 +39,7 @@ 
 // Send vote announcement to members of the player's council (war votes)
 // or both races' councils (peace votes).
 $councilMembers = Council::getRaceCouncil($player->getGameID(),
-                                          $player->getRaceID());
+										  $player->getRaceID());
 if ($type == 'PEACE') {
 	$otherCouncil = Council::getRaceCouncil($player->getGameID(), $race_id);
 	$councilMembers = array_merge($councilMembers, $otherCouncil);
@@ -49,16 +49,16 @@ 
 $color = ($type == 'PEACE' ? 'dgreen' : 'red');
 $type_fancy = "<span class=\"$color\">$type</span>";
 $message = $player->getLevelName() . " " . $player->getBBLink()
-           . " has initiated a vote for $type_fancy with the "
-           . Globals::getRaceName($race_id)
-           . "! You have " . format_time(TIME_FOR_COUNCIL_VOTE)
-           . " to cast your vote.";
+		   . " has initiated a vote for $type_fancy with the "
+		   . Globals::getRaceName($race_id)
+		   . "! You have " . format_time(TIME_FOR_COUNCIL_VOTE)
+		   . " to cast your vote.";
 
 foreach ($councilMembers as $playerID) {
 	// don't send to the player who started the vote
 	if ($player->getPlayerID() != $playerID) {
 		SmrPlayer::sendMessageFromRace($player->getRaceID(), $player->getGameID(),
-		                               $playerID, $message, $time);
+									   $playerID, $message, $time);
   }
 }
 

engine/Default/port_attack_processing.php

Spacing +3 added lines, -3 removed lines

@@ -52,12 +52,12 @@
 }
 
 foreach ($attackers as $attacker) {
-	$playerResults =& $attacker->shootPort($port);
-	$results['Attackers']['Traders'][$attacker->getPlayerID()] =& $playerResults;
+	$playerResults = & $attacker->shootPort($port);
+	$results['Attackers']['Traders'][$attacker->getPlayerID()] = & $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());
 

engine/Default/trader_attack_processing.php

Spacing +2 added lines, -2 removed lines

@@ -47,8 +47,8 @@
 
 function teamAttack(&$results, $fightingPlayers, $attack, $defend) {
 	foreach ($fightingPlayers[$attack] as $playerID => $teamPlayer) {
-		$playerResults =& $teamPlayer->shootPlayers($fightingPlayers[$defend]);
-		$results[$attack]['Traders'][$teamPlayer->getPlayerID()] =& $playerResults;
+		$playerResults = & $teamPlayer->shootPlayers($fightingPlayers[$defend]);
+		$results[$attack]['Traders'][$teamPlayer->getPlayerID()] = & $playerResults;
 		$results[$attack]['TotalDamage'] += $playerResults['TotalDamage'];
 
 		// Award assists (if there are multiple attackers)

engine/Default/message_view.php

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 					AND receiver_delete = ' . $db->escapeBoolean(false) . '
 					ORDER BY send_time DESC');
 	while ($db->nextRecord()) {
-		$groupBox =& $messageBox['GroupedMessages'][$db->getInt('sender_player_id')];
+		$groupBox = & $messageBox['GroupedMessages'][$db->getInt('sender_player_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('player_id'), $db->getInt('sender_player_id'), stripslashes($db->getField('message_text')), $db->getInt('send_time'), $db->getBoolean('msg_read'), MSG_SCOUT);

engine/Default/planet_attack_processing.php

Spacing +3 added lines, -3 removed lines

@@ -57,12 +57,12 @@
 }
 
 foreach ($attackers as $attacker) {
-	$playerResults =& $attacker->shootPlanet($planet, false);
-	$results['Attackers']['Traders'][$attacker->getPlayerID()] =& $playerResults;
+	$playerResults = & $attacker->shootPlanet($planet, false);
+	$results['Attackers']['Traders'][$attacker->getPlayerID()] = & $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/Draft/alliance_pick.inc

Indentation +3 added lines, -3 removed lines

@@ -15,11 +15,11 @@
 			// Special case for leaders who haven't made their own alliance yet,
 			// or are still in the Newbie Help Alliance.
 			$teams[$leader->getPlayerID()] = array('Leader'   => $leader,
-			                                       'Size'     => 0);
+												   'Size'     => 0);
 		} else {
 			$teams[$leader->getPlayerID()] = array('Leader'   => $leader,
-			                                       'Alliance' => $alliance,
-			                                       'Size'     => $alliance->getNumMembers());
+												   'Alliance' => $alliance,
+												   'Size'     => $alliance->getNumMembers());
 		}
 	}