smrealms / smr

lib/Default/SmrPlayer.class.php

Indentation +1 added lines, -1 removed lines

@@ -197,7 +197,7 @@
 		while ($this->db->nextRecord()) {
 			try {
 				$otherPlayer = SmrPlayer::getPlayer($this->db->getInt('from_account_id'),
-				                                    $this->getGameID(), $forceUpdate);
+													$this->getGameID(), $forceUpdate);
 			} catch (PlayerNotFoundException $e) {
 				// Skip players that have not joined this game
 				continue;

Spacing +5 added lines, -5 removed lines

@@ -184,7 +184,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) {
 		// Put the player in a sector with an HQ
 		$startSectorID = self::getHome($gameID, $raceID);
 
@@ -1237,13 +1237,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->getField('amount');
 			}
@@ -1668,7 +1668,7 @@ 
 					'OffsetLeft' => $this->db->getInt('offset_left')
 				);
 			}
-			$this->storedDestinations =& $storedDestinations;
+			$this->storedDestinations = & $storedDestinations;
 		}
 		return $this->storedDestinations;
 	}
@@ -1686,7 +1686,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;

Braces +193 added lines, -148 removed lines

@@ -58,8 +58,9 @@ 
 	public static function &getSectorPlayersByAlliances($gameID, $sectorID, array $allianceIDs, $forceUpdate = false) {
 		$players = self::getSectorPlayers($gameID, $sectorID, $forceUpdate); // Don't use & as we do an unset
 		foreach ($players as $accountID => $player) {
-			if (!in_array($player->getAllianceID(), $allianceIDs))
-				unset($players[$accountID]);
+			if (!in_array($player->getAllianceID(), $allianceIDs)) {
+							unset($players[$accountID]);
+			}
 		}
 		return $players;
 	}
@@ -193,8 +194,7 @@ 
 			$this->newbieWarning = $db->getBoolean('newbie_warning');
 			$this->nameChanged = $db->getBoolean('name_changed');
 			$this->combatDronesKamikazeOnMines = $db->getBoolean('combat_drones_kamikaze_on_mines');
-		}
-		else {
+		} else {
 			throw new PlayerNotFoundException('Invalid accountID: ' . $accountID . ' OR gameID:' . $gameID);
 		}
 	}
@@ -280,22 +280,25 @@ 
 	protected function setZoom($zoom) {
 		// Set the zoom level between [1, 9]
 		$zoom = max(1, min(9, $zoom));
-		if ($this->zoom == $zoom)
-			return;
+		if ($this->zoom == $zoom) {
+					return;
+		}
 		$this->zoom = $zoom;
 		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET zoom = ' . $zoom . ' WHERE ' . $this->SQL . ' LIMIT 1');
 	}
 
 	public function increaseZoom($zoom) {
-		if ($zoom < 0)
-			throw new Exception('Trying to increase negative zoom.');
+		if ($zoom < 0) {
+					throw new Exception('Trying to increase negative zoom.');
+		}
 		$this->setZoom($this->getZoom() + $zoom);
 	}
 
 	public function decreaseZoom($zoom) {
-		if ($zoom < 0)
-			throw new Exception('Trying to decrease negative zoom.');
+		if ($zoom < 0) {
+					throw new Exception('Trying to decrease negative zoom.');
+		}
 		$this->setZoom($this->getZoom() - $zoom);
 	}
 
