smrealms / smr

lib/Default/message.functions.inc

Braces +18 added lines, -18 removed lines

@@ -26,30 +26,30 @@
 }
 
 function &getMessagePlayer($accountID, $gameID, $messageType = false) {
-	if($accountID==ACCOUNT_ID_PORT)
-		$return = '<span class="yellow">Port Defenses</span>';
-	else if($accountID==ACCOUNT_ID_ADMIN)
-		$return = '<span class="admin">Administrator</span>';
-	else if($accountID==ACCOUNT_ID_PLANET)
-		$return = '<span class="yellow">Planetary Defenses</span>';
-	else if($accountID==ACCOUNT_ID_ALLIANCE_AMBASSADOR)
-		$return = '<span class="green">Alliance Ambassador</span>';
-	else if($accountID==ACCOUNT_ID_CASINO)
-		$return = '<span class="yellow">Casino</span>';
-	else if($accountID==ACCOUNT_ID_FED_CLERK)
-		$return = '<span class="yellow">Federal Clerk</span>';
-	else if($accountID==ACCOUNT_ID_OP_ANNOUNCE || $accountID==ACCOUNT_ID_ALLIANCE_COMMAND)
-		$return = '<span class="green">Alliance Command</span>';
-	else {
+	if($accountID==ACCOUNT_ID_PORT) {
+			$return = '<span class="yellow">Port Defenses</span>';
+	} else if($accountID==ACCOUNT_ID_ADMIN) {
+			$return = '<span class="admin">Administrator</span>';
+	} else if($accountID==ACCOUNT_ID_PLANET) {
+			$return = '<span class="yellow">Planetary Defenses</span>';
+	} else if($accountID==ACCOUNT_ID_ALLIANCE_AMBASSADOR) {
+			$return = '<span class="green">Alliance Ambassador</span>';
+	} else if($accountID==ACCOUNT_ID_CASINO) {
+			$return = '<span class="yellow">Casino</span>';
+	} else if($accountID==ACCOUNT_ID_FED_CLERK) {
+			$return = '<span class="yellow">Federal Clerk</span>';
+	} else if($accountID==ACCOUNT_ID_OP_ANNOUNCE || $accountID==ACCOUNT_ID_ALLIANCE_COMMAND) {
+			$return = '<span class="green">Alliance Command</span>';
+	} else {
 		foreach (Globals::getRaces() as $raceID => $raceInfo) {
 			if($accountID==ACCOUNT_ID_GROUP_RACES+$raceID) {
 				$return = '<span class="yellow">'.$raceInfo['Race Name'].' Government</span>';
 				return $return;
 			}
 		}
-		if(!empty($accountID))
-			$return = SmrPlayer::getPlayer($accountID, $gameID);
-		else {
+		if(!empty($accountID)) {
+					$return = SmrPlayer::getPlayer($accountID, $gameID);
+		} else {
 			switch($messageType) {
 				case MSG_ADMIN:
 					$return = '<span class="admin">Administrator</span>';

lib/Default/SmrPlayer.class.inc

Braces +202 added lines, -152 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;
 	}
@@ -175,8 +176,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);
 		}
 	}
@@ -302,24 +302,31 @@ 
 	}
 
 	function setZoom($zoom) {
-		if ($zoom < 0) $zoom = 0;
-		if ($zoom > 12) $zoom = 12;
-		if($this->zoom == $zoom)
-			return;
+		if ($zoom < 0) {
+			$zoom = 0;
+		}
+		if ($zoom > 12) {
+			$zoom = 12;
+		}
+		if($this->zoom == $zoom) {
+					return;
+		}
 		$this->zoom=$zoom;
 		$this->hasChanged=true;
 //		$this->db->query('UPDATE player SET zoom = ' . $zoom . ' WHERE ' . $this->SQL . ' LIMIT 1');
 	}
 
 	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);
 	}
 
 	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);
 	}
 
@@ -334,8 +341,9 @@ 
 	}
 
 	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');
@@ -348,11 +356,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);
@@ -377,7 +383,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;
+				}
 			}
 		}
 
@@ -393,8 +401,9 @@ 
 	}
 
 	function setAllianceJoinable($time) {
-		if($this->allianceJoinable == $time)
-			return;
+		if($this->allianceJoinable == $time) {
+					return;
+		}
 		$this->allianceJoinable=$time;
 		$this->hasChanged=true;
 	}
@@ -404,8 +413,9 @@ 
 	}
 
 	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');
@@ -416,28 +426,35 @@ 
 	}
 
 	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);
 	}
 	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);
 	}
 	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');
@@ -448,8 +465,9 @@ 
 	}
 
 	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');
@@ -487,7 +505,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);
@@ -516,8 +536,9 @@ 
 	}
 
 	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');
@@ -529,8 +550,9 @@ 
 	}
 
 	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');
@@ -541,8 +563,9 @@ 
 	}
 
 	function setDisplayMissions($bool) {
-		if($this->displayMissions == $bool)
-			return;
+		if($this->displayMissions == $bool) {
+					return;
+		}
 		$this->displayMissions=$bool;
 		$this->hasChanged=true;
 	}
@@ -552,8 +575,9 @@ 
 	}
 
 	function setDisplayWeapons($bool) {
-		if($this->displayWeapons == $bool)
-			return;
+		if($this->displayWeapons == $bool) {
+					return;
+		}
 		$this->displayWeapons=$bool;
 		$this->hasChanged=true;
 	}
@@ -563,8 +587,9 @@ 
 	}
 
 	function setForceDropMessages($bool) {
-		if($this->forceDropMessages == $bool)
-			return;
+		if($this->forceDropMessages == $bool) {
+					return;
+		}
 		$this->forceDropMessages=$bool;
 		$this->hasChanged=true;
 	}
@@ -596,8 +621,9 @@ 
 	}
 
 	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');
@@ -621,8 +647,9 @@ 
 	function increaseRelationsByTrade($numGoods,$raceID) {
 		$relations = ceil(min($numGoods,300)/30);
 		//Cap relations to a max of 1 after 500 have been reached
-		if($this->getPureRelation($raceID) + $relations >= 500)
-			$relations = max(1, min($relations, 500 - $this->getPureRelation($raceID)));
+		if($this->getPureRelation($raceID) + $relations >= 500) {
+					$relations = max(1, min($relations, 500 - $this->getPureRelation($raceID)));
+		}
 		$this->increaseRelations($relations,$raceID);
 	}
 
@@ -632,27 +659,33 @@ 
 	}
 
 	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);
 	}
 	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);
 	}
 	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);
@@ -687,8 +720,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;
 			}
 		}
@@ -700,8 +732,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'));
+			}
 		}
 	}
 
@@ -723,8 +756,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) {
@@ -758,12 +790,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;
@@ -774,8 +806,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;
@@ -808,8 +841,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;
@@ -818,10 +850,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;
 	}
 
@@ -834,9 +868,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);
@@ -849,8 +884,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()));
@@ -924,14 +960,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
@@ -965,8 +1001,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';
 			}
 
@@ -988,16 +1023,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);
 
@@ -1009,8 +1042,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);
 			}
 
@@ -1018,8 +1050,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);
 
@@ -1202,20 +1233,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');
+					}
 				}
 			}
 		}
@@ -1223,14 +1255,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]);
 			}
 		}
@@ -1241,14 +1275,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) . '
@@ -1359,11 +1392,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;
 	}
