smrealms / smr

engine/Default/planet_attack_processing.php

Braces +20 added lines, -11 removed lines

@@ -1,23 +1,31 @@ 
 <?php
 
-if ($player->hasNewbieTurns())
+if ($player->hasNewbieTurns()) {
 	create_error('You are under newbie protection!');
-if ($player->hasFederalProtection())
+}
+if ($player->hasFederalProtection()) {
 	create_error('You are under federal protection!');
-if ($player->isLandedOnPlanet())
+}
+if ($player->isLandedOnPlanet()) {
 	create_error('You cannot attack planets whilst on a planet!');
-if ($player->getTurns() < 3)
+}
+if ($player->getTurns() < 3) {
 	create_error('You do not have enough turns to attack this planet!');
-if (!$ship->hasWeapons() && !$ship->hasCDs())
+}
+if (!$ship->hasWeapons() && !$ship->hasCDs()) {
 	create_error('What are you going to do? Insult it to death?');
-if (!$player->canFight())
+}
+if (!$player->canFight()) {
 	create_error('You are not allowed to fight!');
+}
 
 $planet = $player->getSectorPlanet();
-if (!$planet->exists())
+if (!$planet->exists()) {
 	create_error('This planet does not exist.');
-if (!$planet->isClaimed())
+}
+if (!$planet->isClaimed()) {
 	create_error('This planet is not claimed.');
+}
 
 $planetOwner = $planet->getOwner();
 
@@ -88,9 +96,10 @@ 
 
 // Update sector messages for attackers
 foreach ($attackers as $attacker) {
-	if (!$player->equals($attacker))
-		$db->query('REPLACE INTO sector_message VALUES(' . $attacker->getAccountID() . ',' . $attacker->getGameID() . ',' . $db->escapeString('[ATTACK_RESULTS]' . $logId) . ')');
-}
+	if (!$player->equals($attacker)) {
+			$db->query('REPLACE INTO sector_message VALUES(' . $attacker->getAccountID() . ',' . $attacker->getGameID() . ',' . $db->escapeString('[ATTACK_RESULTS]' . $logId) . ')');
+	}
+	}
 
 $container = create_container('skeleton.php', 'planet_attack.php');
 $container['sector_id'] = $planet->getSectorID();

Spacing +3 added lines, -3 removed lines

@@ -49,12 +49,12 @@
 }
 
 foreach ($attackers as $attacker) {
-	$playerResults =& $attacker->shootPlanet($planet, false);
-	$results['Attackers']['Traders'][$attacker->getAccountID()] =& $playerResults;
+	$playerResults = & $attacker->shootPlanet($planet, false);
+	$results['Attackers']['Traders'][$attacker->getAccountID()] = & $playerResults;
 	$results['Attackers']['TotalDamage'] += $playerResults['TotalDamage'];
 }
 $results['Attackers']['Downgrades'] = $planet->checkForDowngrade($results['Attackers']['TotalDamage']);
-$results['Planet'] =& $planet->shootPlayers($attackers);
+$results['Planet'] = & $planet->shootPlayers($attackers);
 
 $account->log(LOG_TYPE_PLANET_BUSTING, 'Player attacks planet, the planet does ' . $results['Planet']['TotalDamage'] . ', their team does ' . $results['Attackers']['TotalDamage'] . ' and downgrades: ' . var_export($results['Attackers']['Downgrades'], true), $planet->getSectorID());
 

engine/Default/weapon_reorder.php

Braces +4 added lines, -3 removed lines

@@ -11,6 +11,7 @@
 }
 
 if (isset($var['Form'])) {
-	if (isset($_REQUEST['weapon_reorder']) && is_array($_REQUEST['weapon_reorder']))
-		$ship->setWeaponLocations($_REQUEST['weapon_reorder']);
-}
+	if (isset($_REQUEST['weapon_reorder']) && is_array($_REQUEST['weapon_reorder'])) {
+			$ship->setWeaponLocations($_REQUEST['weapon_reorder']);
+	}
+	}

engine/Default/council_embassy_processing.php

Indentation +6 added lines, -6 removed lines

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