@@ -310,8 +313,9 @@ 
 	}
 
 	public function setLastSectorID($lastSectorID) {
-		if ($this->lastSectorID == $lastSectorID)
-			return;
+		if ($this->lastSectorID == $lastSectorID) {
+					return;
+		}
 		$this->lastSectorID = $lastSectorID;
 		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET last_sector_id = '.$this->lastSectorID.' WHERE '.$this->SQL.' LIMIT 1');
@@ -324,11 +328,9 @@ 
 			$kickedBy->sendMessage($this->getAccountID(), MSG_PLAYER, 'You were kicked out of the alliance!', false);
 			$this->actionTaken('PlayerKicked', array('Alliance' => $alliance, 'Player' => $kickedBy));
 			$kickedBy->actionTaken('KickPlayer', array('Alliance' => $alliance, 'Player' => $this));
-		}
-		else if ($this->isAllianceLeader()) {
+		} else if ($this->isAllianceLeader()) {
 			$this->actionTaken('DisbandAlliance', array('Alliance' => $alliance));
-		}
-		else {
+		} else {
 			$this->actionTaken('LeaveAlliance', array('Alliance' => $alliance));
 			if ($alliance->getLeaderID() != 0 && $alliance->getLeaderID() != ACCOUNT_ID_NHL) {
 				$this->sendMessage($alliance->getLeaderID(), MSG_PLAYER, 'I left your alliance!', false);
@@ -356,7 +358,9 @@ 
 			try {
 				$this->sendMessage($alliance->getLeaderID(), MSG_PLAYER, 'I joined your alliance!', false);
 			} catch (AccountNotFoundException $e) {
-				if ($alliance->getLeaderID() != ACCOUNT_ID_NHL) throw $e;
+				if ($alliance->getLeaderID() != ACCOUNT_ID_NHL) {
+					throw $e;
+				}
 			}
 
 			$roleID = ALLIANCE_ROLE_NEW_MEMBER;
@@ -376,8 +380,9 @@ 
 	}
 
 	private function setAllianceJoinable($time) {
-		if ($this->allianceJoinable == $time)
-			return;
+		if ($this->allianceJoinable == $time) {
+					return;
+		}
 		$this->allianceJoinable = $time;
 		$this->hasChanged = true;
 	}
@@ -387,8 +392,9 @@ 
 	}
 
 	public function setAttackColour($colour) {
-		if ($this->attackColour == $colour)
-			return;
+		if ($this->attackColour == $colour) {
+					return;
+		}
 		$this->attackColour = $colour;
 		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET attack_warning = ' . $this->db->escapeString($this->attackColour) . ' WHERE ' . $this->SQL . ' LIMIT 1');
@@ -399,28 +405,35 @@ 
 	}
 
 	public function increaseBank($credits) {
-		if ($credits < 0)
-			throw new Exception('Trying to increase negative credits.');
-		if ($credits == 0)
-			return;
+		if ($credits < 0) {
+					throw new Exception('Trying to increase negative credits.');
+		}
+		if ($credits == 0) {
+					return;
+		}
 		$credits += $this->bank;
 		$this->setBank($credits);
 	}
 	public function decreaseBank($credits) {
-		if ($credits < 0)
-			throw new Exception('Trying to decrease negative credits.');
-		if ($credits == 0)
-			return;
+		if ($credits < 0) {
+					throw new Exception('Trying to decrease negative credits.');
+		}
+		if ($credits == 0) {
+					return;
+		}
 		$credits = $this->bank - $credits;
 		$this->setBank($credits);
 	}
 	public function setBank($credits) {
-		if ($this->bank == $credits)
-			return;
-		if ($credits < 0)
-			throw new Exception('Trying to set negative credits.');
-		if ($credits > MAX_MONEY)
-			throw new Exception('Trying to set more than max credits.');
+		if ($this->bank == $credits) {
+					return;
+		}
+		if ($credits < 0) {
+					throw new Exception('Trying to set negative credits.');
+		}
+		if ($credits > MAX_MONEY) {
+					throw new Exception('Trying to set more than max credits.');
+		}
 		$this->bank = $credits;
 		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET bank = '.$this->bank.' WHERE '.$this->SQL.' LIMIT 1');
@@ -431,8 +444,9 @@ 
 	}
 
 	private function setLastNewsUpdate($time) {
-		if ($this->lastNewsUpdate == $time)
-			return;
+		if ($this->lastNewsUpdate == $time) {
+					return;
+		}
 		$this->lastNewsUpdate = $time;
 		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET last_news_update = ' . $time . ' WHERE ' . $this->SQL . ' LIMIT 1');
@@ -479,7 +493,9 @@ 
 
 	public function updateTurns() {
 		// is account validated?
-		if (!$this->getAccount()->isValidated()) return;
+		if (!$this->getAccount()->isValidated()) {
+			return;
+		}
 
 		// how many turns would he get right now?
 		$extraTurns = $this->getTurnsGained(TIME);
@@ -498,8 +514,9 @@ 
 	}
 
 	public function setIgnoreGlobals($bool) {
-		if ($this->ignoreGlobals == $bool)
-			return;
+		if ($this->ignoreGlobals == $bool) {
+					return;
+		}
 		$this->ignoreGlobals = $bool;
 		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET ignore_globals = '.$this->db->escapeBoolean($bool).' WHERE '.$this->SQL.' LIMIT 1');
@@ -511,8 +528,9 @@ 
 	}
 
 	public function setLastPort($lastPort) {
-		if ($this->lastPort == $lastPort)
-			return;
+		if ($this->lastPort == $lastPort) {
+					return;
+		}
 		$this->lastPort = $lastPort;
 		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET last_port = ' . $this->lastPort . ' WHERE ' . $this->SQL . ' LIMIT 1');
@@ -523,8 +541,9 @@ 
 	}
 
 	public function setDisplayMissions($bool) {
-		if ($this->displayMissions == $bool)
-			return;
+		if ($this->displayMissions == $bool) {
+					return;
+		}
 		$this->displayMissions = $bool;
 		$this->hasChanged = true;
 	}
@@ -539,8 +558,9 @@ 
 	 * which does not acquire a sector lock.
 	 */
 	public function setDisplayWeapons($bool) {
-		if ($this->displayWeapons == $bool)
-			return;
+		if ($this->displayWeapons == $bool) {
+					return;
+		}
 		$this->displayWeapons = $bool;
 		$this->db->query('UPDATE player SET display_weapons=' . $this->db->escapeBoolean($this->displayWeapons) . ' WHERE ' . $this->SQL);
 	}
@@ -550,8 +570,9 @@ 
 	}
 
 	public function setForceDropMessages($bool) {
-		if ($this->forceDropMessages == $bool)
-			return;
+		if ($this->forceDropMessages == $bool) {
+					return;
+		}
 		$this->forceDropMessages = $bool;
 		$this->hasChanged = true;
 	}
@@ -583,8 +604,9 @@ 
 	}
 
 	public function setLastTurnUpdate($time) {
-		if ($this->lastTurnUpdate == $time)
-			return;
+		if ($this->lastTurnUpdate == $time) {
+					return;
+		}
 		$this->lastTurnUpdate = $time;
 		$this->hasChanged = true;
 //		$sql = $this->db->query('UPDATE player SET last_turn_update = ' . $this->lastTurnUpdate . ' WHERE '. $this->SQL . ' LIMIT 1');
@@ -628,27 +650,33 @@ 
 	}
 
 	public function increaseRelations($relations, $raceID) {
-		if ($relations < 0)
-			throw new Exception('Trying to increase negative relations.');
-		if ($relations == 0)
-			return;
+		if ($relations < 0) {
+					throw new Exception('Trying to increase negative relations.');
+		}
+		if ($relations == 0) {
+					return;
+		}
 		$relations += $this->getPureRelation($raceID);
 		$this->setRelations($relations, $raceID);
 	}
 	public function decreaseRelations($relations, $raceID) {
-		if ($relations < 0)
-			throw new Exception('Trying to decrease negative relations.');
-		if ($relations == 0)
-			return;
+		if ($relations < 0) {
+					throw new Exception('Trying to decrease negative relations.');
+		}
+		if ($relations == 0) {
+					return;
+		}
 		$relations = $this->getPureRelation($raceID) - $relations;
 		$this->setRelations($relations, $raceID);
 	}
 	public function setRelations($relations, $raceID) {
 		$this->getRelations();
-		if ($this->pureRelations[$raceID] == $relations)
-			return;
-		if ($relations < MIN_RELATIONS)
-			$relations = MIN_RELATIONS;
+		if ($this->pureRelations[$raceID] == $relations) {
+					return;
+		}
+		if ($relations < MIN_RELATIONS) {
+					$relations = MIN_RELATIONS;
+		}
 		$relationsDiff = $relations - $this->pureRelations[$raceID];
 		$this->pureRelations[$raceID] = $relations;
 		$this->relations[$raceID] += round($relationsDiff);
@@ -683,8 +711,7 @@ 
 			$this->db->query('SELECT * FROM ship_has_name WHERE ' . $this->SQL . ' LIMIT 1');
 			if ($this->db->nextRecord()) {
 				$this->customShipName = $this->db->getField('ship_name');
-			}
-			else {
+			} else {
 				$this->customShipName = false;
 			}
 		}