@@ -1374,8 +1408,9 @@ 
 
 	public function getTicker($tickerType) {
 		$tickers = $this->getTickers();
-		if(isset($tickers[$tickerType]))
-			return $tickers[$tickerType];
+		if(isset($tickers[$tickerType])) {
+					return $tickers[$tickerType];
+		}
 		return false;
 	}
 
@@ -1384,9 +1419,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';
 	}
 
@@ -1464,8 +1505,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);
 
@@ -1488,12 +1530,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);
@@ -1574,32 +1618,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);
 	}
@@ -1642,11 +1690,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();
 		}
 	}
@@ -1656,12 +1704,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/DummyShip.class.inc

Braces +1 added lines, -2 removed lines

@@ -72,8 +72,7 @@
 				$return = unserialize($db->getField('info'));
 				$return->regenerate($player);
 				self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] =& $return;
-			}
-			else {
+			} else {
 				self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] = new DummyShip($player);
 			}
 		}

lib/Default/AbstractSmrShip.class.inc

Braces +87 added lines, -64 removed lines

@@ -28,10 +28,11 @@ 
 			// determine ship
 			$db = new SmrMySqlDatabase();
 			$db->query('SELECT * FROM ship_type WHERE ship_type_id = '.$db->escapeNumber($shipTypeID).' LIMIT 1'); //TODO add game type id
-			if($db->nextRecord())
-				self::$CACHE_BASE_SHIPS[$gameTypeID][$shipTypeID] = self::buildBaseShip($db);
-			else
-				self::$CACHE_BASE_SHIPS[$gameTypeID][$shipTypeID] = false;
+			if($db->nextRecord()) {
+							self::$CACHE_BASE_SHIPS[$gameTypeID][$shipTypeID] = self::buildBaseShip($db);
+			} else {
+							self::$CACHE_BASE_SHIPS[$gameTypeID][$shipTypeID] = false;
+			}
 		}
 		return self::$CACHE_BASE_SHIPS[$gameTypeID][$shipTypeID];
 	}
@@ -149,8 +150,9 @@ 
 				do {
 					list($goodID,$amount)=each($goods);
 				} while($amount==0);
-				if($amount > $total-$this->getCargoHolds())
-					$amount = $total-$this->getCargoHolds();
+				if($amount > $total-$this->getCargoHolds()) {
+									$amount = $total-$this->getCargoHolds();
+				}
 				$this->decreaseCargo($goodID,$amount);
 			}
 		}
@@ -158,19 +160,21 @@ 
 
 	public function checkForExcessHardware() {
 		//check hardware to see if anything needs to be removed
-		if(is_array($hardware = $this->getHardware()))
-			foreach ($hardware as $hardwareTypeID => $amount) {
+		if(is_array($hardware = $this->getHardware())) {
+					foreach ($hardware as $hardwareTypeID => $amount) {
 				if ($amount > ($max=$this->getMaxHardware($hardwareTypeID))) {
 					$this->setHardware($hardwareTypeID,$max,true);
+		}
 				}
 			}
 	}
 
 	public function getPowerUsed() {
 		$power = 0;
-		if($this->getNumWeapons()>0)
-			foreach ($this->weapons as $weapon)
+		if($this->getNumWeapons()>0) {
+					foreach ($this->weapons as $weapon)
 				$power += $weapon->getPowerLevel();
+		}
 		return $power;
 	}
 
@@ -191,17 +195,19 @@ 
 	}
 
 	public function getDisplayAttackRating(AbstractSmrPlayer $player) {
-		if($this->hasActiveIllusion())
-			return $this->getIllusionAttack();
-		else
-			return $this->getAttackRating();
+		if($this->hasActiveIllusion()) {
+					return $this->getIllusionAttack();
+		} else {
+					return $this->getAttackRating();
+		}
 	}
 
 	public function getDisplayDefenseRating() {
-		if($this->hasActiveIllusion())
-			return $this->getIllusionDefense();
-		else
-			return $this->getDefenseRating();
+		if($this->hasActiveIllusion()) {
+					return $this->getIllusionDefense();
+		} else {
+					return $this->getDefenseRating();
+		}
 	}
 
 	public function getAttackRating() {
@@ -251,8 +257,7 @@ 
 				$this->weapons[$i-1] =& $this->weapons[$i]; //If we go above the bounds of the array it will keep on going due to assign by ref. Hence $i-1 =& $i not $i =& $i+1
 			}
 			$this->weapons[count($this->weapons)-1] =& $temp;
-		}
-		else {
+		} else {
 			$temp = $this->weapons[$replacement];
 			$this->weapons[$replacement] = $this->weapons[$orderID];
 			$this->weapons[$orderID] = $temp;
@@ -269,8 +274,7 @@ 
 				$this->weapons[$i] =& $this->weapons[$i-1];
 			}
 			$this->weapons[0] =& $temp;
-		}
-		else {
+		} else {
 			$temp = $this->weapons[$replacement];
 			$this->weapons[$replacement] = $this->weapons[$orderID];
 			$this->weapons[$orderID] = $temp;
@@ -329,8 +333,7 @@ 
 			$this->setArmour(150,true);
 			$this->setCargoHolds(40);
 			$this->setShipTypeID(SHIP_TYPE_NEWBIE_MERCHANT_VESSEL);
-		}
-		else {
+		} else {
 			$this->setShields(50,true);
 			$this->setArmour(50,true);
 			$this->setCargoHolds(5);
@@ -350,8 +353,9 @@ 
 
 
 	public function hasActiveIllusion() {
-		if(!$this->hasIllusion())
-			return false;
+		if(!$this->hasIllusion()) {
+					return false;
+		}
 		return $this->getIllusionShip()!==false;
 
 	}
@@ -475,14 +479,16 @@ 
 	}
 
 	public function getHardware($hardwareTypeID = false) {
-		if($hardwareTypeID === false)
-			return $this->hardware;
+		if($hardwareTypeID === false) {
+					return $this->hardware;
+		}
 		return isset($this->hardware[$hardwareTypeID]) ? $this->hardware[$hardwareTypeID] : 0;
 	}
 
 	public function setHardware($hardwareTypeID,$amount) {
-		if($this->getHardware($hardwareTypeID) == $amount)
-			return;
+		if($this->getHardware($hardwareTypeID) == $amount) {
+					return;
+		}
 		$this->hardware[$hardwareTypeID] = $amount;
 		$this->hasChangedHardware[$hardwareTypeID] = true;
 	}
@@ -492,14 +498,16 @@ 
 	}
 
 	public function getOldHardware($hardwareTypeID = false) {
-		if($hardwareTypeID === false)
-			return $this->oldHardware;
+		if($hardwareTypeID === false) {
+					return $this->oldHardware;
+		}
 		return isset($this->oldHardware[$hardwareTypeID]) ? $this->oldHardware[$hardwareTypeID] : 0;
 	}
 
 	public function setOldHardware($hardwareTypeID,$amount) {
-		if($this->getOldHardware($hardwareTypeID) == $amount)
-			return;
+		if($this->getOldHardware($hardwareTypeID) == $amount) {
+					return;
+		}
 		$this->oldHardware[$hardwareTypeID] = $amount;
 		$this->hasChangedHardware[$hardwareTypeID] = true;
 	}
@@ -509,8 +517,9 @@ 
 	}
 
 	public function getMaxHardware($hardwareTypeID = false) {
-		if($hardwareTypeID === false)
-			return $this->baseShip['MaxHardware'];
+		if($hardwareTypeID === false) {
+					return $this->baseShip['MaxHardware'];
+		}
 		return $this->baseShip['MaxHardware'][$hardwareTypeID];
 	}
 