engine/Default/cargo_dump_processing.php

Indentation +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
 	// Don't lose more exp than you have
 	$lost_xp = min($player->getExperience(),
-	               round(SmrPort::getBaseExperience($amount, $good_distance)));
+				   round(SmrPort::getBaseExperience($amount, $good_distance)));
 	$player->decreaseExperience($lost_xp);
 	$player->increaseHOF($lost_xp, array('Trade', 'Experience', 'Jettisoned'), HOF_PUBLIC);
 

engine/Default/course_plot_processing.php

Braces +26 added lines, -14 removed lines

@@ -1,36 +1,48 @@
 <?php
 
-if (isset($var['from'])) $start = $var['from'];
-else $start = trim($_POST['from']);
-if (isset($var['to'])) $target = $var['to'];
-else $target = trim($_POST['to']);
+if (isset($var['from'])) {
+	$start = $var['from'];
+} else {
+	$start = trim($_POST['from']);
+}
+if (isset($var['to'])) {
+	$target = $var['to'];
+} else {
+	$target = trim($_POST['to']);
+}
 
 // perform some basic checks on both numbers
-if (empty($start) || empty($target))
+if (empty($start) || empty($target)) {
 	create_error('Where do you want to go today?');
+}
 
 
-if (!is_numeric($start) || !is_numeric($target))
+if (!is_numeric($start) || !is_numeric($target)) {
 	create_error('Please enter only numbers!');
+}
 
 $start = abs(str_replace('.', '', $start));
 $target = abs(str_replace('.', '', $target));
 
-if ($start == $target)
+if ($start == $target) {
 	create_error('Hmmmm...if ' . $start . '=' . $target . ' then that means...YOU\'RE ALREADY THERE! *cough*you\'re real smart*cough*');
+}
 
 $startExists = false;
 $targetExists = false;
 $galaxies = SmrGalaxy::getGameGalaxies($player->getGameID());
 foreach ($galaxies as $galaxy) {
-	if ($galaxy->contains($start))
-		$startExists = true;
-	if ($galaxy->contains($target))
-		$targetExists = true;
-}
-
-if ($startExists === false || $targetExists === false)
+	if ($galaxy->contains($start)) {
+			$startExists = true;
+	}
+	if ($galaxy->contains($target)) {
+			$targetExists = true;
+	}
+	}
+
+if ($startExists === false || $targetExists === false) {
 	create_error('The sectors have to exist!');
+}
 
 $account->log(LOG_TYPE_MOVEMENT, 'Player plots to ' . $target . '.', $player->getSectorID());
 

engine/Default/planet_defense_processing.php

Braces +50 added lines, -38 removed lines

@@ -1,17 +1,21 @@ 
 <?php
-if (!$player->isLandedOnPlanet())
+if (!$player->isLandedOnPlanet()) {
 	create_error('You are not on a planet!');
+}
 $amount = trim($_REQUEST['amount']);
-if (!is_numeric($amount))
+if (!is_numeric($amount)) {
 	create_error('Numbers only please');
+}
 	
 // only whole numbers allowed
 $amount = round($amount);
 
-if ($amount <= 0)
+if ($amount <= 0) {
 	create_error('You must actually enter an amount > 0!');
-if ($player->getNewbieTurns() > 0)
+}
+if ($player->getNewbieTurns() > 0) {
 	create_error('You can\'t drop defenses under newbie protection!');
+}
 // get a planet from the sector where the player is in
 $planet = $player->getSectorPlanet();
 
