smrealms / smr

engine/Default/smr_file_create.php

Braces +20 added lines, -14 removed lines

@@ -4,15 +4,17 @@ 
 // code is read-only. This will help reduce sector lag and possible abuse.
 release_lock();
 
-if (isset($var['AdminCreateGameID']) && $var['AdminCreateGameID'] !== false)
+if (isset($var['AdminCreateGameID']) && $var['AdminCreateGameID'] !== false) {
 	$gameID = $var['AdminCreateGameID'];
-else
+} else {
 	$gameID = $player->getGameID();
+}
 
-if (isset($var['AdminCreateGameID']) && $var['AdminCreateGameID'] !== false)
+if (isset($var['AdminCreateGameID']) && $var['AdminCreateGameID'] !== false) {
 	$adminCreate = true;
-else
+} else {
 	$adminCreate = false;
+}
 
 // NOTE: If the format of this file is changed in an incompatible way,
 // make sure to update the SMR_FILE_VERSION!
@@ -103,8 +105,9 @@ 
 	if ($location->isFed()) {
 		$locSells .= 'Fed=,';
 	}
-	if ($locSells != '')
-		$file .= substr($locSells, 0, -1);
+	if ($locSells != '') {
+			$file .= substr($locSells, 0, -1);
+	}
 	$file .= EOL;
 }
 
@@ -125,19 +128,22 @@ 
 	foreach ($galaxy->getSectors() as $sector) {
 		$file .= '[Sector=' . $sector->getSectorID() . ']' . EOL;
 		
-		if (!$sector->isVisited($player) && $adminCreate === false)
-			continue;
+		if (!$sector->isVisited($player) && $adminCreate === false) {
+					continue;
+		}
 		
 		foreach ($sector->getLinks() as $linkName => $link) {
 			$file .= $linkName . '=' . $link . EOL;
 		}
-		if ($sector->hasWarp())
-			$file .= 'Warp=' . $sector->getWarp() . EOL;
+		if ($sector->hasWarp()) {
+					$file .= 'Warp=' . $sector->getWarp() . EOL;
+		}
 		if (($adminCreate !== false && $sector->hasPort()) || is_object($player) && $sector->hasCachedPort($player)) {
-			if ($adminCreate !== false)
-				$port = $sector->getPort();
-			else
-				$port = $sector->getCachedPort($player);
+			if ($adminCreate !== false) {
+							$port = $sector->getPort();
+			} else {
+							$port = $sector->getCachedPort($player);
+			}
 			$file .= 'Port Level=' . $port->getLevel() . EOL;
 			$file .= 'Port Race=' . $port->getRaceID() . EOL;
 			if (!empty($port->getSoldGoodIDs())) {

admin/Default/1.6/universe_create_save_processing.php

Braces +39 added lines, -39 removed lines

@@ -19,21 +19,19 @@ 
 	}
 	SmrSector::saveSectors();
 	$var['message'] = '<span class="green">Success</span> : Succesfully created galaxies.';
-}
-else if ($submit == 'Redo Connections') {
+} else if ($submit == 'Redo Connections') {
 	$galaxy = SmrGalaxy::getGalaxy($var['game_id'], $var['gal_on']);
-	if (!$galaxy->setConnectivity($_REQUEST['connect']))
-		$var['message'] = '<span class="red">Error</span> : Regenerating connections failed.';
-	else
-		$var['message'] = '<span class="green">Success</span> : Regenerated connectivity with ' . $_REQUEST['connect'] . '% target.';
+	if (!$galaxy->setConnectivity($_REQUEST['connect'])) {
+			$var['message'] = '<span class="red">Error</span> : Regenerating connections failed.';
+	} else {
+			$var['message'] = '<span class="green">Success</span> : Regenerated connectivity with ' . $_REQUEST['connect'] . '% target.';
+	}
 	SmrSector::saveSectors();
-}
-elseif ($submit == 'Toggle Link') {
+} elseif ($submit == 'Toggle Link') {
 	$linkSector = SmrSector::getSector($var['game_id'], $var['sector_id']);
 	$linkSector->toggleLink($var['dir']);
 	SmrSector::saveSectors();
-}
-elseif ($submit == 'Create Locations') {
+} elseif ($submit == 'Create Locations') {
 	$galSectors = SmrSector::getGalaxySectors($var['game_id'], $var['gal_on']);
 	foreach ($galSectors as $galSector) {
 		$galSector->removeAllLocations();
@@ -53,8 +51,7 @@ 
 		}
 	}
 	$var['message'] = '<span class="green">Success</span> : Succesfully added locations.';
-}
-elseif ($submit == 'Create Warps') {
+} elseif ($submit == 'Create Warps') {
 	//get all warp info from all gals, some need to be removed, some need to be added
 	$galaxy = SmrGalaxy::getGalaxy($var['game_id'], $var['gal_on']);
 	$galSectors = $galaxy->getSectors();
@@ -94,8 +91,7 @@ 
 	}
 	SmrSector::saveSectors();
 	$var['message'] = '<span class="green">Success</span> : Succesfully added warps.';