@@ -519,8 +528,9 @@ 
 	}
 
 	public function setShields($amount,$updateOldAmount=false) {
-		if($updateOldAmount && !$this->hasLostShields())
-			$this->setOldHardware(HARDWARE_SHIELDS,$amount);
+		if($updateOldAmount && !$this->hasLostShields()) {
+					$this->setOldHardware(HARDWARE_SHIELDS,$amount);
+		}
 		$this->setHardware(HARDWARE_SHIELDS,$amount);
 	}
 
@@ -561,8 +571,9 @@ 
 	}
 
 	public function setArmour($amount,$updateOldAmount=false) {
-		if($updateOldAmount && !$this->hasLostArmour())
-			$this->setOldHardware(HARDWARE_ARMOUR,$amount);
+		if($updateOldAmount && !$this->hasLostArmour()) {
+					$this->setOldHardware(HARDWARE_ARMOUR,$amount);
+		}
 		$this->setHardware(HARDWARE_ARMOUR,$amount);
 	}
 
@@ -631,8 +642,9 @@ 
 	}
 
 	public function setCDs($amount,$updateOldAmount=false) {
-		if($updateOldAmount && !$this->hasLostCDs())
-			$this->setOldHardware(HARDWARE_COMBAT,$amount);
+		if($updateOldAmount && !$this->hasLostCDs()) {
+					$this->setOldHardware(HARDWARE_COMBAT,$amount);
+		}
 		$this->setHardware(HARDWARE_COMBAT,$amount);
 	}
 
@@ -714,8 +726,9 @@ 
 
 	public function &getCargo($goodID=false) {
 		if($goodID!==false) {
-			if(isset($this->cargo[$goodID]))
-				return $this->cargo[$goodID];
+			if(isset($this->cargo[$goodID])) {
+							return $this->cargo[$goodID];
+			}
 			$cargo = 0;
 			return $cargo;
 		}
@@ -723,16 +736,19 @@ 
 	}
 
 	public function hasCargo($goodID=false) {
-		if($goodID!==false)
-			return $this->getCargo($goodID)>0;
-		if(is_array($cargo = $this->getCargo()))
-			return array_sum($cargo)>0;
+		if($goodID!==false) {
+					return $this->getCargo($goodID)>0;
+		}
+		if(is_array($cargo = $this->getCargo())) {
+					return array_sum($cargo)>0;
+		}
 		return false;
 	}
 
 	public function setCargo($goodID,$amount) {
-		if($this->getCargo($goodID) == $amount)
-			return;
+		if($this->getCargo($goodID) == $amount) {
+					return;
+		}
 		$this->cargo[$goodID] = $amount;
 		$this->hasChangedCargo = true;
 		// Sort cargo by goodID to make sure it shows up in the correct order
@@ -741,14 +757,16 @@ 
 	}
 
 	public function decreaseCargo($goodID,$amount) {
-		if($amount < 0)
-			throw new Exception('Trying to decrease negative cargo.');
+		if($amount < 0) {
+					throw new Exception('Trying to decrease negative cargo.');
+		}
 		$this->setCargo($goodID,$this->getCargo($goodID)-$amount);
 	}
 
 	public function increaseCargo($goodID,$amount) {
-		if($amount < 0)
-			throw new Exception('Trying to increase negative cargo.');
+		if($amount < 0) {
+					throw new Exception('Trying to increase negative cargo.');
+		}
 		$this->setCargo($goodID,$this->getCargo($goodID)+$amount);
 	}
 
@@ -778,8 +796,9 @@ 
 		$this->setOldShields($this->getShields());
 		$this->setOldCDs($this->getCDs());
 		$this->setOldArmour($this->getArmour());
-		if(isset($var['UnderAttack']))
-			return $var['UnderAttack'];
+		if(isset($var['UnderAttack'])) {
+					return $var['UnderAttack'];
+		}
 		if($underAttack && !USING_AJAX) {
 			SmrSession::updateVar('UnderAttack',$underAttack); //Remember we are under attack for AJAX
 		}
@@ -854,8 +873,9 @@ 
 		$results['DeadBeforeShot'] = false;
 		foreach($this->weapons as $orderID => $weapon) {
 			$results['Weapons'][$orderID] =& $weapon->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]);
-			if($results['Weapons'][$orderID]['Hit'])
-				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
+			if($results['Weapons'][$orderID]['Hit']) {
+							$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
+			}
 		}
 		if($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(),$this->getCDs());
@@ -917,8 +937,9 @@ 
 		$results['DeadBeforeShot'] = false;
 		foreach($this->weapons as $orderID => $weapon) {
 			$results['Weapons'][$orderID] =& $weapon->shootPort($thisPlayer, $port);
-			if($results['Weapons'][$orderID]['Hit'])
-				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
+			if($results['Weapons'][$orderID]['Hit']) {
+							$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
+			}
 		}
 		if($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(),$this->getCDs());
@@ -954,8 +975,9 @@ 
 		$results['DeadBeforeShot'] = false;
 		foreach($this->weapons as $orderID => $weapon) {
 			$results['Weapons'][$orderID] =& $weapon->shootPlanet($thisPlayer, $planet, $delayed);
-			if($results['Weapons'][$orderID]['Hit'])
-				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
+			if($results['Weapons'][$orderID]['Hit']) {
+							$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
+			}
 		}
 		if($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(),$this->getCDs());
@@ -980,8 +1002,9 @@ 
 				$cdDamage = $this->doCDDamage(min($damage['MaxDamage'],$damage['Armour']));
 				$damage['Armour'] -= $cdDamage;
 				$damage['MaxDamage'] -= $cdDamage;