@@ -21,40 +25,44 @@ 
 if ($action == 'Ship') {
 	if ($type_id == HARDWARE_SHIELDS) {
 		// do we want transfer more than we have?
-		if ($amount > $planet->getShields())
-			create_error('You can\'t take more shields from planet than are on it!');
+		if ($amount > $planet->getShields()) {
+					create_error('You can\'t take more shields from planet than are on it!');
+		}
 
 		// do we want to transfer more than we can carry?
-		if ($amount > $ship->getMaxShields() - $ship->getShields())
-			create_error('You can\'t take more shields than you can carry!');
+		if ($amount > $ship->getMaxShields() - $ship->getShields()) {
+					create_error('You can\'t take more shields than you can carry!');
+		}
 
 		// now transfer
 		$planet->decreaseShields($amount);
 		$ship->increaseShields($amount);
 		$account->log(LOG_TYPE_PLANETS, 'Player takes ' . $amount . ' shields from planet.', $player->getSectorID());
-	}
-	else if ($type_id == HARDWARE_COMBAT) {
+	} else if ($type_id == HARDWARE_COMBAT) {
 		// do we want transfer more than we have?
-		if ($amount > $planet->getCDs())
-			create_error('You can\'t take more drones from planet than are on it!');
+		if ($amount > $planet->getCDs()) {
+					create_error('You can\'t take more drones from planet than are on it!');
+		}
 
 		// do we want to transfer more than we can carry?
-		if ($amount > $ship->getMaxCDs() - $ship->getCDs())
-			create_error('You can\'t take more drones than you can carry!');
+		if ($amount > $ship->getMaxCDs() - $ship->getCDs()) {
+					create_error('You can\'t take more drones than you can carry!');
+		}
 
 		// now transfer
 		$planet->decreaseCDs($amount);
 		$ship->increaseCDs($amount);
 		$account->log(LOG_TYPE_PLANETS, 'Player takes ' . $amount . ' drones from planet.', $player->getSectorID());
-	}
-	else if ($type_id == HARDWARE_ARMOUR) {
+	} else if ($type_id == HARDWARE_ARMOUR) {
 		// do we want transfer more than we have?
-		if ($amount > $planet->getArmour())
-			create_error('You can\'t take more armour from planet than are on it!');
+		if ($amount > $planet->getArmour()) {
+					create_error('You can\'t take more armour from planet than are on it!');
+		}
 
 		// do we want to transfer more than we can carry?
-		if ($amount > $ship->getMaxArmour() - $ship->getArmour())
-			create_error('You can\'t take more armour than you can carry!');
+		if ($amount > $ship->getMaxArmour() - $ship->getArmour()) {
+					create_error('You can\'t take more armour than you can carry!');
+		}
 
 		// now transfer
 		$planet->decreaseArmour($amount);
@@ -62,32 +70,34 @@ 
 		$account->log(LOG_TYPE_PLANETS, 'Player takes ' . $amount . ' armour from planet.', $player->getSectorID());
 	}
 	
-}
-elseif ($action == 'Planet') {
+} elseif ($action == 'Planet') {
 	// does the user wants to transfer shields?
 	if ($type_id == HARDWARE_SHIELDS) {
 		// do we want transfer more than we have?
-		if ($amount > $ship->getShields())
-			create_error('You can\'t transfer more shields than you carry!');
+		if ($amount > $ship->getShields()) {
+					create_error('You can\'t transfer more shields than you carry!');
+		}
 
 		// do we want to transfer more than the planet can hold?
-		if ($amount + $planet->getShields() > $planet->getMaxShields())
-			create_error('The planet can\'t hold more than ' . $planet->getMaxShields() . ' shields!');
+		if ($amount + $planet->getShields() > $planet->getMaxShields()) {
+					create_error('The planet can\'t hold more than ' . $planet->getMaxShields() . ' shields!');
+		}
 
 		// now transfer
 		$planet->increaseShields($amount);
 		$ship->decreaseShields($amount);
 		$account->log(LOG_TYPE_PLANETS, 'Player puts ' . $amount . ' shields on planet.', $player->getSectorID());
 	// does the user wants to transfer drones?
-	}
-	else if ($type_id == HARDWARE_COMBAT) {
+	} else if ($type_id == HARDWARE_COMBAT) {
 		// do we want transfer more than we have?
-		if ($amount > $ship->getCDs())
-			create_error('You can\'t transfer more combat drones than you carry!');
+		if ($amount > $ship->getCDs()) {
+					create_error('You can\'t transfer more combat drones than you carry!');
+		}
 
 		// do we want to transfer more than we can carry?
-		if ($amount + $planet->getCDs() > $planet->getMaxCDs())
-			create_error('The planet can\'t hold more than ' . $planet->getMaxCDs() . ' drones!');
+		if ($amount + $planet->getCDs() > $planet->getMaxCDs()) {
+					create_error('The planet can\'t hold more than ' . $planet->getMaxCDs() . ' drones!');
+		}
 
 		// now transfer
 		$planet->increaseCDs($amount);
@@ -97,12 +107,14 @@ 
 	// does the user wish to transfare armour?
 	else if ($type_id == HARDWARE_ARMOUR) {
 		// do we want transfer more than we have?
-		if ($amount >= $ship->getArmour())
-			create_error('You can\'t transfer more armour than what you carry minus one!');
+		if ($amount >= $ship->getArmour()) {
+					create_error('You can\'t transfer more armour than what you carry minus one!');
+		}
 
 		// do we want to transfer more than we can carry?
-		if ($amount + $planet->getArmour() > $planet->getMaxArmour())
-			create_error('The planet can\'t hold more than ' . $planet->getMaxArmour() . ' armour!');
+		if ($amount + $planet->getArmour() > $planet->getMaxArmour()) {
+					create_error('The planet can\'t hold more than ' . $planet->getMaxArmour() . ' armour!');
+		}
 
 		// now transfer
 		$planet->increaseArmour($amount);
@@ -110,9 +122,9 @@ 
 		$account->log(LOG_TYPE_PLANETS, 'Player puts ' . $amount . ' armour on planet.', $player->getSectorID());
 	}
 	
-}
-else
+} else {
 	create_error('You must choose if you want to transfer to planet or to the ship!');
+}
 
 $ship->removeUnderAttack();
 