@@ -696,8 +723,9 @@ 
 			//Get Player Gadgets
 			$this->db->query('SELECT gadget_id,equipped,cooldown,lasts_until FROM player_has_gadget WHERE ' . $this->SQL);
 			$this->gadgets = array();
-			while ($this->db->nextRecord())
-				$this->gadgets[$this->db->getField('gadget_id')] = array('Equipped' => $this->db->getField('equipped'), 'Cooldown' => $this->db->getField('cooldown'), 'Expires' => $this->db->getField('lasts_until'));
+			while ($this->db->nextRecord()) {
+							$this->gadgets[$this->db->getField('gadget_id')] = array('Equipped' => $this->db->getField('equipped'), 'Cooldown' => $this->db->getField('cooldown'), 'Expires' => $this->db->getField('lasts_until'));
+			}
 		}
 	}
 
@@ -719,8 +747,7 @@ 
 				$set = substr($set, 0, -1);
 				$this->db->query('UPDATE player_has_gadget SET ' . $set . ' WHERE ' . $this->SQL . ' LIMIT ' . count($this->gadgets));
 			}
-		}
-		else {
+		} else {
 			$field = $this->gadgetKeyToField($keyOrUpdateArray);
 			if ($field !== false) {
 				foreach ($this->gadgets as $gadgetID => $gadget) {
@@ -754,12 +781,12 @@ 
 					$this->db->query('UPDATE player_has_gadget SET ' . $set . ' WHERE ' . $this->SQL . ' AND gadget_id = ' . $this->db->escapeNumber($gadgetID) . ' LIMIT 1');
 					return true;
 				}
-			}
-			else {
+			} else {
 				$field = $this->gadgetKeyToField($keyOrUpdateArray);
 				if ($field !== false) {
-					if ($this->gadgets[$gadgetID][$keyOrUpdateArray] == $value)
-						return;
+					if ($this->gadgets[$gadgetID][$keyOrUpdateArray] == $value) {
+											return;
+					}
 					$this->gadgets[$gadgetID][$keyOrUpdateArray] = $value;
 					$this->db->query('UPDATE player_has_gadget SET `' . $field . '` = ' . $this->db->escapeString($value) . ' WHERE ' . $this->SQL . ' AND gadget_id = ' . $this->db->escapeNumber($gadgetID) . ' LIMIT 1');
 					return true;
@@ -770,8 +797,9 @@ 
 	}
 
 	public function addGadget($gadgetID) {
-		if (isset($this->gadgets[$gadgetID]))
-			return false;
+		if (isset($this->gadgets[$gadgetID])) {
+					return false;
+		}
 		$this->gadgets[$gadgetID] = array('Equipped' => 0, 'Cooldown' => 0, 'Expires' => 0);
 		$this->db->query('REPLACE INTO player_has_gadget (game_id, account_id, gadget_id, cooldown, equipped,lasts_until) VALUES (' . $this->db->escapeNumber($this->gameID) . ',' . $this->db->escapeNumber($this->accountID) . ',' . $this->db->escapeNumber($gadgetID) . ',0,0,0)');
 		return true;
@@ -804,8 +832,7 @@ 
 				$this->knowledge['Nyx'] = $this->db->getInt('nyx');
 				$this->knowledge['Federation'] = 0;
 				$this->knowledge['Underground'] = 0;
-			}
-			else {
+			} else {
 				$this->knowledge['Erebus'] = 0;
 				$this->knowledge['Aether'] = 0;
 				$this->knowledge['Tartarus'] = 0;
@@ -814,10 +841,12 @@ 
 				$this->knowledge['Underground'] = 0;
 			}
 		}
-		if ($knowledgeType === false)
-			return $this->knowledge;
-		if (isset($this->knowledge[$knowledgeType]))
-			return $this->knowledge[$knowledgeType];
+		if ($knowledgeType === false) {
+					return $this->knowledge;
+		}
+		if (isset($this->knowledge[$knowledgeType])) {
+					return $this->knowledge[$knowledgeType];
+		}
 		return false;
 	}
 
@@ -830,9 +859,10 @@ 
 		$sector->diedHere($this);
 
 		// if we are in an alliance we increase their deaths