-				if(!$this->hasCDs() && ($cdDamage == 0 || $damage['Rollover']))
-					$armourDamage = $this->doArmourDamage(min($damage['MaxDamage'],$damage['Armour']));
+				if(!$this->hasCDs() && ($cdDamage == 0 || $damage['Rollover'])) {
+									$armourDamage = $this->doArmourDamage(min($damage['MaxDamage'],$damage['Armour']));
+				}
 			}
 		}
 		$return = array(

lib/Default/council.inc

Braces +14 added lines, -12 removed lines

@@ -16,17 +16,19 @@ 
 		$race_id_2	= $db->getInt('race_id_2');
 		$action		= $db->getField('action');
 
-		if ($action == 'INC')
-			$relation_modifier = RELATIONS_VOTE_CHANGE;
-		else
-			$relation_modifier = -RELATIONS_VOTE_CHANGE;
+		if ($action == 'INC') {
+					$relation_modifier = RELATIONS_VOTE_CHANGE;
+		} else {
+					$relation_modifier = -RELATIONS_VOTE_CHANGE;
+		}
 
 		$db2->query('SELECT * FROM race_has_relation ' .
 					'WHERE race_id_1 = ' . $db2->escapeNumber($race_id_1) . '
 						AND race_id_2 = ' . $db2->escapeNumber($race_id_2) . '
 						AND game_id = ' . $db2->escapeNumber($player->getGameID()));
-		if ($db2->nextRecord())
-			$relation = $db2->getField('relation') + $relation_modifier;
+		if ($db2->nextRecord()) {
+					$relation = $db2->getField('relation') + $relation_modifier;
+		}
 
 		if ($relation < MIN_GLOBAL_RELATIONS) {
 			$relation = MIN_GLOBAL_RELATIONS;
@@ -107,10 +109,11 @@ 
 					$expireTime = TIME + TIME_FOR_WAR_VOTE_FED_SAFETY;
 					$query = 'REPLACE INTO player_can_fed (account_id, game_id, race_id, expiry, allowed) VALUES ';
 					foreach($currentlyParkedAccountIDs as $raceID => $accountIDs) {
-						if($raceID == $race_id_1)
-							$message = 'We have declared war upon your race';
-						else
-							$message = 'Your race has declared war upon us';
+						if($raceID == $race_id_1) {
+													$message = 'We have declared war upon your race';
+						} else {
+													$message = 'Your race has declared war upon us';
+						}
 						$message .= ', you have '.format_time(TIME_FOR_WAR_VOTE_FED_SAFETY).' to vacate our federal space, after that time you will no longer be protected (unless you have strong personal relations).';
 						foreach($accountIDs as $accountID) {
 							$query .= '('.$db2->escapeNumber($accountID).','.$db2->escapeNumber($player->getGameID()).','.$db2->escapeNumber($raceID).','.$db2->escapeNumber($expireTime).','.$db2->escapeBoolean(true).'),';
@@ -135,8 +138,7 @@ 
 				$news = 'The [race='.$race_id_1.'] have declared <span class="red">WAR</span> on the [race='.$race_id_2.']';
 				$db2->query('INSERT INTO news (game_id, time, news_message) VALUES ' .
 							'('.$db2->escapeNumber($player->getGameID()).', '.$db2->escapeNumber(TIME).', ' . $db2->escapeString($news) . ')');
-			}
-			elseif ($type == 'PEACE') {
+			} elseif ($type == 'PEACE') {
 				// get 'yes' votes
 				$db2->query('SELECT * FROM player_votes_pact
 							WHERE game_id = '.$db2->escapeNumber($player->getGameID()).'

lib/Default/AbstractSmrPlayer.class.inc

Braces +238 added lines, -163 removed lines

@@ -78,8 +78,9 @@ 
 		return $this->getNewbieTurns()>0;
 	}
 	public function setNewbieTurns($newbieTurns) {
-		if($this->newbieTurns == $newbieTurns)
-			return;
+		if($this->newbieTurns == $newbieTurns) {
+					return;
+		}
 		$this->newbieTurns=$newbieTurns;
 		$this->hasChanged=true;
 	}
@@ -89,8 +90,9 @@ 
 	}
 
 	public function setShipTypeID($shipID) {
-		if($this->shipID == $shipID)
-			return;
+		if($this->shipID == $shipID) {
+					return;
+		}
 		$this->shipID=$shipID;
 		$this->hasChanged=true;
 	}
@@ -206,8 +208,9 @@ 
 		}
 
 		$ship = $this->getShip();
-		if ($ship->hasIllegalGoods())
-			return false;
+		if ($ship->hasIllegalGoods()) {
+					return false;
+		}
 
 		if ($ship->getAttackRating() <= $this->getSafeAttackRating()) {
 			foreach($sector->getFedRaceIDs() as $fedRaceID) {
@@ -248,8 +251,9 @@ 
 	}
 
 	public function setDead($bool) {
-		if($this->dead == $bool)
-			return;
+		if($this->dead == $bool) {
+					return;
+		}
 		$this->dead=$bool;
 		$this->hasChanged=true;
 	}
@@ -259,14 +263,16 @@ 
 	}
 
 	public function increaseKills($kills) {
-		if($kills < 0)
-			throw new Exception('Trying to increase negative kills.');
+		if($kills < 0) {
+					throw new Exception('Trying to increase negative kills.');
+		}
 		$this->setKills($this->kills+$kills);
 	}
 
 	public function setKills($kills) {
-		if($this->kills == $kills)
-			return;
+		if($this->kills == $kills) {
+					return;
+		}
 		$this->kills=$kills;
 		$this->hasChanged=true;
 	}
@@ -276,14 +282,16 @@ 
 	}
 
 	public function increaseDeaths($deaths) {
-		if($deaths < 0)
-			throw new Exception('Trying to increase negative deaths.');
+		if($deaths < 0) {
+					throw new Exception('Trying to increase negative deaths.');
+		}
 		$this->setDeaths($this->getDeaths()+$deaths);
 	}
 
 	public function setDeaths($deaths) {
-		if($this->deaths == $deaths)
-			return;
+		if($this->deaths == $deaths) {
+					return;
+		}
 		$this->deaths = $deaths;
 		$this->hasChanged=true;
 	}
@@ -305,24 +313,29 @@ 
 	}
 
 	public function increaseAlignment($align) {
-		if($align < 0)
-			throw new Exception('Trying to increase negative align.');
-		if($align == 0)
-			return;
+		if($align < 0) {
+					throw new Exception('Trying to increase negative align.');
+		}
+		if($align == 0) {
+					return;
+		}
 		$align += $this->alignment;
 		$this->setAlignment($align);
 	}
 	public function decreaseAlignment($align) {
-		if($align < 0)
-			throw new Exception('Trying to decrease negative align.');
-		if($align == 0)
-			return;
+		if($align < 0) {
+					throw new Exception('Trying to decrease negative align.');
+		}
+		if($align == 0) {
+					return;
+		}
 		$align = $this->alignment - $align;
 		$this->setAlignment($align);
 	}
 	public function setAlignment($align) {
-		if($this->alignment == $align)
-			return;
+		if($this->alignment == $align) {
+					return;
+		}
 		$this->alignment = $align;
 		$this->hasChanged=true;
 	}
@@ -336,8 +349,9 @@ 
 	}
 
 	public function getNextLevelPercentAcquired() {
-		if($this->getNextLevelExperience() == $this->getThisLevelExperience())
-			return 100;
+		if($this->getNextLevelExperience() == $this->getThisLevelExperience()) {
+					return 100;
+		}
 		return max(0,min(100,round(($this->getExperience() - $this->getThisLevelExperience()) / ($this->getNextLevelExperience() - $this->getThisLevelExperience())*100)));
 	}
 
@@ -347,8 +361,10 @@ 
 
 	public function getNextLevelExperience() {
 		$LEVELS_REQUIREMENTS = Globals::getLevelRequirements();
-		if(!isset($LEVELS_REQUIREMENTS[$this->getLevelID()+1]))
-			return $this->getThisLevelExperience(); //Return current level experience if on last level.
+		if(!isset($LEVELS_REQUIREMENTS[$this->getLevelID()+1])) {
+					return $this->getThisLevelExperience();
+		}
+		//Return current level experience if on last level.
 		return $LEVELS_REQUIREMENTS[$this->getLevelID()+1]['Requirement'];
 	}
 