engine/Default/preferences_processing.php

Braces +62 added lines, -62 removed lines

@@ -3,8 +3,7 @@ 
 $container = create_container('skeleton.php');
 if (SmrSession::hasGame()) {
 	$container['body'] = 'current_sector.php';
-}
-else {
+} else {
 	$container['body'] = 'game_play.php';
 }
 $action = $_REQUEST['action'];
@@ -17,35 +16,38 @@ 
 	// overwrite container
 	$container['body'] = 'validate.php';
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your email address, you will now need to revalidate with the code sent to the new email address.';
-}
-elseif ($action == 'Change Password') {
+} elseif ($action == 'Change Password') {
 	$new_password = $_REQUEST['new_password'];
 	$old_password = $_REQUEST['old_password'];
 	$retype_password = $_REQUEST['retype_password'];
 
-	if (empty($new_password))
-		create_error('You must enter a non empty password!');
+	if (empty($new_password)) {
+			create_error('You must enter a non empty password!');
+	}
 
-	if (!$account->checkPassword($old_password))
-		create_error('Your current password is wrong!');
+	if (!$account->checkPassword($old_password)) {
+			create_error('Your current password is wrong!');
+	}
 
-	if ($new_password != $retype_password)
-		create_error('The passwords you entered don\'t match!');
+	if ($new_password != $retype_password) {
+			create_error('The passwords you entered don\'t match!');
+	}
 
-	if ($new_password == $account->getLogin())
-		create_error('Your chosen password is invalid!');
+	if ($new_password == $account->getLogin()) {
+			create_error('Your chosen password is invalid!');
+	}
 
 	$account->setPassword($new_password);
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your password.';
-}
-elseif ($action == 'Change Name') {
+} elseif ($action == 'Change Name') {
 	$HoF_name = trim($_REQUEST['HoF_name']);
 
 	$limited_char = 0;
 	for ($i = 0; $i < strlen($HoF_name); $i++) {
 		// disallow certain ascii chars
-		if (ord($HoF_name[$i]) < 32 || ord($HoF_name[$i]) > 127)
-			create_error('Your Hall Of Fame name contains invalid characters!');
+		if (ord($HoF_name[$i]) < 32 || ord($HoF_name[$i]) > 127) {
+					create_error('Your Hall Of Fame name contains invalid characters!');
+		}
 
 		// numbers 48..57
 		// Letters 65..90
@@ -57,23 +59,26 @@ 
 		}
 	}
 