-		if ($this->hasAlliance())
-			$this->db->query('UPDATE alliance SET alliance_deaths = alliance_deaths + 1
+		if ($this->hasAlliance()) {
+					$this->db->query('UPDATE alliance SET alliance_deaths = alliance_deaths + 1
 							WHERE game_id = ' . $this->db->escapeNumber($this->getGameID()) . ' AND alliance_id = ' . $this->db->escapeNumber($this->getAllianceID()) . ' LIMIT 1');
+		}
 
 		// record death stat
 		$this->increaseHOF(1, array('Dying', 'Deaths'), HOF_PUBLIC);
@@ -845,8 +875,9 @@ 
 		$newCredits = round($this->getShip()->getCost() / 4);
 		$old_speed = $this->getShip()->getSpeed();
 
-		if ($newCredits < 100000)
-			$newCredits = 100000;
+		if ($newCredits < 100000) {
+					$newCredits = 100000;
+		}
 		$this->setCredits($newCredits);
 
 		$this->setSectorID($this::getHome($this->getGameID(), $this->getRaceID()));
@@ -921,14 +952,14 @@ 
 		$relation = $relations[$killer->getRaceID()];
 
 		$alignChangePerRelation = 0.1;
-		if ($relation >= RELATIONS_PEACE || $relation <= RELATIONS_WAR)
-			$alignChangePerRelation = 0.04;
+		if ($relation >= RELATIONS_PEACE || $relation <= RELATIONS_WAR) {
+					$alignChangePerRelation = 0.04;
+		}
 
 		$return['KillerAlign'] = -$relation * $alignChangePerRelation; //Lose relations when killing a peaceful race
 		if ($return['KillerAlign'] > 0) {
 			$killer->increaseAlignment($return['KillerAlign']);
-		}
-		else {
+		} else {
 			$killer->decreaseAlignment(-$return['KillerAlign']);
 		}
 		// War setting gives them military pay
@@ -962,8 +993,7 @@ 
 			// If the podded players alignment makes them deputy or member then set bounty
 			if ($this->getAlignment() >= 100) {
 				$return['BountyGained']['Type'] = 'HQ';
-			}
-			else if ($this->getAlignment() <= 100) {
+			} else if ($this->getAlignment() <= 100) {
 				$return['BountyGained']['Type'] = 'UG';
 			}
 
@@ -985,16 +1015,14 @@ 
 
 			if ($return['KillerAlign'] > 0) {
 				$killer->increaseHOF($return['KillerAlign'], array('Killing', 'NPC', 'Alignment', 'Gain'), HOF_PUBLIC);
-			}
-			else {
+			} else {
 				$killer->increaseHOF(-$return['KillerAlign'], array('Killing', 'NPC', 'Alignment', 'Loss'), HOF_PUBLIC);
 			}
 
 			$killer->increaseHOF($return['BountyGained']['Amount'], array('Killing', 'NPC', 'Money', 'Bounty Gained'), HOF_PUBLIC);
 
 			$killer->increaseHOF(1, array('Killing', 'NPC Kills'), HOF_PUBLIC);
-		}
-		else {
+		} else {
 			$killer->increaseHOF($return['KillerExp'], array('Killing', 'Experience', 'Gained'), HOF_PUBLIC);
 			$killer->increaseHOF($this->getExperience(), array('Killing', 'Experience', 'Of Traders Killed'), HOF_PUBLIC);
 
@@ -1006,8 +1034,7 @@ 
 
 			if ($return['KillerAlign'] > 0) {
 				$killer->increaseHOF($return['KillerAlign'], array('Killing', 'Alignment', 'Gain'), HOF_PUBLIC);
-			}
-			else {
+			} else {
 				$killer->increaseHOF(-$return['KillerAlign'], array('Killing', 'Alignment', 'Loss'), HOF_PUBLIC);
 			}
 
@@ -1015,8 +1042,7 @@ 
 
 			if ($this->getShip()->getAttackRatingWithMaxCDs() <= MAX_ATTACK_RATING_NEWBIE && $this->hasNewbieStatus() && !$killer->hasNewbieStatus()) { //Newbie kill
 				$killer->increaseHOF(1, array('Killing', 'Newbie Kills'), HOF_PUBLIC);
-			}
-			else {
+			} else {
 				$killer->increaseKills(1);
 				$killer->increaseHOF(1, array('Killing', 'Kills'), HOF_PUBLIC);
 
@@ -1198,20 +1224,21 @@ 
 				$bountyChanged = false;
 				$bounty = $this->getBounty($key);
 				if ($bounty['New'] === true) {
-					if ($bounty['Amount'] > 0 || $bounty['SmrCredits'] > 0)
-						$this->db->query('INSERT INTO bounty (account_id,game_id,type,amount,smr_credits,claimer_id,time) VALUES (' . $this->db->escapeNumber($this->getAccountID()) . ',' . $this->db->escapeNumber($this->getGameID()) . ',' . $this->db->escapeString($bounty['Type']) . ',' . $this->db->escapeNumber($bounty['Amount']) . ',' . $this->db->escapeNumber($bounty['SmrCredits']) . ',' . $this->db->escapeNumber($bounty['Claimer']) . ',' . $this->db->escapeNumber($bounty['Time']) . ')');
-				}
-				else {
-					if ($bounty['Amount'] > 0 || $bounty['SmrCredits'] > 0)
-						$this->db->query('UPDATE bounty
+					if ($bounty['Amount'] > 0 || $bounty['SmrCredits'] > 0) {
+											$this->db->query('INSERT INTO bounty (account_id,game_id,type,amount,smr_credits,claimer_id,time) VALUES (' . $this->db->escapeNumber($this->getAccountID()) . ',' . $this->db->escapeNumber($this->getGameID()) . ',' . $this->db->escapeString($bounty['Type']) . ',' . $this->db->escapeNumber($bounty['Amount']) . ',' . $this->db->escapeNumber($bounty['SmrCredits']) . ',' . $this->db->escapeNumber($bounty['Claimer']) . ',' . $this->db->escapeNumber($bounty['Time']) . ')');
+					}
+				} else {
+					if ($bounty['Amount'] > 0 || $bounty['SmrCredits'] > 0) {
+											$this->db->query('UPDATE bounty
 							SET amount=' . $this->db->escapeNumber($bounty['Amount']) . ',
 							smr_credits=' . $this->db->escapeString($bounty['SmrCredits']) . ',
 							type=' . $this->db->escapeString($bounty['Type']) . ',
 							claimer_id=' . $this->db->escapeNumber($bounty['Claimer']) . ',
 							time=' . $this->db->escapeNumber($bounty['Time']) . '
 							WHERE bounty_id=' . $this->db->escapeNumber($bounty['ID']) . ' AND ' . $this->SQL . ' LIMIT 1');
-					else
-						$this->db->query('DELETE FROM bounty WHERE bounty_id=' . $this->db->escapeNumber($bounty['ID']) . ' AND ' . $this->SQL . ' LIMIT 1');
+					} else {
+											$this->db->query('DELETE FROM bounty WHERE bounty_id=' . $this->db->escapeNumber($bounty['ID']) . ' AND ' . $this->SQL . ' LIMIT 1');
+					}
 				}
 			}
 		}
@@ -1219,14 +1246,16 @@ 
 	}
 
 	public function saveHOF() {
-		if ($this->hasHOFChanged !== false)
-			$this->doHOFSave($this->hasHOFChanged);
+		if ($this->hasHOFChanged !== false) {
+					$this->doHOFSave($this->hasHOFChanged);
+		}
 		if (!empty(self::$hasHOFVisChanged)) {
 			foreach (self::$hasHOFVisChanged as $hofType => $changeType) {
-				if ($changeType == self::HOF_NEW)
-					$this->db->query('INSERT INTO hof_visibility (type, visibility) VALUES (' . $this->db->escapeString($hofType) . ',' . $this->db->escapeString(self::$HOFVis[$hofType]) . ')');
-				else
-					$this->db->query('UPDATE hof_visibility SET visibility = ' . $this->db->escapeString(self::$HOFVis[$hofType]) . ' WHERE type = ' . $this->db->escapeString($hofType) . ' LIMIT 1');
+				if ($changeType == self::HOF_NEW) {
+									$this->db->query('INSERT INTO hof_visibility (type, visibility) VALUES (' . $this->db->escapeString($hofType) . ',' . $this->db->escapeString(self::$HOFVis[$hofType]) . ')');
+				} else {
+									$this->db->query('UPDATE hof_visibility SET visibility = ' . $this->db->escapeString(self::$HOFVis[$hofType]) . ' WHERE type = ' . $this->db->escapeString($hofType) . ' LIMIT 1');
+				}
 				unset(self::$hasHOFVisChanged[$hofType]);
 			}
 		}
@@ -1237,14 +1266,13 @@ 
 			$tempTypeList[] = $type;
 			if (is_array($hofChanged)) {
 				$this->doHOFSave($hofChanged, $tempTypeList);
-			}
-			else {
+			} else {
 				$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) . ')');
-				}
-				else if ($hofChanged == self::HOF_CHANGED) {
+					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) . ')');
+					}
+				} else if ($hofChanged == self::HOF_CHANGED) {
 	//				if($amount > 0)
 						$this->db->query('UPDATE player_hof
 							SET amount=' . $this->db->escapeNumber($amount) . '
@@ -1355,11 +1383,12 @@ 
 			$this->tickers = array();
 			//get ticker info
 			$this->db->query('SELECT type,time,expires,recent FROM player_has_ticker WHERE ' . $this->SQL . ' AND expires > ' . $this->db->escapeNumber(TIME));
-			while ($this->db->nextRecord())
-				$this->tickers[$this->db->getField('type')] = array('Type' => $this->db->getField('type'),
+			while ($this->db->nextRecord()) {
+							$this->tickers[$this->db->getField('type')] = array('Type' => $this->db->getField('type'),
 																				'Time' => $this->db->getInt('time'),
 																				'Expires' => $this->db->getInt('expires'),
 																				'Recent' => $this->db->getField('recent'));
+			}
 		}
 		return $this->tickers;
 	}
@@ -1370,8 +1399,9 @@ 
 
 	public function getTicker($tickerType) {
 		$tickers = $this->getTickers();
-		if (isset($tickers[$tickerType]))
-			return $tickers[$tickerType];
+		if (isset($tickers[$tickerType])) {
+					return $tickers[$tickerType];
+		}
 		return false;
 	}
 
@@ -1380,9 +1410,15 @@ 
 	}
 
 	public function getTurnsLevel() {
-		if (!$this->hasTurns()) return 'NONE';
-		if ($this->getTurns() <= 25) return 'LOW';
-		if ($this->getTurns() <= 75) return 'MEDIUM';
+		if (!$this->hasTurns()) {
+			return 'NONE';
+		}
+		if ($this->getTurns() <= 25) {
+			return 'LOW';
+		}
+		if ($this->getTurns() <= 75) {
+			return 'MEDIUM';
+		}
 		return 'HIGH';
 	}
 