-}
-elseif ($submit == 'Create Planets') {
+} elseif ($submit == 'Create Planets') {
 	$galaxy = SmrGalaxy::getGalaxy($var['game_id'], $var['gal_on']);
 	$galSectors = $galaxy->getSectors();
 	foreach ($galSectors as $galSector) {
@@ -108,13 +104,15 @@ 
 		$numberOfPlanets = $_POST['type' . $planetTypeID];
 		for ($i = 1; $i <= $numberOfPlanets; $i++) {
 			$galSector = $galSectors[array_rand($galSectors)];
-			while ($galSector->hasPlanet()) $galSector = $galSectors[array_rand($galSectors)]; //1 per sector
+			while ($galSector->hasPlanet()) {
+				$galSector = $galSectors[array_rand($galSectors)];
+			}
+			//1 per sector
 			$galSector->createPlanet($planetTypeID);
 		}
 	}
 	$var['message'] = '<span class="green">Success</span> : Succesfully added planets.';
-}
-elseif ($submit == 'Create Ports') {
+} elseif ($submit == 'Create Ports') {
 	$numLevelPorts = [];
 	for ($i = 1; $i <= SmrPort::MAX_LEVEL; $i++) {
 		$numLevelPorts[$i] = $_REQUEST['port' . $i] ?? 0;
@@ -169,27 +167,23 @@ 
 		}
 		SmrPort::savePorts();
 		$var['message'] = '<span class="green">Success</span> : Succesfully added ports.';
-	}
-	else {
+	} else {
 		$var['message'] = '<span class="red">Error: Your port race distribution must equal 100!</span>';
 	}