-	if ($limited_char > 4)
-		create_error('You cannot use a name with more than 4 special characters.');
+	if ($limited_char > 4) {
+			create_error('You cannot use a name with more than 4 special characters.');
+	}
 
 
 	//disallow blank names
-	if (empty($HoF_name) || $HoF_name == '') create_error('You Hall of Fame name must contain characters!');
+	if (empty($HoF_name) || $HoF_name == '') {
+		create_error('You Hall of Fame name must contain characters!');
+	}
 
 	//no duplicates
 	$db->query('SELECT * FROM account WHERE hof_name = ' . $db->escapeString($HoF_name) . ' AND account_id != ' . $db->escapeNumber($account->getAccountID()) . ' LIMIT 1');
-	if ($db->nextRecord()) create_error('Someone is already using that name!');
+	if ($db->nextRecord()) {
+		create_error('Someone is already using that name!');
+	}
 
 	// set the HoF name in account stat
 	$account->setHofName($HoF_name);
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your hall of fame name.';
-}
-
-elseif ($action == 'Change Discord ID') {
+} elseif ($action == 'Change Discord ID') {
 	$discordId = trim($_REQUEST['discord_id']);
 
 	if (empty($discordId)) {
@@ -83,20 +88,21 @@ 
 	} else {
 		// no duplicates
 		$db->query('SELECT * FROM account WHERE discord_id =' . $db->escapeString($discordId) . ' AND account_id != ' . $db->escapeNumber($account->getAccountID()) . ' LIMIT 1');
-		if ($db->nextRecord()) create_error('Someone is already using that Discord User ID!');
+		if ($db->nextRecord()) {
+			create_error('Someone is already using that Discord User ID!');
+		}
 
 		$account->setDiscordId($discordId);
 		$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your Discord User ID.';
 	}
-}
-
-elseif ($action == 'Change IRC Nick') {
+} elseif ($action == 'Change IRC Nick') {
 	$ircNick = trim($_REQUEST['irc_nick']);
 
 	for ($i = 0; $i < strlen($ircNick); $i++) {
 		// disallow certain ascii chars (and whitespace!)
-		if (ord($ircNick[$i]) < 33 || ord($ircNick[$i]) > 127)
-			create_error('Your IRC Nick contains invalid characters!');
+		if (ord($ircNick[$i]) < 33 || ord($ircNick[$i]) > 127) {
+					create_error('Your IRC Nick contains invalid characters!');
+		}
 	}
 
 	// here you can delete your registered irc nick
@@ -107,7 +113,9 @@ 
 
 		// no duplicates
 		$db->query('SELECT * FROM account WHERE irc_nick = ' . $db->escapeString($ircNick) . ' AND account_id != ' . $db->escapeNumber($account->getAccountID()) . ' LIMIT 1');
-		if ($db->nextRecord()) create_error('Someone is already using that nick!');
+		if ($db->nextRecord()) {
+			create_error('Someone is already using that nick!');
+		}
 
 		// save irc nick in db and set message
 		$account->setIrcNick($ircNick);
@@ -115,8 +123,7 @@ 
 
 	}
 
