smrealms / smr

engine/Default/bar_buy_drink_processing.php

Spacing +19 added lines, -19 removed lines

@@ -9,9 +9,9 @@ 
 
 if (isset($var['action']) && $var['action'] != 'drink') {
 	$drinkName = 'water';
-	$message.= 'You ask the bartender for some water and you quickly down it.<br />You don\'t feel quite so intoxicated anymore.<br />';
+	$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);
+	$player->increaseHOF(1, array('Bar', 'Drinks', 'Water'), HOF_PUBLIC);
 }
 else {
 	$random = mt_rand(1, 20);
@@ -35,30 +35,30 @@ 
 			$curr_drink_id = 1;
 		}
 
-		if ($drink_id != 11 && $drink_id !=1) {
-			$message.=('You have bought a '.$drinkName.' for $10');
+		if ($drink_id != 11 && $drink_id != 1) {
+			$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);
+			$player->increaseHOF(1, array('Bar', 'Drinks', 'Alcoholic'), HOF_PUBLIC);
 		}
 		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 />');
+			$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 />');
 
 			if ($drink_id == 1) {
-				$message.=('The bartender says that Spock himself gave him the directions to make this drink.<br />');
+				$message .= ('The bartender says that Spock himself gave him the directions to make this drink.<br />');
 			}
 
-			$message.=('You drink the '.$drinkName.' and feel like like you have been drinking for hours.<br />');
+			$message .= ('You drink the ' . $drinkName . ' and feel like like you have been drinking for hours.<br />');
 
 			if ($drink_id == 11) {
-				$message.=('After drinking the '.$drinkName.' you feel like nothing can bring you down and like you are the best trader in the universe.<br />');
+				$message .= ('After drinking the ' . $drinkName . ' you feel like nothing can bring you down and like you are the best trader in the universe.<br />');
 			}
 
 			//has the power of 2 drinks
 			$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) . ')');
 			$curr_drink_id++;
 			$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', 'Special'), HOF_PUBLIC);
+			$player->increaseHOF(1, array('Bar', 'Drinks', 'Special'), HOF_PUBLIC);
 		}
 
 	}
@@ -66,7 +66,7 @@ 
 	$db->nextRecord();
 	$num_drinks = $db->getInt('count(*)');
 	//display woozy message
-	$message.= '<br />You feel a little W'.str_repeat('oO', $num_drinks).'zy<br />';
+	$message .= '<br />You feel a little W' . str_repeat('oO', $num_drinks) . 'zy<br />';
 }
 
 $player->actionTaken('BuyDrink', array(
@@ -76,22 +76,22 @@ 
 
 //see if the player blacksout or not
 if (isset($num_drinks) && $num_drinks > 15) {
-	$percent = mt_rand(1,25);
+	$percent = mt_rand(1, 25);
 	$lostCredits = round($player->getCredits() * $percent / 100);
 
-	$message.= '<span class="red">You decide you need to go to the restroom.  So you stand up and try to start walking but immediately collapse!<br />About 10 minutes later you wake up and find yourself missing ' . number_format($lostCredits) . ' credits</span><br />';
+	$message .= '<span class="red">You decide you need to go to the restroom.  So you stand up and try to start walking but immediately collapse!<br />About 10 minutes later you wake up and find yourself missing ' . number_format($lostCredits) . ' credits</span><br />';
 
 	$player->decreaseCredits($lostCredits);
-	$player->increaseHOF(1,array('Bar','Robbed','Number Of Times'), HOF_PUBLIC);
-	$player->increaseHOF($lostCredits,array('Bar','Robbed','Money Lost'), HOF_PUBLIC);
+	$player->increaseHOF(1, array('Bar', 'Robbed', 'Number Of Times'), HOF_PUBLIC);
+	$player->increaseHOF($lostCredits, array('Bar', 'Robbed', 'Money Lost'), HOF_PUBLIC);
 
 	$db->query('DELETE FROM player_has_drinks WHERE game_id=' . $db->escapeNumber($player->getGameID()) . ' AND account_id=' . $db->escapeNumber($player->getAccountID()));
 
 }
-$player->increaseHOF(1,array('Bar','Drinks', 'Total'), HOF_PUBLIC);
-$message.= '</div>';
+$player->increaseHOF(1, array('Bar', 'Drinks', 'Total'), HOF_PUBLIC);
+$message .= '</div>';
 
-$container=create_container('skeleton.php','bar_main.php');
+$container = create_container('skeleton.php', 'bar_main.php');
 transfer('LocationID');
 $container['message'] = $message;
 forward($container);

engine/Default/alliance_treaties.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 		}
 	}
 	$otherAllianceID = $db->getInt('alliance_id_1');