-}
-elseif ($submit == 'Edit Sector') {
+} elseif ($submit == 'Edit Sector') {
 	$editSector = SmrSector::getSector($var['game_id'], $var['sector_id']);
 
 	//update planet
 	if ($_POST['plan_type'] != '0') {
 		if (!$editSector->hasPlanet()) {
 			$editSector->createPlanet($_POST['plan_type']);
-		}
-		else {
+		} else {
 			$type = $editSector->getPlanet()->getTypeID();
 			if ($_POST['plan_type'] != $type) {
 				$editSector->getPlanet()->setTypeID($_POST['plan_type']);
 			}
 		}
-	}
-	else {
+	} else {
 		$editSector->removePlanet();
 	}
 
@@ -228,10 +222,11 @@ 
 	for ($x = 0; $x < UNI_GEN_LOCATION_SLOTS; $x++) {
 		if ($_POST['loc_type' . $x] != 0) {
 			$locationToAdd = SmrLocation::getLocation($_POST['loc_type' . $x]);
-			if ($editSector->hasLocation($locationToAdd->getTypeID()))
-				$locationsToKeep[] = $locationToAdd;
-			else
-				$locationsToAdd[] = $locationToAdd;
+			if ($editSector->hasLocation($locationToAdd->getTypeID())) {
+							$locationsToKeep[] = $locationToAdd;
+			} else {
+							$locationsToAdd[] = $locationToAdd;
+			}
 		}
 	}
 	$editSector->removeAllLocations();
@@ -265,8 +260,7 @@ 
 function checkSectorAllowedForLoc(SmrSector $sector, SmrLocation $location) {
 	if (!$location->isHQ()) {
 		return (count($sector->getLocations()) < 4 && !$sector->offersFederalProtection());
-	}
-	else {
+	} else {
 		//HQs are here
 		//find a sector where there are no locations yet
 		return !$sector->hasLocation();
@@ -274,8 +268,9 @@ 
 }
 
 function addLocationToSector(SmrLocation $location, SmrSector $sector) {
-	if ($sector->hasLocation($location->getTypeID()))
-		return false;
+	if ($sector->hasLocation($location->getTypeID())) {
+			return false;
+	}
 
 	$sector->addLocation($location); //insert the location
 	if ($location->isHQ()) {
@@ -283,13 +278,16 @@ 
 		//Racial/Fed
 		foreach ($location->getLinkedLocations() as $linkedLocation) {
 			$sector->addLocation($linkedLocation);
-			if ($linkedLocation->isFed())
-				$fedBeacon = $linkedLocation;
+			if ($linkedLocation->isFed()) {
+							$fedBeacon = $linkedLocation;
+			}
 		}
 			
 		//add Beacons to all surrounding areas (up to 2 sectors out)
-		if (!$sector->offersFederalProtection())
-			$sector->addLocation($fedBeacon); //add beacon to this sector
+		if (!$sector->offersFederalProtection()) {
+					$sector->addLocation($fedBeacon);
+		}
+		//add beacon to this sector
 		$visitedSectors = array();
 		$links = array('Up', 'Right', 'Down', 'Left');
 		$fedSectors = array($sector);
@@ -299,8 +297,10 @@ 
 				foreach ($links as $link) {
 					if ($fedSector->hasLink($link) && !isset($visitedSectors[$fedSector->getLink($link)])) {
 						$linkSector = $sector->getLinkSector($link);
-						if (!$linkSector->offersFederalProtection())
-							$linkSector->addLocation($fedBeacon); //add beacon to this sector
+						if (!$linkSector->offersFederalProtection()) {
+													$linkSector->addLocation($fedBeacon);
+						}
+						//add beacon to this sector
 						$tempFedSectors[] = $linkSector;
 						$visitedSectors[$fedSector->getLink($link)] = true;
 					}

engine/Default/shop_goods_processing.php

Braces +36 added lines, -23 removed lines

@@ -5,59 +5,73 @@ 
 $amount = get_amount();
 $bargain_price = get_bargain_price();
 
-if (!is_numeric($amount) || !is_numeric($bargain_price))
+if (!is_numeric($amount) || !is_numeric($bargain_price)) {
 	create_error('Numbers only please!');
+}
 // get good name, id, ...
 $good_id = $var['good_id'];
 $good_name = Globals::getGoodName($good_id);
 
 // do we have enough turns?
-if ($player->getTurns() == 0)
+if ($player->getTurns() == 0) {
 	create_error('You don\'t have enough turns to trade.');
+}
 
 // get rid of those bugs when we die...there is no port at the home sector
-if (!$sector->hasPort())
+if (!$sector->hasPort()) {
 	create_error('I can\'t see a port in this sector. Can you?');
+}
 $port = $sector->getPort();
 
 // check if the player has the right relations to trade at the current port
-if ($player->getRelation($port->getRaceID()) < RELATIONS_WAR)
+if ($player->getRelation($port->getRaceID()) < RELATIONS_WAR) {
 	create_error('This port refuses to trade with you because you are at <span class="big bold red">WAR!</span>');
+}
 
 // does the port actually buy or sell this good?
 $transaction = $port->getGoodTransaction($good_id);
-if (empty($transaction))
+if (empty($transaction)) {
 	create_error('I don\'t trade in that good.');
+}
 
 $portGood = $port->getGood($good_id);
 // check if there are enough left at port
-if ($port->getGoodAmount($good_id) < $amount)
+if ($port->getGoodAmount($good_id) < $amount) {
 	create_error('I\'m short of ' . $good_name . '. So I\'m not going to sell you ' . $amount . ' pcs.');
+}
 
 // does we have what we are going to sell?
-if ($transaction == 'Sell' && $amount > $ship->getCargo($good_id))
+if ($transaction == 'Sell' && $amount > $ship->getCargo($good_id)) {
 	create_error('Scanning your ships indicates you don\'t have ' . $amount . ' pcs. of ' . $good_name . '!');
+}
 
 // check if we have enough room for the thing we are going to buy
-if ($transaction == 'Buy' && $amount > $ship->getEmptyHolds())
+if ($transaction == 'Buy' && $amount > $ship->getEmptyHolds()) {
 	create_error('Scanning your ships indicates you don\'t have enough free cargo bays!');
+}
 
 // check if the guy has enough money
-if ($transaction == 'Buy' && $player->getCredits() < $bargain_price)
+if ($transaction == 'Buy' && $player->getCredits() < $bargain_price) {
 	create_error('You don\'t have enough credits!');
+}
 
 // get relations for us (global + personal)
 $relations = $player->getRelation($port->getRaceID());
 
-if (!isset($var['ideal_price'])) SmrSession::updateVar('ideal_price', $port->getIdealPrice($good_id, $transaction, $amount, $relations));
+if (!isset($var['ideal_price'])) {
+	SmrSession::updateVar('ideal_price', $port->getIdealPrice($good_id, $transaction, $amount, $relations));
+}
 $ideal_price = $var['ideal_price'];
 
-if (!isset($var['offered_price'])) SmrSession::updateVar('offered_price', $port->getOfferPrice($ideal_price, $relations, $transaction));
+if (!isset($var['offered_price'])) {
+	SmrSession::updateVar('offered_price', $port->getOfferPrice($ideal_price, $relations, $transaction));
+}
 $offered_price = $var['offered_price'];
 
 // nothing should happen here but just to avoid / by 0
-if ($ideal_price == 0 || $offered_price == 0)
+if ($ideal_price == 0 || $offered_price == 0) {
 	create_error('Port calculation error...buy more goods.');
+}
 
 if ($_REQUEST['action'] == 'Steal') {
 	if (!$ship->isUnderground()) {
@@ -109,8 +123,7 @@ 
 		$player->increaseHOF($bargain_price, array('Trade', 'Money', 'Buying'), HOF_PUBLIC);
 		$port->buyGoods($portGood, $amount, $ideal_price, $bargain_price, $gained_exp);
 		$player->increaseRelationsByTrade($amount, $port->getRaceID());
-	}
-	elseif ($transaction == 'Sell') {
+	} elseif ($transaction == 'Sell') {
 		$msg_transaction = 'sold';
 		$ship->decreaseCargo($good_id, $amount);
 		$player->increaseCredits($bargain_price);
@@ -120,8 +133,7 @@ 
 		$player->increaseHOF($bargain_price, array('Trade', 'Money', 'Selling'), HOF_PUBLIC);
 		$port->sellGoods($portGood, $amount, $ideal_price, $bargain_price, $gained_exp);
 		$player->increaseRelationsByTrade($amount, $port->getRaceID());
-	}
-	elseif ($transaction == 'Steal') {
+	} elseif ($transaction == 'Steal') {
 		$msg_transaction = 'stolen';
 		$ship->increaseCargo($good_id, $amount);
 		$player->increaseHOF($amount, array('Trade', 'Goods', 'Stolen'), HOF_ALLIANCE);
@@ -151,13 +163,13 @@ 
 
 	$container['trade_msg'] = $tradeMessage;
 
-	if ($ship->getEmptyHolds() == 0)
-		$container['body'] = 'current_sector.php';
-	else
-		$container['body'] = 'shop_goods.php';
+	if ($ship->getEmptyHolds() == 0) {
+			$container['body'] = 'current_sector.php';
+	} else {
+			$container['body'] = 'shop_goods.php';
+	}
 
-}
-else {
+} else {
 	// does the trader try to outsmart us?
 	$container = create_container('skeleton.php', 'shop_goods_trade.php');
 	transfer('ideal_price');
@@ -172,8 +184,9 @@ 
 }
 
 // only take turns if they bargained
-if (!isset($container['number_of_bargains']) || $container['number_of_bargains'] != 1)
+if (!isset($container['number_of_bargains']) || $container['number_of_bargains'] != 1) {
 	$player->takeTurns(TURNS_PER_TRADE, TURNS_PER_TRADE);
+}
 
 // go to next page
 forward($container);

lib/Default/ChessPiece.class.php

Braces +5 added lines, -10 removed lines

@@ -91,8 +91,7 @@ 
 						}
 					}
 				}
-			}
-			else if($this->pieceID==self::KING) {
+			} else if($this->pieceID==self::KING) {
 				for($i = -1; $i < 2; $i++) {
 					for($j = -1; $j < 2; $j++) {
 						if($i!=0 || $j!=0) {
@@ -114,8 +113,7 @@ 
 						$this->addMove($this->x+2, $this->y, $board, $moves, $hasMoved, $attackingCheck);
 					}
 				}
-			}
-			else if($this->pieceID==self::QUEEN) {
+			} else if($this->pieceID==self::QUEEN) {
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
@@ -140,8 +138,7 @@ 
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
-			}
-			else if($this->pieceID==self::ROOK) {
+			} else if($this->pieceID==self::ROOK) {
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
@@ -154,8 +151,7 @@ 
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while($this->addMove($moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down
-			}
-			else if($this->pieceID==self::BISHOP) {
+			} else if($this->pieceID==self::BISHOP) {
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while($this->addMove(--$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
@@ -168,8 +164,7 @@ 
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
-			}
-			else if($this->pieceID==self::KNIGHT) {
+			} else if($this->pieceID==self::KNIGHT) {
 				$moveX = $this->x-1;
 				$moveY = $this->y-2;
 				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2up-left

lib/Default/Plotter.class.php

Braces +13 added lines, -10 removed lines

@@ -92,12 +92,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());
@@ -115,8 +117,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();
 			}
@@ -134,11 +137,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/DummyShip.class.php

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/SmrForce.class.php

Braces +8 added lines, -12 removed lines

@@ -252,16 +252,16 @@ 
 		}
 		$this->hasChanged = true;
 		$this->expire = $time;
-		if (!$this->isNew)
-			$this->update();
+		if (!$this->isNew) {
+					$this->update();
+		}
 	}
 
 	public function updateExpire() {
 		// Changed (26/10/05) - scout drones count * 2
 		if ($this->getCDs() == 0 && $this->getMines() == 0 && $this->getSDs() > 0) {
 			$time = self::TIME_PER_SCOUT_ONLY * $this->getSDs();
-		}
-		else {
+		} else {
 			$time = ($this->getCDs() * self::TIME_PERCENT_PER_COMBAT + $this->getSDs() * self::TIME_PERCENT_PER_SCOUT + $this->getMines() * self::TIME_PERCENT_PER_MINE) * $this->getMaxGalaxyExpireTime();
 		}
 		$this->setExpire(TIME + $time);
@@ -288,11 +288,9 @@ 
 		}
 		if ($mines < 10) {
 			$turns = 1;
-		}
-		else if ($mines < 25) {
+		} else if ($mines < 25) {
 			$turns = 2;
-		}
-		else {
+		} else {
 			$turns = 3;
 		}
 		if ($ship->isFederal() || $ship->hasDCS()) {
@@ -347,12 +345,10 @@ 
 			if (!$this->exists()) {
 				$this->db->query('DELETE FROM sector_has_forces WHERE ' . $this->SQL);
 				$this->isNew = true;
-			}
-			else if ($this->hasChanged) {
+			} else if ($this->hasChanged) {
 				$this->db->query('UPDATE sector_has_forces SET combat_drones = ' . $this->db->escapeNumber($this->combatDrones) . ', scout_drones = ' . $this->db->escapeNumber($this->scoutDrones) . ', mines = ' . $this->db->escapeNumber($this->mines) . ', expire_time = ' . $this->db->escapeNumber($this->expire) . ' WHERE ' . $this->SQL);
 			}
-		}
-		else if ($this->exists()) {
+		} else if ($this->exists()) {
 			$this->db->query('INSERT INTO sector_has_forces (game_id, sector_id, owner_id, combat_drones, scout_drones, mines, expire_time)
 								VALUES('.$this->db->escapeNumber($this->gameID) . ', ' . $this->db->escapeNumber($this->sectorID) . ', ' . $this->db->escapeNumber($this->ownerID) . ', ' . $this->db->escapeNumber($this->combatDrones) . ', ' . $this->db->escapeNumber($this->scoutDrones) . ', ' . $this->db->escapeNumber($this->mines) . ', ' . $this->db->escapeNumber($this->expire) . ')');
 			$this->isNew = false;

lib/Default/AbstractSmrCombatWeapon.class.php

Braces +21 added lines, -14 removed lines

@@ -87,8 +87,9 @@ 
 	protected function &doPlayerDamageToForce(array &$return, AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
 		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstForces($weaponPlayer,$forces);
 		$return['ActualDamage'] =& $forces->doWeaponDamage($return['WeaponDamage']);
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $forces->killForcesByPlayer($weaponPlayer);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $forces->killForcesByPlayer($weaponPlayer);
+		}
 		return $return;
 	}
 	
@@ -96,24 +97,27 @@ 
 		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPlayer($weaponPlayer,$targetPlayer);
 		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByPlayer($weaponPlayer);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $targetPlayer->killPlayerByPlayer($weaponPlayer);
+		}
 		return $return;
 	}
 	
 	protected function &doPlayerDamageToPort(array &$return, AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
 		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPort($weaponPlayer,$port);
 		$return['ActualDamage'] =& $port->doWeaponDamage($return['WeaponDamage']);
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $port->killPortByPlayer($weaponPlayer);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $port->killPortByPlayer($weaponPlayer);
+		}
 		return $return;
 	}
 	
 	protected function &doPlayerDamageToPlanet(array &$return, AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet, $delayed) {
 		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPlanet($weaponPlayer,$planet);
 		$return['ActualDamage'] =& $planet->doWeaponDamage($return['WeaponDamage'],$delayed);
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $planet->killPlanetByPlayer($weaponPlayer);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $planet->killPlanetByPlayer($weaponPlayer);
+		}
 		return $return;
 	}
 	
@@ -121,8 +125,9 @@ 
 		$return['WeaponDamage'] =& $this->getModifiedPortDamageAgainstPlayer($port,$targetPlayer);
 		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByPort($port);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $targetPlayer->killPlayerByPort($port);
+		}
 		return $return;
 	}
 	