@@ -358,12 +374,15 @@ 
 	}
 
 	public function setExperience($experience) {
-		if($this->experience == $experience)
-			return;
-		if($experience<MIN_EXPERIENCE)
-			$experience = MIN_EXPERIENCE;
-		if($experience>MAX_EXPERIENCE)
-			$experience = MAX_EXPERIENCE;
+		if($this->experience == $experience) {
+					return;
+		}
+		if($experience<MIN_EXPERIENCE) {
+					$experience = MIN_EXPERIENCE;
+		}
+		if($experience>MAX_EXPERIENCE) {
+					$experience = MAX_EXPERIENCE;
+		}
 		$this->experience = $experience;
 		$this->hasChanged=true;
 
@@ -373,46 +392,57 @@ 
 	}
 
 	public function increaseCredits($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->credits;
 		$this->setCredits($credits);
 	}
 	public function decreaseCredits($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->credits - $credits;
 		$this->setCredits($credits);
 	}
 	public function setCredits($credits) {
-		if($this->credits == $credits)
-			return;
-		if($credits < 0)
-			throw new Exception('Trying to set negative credits.');
-		if($credits > MAX_MONEY)
-			$credits = MAX_MONEY;
+		if($this->credits == $credits) {
+					return;
+		}
+		if($credits < 0) {
+					throw new Exception('Trying to set negative credits.');
+		}
+		if($credits > MAX_MONEY) {
+					$credits = MAX_MONEY;
+		}
 		$this->credits = $credits;
 		$this->hasChanged=true;
 	}
 
 	public function increaseExperience($experience) {
-		if($experience < 0)
-			throw new Exception('Trying to increase negative experience.');
-		if($experience == 0)
-			return;
+		if($experience < 0) {
+					throw new Exception('Trying to increase negative experience.');
+		}
+		if($experience == 0) {
+					return;
+		}
 		$newExperience = $this->experience + $experience;
 		$this->setExperience($newExperience);
 		$this->increaseHOF($experience,array('Experience','Total','Gain'), HOF_PUBLIC);
 	}
 	public function decreaseExperience($experience) {
-		if($experience < 0)
-			throw new Exception('Trying to decrease negative experience.');
-		if($experience == 0)
-			return;
+		if($experience < 0) {
+					throw new Exception('Trying to decrease negative experience.');
+		}
+		if($experience == 0) {
+					return;
+		}
 		$newExperience = $this->experience - $experience;
 		$this->setExperience($newExperience);
 		$this->decreaseHOF($experience,array('Experience','Total','Loss'), HOF_PUBLIC);
@@ -423,8 +453,9 @@ 
 	}
 
 	public function setLandedOnPlanet($bool) {
-		if($this->landedOnPlanet == $bool)
-			return;
+		if($this->landedOnPlanet == $bool) {
+					return;
+		}
 		$this->landedOnPlanet=$bool;
 		$this->hasChanged=true;
 	}
@@ -438,7 +469,9 @@ 
 		if ($this->level === null) {
 			$LEVELS_REQUIREMENTS = Globals::getLevelRequirements();
 			foreach ($LEVELS_REQUIREMENTS as $level_id => $require) {
-				if ($this->getExperience() >= $require['Requirement']) continue;
+				if ($this->getExperience() >= $require['Requirement']) {
+					continue;
+				}
 				$this->level = $level_id - 1;
 				return $this->level;
 			}
@@ -516,8 +549,9 @@ 
 	}
 
 	public function setRaceID($raceID) {
-		if($this->raceID == $raceID)
-			return;
+		if($this->raceID == $raceID) {
+					return;
+		}
 		$this->raceID=$raceID;
 		$this->hasChanged=true;
 	}
@@ -539,8 +573,9 @@ 
 	}
 
 	public function setAllianceID($ID) {
-		if($this->allianceID == $ID)
-			return;
+		if($this->allianceID == $ID) {
+					return;
+		}
 		$this->allianceID=$ID;
 		if ($this->allianceID != 0) {
 			$status = $this->hasNewbieStatus() ? 'NEWBIE' : 'VETERAN';
@@ -557,8 +592,7 @@ 
 	public function getAllianceName($linked=false, $includeAllianceID=false) {
 		if($this->hasAlliance()) {
 			return $this->getAlliance()->getAllianceName($linked, $includeAllianceID);
-		}
-		else {
+		} else {
 			return 'No Alliance';
 		}
 	}
@@ -590,8 +624,9 @@ 
 	}
 
 	public function setCombatDronesKamikazeOnMines($bool) {
-		if($this->combatDronesKamikazeOnMines == $bool)
-			return;
+		if($this->combatDronesKamikazeOnMines == $bool) {
+					return;
+		}
 		$this->combatDronesKamikazeOnMines = $bool;
 		$this->hasChanged=true;
 	}
@@ -608,15 +643,17 @@ 
 			$gadgetID = $GADGETS[$gadgetID]['ID'];
 		}
 		$gadgets = $this->getGadgets();
-		if(isset($gadgets[$gadgetID]))
-			return $gadgets[$gadgetID];
+		if(isset($gadgets[$gadgetID])) {
+					return $gadgets[$gadgetID];
+		}
 		return false;
 	}
 
 	public function isGadgetEquipped($gadgetID) {
 		$gadget = $this->getGadget($gadgetID);
-		if($gadget===false)
-			return false;
+		if($gadget===false) {
+					return false;
+		}
 		return $gadget['Equipped'] > 0 && $gadget['Equipped'] < TIME && ($gadget['Expires'] == 0 || $gadget['Expires'] > TIME) && $gadget['Cooldown'] <= TIME;
 	}
 
@@ -688,21 +725,24 @@ 
 	}
 
 	public function setMilitaryPayment($amount) {
-		if($this->militaryPayment == $amount)
-			return;
+		if($this->militaryPayment == $amount) {
+					return;
+		}
 		$this->militaryPayment = $amount;
 		$this->hasChanged=true;
 	}
 
 	public function increaseMilitaryPayment($amount) {
-		if($amount < 0)
-			throw new Exception('Trying to increase negative military payment.');
+		if($amount < 0) {
+					throw new Exception('Trying to increase negative military payment.');
+		}
 		$this->setMilitaryPayment($this->getMilitaryPayment()+$amount);
 	}
 
 	public function decreaseMilitaryPayment($amount) {
-		if($amount < 0)
-			throw new Exception('Trying to decrease negative military payment.');
+		if($amount < 0) {
+					throw new Exception('Trying to decrease negative military payment.');
+		}
 		$this->setMilitaryPayment($this->getMilitaryPayment()-$amount);
 	}
 
@@ -744,10 +784,11 @@ 
 
 	public function getNextBountyID() {
 		$keys = array_keys($this->getBounties());
-		if(count($keys)>0)
-			return max($keys)+1;
-		else
-			return 0;
+		if(count($keys)>0) {
+					return max($keys)+1;
+		} else {
+					return 0;
+		}
 	}
 
 	public function setBounty(array $bounty) {
@@ -762,22 +803,25 @@ 
 	}
 
 	public function increaseBountyAmount($bountyID,$amount) {
-		if($amount < 0)
-			throw new Exception('Trying to increase negative bounty.');
+		if($amount < 0) {
+					throw new Exception('Trying to increase negative bounty.');
+		}
 		$this->setBountyAmount($this->getBountyAmount($bountyID)+$amount);
 	}
 
 	public function decreaseBountyAmount($bountyID,$amount) {
-		if($amount < 0)
-			throw new Exception('Trying to decrease negative bounty.');
+		if($amount < 0) {
+					throw new Exception('Trying to decrease negative bounty.');
+		}
 		$this->setBountyAmount($this->getBountyAmount($bountyID)+$amount);
 	}
 
 	public function getCurrentBounty($type) {
 		$bounties = $this->getBounties();
 		foreach($bounties as $bounty) {
-			if($bounty['Claimer'] == 0 && $bounty['Type']==$type)
-				return $bounty;
+			if($bounty['Claimer'] == 0 && $bounty['Type']==$type) {
+							return $bounty;
+			}
 		}
 		return $this->createBounty($type);
 	}