-	$container=create_container('alliance_treaties_processing.php','');
+	$container = create_container('alliance_treaties_processing.php', '');
 	$container['alliance_id_1'] = $otherAllianceID;
 	$container['aa_access'] = $db->getField('aa_access');
 	$container['accept'] = true;

engine/Default/council_politics.php

Spacing +5 added lines, -5 removed lines

@@ -5,22 +5,22 @@
 }
 $raceID = $var['race_id'];
 
-$template->assign('PageTopic','Ruling Council Of ' . Globals::getRaceName($raceID));
+$template->assign('PageTopic', 'Ruling Council Of ' . Globals::getRaceName($raceID));
 
 // echo menu
 Menu::council($raceID);
 
-$raceRelations = Globals::getRaceRelations($player->getGameID(),$raceID);
+$raceRelations = Globals::getRaceRelations($player->getGameID(), $raceID);
 
 $peaceRaces = array();
 $neutralRaces = array();
 $warRaces = array();
 foreach (Globals::getRaces() as $otherRaceID => $raceInfo) {
-	if($otherRaceID != RACE_NEUTRAL && $raceID != $otherRaceID) {
-		if($raceRelations[$otherRaceID] >= RELATIONS_PEACE) {
+	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 {

engine/Default/underground.php

Spacing +2 added lines, -2 removed lines

@@ -4,11 +4,11 @@
 	create_error('You are not allowed to come in here!');
 }
 
-if(!$player->getSector()->hasLocation($var['LocationID'])) {
+if (!$player->getSector()->hasLocation($var['LocationID'])) {
 	create_error('That location does not exist in this sector');
 }
 $location = SmrLocation::getLocation($var['LocationID']);
-if(!$location->isUG()) {
+if (!$location->isUG()) {
 	create_error('There is no underground here.');
 }
 

engine/Default/galactic_post_make_paper_processing.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 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).')');
+$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
 $container = array();
 $container['url'] = 'skeleton.php';

engine/Default/preferences_processing.php

Spacing +13 added lines, -13 removed lines

@@ -65,7 +65,7 @@ 
 	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');
+	$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!');
 
 	// set the HoF name in account stat
@@ -82,7 +82,7 @@ 
 
 	} else {
 		// no duplicates
-		$db->query('SELECT * FROM account WHERE discord_id =' . $db->escapeString($discordId) . ' AND account_id != '.$db->escapeNumber($account->getAccountID()).' LIMIT 1');
+		$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!');
 
 		$account->setDiscordId($discordId);
@@ -106,7 +106,7 @@ 
 	} else {
 
 		// no duplicates
-		$db->query('SELECT * FROM account WHERE irc_nick = ' . $db->escapeString($ircNick) . ' AND account_id != '.$db->escapeNumber($account->getAccountID()).' LIMIT 1');
+		$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!');
 
 		// save irc nick in db and set message
@@ -134,7 +134,7 @@ 
 	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()));
+	$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') {
@@ -147,7 +147,7 @@ 
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your ship images preferences.';
 }
 elseif ($action == 'Change Centering') {
-	$account->setCenterGalaxyMapOnPlayer($_REQUEST['centergalmap']=='Yes');
+	$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) {
@@ -167,22 +167,22 @@ 
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your CSS options.';
 }
 else if ($action == 'Change Kamikaze Setting') {
-	$player->setCombatDronesKamikazeOnMines($_REQUEST['kamikaze']=='Yes');
+	$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') {
-	$player->setForceDropMessages($_REQUEST['forceDropMessages']=='Yes');
+	$player->setForceDropMessages($_REQUEST['forceDropMessages'] == 'Yes');
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your message options.';
 }
 else if ($action == 'Save Hotkeys') {
-	foreach(AbstractSmrAccount::getDefaultHotkeys() as $hotkey => $binding) {
-		if(isset($_REQUEST[$hotkey])) {
+	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']);
 
@@ -218,13 +218,13 @@ 
 	// Check if name is in use.
 	// The player_name field has case-insensitive collation, so check against ID
 	// to allow player to change the case of their name.
-	$db->query('SELECT 1 FROM player WHERE game_id=' . $db->escapeNumber($player->getGameID()) . ' AND player_name=' . $db->escapeString($player_name) . ' AND player_id != ' . $db->escapeString($player->getPlayerID()) . ' LIMIT 1' );
+	$db->query('SELECT 1 FROM player WHERE game_id=' . $db->escapeNumber($player->getGameID()) . ' AND player_name=' . $db->escapeString($player_name) . ' AND player_id != ' . $db->escapeString($player->getPlayerID()) . ' LIMIT 1');
 	if ($db->getNumRows()) {
 		create_error('Name is already being used in this game!');
 	}
 
-	if($player->isNameChanged()) {
-		if($account->getTotalSmrCredits()<CREDITS_PER_NAME_CHANGE) {
+	if ($player->isNameChanged()) {
+		if ($account->getTotalSmrCredits() < CREDITS_PER_NAME_CHANGE) {
 			create_error('You do not have enough credits to change your name.');
 		}
 		$account->decreaseTotalSmrCredits(CREDITS_PER_NAME_CHANGE);

engine/Default/alliance_message.php

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if (!isset($var['alliance_id'])) {
-	SmrSession::updateVar('alliance_id',$player->getAllianceID());
+	SmrSession::updateVar('alliance_id', $player->getAllianceID());
 }
 
 $alliance = SmrAlliance::getAlliance($var['alliance_id'], $player->getGameID());
@@ -41,7 +41,7 @@ 
 	$container = create_container('alliance_message_delete_processing.php');
 	$container['alliance_id'] = $alliance->getAllianceID();
 
-	$i=0;
+	$i = 0;
 	$alliance_eyes = array();
 	while ($db->nextRecord()) {
 		$threadID = $db->getInt('thread_id');
@@ -82,7 +82,7 @@ 
 						AND alliance_thread.thread_id=' . $db2->escapeNumber($threadID) . '
 						AND alliance_thread.reply_id=1 LIMIT 1
 						');
-			if($db2->nextRecord()) {
+			if ($db2->nextRecord()) {
 				$sender_id = $db2->getInt('sender_id');
 				$author = SmrPlayer::getPlayer($sender_id, $player->getGameID());
 				$playerName = $author->getLinkedDisplayName(false);
@@ -93,7 +93,7 @@ 
 		$db2->query('SELECT * FROM player_has_alliance_role JOIN alliance_has_roles USING(game_id,alliance_id,role_id) WHERE account_id = ' . $db->escapeNumber($player->getAccountID()) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND alliance_id=' . $db->escapeNumber($alliance->getAllianceID()) . ' LIMIT 1');
 		$db2->nextRecord();
 		$threads[$i]['CanDelete'] = $player->getAccountID() == $sender_id || $db2->getBoolean('mb_messages');
-		if($threads[$i]['CanDelete']) {
+		if ($threads[$i]['CanDelete']) {
 			$container['thread_id'] = $threadID;
 			$threads[$i]['DeleteHref'] = SmrSession::getNewHREF($container);
 		}
@@ -103,31 +103,31 @@ 
 		++$i;
 	}
 
-	$container = create_container('skeleton.php','alliance_message_view.php');
+	$container = create_container('skeleton.php', 'alliance_message_view.php');
 	$container['alliance_id'] = $alliance->getAllianceID();
 	$container['thread_ids'] = $thread_ids;
 	$container['thread_topics'] = $thread_topics;
 	$container['thread_replies'] = $thread_replies;
 	$container['alliance_eyes'] = $alliance_eyes;
-	for($j=0;$j<$i;$j++) {
+	for ($j = 0; $j < $i; $j++) {
 		$container['thread_index'] = $j;
 		$threads[$j]['ViewHref'] = SmrSession::getNewHREF($container);
 	}
 }
-$template->assign('Threads',$threads);
+$template->assign('Threads', $threads);
 
 if ($mbWrite || in_array($player->getAccountID(), Globals::getHiddenPlayers())) {
 	$container = create_container('alliance_message_add_processing.php');
 	$container['alliance_id'] = $alliance->getAllianceID();
-	$template->assign('CreateNewThreadFormHref',SmrSession::getNewHREF($container));
+	$template->assign('CreateNewThreadFormHref', SmrSession::getNewHREF($container));
 }
 
-if(isset($var['preview'])) {
+if (isset($var['preview'])) {
 	$template->assign('Preview', $var['preview']);
 }
-if(isset($var['topic'])) {
+if (isset($var['topic'])) {
 	$template->assign('Topic', $var['topic']);
 }
-if(isset($var['AllianceEyesOnly'])) {
+if (isset($var['AllianceEyesOnly'])) {
 	$template->assign('AllianceEyesOnly', $var['AllianceEyesOnly']);
 }

engine/Default/alliance_option.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 if (!isset($var['alliance_id'])) {
-	SmrSession::updateVar('alliance_id',$player->getAllianceID());
+	SmrSession::updateVar('alliance_id', $player->getAllianceID());
 }
 
 $alliance = SmrAlliance::getAlliance($var['alliance_id'], $player->getGameID());

engine/Default/leave_newbie.php

Spacing +1 added lines, -1 removed lines

@@ -1,2 +1,2 @@
 <?php
-$template->assign('PageTopic','Leave Newbie Protection');
+$template->assign('PageTopic', 'Leave Newbie Protection');