@@ -130,8 +135,9 @@ 
 		$return['WeaponDamage'] =& $this->getModifiedPlanetDamageAgainstPlayer($planet,$targetPlayer);
 		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByPlanet($planet);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $targetPlayer->killPlayerByPlanet($planet);
+		}
 		return $return;
 	}
 	
@@ -139,8 +145,9 @@ 
 		$return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces,$targetPlayer);
 		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByForces($forces);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $targetPlayer->killPlayerByForces($forces);
+		}
 		return $return;
 	}
 	

lib/Default/AbstractSmrLocation.class.php

Braces +55 added lines, -46 removed lines

@@ -74,8 +74,7 @@ 
 			$this->name = $db->getField('location_name');
 			$this->processor = $db->getField('location_processor');
 			$this->image = $db->getField('location_image');
-		}
-		else {
+		} else {
 			throw new Exception('Cannot find location: ' . $locationTypeID);
 		}
 	}
@@ -134,8 +133,7 @@ 
 		if ($bool === true) {
 			$this->db->query('INSERT IGNORE INTO location_is_fed (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->fed = true;
-		}
-		else if ($bool === false) {
+		} else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_fed WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->fed = false;
 		}
@@ -150,13 +148,13 @@ 
 	}
 	
 	public function setBank($bool) {
-		if ($this->bank === $bool)
-			return;
+		if ($this->bank === $bool) {
+					return;
+		}
 		if ($bool === true) {
 			$this->db->query('INSERT INTO location_is_bank (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->bank = true;
-		}
-		else if ($bool === false) {
+		} else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_bank WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->bank = false;
 		}
@@ -171,13 +169,13 @@ 
 	}
 	
 	public function setBar($bool) {
-		if ($this->bar === $bool)
-			return;
+		if ($this->bar === $bool) {
+					return;
+		}
 		if ($bool === true) {
 			$this->db->query('INSERT IGNORE INTO location_is_bar (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->bar = true;
-		}
-		else if ($bool === false) {
+		} else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_bar WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->bar = false;
 		}
@@ -192,13 +190,13 @@ 
 	}
 	
 	public function setHQ($bool) {
-		if ($this->HQ === $bool)
-			return;
+		if ($this->HQ === $bool) {
+					return;
+		}
 		if ($bool === true) {
 			$this->db->query('INSERT IGNORE INTO location_is_hq (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->HQ = true;
-		}
-		else if ($bool === false) {
+		} else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_hq WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->HQ = false;
 		}
@@ -213,13 +211,13 @@ 
 	}
 	
 	public function setUG($bool) {
-		if ($this->UG === $bool)
-			return;
+		if ($this->UG === $bool) {
+					return;
+		}
 		if ($bool === true) {
 			$this->db->query('INSERT INTO location_is_ug (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->UG = true;
-		}
-		else if ($bool === false) {
+		} else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_ug WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->UG = false;
 		}
@@ -245,18 +243,21 @@ 
 	}
 	
 	public function addHardwareSold($hardwareTypeID) {
-		if ($this->isHardwareSold($hardwareTypeID))
-			return;
+		if ($this->isHardwareSold($hardwareTypeID)) {
+					return;
+		}
 		$this->db->query('SELECT * FROM hardware_type WHERE hardware_type_id = ' . $this->db->escapeNumber($hardwareTypeID) . ' LIMIT 1');
-		if (!$this->db->nextRecord())
-			throw new Exception('Invalid hardware type id given');
+		if (!$this->db->nextRecord()) {
+					throw new Exception('Invalid hardware type id given');
+		}
 		$this->db->query('INSERT INTO location_sells_hardware (location_type_id,hardware_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ',' . $this->db->escapeNumber($hardwareTypeID) . ')');
 		$this->hardwareSold[$hardwareTypeID] = $this->db->getField('hardware_name');
 	}
 	
 	public function removeHardwareSold($hardwareTypeID) {
-		if (!$this->isHardwareSold($hardwareTypeID))
-			return;
+		if (!$this->isHardwareSold($hardwareTypeID)) {
+					return;
+		}
 		$this->db->query('DELETE FROM location_sells_hardware WHERE ' . $this->SQL . ' AND hardware_type_id = ' . $this->db->escapeNumber($hardwareTypeID) . ' LIMIT 1');
 		unset($this->hardwareSold[$hardwareTypeID]);
 	}