@@ -785,8 +829,9 @@ 
 	public function hasCurrentBounty($type) {
 		$bounties = $this->getBounties();
 		foreach($bounties as $bounty) {
-			if($bounty['Claimer'] == 0 && $bounty['Type']==$type)
-				return true;
+			if($bounty['Claimer'] == 0 && $bounty['Type']==$type) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -798,21 +843,24 @@ 
 
 	public function setCurrentBountyAmount($type, $amount) {
 		$bounty = $this->getCurrentBounty($type);
-		if($bounty['Amount'] == $amount)
-			return;
+		if($bounty['Amount'] == $amount) {
+					return;
+		}
 		$bounty['Amount'] = $amount;
 		$this->setBounty($bounty);
 	}
 
 	public function increaseCurrentBountyAmount($type,$amount) {
-		if($amount < 0)
-			throw new Exception('Trying to increase negative current bounty.');
+		if($amount < 0) {
+					throw new Exception('Trying to increase negative current bounty.');
+		}
 		$this->setCurrentBountyAmount($type,$this->getCurrentBountyAmount($type)+$amount);
 	}
 
 	public function decreaseCurrentBountyAmount($type,$amount) {
-		if($amount < 0)
-			throw new Exception('Trying to decrease negative current bounty.');
+		if($amount < 0) {
+					throw new Exception('Trying to decrease negative current bounty.');
+		}
 		$this->setCurrentBountyAmount($type,$this->getCurrentBountyAmount($type)-$amount);
 	}
 
@@ -823,21 +871,24 @@ 
 
 	public function setCurrentBountySmrCredits($type, $credits) {
 		$bounty = $this->getCurrentBounty($type);
-		if($bounty['SmrCredits'] == $credits)
-			return;
+		if($bounty['SmrCredits'] == $credits) {
+					return;
+		}
 		$bounty['SmrCredits'] = $credits;
 		$this->setBounty($bounty);
 	}
 
 	public function increaseCurrentBountySmrCredits($type,$credits) {
-		if($credits<0)
-			throw new Exception('Trying to increase negative current bounty.');
+		if($credits<0) {
+					throw new Exception('Trying to increase negative current bounty.');
+		}
 		$this->setCurrentBountySmrCredits($type,$this->getCurrentBountySmrCredits($type)+$credits);
 	}
 
 	public function decreaseCurrentBountySmrCredits($type,$credits) {
-		if($credits<0)
-			throw new Exception('Trying to decrease negative current bounty.');
+		if($credits<0) {
+					throw new Exception('Trying to decrease negative current bounty.');
+		}
 		$this->setCurrentBountySmrCredits($type,$this->getCurrentBountySmrCredits($type)-$credits);
 	}
 
@@ -858,51 +909,59 @@ 
 
 	public function getHOF(array $typeList = null) {
 		$this->getHOFData();
-		if($typeList==null)
-			return $this->HOF;
+		if($typeList==null) {
+					return $this->HOF;
+		}
 		$hof=$this->HOF;
 		foreach($typeList as $type) {
-			if(!isset($hof[$type]))
-				return 0;
+			if(!isset($hof[$type])) {
+							return 0;
+			}
 			$hof = $hof[$type];
 		}
 		return $hof;
 	}
 
 	public function increaseHOF($amount,array $typeList, $visibility) {
-		if($amount < 0)
-			throw new Exception('Trying to increase negative HOF: '.implode(':',$typeList));
-		if($amount == 0)
-			return;
+		if($amount < 0) {
+					throw new Exception('Trying to increase negative HOF: '.implode(':',$typeList));
+		}
+		if($amount == 0) {
+					return;
+		}
 		$this->setHOF($this->getHOF($typeList)+$amount,$typeList, $visibility);
 	}
 
 	public function decreaseHOF($amount,array $typeList, $visibility) {
-		if($amount < 0)
-			throw new Exception('Trying to decrease negative HOF: '.implode(':',$typeList));
-		if($amount == 0)
-			return;
+		if($amount < 0) {
+					throw new Exception('Trying to decrease negative HOF: '.implode(':',$typeList));
+		}
+		if($amount == 0) {
+					return;
+		}
 		$this->setHOF($this->getHOF($typeList)-$amount,$typeList, $visibility);
 	}
 
 	public function setHOF($amount,array $typeList, $visibility) {
-		if(is_array($this->getHOF($typeList)))
-			throw new Exception('Trying to overwrite a HOF type: '.implode(':',$typeList));
+		if(is_array($this->getHOF($typeList))) {
+					throw new Exception('Trying to overwrite a HOF type: '.implode(':',$typeList));
+		}
 		if($this->isNPC()) {
 			// Don't store HOF for NPCs.
 			return;
 		}
-		if($this->getHOF($typeList)==$amount)
-			return;
-		if($amount < 0)
-			$amount=0;
+		if($this->getHOF($typeList)==$amount) {
+					return;
+		}
+		if($amount < 0) {
+					$amount=0;
+		}
 		$this->getHOF();
 
 		$hofType = implode(':',$typeList);
 		if(!isset(self::$HOFVis[$hofType])) {
 			self::$hasHOFVisChanged[$hofType] = self::HOF_NEW;
-		}
-		else if(self::$HOFVis[$hofType] != $visibility) {
+		} else if(self::$HOFVis[$hofType] != $visibility) {
 			self::$hasHOFVisChanged[$hofType] = self::HOF_CHANGED;
 		}
 		self::$HOFVis[$hofType] = $visibility;
@@ -911,8 +970,9 @@ 
 		$hofChanged =& $this->hasHOFChanged;
 		$new = false;
 		foreach($typeList as $type) {
-			if(!isset($hofChanged[$type]))
-				$hofChanged[$type] = array();
+			if(!isset($hofChanged[$type])) {
+							$hofChanged[$type] = array();
+			}
 			if(!isset($hof[$type])) {
 				$hof[$type] = array();
 				$new = true;
@@ -922,8 +982,9 @@ 
 		}
 		if($hofChanged==null) {
 			$hofChanged = self::HOF_CHANGED;
-			if($new)
-				$hofChanged = self::HOF_NEW;
+			if($new) {
+							$hofChanged = self::HOF_NEW;
+			}
 		}
 		$hof = $amount;
 	}
@@ -949,16 +1010,19 @@ 
 	}
 
 	public function setTurns($turns,$newNoob = false,$updateLastActive = false) {
-		if($this->turns == $turns && ($this->newbieTurns == $newNoob || $newNoob==false) && !$updateLastActive)
-			return;
+		if($this->turns == $turns && ($this->newbieTurns == $newNoob || $newNoob==false) && !$updateLastActive) {
+					return;
+		}
 
 		// Make sure turns are in range [0, MaxTurns]
 		$this->turns = max(0, min($turns, $this->getMaxTurns()));
 
-		if($newNoob !== false)
-			$this->newbieTurns = $newNoob;
-		if ($this->newbieTurns < 0)
-			$this->newbieTurns = 0;
+		if($newNoob !== false) {
+					$this->newbieTurns = $newNoob;
+		}
+		if ($this->newbieTurns < 0) {
+					$this->newbieTurns = 0;
+		}
 
 		$this->hasChanged=true;
 		if($updateLastActive === true) {
@@ -968,8 +1032,9 @@ 
 	}
 
 	public function takeTurns($take, $noob = 0, $updateLastActive = true) {
-		if($take < 0 || $noob < 0)
-			throw new Exception('Trying to take negative turns.');
+		if($take < 0 || $noob < 0) {
+					throw new Exception('Trying to take negative turns.');
+		}
 		$take = ceil($take);
 		$new_turns = $this->getTurns() - $take;
 		$newbiesTaken = min($this->getNewbieTurns(),$noob);
@@ -982,8 +1047,9 @@ 
 	}
 
 	public function giveTurns($give, $noob = 0,$updateLastActive = false) {
-		if($give < 0 || $noob < 0)
-			throw new Exception('Trying to give negative turns.');
+		if($give < 0 || $noob < 0) {
+					throw new Exception('Trying to give negative turns.');
+		}
 		$give = floor($give);
 
 		$this->setTurns($this->getTurns() + $give, $this->getNewbieTurns() + $noob, $updateLastActive);
@@ -994,8 +1060,9 @@ 
 	}
 
 	public function setLastActive($lastActive) {
-		if($this->lastActive == $lastActive)
-			return;
+		if($this->lastActive == $lastActive) {
+					return;
+		}
 		$this->lastActive=$lastActive;
 		$this->hasChanged=true;
 	}
@@ -1005,8 +1072,9 @@ 
 	}
 
 	public function setLastCPLAction($time) {
-		if($this->lastCPLAction == $time)
-			return;
+		if($this->lastCPLAction == $time) {
+					return;
+		}
 		$this->lastCPLAction=$time;
 		$this->hasChanged=true;
 	}
@@ -1021,8 +1089,9 @@ 
 			//Get Player missions
 			$this->db->query('SELECT mission_id FROM player_completed_mission WHERE ' . $this->SQL);
 			$this->completedMissions = array();
-			while ($this->db->nextRecord())
-				$this->completedMissions[$this->db->getField('mission_id')] = $this->db->getField('mission_id');
+			while ($this->db->nextRecord()) {
+							$this->completedMissions[$this->db->getField('mission_id')] = $this->db->getField('mission_id');
+			}
 		}
 		return $this->completedMissions;
 	}
