smrealms / smr

engine/Default/game_join_processing.php

Braces +20 added lines, -15 removed lines

@@ -3,14 +3,16 @@ 
 // trim input now
 $player_name = trim($_REQUEST['player_name']);
 
-if(!defined('NPC_SCRIPT') && strpos($player_name,'NPC')===0)
+if(!defined('NPC_SCRIPT') && strpos($player_name,'NPC')===0) {
 	create_error('Player names cannot begin with "NPC".');
+}
 
 $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
@@ -22,17 +24,21 @@ 
 	}
 }
 
-if ($limited_char > 4)
+if ($limited_char > 4) {
 	create_error('You cannot use a name with more than 4 special characters.');
+}
 
-if (empty($player_name))
+if (empty($player_name)) {
 	create_error('You must enter a player name!');
+}
 
 $race_id = $_REQUEST['race_id'];
-if (empty($race_id) || $race_id == 1)
+if (empty($race_id) || $race_id == 1) {
 	create_error('Please choose a race!');
-if(!is_numeric($var['game_id']))
+}
+if(!is_numeric($var['game_id'])) {
 	create_error('Game ID is not numeric');
+}
 
 $gameID = $var['game_id'];
 
@@ -40,11 +46,13 @@ 
 $player_name = htmlentities($player_name);
 
 $db->query('SELECT 1 FROM player WHERE game_id = ' . $db->escapeNumber($gameID) . ' AND player_name = ' . $db->escapeString($player_name) . ' LIMIT 1');
-if ($db->nextRecord() > 0)
+if ($db->nextRecord() > 0) {
 	create_error('The player name already exists.');
+}
 
-if (!Globals::isValidGame($gameID))
+if (!Globals::isValidGame($gameID)) {
 	create_error('Game not found!');
+}
 
 // does it cost something to join that game?
 $credits = Globals::getGameCreditsRequired($gameID);
@@ -65,8 +73,7 @@ 
 	$ship_id = SHIP_TYPE_NEWBIE_MERCHANT_VESSEL;
 	$amount_shields = 75;
 	$amount_armour = 150;