@@ -274,24 +275,28 @@ 
 	
 	public function isShipSold($shipTypeID = false) {
 		$ships = $this->getShipsSold();
-		if ($shipTypeID === false)
-			return count($ships) != 0;
+		if ($shipTypeID === false) {
+					return count($ships) != 0;
+		}
 		return isset($ships[$shipTypeID]);
 	}
 	
 	public function addShipSold($shipTypeID) {
-		if ($this->isShipSold($shipTypeID))
-			return;
+		if ($this->isShipSold($shipTypeID)) {
+					return;
+		}
 		$ship = AbstractSmrShip::getBaseShip(Globals::getGameType(SmrSession::getGameID()), $shipTypeID);
-		if ($ship === false)
-			throw new Exception('Invalid ship type id given');
+		if ($ship === false) {
+					throw new Exception('Invalid ship type id given');
+		}
 		$this->db->query('INSERT INTO location_sells_ships (location_type_id,ship_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ',' . $this->db->escapeNumber($shipTypeID) . ')');
 		$this->shipsSold[$shipTypeID] = $ship;
 	}
 	
 	public function removeShipSold($shipTypeID) {
-		if (!$this->isShipSold($shipTypeID))
-			return;
+		if (!$this->isShipSold($shipTypeID)) {
+					return;
+		}
 		$this->db->query('DELETE FROM location_sells_ships WHERE ' . $this->SQL . ' AND ship_type_id = ' . $this->db->escapeNumber($shipTypeID) . ' LIMIT 1');
 		unset($this->shipsSold[$shipTypeID]);
 	}