@@ -1460,8 +1496,9 @@ 
 
 	public function sendGlobalMessage($message, $canBeIgnored = true) {
 		if ($canBeIgnored) {
-			if ($this->getAccount()->isMailBanned())
-				create_error('You are currently banned from sending messages');
+			if ($this->getAccount()->isMailBanned()) {
+							create_error('You are currently banned from sending messages');
+			}
 		}
 		$this->sendMessageToBox(BOX_GLOBALS, $message);
 
@@ -1484,12 +1521,14 @@ 
 	public function sendMessage($receiverID, $messageTypeID, $message, $canBeIgnored = true, $unread = true, $expires = false, $senderDelete = false) {
 		//get expire time
 		if ($canBeIgnored) {
-			if ($this->getAccount()->isMailBanned())
-				create_error('You are currently banned from sending messages');
+			if ($this->getAccount()->isMailBanned()) {
+							create_error('You are currently banned from sending messages');
+			}
 			// Don't send messages to players ignoring us
 			$this->db->query('SELECT account_id FROM message_blacklist WHERE account_id=' . $this->db->escapeNumber($receiverID) . ' AND blacklisted_id=' . $this->db->escapeNumber($this->getAccountID()) . ' LIMIT 1');
-			if ($this->db->nextRecord())
-				return;
+			if ($this->db->nextRecord()) {
+							return;
+			}
 		}
 
 		$message = word_filter($message);
@@ -1570,32 +1609,36 @@ 
 
 	public static function sendMessageFromAdmin($gameID, $receiverID, $message, $expires = false) {
 		//get expire time
-		if ($expires === false)
-			$expires = TIME + 86400 * 365;
+		if ($expires === false) {
+					$expires = TIME + 86400 * 365;
+		}
 		// send him the message
 		self::doMessageSending(ACCOUNT_ID_ADMIN, $receiverID, $gameID, MSG_ADMIN, $message, $expires);
 	}
 
 	public static function sendMessageFromAllianceAmbassador($gameID, $receiverID, $message, $expires = false) {
 		//get expire time
-		if ($expires === false)
-			$expires = TIME + 86400 * 31;
+		if ($expires === false) {
+					$expires = TIME + 86400 * 31;
+		}
 		// send him the message
 		self::doMessageSending(ACCOUNT_ID_ALLIANCE_AMBASSADOR, $receiverID, $gameID, MSG_ALLIANCE, $message, $expires);
 	}
 
 	public static function sendMessageFromCasino($gameID, $receiverID, $message, $expires = false) {
 		//get expire time
-		if ($expires === false)
-			$expires = TIME + 86400 * 7;
+		if ($expires === false) {
+					$expires = TIME + 86400 * 7;
+		}
 		// send him the message
 		self::doMessageSending(ACCOUNT_ID_CASINO, $receiverID, $gameID, MSG_CASINO, $message, $expires);
 	}
 
 	public static function sendMessageFromRace($raceID, $gameID, $receiverID, $message, $expires = false) {
 		//get expire time
-		if ($expires === false)
-			$expires = TIME + 86400 * 5;
+		if ($expires === false) {
+					$expires = TIME + 86400 * 5;
+		}
 		// send him the message
 		self::doMessageSending(ACCOUNT_ID_GROUP_RACES + $raceID, $receiverID, $gameID, MSG_POLITICAL, $message, $expires);
 	}
@@ -1638,11 +1681,11 @@ 
 	public function setPlottedCourse(Distance $plottedCourse) {
 		$hadPlottedCourse = $this->hasPlottedCourse();
 		$this->plottedCourse = $plottedCourse;
-		if ($this->plottedCourse->getTotalSectors() > 0)
-			$this->db->query('REPLACE INTO player_plotted_course
+		if ($this->plottedCourse->getTotalSectors() > 0) {
+					$this->db->query('REPLACE INTO player_plotted_course
 				(account_id, game_id, course)
 				VALUES(' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber($this->getGameID()) . ', ' . $this->db->escapeBinary(serialize($this->plottedCourse)) . ')');
-		else if ($hadPlottedCourse) {
+		} else if ($hadPlottedCourse) {
 			$this->deletePlottedCourse();
 		}
 	}
@@ -1652,12 +1695,14 @@ 
 	}
 
 	public function isPartOfCourse($sectorOrSectorID) {
-		if (!$this->hasPlottedCourse())
-			return false;
-		if ($sectorOrSectorID instanceof SmrSector)
-			$sectorID = $sectorOrSectorID->getSectorID();
-		else
-			$sectorID = $sectorOrSectorID;
+		if (!$this->hasPlottedCourse()) {
+					return false;
+		}
+		if ($sectorOrSectorID instanceof SmrSector) {
+					$sectorID = $sectorOrSectorID->getSectorID();
+		} else {
+					$sectorID = $sectorOrSectorID;
+		}
 		return $this->getPlottedCourse()->isInPath($sectorID);
 	}
 

lib/Default/DummyPlayer.class.php

Spacing +20 added lines, -20 removed lines

@@ -1,31 +1,31 @@ 
 <?php
 
 class DummyPlayer extends AbstractSmrPlayer {
-	public function __construct($gameID=0,$playerName='Dummy',$raceID=1,$experience=1000,$alignment=100,$allianceID=0,$shipTypeID=60) {
+	public function __construct($gameID = 0, $playerName = 'Dummy', $raceID = 1, $experience = 1000, $alignment = 100, $allianceID = 0, $shipTypeID = 60) {
 		parent::__construct();
 		$this->accountID				= 0;
-		$this->gameID					= (int) $gameID;
-		$this->playerName				= (string) $playerName;
+		$this->gameID = (int)$gameID;
+		$this->playerName = (string)$playerName;
 		$this->playerID					= 0;
 		$this->sectorID					= 0;
-		$this->lastSectorID				= 0;
+		$this->lastSectorID = 0;
 		$this->turns					= 1000;
-		$this->newbieTurns				= 0;
+		$this->newbieTurns = 0;
 		$this->lastNewsUpdate			= 0;
 		$this->dead						= false;
 		$this->landedOnPlanet			= false;
-		$this->lastActive				= 0;
-		$this->lastCPLAction			= 0;
-		$this->raceID					= (int) $raceID;
-		$this->credits					= 0;
-		$this->experience				= (int) $experience;
-		$this->alignment				= (int) $alignment;
-		$this->militaryPayment			= 0;
-		$this->allianceID				= (int) $allianceID;
-		$this->shipID					= (int) $shipTypeID;
+		$this->lastActive = 0;
+		$this->lastCPLAction = 0;
+		$this->raceID = (int)$raceID;
+		$this->credits = 0;
+		$this->experience				= (int)$experience;
+		$this->alignment = (int)$alignment;
+		$this->militaryPayment = 0;
+		$this->allianceID				= (int)$allianceID;
+		$this->shipID					= (int)$shipTypeID;
 		$this->kills					= 0;
 		$this->deaths					= 0;
-		$this->lastPort					= 0;
+		$this->lastPort = 0;
 		$this->bank						= 0;
 		$this->zoom						= 0;
 		
@@ -53,9 +53,9 @@ 
 	}
 	
 	public function setAllianceID($ID) {
-		if($this->allianceID == $ID)
+		if ($this->allianceID == $ID)
 			return;
-		$this->allianceID=$ID;
+		$this->allianceID = $ID;
 	}
 	
 	public function &killPlayerByPlayer(AbstractSmrPlayer $killer) {
@@ -81,7 +81,7 @@ 
 		$db = new SmrMySqlDatabase();
 		$db->query('REPLACE INTO cached_dummys ' .
 					'(type, id, info) ' .
-					'VALUES (\'DummyPlayer\', '.$db->escapeString($this->getPlayerName()).', '.$db->escapeString($cache).')');	
+					'VALUES (\'DummyPlayer\', ' . $db->escapeString($this->getPlayerName()) . ', ' . $db->escapeString($cache) . ')');	
 		 unserialize($cache);
 	}
 	
@@ -90,7 +90,7 @@ 
 		$db->query('SELECT info FROM cached_dummys
 					WHERE type = \'DummyPlayer\'
 						AND id = ' . $db->escapeString($name) . ' LIMIT 1');
-		if($db->nextRecord()) {
+		if ($db->nextRecord()) {
 			$return = unserialize($db->getField('info'));
 			return $return;
 		}
@@ -105,7 +105,7 @@ 
 		$db->query('SELECT id FROM cached_dummys
 					WHERE type = \'DummyPlayer\'');
 		$dummyNames = array();
-		while($db->nextRecord()) {
+		while ($db->nextRecord()) {
 			$dummyNames[] = $db->getField('id');
 		}
 		return $dummyNames;

Braces +4 added lines, -4 removed lines

@@ -53,8 +53,9 @@ 
 	}
 	
 	public function setAllianceID($ID) {
-		if($this->allianceID == $ID)
-			return;
+		if($this->allianceID == $ID) {
+					return;
+		}
 		$this->allianceID=$ID;
 	}
 	
@@ -93,8 +94,7 @@ 
 		if($db->nextRecord()) {
 			$return = unserialize($db->getField('info'));
 			return $return;
-		}
-		else {
+		} else {
 			$return = new DummyPlayer();
 			return $return;
 		}

lib/Default/SocialLogins/Twitter.class.php

Indentation +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 		}
 		$helper = self::getTwitterObj($_SESSION['TwitterToken']);
 		$accessToken = $helper->oauth('oauth/access_token',
-		                              ['oauth_verifier' => $_REQUEST['oauth_verifier']]);
+									  ['oauth_verifier' => $_REQUEST['oauth_verifier']]);
 		$auth = self::getTwitterObj($accessToken);
 		$userInfo = $auth->get('account/verify_credentials', ['include_email' => 'true']);
 		if ($auth->getLastHttpCode() == 200) {

htdocs/login.php

Braces +1 added lines, -2 removed lines

@@ -50,7 +50,6 @@
 	$template->assign('Body', 'login/login.php');
 	$template->display('login/skeleton.php');
 
-}
-catch (Throwable $e) {
+} catch (Throwable $e) {
 	handleException($e);
 }

templates/Default/engine/Default/includes/PlanetTraderTeamCombatResults.inc

Spacing +51 added lines, -51 removed lines

@@ -1,10 +1,10 @@ 
 <?php
-foreach($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
-	$ShootingPlayer =& $TraderResults['Player'];
-	$TotalDamage =& $TraderResults['TotalDamage'];
-	if($MinimalDisplay && !$ThisPlayer->equals($ShootingPlayer)) {
+foreach ($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
+	$ShootingPlayer = & $TraderResults['Player'];
+	$TotalDamage = & $TraderResults['TotalDamage'];
+	if ($MinimalDisplay && !$ThisPlayer->equals($ShootingPlayer)) {
 		echo $ShootingPlayer->getDisplayName();
-		if($TotalDamage > 0) {
+		if ($TotalDamage > 0) {
 			?> hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php
 		} else {
 			?> does no damage this round<?php
@@ -12,125 +12,125 @@ 
 		continue;
 	}
 
-	if($TraderResults['DeadBeforeShot']) {
+	if ($TraderResults['DeadBeforeShot']) {
 		echo $ShootingPlayer->getDisplayName() ?> died before they were able to attack!<br /><?php
 	} else {
-		if(isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
-			foreach($TraderResults['Weapons'] as $WeaponResults) {
-				$ShootingWeapon =& $WeaponResults['Weapon'];
-				$ShotHit =& $WeaponResults['Hit'];
-				$ActualDamage =& $WeaponResults['ActualDamage'];
-				$WeaponDamage =& $WeaponResults['WeaponDamage'];
-				$TargetPlanet =& $WeaponResults['TargetPlanet'];
+		if (isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
+			foreach ($TraderResults['Weapons'] as $WeaponResults) {
+				$ShootingWeapon = & $WeaponResults['Weapon'];
+				$ShotHit = & $WeaponResults['Hit'];
+				$ActualDamage = & $WeaponResults['ActualDamage'];
+				$WeaponDamage = & $WeaponResults['WeaponDamage'];
+				$TargetPlanet = & $WeaponResults['TargetPlanet'];
 				$DamageTypes = 0;
-				if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
-				if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-				if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
+				if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
+				if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+				if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
 				
-				echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?>the debris that was once <?php } echo $TargetPlanet->getDisplayName();
-				if(!$ActualDamage['TargetAlreadyDead']) {
-					if(!$ShotHit) {
+				echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?>the debris that was once <?php } echo $TargetPlanet->getDisplayName();
+				if (!$ActualDamage['TargetAlreadyDead']) {
+					if (!$ShotHit) {
 						?> and misses<?php
-					} else if($ActualDamage['TotalDamage'] == 0) {
-						if($WeaponDamage['Shield'] > 0) {
-							if($ActualDamage['HasCDs']) {
+					} else if ($ActualDamage['TotalDamage'] == 0) {
+						if ($WeaponDamage['Shield'] > 0) {
+							if ($ActualDamage['HasCDs']) {
 								?> which proves ineffective against their combat drones<?php
 							} else {
 								?> which washes harmlessly over their hull<?php
 							}
-						} else if($WeaponDamage['Armour'] > 0) {
+						} else if ($WeaponDamage['Armour'] > 0) {
 							?> which is deflected by their shields<?php
 						} else {
 							?> but it cannot do any damage<?php
 						}
 					} else {
 						?> destroying <?php
-						if($ActualDamage['Shield'] > 0) {
+						if ($ActualDamage['Shield'] > 0) {
 							?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
 							$this->doDamageTypeReductionDisplay($DamageTypes);
 						}
-						if($ActualDamage['NumCDs'] > 0) {
+						if ($ActualDamage['NumCDs'] > 0) {
 							?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
 							$this->doDamageTypeReductionDisplay($DamageTypes);
 						}
-						if($ActualDamage['Armour'] > 0) {
+						if ($ActualDamage['Armour'] > 0) {
 							?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
 						}
 					}
 				} ?>.
 				<br /><?php
-				if($ActualDamage['KillingShot']) {
-					$this->includeTemplate('includes/PlanetKillMessage.inc',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlanet'=>$TargetPlanet));
+				if ($ActualDamage['KillingShot']) {
+					$this->includeTemplate('includes/PlanetKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlanet'=>$TargetPlanet));
 				}
 			}
 		}
-		if(isset($TraderResults['Drones'])) {
-			$Drones =& $TraderResults['Drones'];
-			$ActualDamage =& $Drones['ActualDamage'];
-			$WeaponDamage =& $Drones['WeaponDamage'];
-			$TargetPlanet =& $Drones['TargetPlanet'];
+		if (isset($TraderResults['Drones'])) {
+			$Drones = & $TraderResults['Drones'];
+			$ActualDamage = & $Drones['ActualDamage'];
+			$WeaponDamage = & $Drones['WeaponDamage'];
+			$TargetPlanet = & $Drones['TargetPlanet'];
 			$DamageTypes = 0;
-			if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
-			if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-			if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
+			if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
+			if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+			if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
 
 			echo $ShootingPlayer->getDisplayName();
-			if($WeaponDamage['Launched'] == 0) {
+			if ($WeaponDamage['Launched'] == 0) {
 				?> fails to launch their combat drones<?php
 			} else {
 				?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php
-				if($ActualDamage['TargetAlreadyDead']) {
+				if ($ActualDamage['TargetAlreadyDead']) {
 					?>the debris that was once <?php
 				}
 				echo $TargetPlanet->getDisplayName();
-				if(!$ActualDamage['TargetAlreadyDead']) {
-					if($ActualDamage['TotalDamage'] == 0) {
-						if($WeaponDamage['Shield'] > 0) {
-							if($ActualDamage['HasCDs']) {
+				if (!$ActualDamage['TargetAlreadyDead']) {
+					if ($ActualDamage['TotalDamage'] == 0) {
+						if ($WeaponDamage['Shield'] > 0) {
+							if ($ActualDamage['HasCDs']) {
 								?> which prove ineffective against their combat drones<?php
 							} else {
 								?> which washes harmlessly over their hull<?php
 							}
 						}
-						if($ActualDamage['Armour'] > 0) {
+						if ($ActualDamage['Armour'] > 0) {
 							?> which is deflected by their shields<?php
 						} else {
 							?> but they cannot do any damage<?php
 						}
 					} else {
 						?> destroying <?php
-						if($ActualDamage['Shield'] > 0) {
+						if ($ActualDamage['Shield'] > 0) {
 							?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
 							$this->doDamageTypeReductionDisplay($DamageTypes);
 						}
-						if($ActualDamage['NumCDs'] > 0) {
+						if ($ActualDamage['NumCDs'] > 0) {
 							?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
 							$this->doDamageTypeReductionDisplay($DamageTypes);
 						}
-						if($ActualDamage['Armour'] > 0) {
+						if ($ActualDamage['Armour'] > 0) {
 							?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
 						}
 					}
 				}
 			} ?>.
 			<br /><?php
-			if($ActualDamage['KillingShot']) {
-				$this->includeTemplate('includes/PlanetKillMessage.inc',array('KillResults'=>$Drones['KillResults'],'TargetPlanet'=>$TargetPlanet));
+			if ($ActualDamage['KillingShot']) {
+				$this->includeTemplate('includes/PlanetKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPlanet'=>$TargetPlanet));
 			}
 		}
 	}
 	echo $ShootingPlayer->getDisplayName();
-	if($TotalDamage > 0) {
+	if ($TotalDamage > 0) {
 		?> hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php
 	} else {
 		?> does no damage this round<?php
-		if(!$TraderResults['DeadBeforeShot']) {
+		if (!$TraderResults['DeadBeforeShot']) {
 			?>. Maybe they should go back to the academy<?php
 		}
 	} ?>.<br /><br /><?php
 }
 $TotalDamage = $TraderTeamCombatResults['TotalDamage']; ?>
-This fleet <?php if($TotalDamage > 0){ ?>hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php } else{ ?>does no damage this round. You call that a fleet? They need a better recruiter<?php } ?>.<br /><?php
+This fleet <?php if ($TotalDamage > 0) { ?>hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php } else { ?>does no damage this round. You call that a fleet? They need a better recruiter<?php } ?>.<br /><?php
 foreach ($TraderTeamCombatResults['Downgrades'] as $structureID => $numDestroyed) { ?>
 	This team destroys <span class="red"><?php echo $numDestroyed; ?> </span><?php echo pluralise($TargetPlanet->getStructureTypes($structureID)->name(), $numDestroyed); ?>.<br /><?php
 } ?>