-}
-elseif ($action == 'Yes') {
+} elseif ($action == 'Yes') {
 	$account_id = $var['account_id'];
 	$amount = $var['amount'];
 
@@ -128,33 +135,28 @@ 
 	// add to him
 	$his_account->increaseSmrCredits($amount);
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have sent SMR credits.';
-}
-elseif ($action == 'Change Timezone') {
+} elseif ($action == 'Change Timezone') {
 	$timez = $_REQUEST['timez'];
-	if (!is_numeric($timez))
-		create_error('Numbers only please');
+	if (!is_numeric($timez)) {
+			create_error('Numbers only please');
+	}
 
 	$db->query('UPDATE account SET offset = ' . $db->escapeNumber($timez) . ' WHERE account_id = ' . $db->escapeNumber($account->getAccountID()));
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your time offset.';
-}
-elseif ($action == 'Change Date Formats') {
+} elseif ($action == 'Change Date Formats') {
 	$account->setShortDateFormat($_REQUEST['dateformat']);
 	$account->setShortTimeFormat($_REQUEST['timeformat']);
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your date formats.';
-}
-elseif ($action == 'Change Images') {
+} elseif ($action == 'Change Images') {
 	$account->setDisplayShipImages($_REQUEST['images']);
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your ship images preferences.';
-}
-elseif ($action == 'Change Centering') {
+} elseif ($action == 'Change Centering') {
 	$account->setCenterGalaxyMapOnPlayer($_REQUEST['centergalmap'] == 'Yes');
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your centering galaxy map preferences.';
-}
-else if ($action == 'Change Size' && is_numeric($_REQUEST['fontsize']) && $_REQUEST['fontsize'] >= 50) {
+} else if ($action == 'Change Size' && is_numeric($_REQUEST['fontsize']) && $_REQUEST['fontsize'] >= 50) {
 	$account->setFontSize($_REQUEST['fontsize']);
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your font size.';
-}
-else if ($action == 'Change CSS Options') {
+} else if ($action == 'Change CSS Options') {
 	$account->setCssLink($_REQUEST['csslink']);
 	if ($_REQUEST['template'] == 'None') {
 		$account->setDefaultCSSEnabled(false);
@@ -165,24 +167,20 @@ 
 		$account->setColourScheme($cssColourScheme);
 	}
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your CSS options.';
-}
-else if ($action == 'Change Kamikaze Setting') {
+} else if ($action == 'Change Kamikaze Setting') {
 	$player->setCombatDronesKamikazeOnMines($_REQUEST['kamikaze'] == 'Yes');
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your combat drones options.';
-}
-else if ($action == 'Change Message Setting') {
+} else if ($action == 'Change Message Setting') {
 	$player->setForceDropMessages($_REQUEST['forceDropMessages'] == 'Yes');
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your message options.';
-}
-else if ($action == 'Save Hotkeys') {
+} else if ($action == 'Save Hotkeys') {
 	foreach (AbstractSmrAccount::getDefaultHotkeys() as $hotkey => $binding) {
 		if (isset($_REQUEST[$hotkey])) {
 			$account->setHotkey($hotkey, explode(' ', $_REQUEST[$hotkey]));
 		}
 	}
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have saved your hotkeys.';
-}
-else if (strpos(trim($action), 'Alter Player') === 0) {
+} else if (strpos(trim($action), 'Alter Player') === 0) {
 	// trim input now
 	$player_name = trim($_POST['PlayerName']);
 
@@ -193,8 +191,9 @@ 
 	$limited_char = 0;
 	for ($i = 0; $i < strlen($player_name); $i++) {
 		// disallow certain ascii chars
-		if (ord($player_name[$i]) < 32 || ord($player_name[$i]) > 127)
-			create_error('The player name contains invalid characters!');
+		if (ord($player_name[$i]) < 32 || ord($player_name[$i]) > 127) {
+					create_error('The player name contains invalid characters!');
+		}
 
 		// numbers 48..57
 		// Letters 65..90
@@ -206,11 +205,13 @@ 
 		}
 	}
 
-	if ($limited_char > 4)
-		create_error('You cannot use a name with more than 4 special characters.');
+	if ($limited_char > 4) {
+			create_error('You cannot use a name with more than 4 special characters.');
+	}
 
-	if (empty($player_name))
-		create_error('You must enter a player name!');
+	if (empty($player_name)) {
+			create_error('You must enter a player name!');
+	}
 
 	// Escape html elements so the name displays correctly
 	$player_name = htmlentities($player_name);