-}
-else {
+} else {
 	$startingNewbieTurns = STARTING_NEWBIE_TURNS_VET;
 	switch($race_id) {
 		case RACE_ALSKANT:
@@ -105,8 +112,7 @@ 
 //// newbie leaders need to put into there alliances
 if ($account->getAccountID() == ACCOUNT_ID_NHL) {
 	$alliance_id = NHA_ID;
-}
-else {
+} else {
 	$alliance_id = 0;
 }
 
@@ -116,8 +122,7 @@ 
 $db->query('SELECT MAX(player_id) FROM player WHERE game_id = ' . $db->escapeNumber($gameID));
 if ($db->nextRecord()) {
 	$player_id = $db->getInt('MAX(player_id)') + 1;
-}
-else {
+} else {
 	$player_id = 1;
 }
 

engine/Default/bank_anon_detail.php

Braces +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
 	&& is_numeric($var['maxValue'])
 	&& $var['maxValue'] > 0) {
 	$maxValue = $var['maxValue'];
-}
-else {
+} else {
 	$db->query('SELECT MAX(transaction_id) FROM anon_bank_transactions
 				WHERE game_id=' . $db->escapeNumber($player->getGameID()) . '
 				AND anon_id=' . $db->escapeNumber($account_num)

engine/Default/council_vote.php

Braces +3 added lines, -2 removed lines

@@ -20,8 +20,9 @@
 $voteRelations = array();
 $globalRelations = Globals::getRaceRelations($player->getGameID(), $player->getRaceID());
 foreach (Globals::getRaces() as $raceID => $raceInfo) {
-	if($raceID == RACE_NEUTRAL || $raceID == $player->getRaceID())
-		continue;
+	if($raceID == RACE_NEUTRAL || $raceID == $player->getRaceID()) {
+			continue;
+	}
 	$container = create_container('council_vote_processing.php', '', array('race_id' => $raceID));
 	$voteRelations[$raceID] = array(
 		'HREF' => SmrSession::getNewHREF($container),

engine/Default/current_players.php

Braces +15 added lines, -9 removed lines

@@ -6,10 +6,12 @@ 
 			WHERE last_accessed >= ' . $db->escapeNumber(TIME - 600) . ' AND
 				game_id = ' . $db->escapeNumber($player->getGameID()));
 $count_real_last_active = 0;
-if($db->nextRecord())
+if($db->nextRecord()) {
 	$count_real_last_active = $db->getField('count');
-if(SmrSession::$last_accessed < TIME - 600)
+}
+if(SmrSession::$last_accessed < TIME - 600) {
 	++$count_real_last_active;
+}
 
 
 $db->query('SELECT * FROM player
@@ -19,8 +21,9 @@ 
 $count_last_active = $db->getNumRows();
 
 // fix it if some1 is using the logoff button
-if ($count_real_last_active < $count_last_active)
+if ($count_real_last_active < $count_last_active) {
 	$count_real_last_active = $count_last_active;
+}
 
 // Get the summary text
 $summary = 'There ';
@@ -57,12 +60,15 @@ 
 
 		// How should we style the row for this player?
 		$class='';
-		if ($player->equals($curr_player))
-			$class .= 'bold';
-		if ($curr_player->hasNewbieStatus())
-			$class.= ' newbie';
-		if ($class!='')
-			$class = ' class="'.trim($class).'"';
+		if ($player->equals($curr_player)) {
+					$class .= 'bold';
+		}
+		if ($curr_player->hasNewbieStatus()) {
+					$class.= ' newbie';
+		}
+		if ($class!='') {
+					$class = ' class="'.trim($class).'"';
+		}
 		$row['tr_class'] = $class;
 
 		// What should the player name be displayed as?

engine/Default/bar_buy_drink_processing.php

Braces +4 added lines, -8 removed lines

@@ -12,14 +12,12 @@ 
 	$message.= 'You ask the bartender for some water and you quickly down it.<br />You don\'t feel quite so intoxicated anymore.<br />';
 	$db->query('DELETE FROM player_has_drinks WHERE game_id=' . $db->escapeNumber($player->getGameID()) . ' AND account_id=' . $db->escapeNumber($player->getAccountID()) . ' LIMIT 1');
 	$player->increaseHOF(1,array('Bar','Drinks', 'Water'), HOF_PUBLIC);
-}
-else {
+} else {
 	$random = mt_rand(1, 20);
 	//only get Azool or Spock drink if they are very lucky
 	if ($random != 1) {
 		$db->query('SELECT drink_id, drink_name FROM bar_drink WHERE drink_id != 1 && drink_id != 11 ORDER BY rand() LIMIT 1');
-	}
-	else {
+	} else {
 		$db->query('SELECT drink_id, drink_name FROM bar_drink ORDER BY rand() LIMIT 1');
 	}
 
@@ -30,8 +28,7 @@ 
 		$db->query('SELECT drink_id FROM player_has_drinks WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' ORDER by drink_id DESC LIMIT 1');
 		if ($db->nextRecord()) {
 			$curr_drink_id = $db->getInt('drink_id') + 1;
-		}
-		else {
+		} else {
 			$curr_drink_id = 1;
 		}
 
@@ -39,8 +36,7 @@ 
 			$message.=('You have bought a '.$drinkName.' for $10');
 			$db->query('INSERT INTO player_has_drinks (account_id, game_id, drink_id, time) VALUES (' . $db->escapeNumber($player->getAccountID()) . ', ' . $db->escapeNumber($player->getGameID()) . ', ' . $db->escapeNumber($curr_drink_id) . ', ' . $db->escapeNumber(TIME) . ')');
 			$player->increaseHOF(1,array('Bar','Drinks', 'Alcoholic'), HOF_PUBLIC);
-		}
-		else {
+		} else {
 			$message.=('The bartender says, Ive got something special for ya.<br />');
 			$message.=('The bartender turns around for a minute and whips up a '.$drinkName.'.<br />');
 

engine/Default/council_politics.php

Braces +2 added lines, -4 removed lines

@@ -19,11 +19,9 @@
 	if($otherRaceID != RACE_NEUTRAL && $raceID != $otherRaceID) {
 		if($raceRelations[$otherRaceID] >= RELATIONS_PEACE) {
 			$peaceRaces[$otherRaceID] = $raceInfo;
-		}
-		else if($raceRelations[$otherRaceID] <= RELATIONS_WAR) {
+		} else if($raceRelations[$otherRaceID] <= RELATIONS_WAR) {
 			$warRaces[$otherRaceID] = $raceInfo;
-		}
-		else {
+		} else {
 			$neutralRaces[$otherRaceID] = $raceInfo;
 		}
 	}

engine/Default/galactic_post_make_paper_processing.php

Braces +3 added lines, -2 removed lines

@@ -1,10 +1,11 @@
 <?php
 
 $db->query('SELECT * FROM galactic_post_paper WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' ORDER BY paper_id DESC');
-if ($db->nextRecord())
+if ($db->nextRecord()) {
 	$num = $db->getField('paper_id') + 1;
-else
+} else {
 	$num = 1;
+}
 $title = $_REQUEST['title'];
 $db->query('INSERT INTO galactic_post_paper (game_id, paper_id, title) VALUES (' . $db->escapeNumber($player->getGameID()) . ', '.$db->escapeNumber($num).', '.$db->escapeString($title).')');
 //send em back

engine/Default/government_processing.php

Braces +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
 $location = SmrLocation::getLocation($var['LocationID']);
 if ($location->isHQ()) {
 	$player->setAlignment(150);
-}
-elseif ($location->isUG()) {
+} elseif ($location->isUG()) {
 	$player->setAlignment(-150);
 }
 

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 = '<span class="blue">ADMIN</span> Please be advised that ' . $old_name . ' has changed their name to ' . $player->getBBLink() . '</span>';
 	$db->query('INSERT INTO news (time, news_message, game_id, dead_id,dead_alliance) VALUES (' . $db->escapeNumber(TIME) . ',' . $db->escapeString($news) . ',' . $db->escapeNumber($player->getGameID()) . ',' . $db->escapeNumber($player->getAccountID()) . ',' . $db->escapeNumber($player->getAllianceID()) . ')');
 	$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'];