@@ -300,32 +305,37 @@ 
 		if (!isset($this->weaponsSold)) {
 			$this->weaponsSold = array();
 			$this->db->query('SELECT * FROM location_sells_weapons JOIN weapon_type USING (weapon_type_id) WHERE ' . $this->SQL);
-			while ($this->db->nextRecord())
-				$this->weaponsSold[$this->db->getInt('weapon_type_id')] = SmrWeapon::getWeapon($this->db->getInt('weapon_type_id'), false, $this->db);
+			while ($this->db->nextRecord()) {
+							$this->weaponsSold[$this->db->getInt('weapon_type_id')] = SmrWeapon::getWeapon($this->db->getInt('weapon_type_id'), false, $this->db);
+			}
 		}
 		return $this->weaponsSold;
 	}
 	
 	public function isWeaponSold($weaponTypeID = false) {
 		$weapons = $this->getWeaponsSold();
-		if ($weaponTypeID === false)
-			return count($weapons) != 0;
+		if ($weaponTypeID === false) {
+					return count($weapons) != 0;
+		}
 		return isset($weapons[$weaponTypeID]);
 	}
 	
 	public function addWeaponSold($weaponTypeID) {
-		if ($this->isWeaponSold($weaponTypeID))
-			return;
+		if ($this->isWeaponSold($weaponTypeID)) {
+					return;
+		}
 		$weapon = SmrWeapon::getWeapon($weaponTypeID);
-		if ($weapon === false)
-			throw new Exception('Invalid weapon type id given');
+		if ($weapon === false) {
+					throw new Exception('Invalid weapon type id given');
+		}
 		$this->db->query('INSERT INTO location_sells_weapons (location_type_id,weapon_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ',' . $this->db->escapeNumber($weaponTypeID) . ')');
 		$this->weaponsSold[$weaponTypeID] = $weapon;
 	}
 	
 	public function removeWeaponSold($weaponTypeID) {
-		if (!$this->isWeaponSold($weaponTypeID))
-			return;
+		if (!$this->isWeaponSold($weaponTypeID)) {
+					return;
+		}
 		$this->db->query('DELETE FROM location_sells_weapons WHERE ' . $this->SQL . ' AND weapon_type_id = ' . $this->db->escapeNumber($weaponTypeID) . ' LIMIT 1');
 		unset($this->weaponsSold[$weaponTypeID]);
 	}
@@ -336,8 +346,7 @@ 
 			if ($this->getTypeID() == LOCATION_TYPE_FEDERAL_HQ) {
 				$linkedLocations[] = SmrLocation::getLocation(LOCATION_TYPE_FEDERAL_BEACON);
 				$linkedLocations[] = SmrLocation::getLocation(LOCATION_TYPE_FEDERAL_MINT);
-			}
-			else {
+			} else {
 				$raceID = $this->getRaceID();
 				$linkedLocations[] = SmrLocation::getLocation(LOCATION_GROUP_RACIAL_BEACONS + $raceID);
 				$linkedLocations[] = SmrLocation::getLocation(LOCATION_GROUP_RACIAL_SHIPS + $raceID);