@@ -1059,8 +1128,9 @@ 
 
 	function getMission($missionID) {
 		$missions = $this->getMissions();
-		if(isset($missions[$missionID]))
-			return $missions[$missionID];
+		if(isset($missions[$missionID])) {
+					return $missions[$missionID];
+		}
 		return false;
 	}
 
@@ -1106,8 +1176,9 @@ 
 	function addMission($missionID) {
 		$this->getMissions();
 
-		if(isset($this->missions[$missionID]))
-			return;
+		if(isset($this->missions[$missionID])) {
+					return;
+		}
 		$sector = 0;
 
 		$mission = array(
@@ -1136,8 +1207,7 @@ 
 		if ($mission['On Step'] >= count(MISSIONS[$missionID]['Steps'])) {
 			// If we have completed this mission just use false to indicate no current task.
 			$currentStep = false;
-		}
-		else {
+		} else {
 			$currentStep = MISSIONS[$missionID]['Steps'][$mission['On Step']];
 			$currentStep['Text'] = str_replace(array('<Race>','<Sector>','<Starting Sector>','<trader>'),array($this->getRaceID(),$mission['Sector'],$mission['Starting Sector'],$this->playerName),$currentStep['Text']);
 			if (isset($currentStep['Task'])) {
@@ -1145,8 +1215,7 @@ 
 			}
 			if (isset($currentStep['Level'])) {
 				$currentStep['Level'] = str_replace('<Player Level>',$this->levelID,$currentStep['Level']);
-			}
-			else {
+			} else {
 				$currentStep['Level'] = 0;
 			}
 		}
@@ -1274,12 +1343,15 @@ 
 	}
 
 	public function canSee(AbstractSmrPlayer $otherPlayer) {
-		if(!$otherPlayer->getShip()->isCloaked())
-			return true;
-		if($this->sameAlliance($otherPlayer))
-			return true;
-		if($this->getExperience()>=$otherPlayer->getExperience())
-			return true;
+		if(!$otherPlayer->getShip()->isCloaked()) {
+					return true;
+		}
+		if($this->sameAlliance($otherPlayer)) {
+					return true;
+		}
+		if($this->getExperience()>=$otherPlayer->getExperience()) {
+					return true;
+		}
 		return false;
 	}
 
@@ -1332,10 +1404,12 @@ 
 	}
 
 	public function meetsAlignmentRestriction($restriction) {
-		if($restriction<0)
-			return $this->getAlignment()<=$restriction;
-		if($restriction>0)
-			return $this->getAlignment()>=$restriction;
+		if($restriction<0) {
+					return $this->getAlignment()<=$restriction;
+		}
+		if($restriction>0) {
+					return $this->getAlignment()>=$restriction;
+		}
 		return true;
 	}
 
@@ -1358,8 +1432,9 @@ 
 		if(!isset($this->visitedSectors)) {
 			$this->visitedSectors = array();
 			$this->db->query('SELECT sector_id FROM player_visited_sector WHERE ' . $this->SQL);
-			while($this->db->nextRecord())
-				$this->visitedSectors[$this->db->getField('sector_id')] = false;
+			while($this->db->nextRecord()) {
+							$this->visitedSectors[$this->db->getField('sector_id')] = false;
+			}
 		}
 		return !isset($this->visitedSectors[$sectorID]);
 	}

lib/Default/Plotter.class.inc

Braces +13 added lines, -10 removed lines

@@ -94,12 +94,14 @@ 
 		$sectorsTravelled = 0;
 		$visitedSectors = array();
 		$visitedSectors[$checkSector->getSectorID()] = true;
-		if($x=='Distance')
-			$distances[0][$checkSector->getSectorID()] = new Distance($gameID,$checkSector->getSectorID());
+		if($x=='Distance') {
+					$distances[0][$checkSector->getSectorID()] = new Distance($gameID,$checkSector->getSectorID());
+		}
 
 		$distanceQ = array();
-		for($i=0;$i<=TURNS_WARP_SECTOR_EQUIVALENCE;$i++)
-			$distanceQ[] = array();
+		for($i=0;$i<=TURNS_WARP_SECTOR_EQUIVALENCE;$i++) {
+					$distanceQ[] = array();
+		}
 		//Warps first as a slight optimisation due to how visitedSectors is set.
 		if($checkSector->hasWarp()===true) {
 			$d = new Distance($gameID,$checkSector->getSectorID());
@@ -117,8 +119,9 @@ 
 		$maybeWarps=0;
 		while ($maybeWarps<=TURNS_WARP_SECTOR_EQUIVALENCE) {
 			$sectorsTravelled++;
-			if ($sectorsTravelled > $distanceLimit)
-				return $distances;
+			if ($sectorsTravelled > $distanceLimit) {
+							return $distances;
+			}
 			if($x=='Distance') {
 				$distances[$sectorsTravelled] = array();
 			}
@@ -136,11 +139,11 @@ 
 					$checkSector = SmrSector::getSector($gameID,$checkSectorID);
 					if($x=='Distance') {
 						$distances[$sectorsTravelled][$checkSector->getSectorID()] = $distance;
-					}
-					else if (($needsToHaveBeenExploredBy===null||$needsToHaveBeenExploredBy->hasVisitedSector($checkSector->getSectorID()))===true
+					} else if (($needsToHaveBeenExploredBy===null||$needsToHaveBeenExploredBy->hasVisitedSector($checkSector->getSectorID()))===true
 							&& $checkSector->hasX($x,$player)===true) {
-						if($useFirst===true)
-							return $distance;
+						if($useFirst===true) {
+													return $distance;
+						}
 						$distances[$checkSector->getSectorID()] = $distance;
 					}
 					//Warps first as a slight optimisation due to how visitedSectors is set.

lib/Default/SmrPlanet.class.inc

Braces +47 added lines, -54 removed lines

@@ -138,26 +138,19 @@ 
 		$level = $this->getLevel();
 		if ($level < 9) {
 			return .0404;
-		}
-		elseif ($level < 19) {
+		} elseif ($level < 19) {
 			return .0609;
-		}
-		elseif ($level < 29) {
+		} elseif ($level < 29) {
 			return .1236;
-		}
-		elseif ($level < 39) {
+		} elseif ($level < 39) {
 			return .050625;
-		}
-		elseif ($level < 49) {
+		} elseif ($level < 49) {
 			return .0404;
-		}
-		elseif ($level < 59) {
+		} elseif ($level < 59) {
 			return .030225;
-		}
-		elseif ($level < 69) {
+		} elseif ($level < 69) {
 			return .0201;
-		}
-		else {
+		} else {
 			return .018081;
 		}
 	}
@@ -366,8 +359,7 @@ 
 		}
 		if($delayed===false) {
 			$this->setShields($this->getShields() - $number);
-		}
-		else {
+		} else {
 			$this->delayedShieldsDelta -= $number;
 		}
 	}