@@ -237,8 +238,7 @@ 
 	$news = 'Please be advised that ' . $old_name . ' has changed their name to ' . $player->getBBLink();
 	$db->query('INSERT INTO news (time, news_message, game_id, type) VALUES (' . $db->escapeNumber(TIME) . ',' . $db->escapeString($news) . ',' . $db->escapeNumber($player->getGameID()) . ', \'admin\')');
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your player name.';
-}
-else if ($action == 'Update Colours') {
+} else if ($action == 'Update Colours') {
 	$friendlyColour = $_REQUEST['friendly_color'];
 	$neutralColour = $_REQUEST['neutral_color'];
 	$enemyColour = $_REQUEST['enemy_color'];

engine/Default/message_send_processing.php

Braces +9 added lines, -9 removed lines

@@ -4,18 +4,20 @@ 
 
 if ($_REQUEST['action'] == 'Preview message') {
 	$container = create_container('skeleton.php');
-	if (isset($var['alliance_id']))
-		$container['body'] = 'alliance_broadcast.php';
-	else
-		$container['body'] = 'message_send.php';
+	if (isset($var['alliance_id'])) {
+			$container['body'] = 'alliance_broadcast.php';
+	} else {
+			$container['body'] = 'message_send.php';
+	}
 	transfer('receiver');
 	transfer('alliance_id');
 	$container['preview'] = $message;
 	forward($container);
 }
 
-if (empty($message))
+if (empty($message)) {
 	create_error('You have to enter a message to send!');
+}
 
 if (isset($var['alliance_id'])) {
 	$db->query('SELECT account_id FROM player
@@ -26,11 +28,9 @@ 
 		$player->sendMessage($db->getField('account_id'), MSG_ALLIANCE, $message, false);
 	}
 	$player->sendMessage($player->getAccountID(), MSG_ALLIANCE, $message, true, false);
-}
-else if (!empty($var['receiver'])) {
+} else if (!empty($var['receiver'])) {
 	$player->sendMessage($var['receiver'], MSG_PLAYER, $message);
-}
-else {
+} else {
 	$player->sendGlobalMessage($message);
 }
 

engine/Default/planet_stockpile_processing.php

Braces +19 added lines, -13 removed lines

@@ -1,14 +1,17 @@ 
 <?php
-if (!$player->isLandedOnPlanet())
+if (!$player->isLandedOnPlanet()) {
 	create_error('You are not on a planet!');
+}
 $amount = $_REQUEST['amount'];
-if (!is_numeric($amount))
+if (!is_numeric($amount)) {
 	create_error('Numbers only please');
+}
 	
 $amount = floor($amount);
 
-if ($amount <= 0)
+if ($amount <= 0) {
 	create_error('You must actually enter an amount > 0!');
+}
 
 // get a planet from the sector where the player is in
 $planet = $player->getSectorPlanet();
@@ -17,12 +20,14 @@ 
 if ($action == 'Ship') {
 
 	// do we want transfer more than we have?
-	if ($amount > $planet->getStockpile($var['good_id']))
-		create_error('You can\'t take more than on planet!');
+	if ($amount > $planet->getStockpile($var['good_id'])) {
+			create_error('You can\'t take more than on planet!');
+	}
 
 	// do we want to transfer more than we can carry?
-	if ($amount > $ship->getEmptyHolds())
-		create_error('You can\'t take more than you can carry!');
+	if ($amount > $ship->getEmptyHolds()) {
+			create_error('You can\'t take more than you can carry!');
+	}
 
 	// now transfer
 	$planet->decreaseStockpile($var['good_id'], $amount);
@@ -30,15 +35,16 @@ 
 	$account->log(LOG_TYPE_PLANETS, 'Player takes ' . $amount . ' ' . Globals::getGoodName($var['good_id']) . ' from planet.', $player->getSectorID());
 
 // transfer to planet
-}
-elseif ($action == 'Planet') {
+} elseif ($action == 'Planet') {
 	// do we want transfer more than we have?
-	if ($amount > $ship->getCargo($var['good_id']))
-		create_error('You can\'t store more than you carry!');
+	if ($amount > $ship->getCargo($var['good_id'])) {
+			create_error('You can\'t store more than you carry!');
+	}
 
 	// do we want to transfer more than the planet can hold?
-	if ($amount > $planet->getRemainingStockpile($var['good_id']))
-		create_error('This planet cannot store more than ' . SmrPlanet::MAX_STOCKPILE . ' of each good!');
+	if ($amount > $planet->getRemainingStockpile($var['good_id'])) {
+			create_error('This planet cannot store more than ' . SmrPlanet::MAX_STOCKPILE . ' of each good!');
+	}
 
 	// now transfer
 	$planet->increaseStockpile($var['good_id'], $amount);