@@ -378,8 +370,7 @@ 
 		}
 		if($delayed===false) {
 			$this->setShields($this->getShields() + $number);
-		}
-		else {
+		} else {
 			$this->delayedShieldsDelta += $number;
 		}
 	}
@@ -411,8 +402,7 @@ 
 		}
 		if($delayed===false) {
 			$this->setArmour($this->getArmour() - $number);
-		}
-		else {
+		} else {
 			$this->delayedArmourDelta -= $number;
 		}
 	}
@@ -423,8 +413,7 @@ 
 		}
 		if($delayed===false) {
 			$this->setArmour($this->getArmour() + $number);
-		}
-		else {
+		} else {
 			$this->delayedArmourDelta += $number;
 		}
 	}
@@ -456,8 +445,7 @@ 
 		}
 		if($delayed===false) {
 			$this->setCDs($this->getCDs() - $number);
-		}
-		else {
+		} else {
 			$this->delayedCDsDelta -= $number;
 		}
 	}
@@ -468,8 +456,7 @@ 
 		}
 		if($delayed===false) {
 			$this->setCDs($this->getCDs() + $number);
-		}
-		else {
+		} else {
 			$this->delayedCDsDelta += $number;
 		}
 	}
@@ -569,13 +556,16 @@ 
 			// get supplies from db
 			$this->db->query('SELECT good_id, amount FROM planet_has_cargo WHERE ' . $this->SQL);
 			// adding cargo and amount to array
-			while ($this->db->nextRecord())
-				$this->stockpile[$this->db->getInt('good_id')] = $this->db->getInt('amount');
+			while ($this->db->nextRecord()) {
+							$this->stockpile[$this->db->getInt('good_id')] = $this->db->getInt('amount');
+			}
+		}
+		if($goodID===false) {
+					return $this->stockpile;
+		}
+		if(isset($this->stockpile[$goodID])) {
+					return $this->stockpile[$goodID];
 		}
-		if($goodID===false)
-			return $this->stockpile;
-		if(isset($this->stockpile[$goodID]))
-			return $this->stockpile[$goodID];
 		return 0;
 	}
 
@@ -583,8 +573,7 @@ 
 		if($goodID===false) {
 			$stockpile = $this->getStockpile($goodID);
 			return count($stockpile) > 0 && max($stockpile) > 0;
-		}
-		else {
+		} else {
 			return $this->getStockpile($goodID) > 0;
 		}
 	}
@@ -601,14 +590,16 @@ 
 	}
 
 	public function decreaseStockpile($goodID,$amount) {
-		if($amount < 0)
-			throw new Exception('Trying to decrease negative stockpile.');
+		if($amount < 0) {
+					throw new Exception('Trying to decrease negative stockpile.');
+		}
 		$this->setStockpile($goodID,$this->getStockpile($goodID) - $amount);
 	}
 
 	public function increaseStockpile($goodID,$amount) {
-		if($amount < 0)
-			throw new Exception('Trying to increase negative stockpile.');
+		if($amount < 0) {
+					throw new Exception('Trying to increase negative stockpile.');
+		}
 		$this->setStockpile($goodID,$this->getStockpile($goodID) + $amount);
 	}
 
@@ -642,8 +633,9 @@ 
 	}
 
 	public function setBuilding($buildingTypeID,$number) {
-		if($this->getBuilding($buildingTypeID) == $number)
-			return;
+		if($this->getBuilding($buildingTypeID) == $number) {
+					return;
+		}
 
 		$this->buildings[$buildingTypeID] = $number;
 		$this->hasChangedBuildings[$buildingTypeID] = true;
@@ -815,8 +807,7 @@ 
 				if ($amount != 0) {
 					$this->db->query('REPLACE INTO planet_has_cargo (game_id, sector_id, good_id, amount) ' .
 										 'VALUES(' . $this->db->escapeNumber($this->getGameID()) . ', ' . $this->db->escapeNumber($this->getSectorID()) . ', ' . $this->db->escapeNumber($id) . ', ' . $this->db->escapeNumber($amount) . ')');
-				}
-				else {
+				} else {
 					$this->db->query('DELETE FROM planet_has_cargo WHERE ' . $this->SQL . '
 										AND good_id = ' . $this->db->escapeNumber($id));
 				}
@@ -844,8 +835,7 @@ 
 				if ($this->hasBuilding($id)) {
 					$this->db->query('REPLACE INTO planet_has_building (game_id, sector_id, construction_id, amount) ' .
 										'VALUES(' . $this->db->escapeNumber($this->gameID) . ', ' . $this->db->escapeNumber($this->sectorID) . ', ' . $this->db->escapeNumber($id) . ', ' . $this->db->escapeNumber($this->getBuilding($id)) . ')');
-				}
-				else {
+				} else {
 					$this->db->query('DELETE FROM planet_has_building WHERE ' . $this->SQL . '
 										AND construction_id = ' . $this->db->escapeNumber($id));
 				}
@@ -1090,23 +1080,27 @@ 
 	}
 
 	public function hasEnemyTraders(AbstractSmrPlayer $player) {
-		if(!$this->hasOtherTraders($player))
-			return false;
+		if(!$this->hasOtherTraders($player)) {
+					return false;
+		}
 		$otherPlayers = $this->getOtherTraders($player);
 		foreach($otherPlayers as $otherPlayer) {
-			if(!$player->traderNAPAlliance($otherPlayer))
-				return true;
+			if(!$player->traderNAPAlliance($otherPlayer)) {
+							return true;
+			}
 		}
 		return false;
 	}
 
 	public function hasFriendlyTraders(AbstractSmrPlayer $player) {
-		if(!$this->hasOtherTraders($player))
-			return false;
+		if(!$this->hasOtherTraders($player)) {
+					return false;
+		}
 		$otherPlayers = $this->getOtherTraders($player);
 		foreach($otherPlayers as $otherPlayer) {
-			if($player->traderNAPAlliance($otherPlayer))
-				return true;
+			if($player->traderNAPAlliance($otherPlayer)) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -1203,8 +1197,7 @@ 
 					}
 				}
 
-			}
-			else { // hit drones behind shields - we should only use this reduced damage branch if we cannot hit shields.
+			} else { // hit drones behind shields - we should only use this reduced damage branch if we cannot hit shields.
 				$cdDamage = $this->doCDDamage(floor(min($damage['MaxDamage'],$damage['Armour'])*DRONES_BEHIND_SHIELDS_DAMAGE_PERCENT),$delayed);
 			}
 		}

lib/Default/Sorter.class.inc

Braces +3 added lines, -1 removed lines

@@ -20,7 +20,9 @@
 	}
 
 	public static function cmpNum($a, $b) {
-		if($a == $b) return 0;
+		if($a == $b) {
+			return 0;
+		}
 		return (self::$reverseOrder?-1:1)*($a < $b ? -1 : 1);
 	}