smrealms / smr

engine/Default/game_join.php

Spacing +12 added lines, -12 removed lines

@@ -2,7 +2,7 @@ 
 
 $game = SmrGame::getGame($var['game_id']);
 
-$template->assign('Game',$game);
+$template->assign('Game', $game);
 
 // do we need credits for this game?
 if ($game->getCreditsNeeded() > 0) {
@@ -24,18 +24,18 @@ 
 
 $template->assign('PageTopic', 'Join Game: ' . $game->getDisplayName());
 
-$raceDescriptions='';
+$raceDescriptions = '';
 $first = true;
 foreach (Globals::getRaces() as $race) {
 	if ($first) {
-		$raceDescriptions.=('\'' . str_replace('\'','\\\'"',$race['Description']) . '\'');
+		$raceDescriptions .= ('\'' . str_replace('\'', '\\\'"', $race['Description']) . '\'');
 		$first = false;
 
 	}
 	else
-		$raceDescriptions.=(', \'' . str_replace('\'','\\\'',$race['Description']) . '\'');
+		$raceDescriptions .= (', \'' . str_replace('\'', '\\\'', $race['Description']) . '\'');
 }
-$template->assign('RaceDescriptions',$raceDescriptions);
+$template->assign('RaceDescriptions', $raceDescriptions);
 
 
 // create a container that will hold next url and additional variables.
@@ -43,7 +43,7 @@ 
 $container['game_id'] = $var['game_id'];
 $container['url'] = 'game_join_processing.php';
 if (TIME >= $game->getStartDate())
-	$template->assign('JoinGameFormHref',SmrSession::getNewHREF($container));
+	$template->assign('JoinGameFormHref', SmrSession::getNewHREF($container));
 
 $db2 = new SmrMySqlDatabase();
 //this prevents multiple races appearing when there is more than 1 game
@@ -51,8 +51,8 @@ 
 // get all available hq's
 $db->query('SELECT location_name, location_type_id
 			FROM location JOIN location_type USING(location_type_id)
-			WHERE location_type_id > '.$db->escapeNumber(UNDERGROUND).'
-				AND location_type_id < '.$db->escapeNumber(FED).'
+			WHERE location_type_id > '.$db->escapeNumber(UNDERGROUND) . '
+				AND location_type_id < '.$db->escapeNumber(FED) . '
 				AND game_id = ' . $db->escapeNumber($var['game_id']) . '
 			ORDER BY location_type_id');
 $races = array();
@@ -65,7 +65,7 @@ 
 	if (in_array($curr_race_id, $only)) continue;
 	$only[] = $curr_race_id;
 	// get number of traders in game
-	$db2->query('SELECT count(*) as number_of_race FROM player WHERE race_id = '.$db2->escapeNumber($curr_race_id).' AND game_id = ' . $db2->escapeNumber($var['game_id']));
+	$db2->query('SELECT count(*) as number_of_race FROM player WHERE race_id = ' . $db2->escapeNumber($curr_race_id) . ' AND game_id = ' . $db2->escapeNumber($var['game_id']));
 	$db2->nextRecord();
 
 	$races[$curr_race_id]['ID'] = $curr_race_id;
@@ -73,10 +73,10 @@ 
 	$races[$curr_race_id]['NumberOfPlayers'] = $db2->getInt('number_of_race');
 	$races[$curr_race_id]['Selected'] = false;
 }
-if(count($races) > 1) {
+if (count($races) > 1) {
 	do {
 		$raceKey = array_rand($races);
-	} while($races[$raceKey]['ID'] == RACE_ALSKANT);
+	} while ($races[$raceKey]['ID'] == RACE_ALSKANT);
 	$races[$raceKey]['Selected'] = true;
 }
-$template->assign('Races',$races);
+$template->assign('Races', $races);

engine/Default/bar_read_wall.php

Spacing +17 added lines, -17 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-$template->assign('PageTopic','Reading The Wall');
+$template->assign('PageTopic', 'Reading The Wall');
 
 Menu::bar();
 
@@ -17,28 +17,28 @@ 
 }
 $db->query('SELECT * FROM bar_wall WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND sector_id = ' . $db->escapeNumber($player->getSectorID()) . ' ORDER BY time DESC');
 if ($db->getNumRows()) {
-	$PHP_OUTPUT.=('<table class="standard">');
-	$PHP_OUTPUT.=('<tr>');
-	$PHP_OUTPUT.=('<th align="center">Time written</th>');
-	$PHP_OUTPUT.=('<th align="center">Message</th>');
-	$PHP_OUTPUT.=('</tr>');
+	$PHP_OUTPUT .= ('<table class="standard">');
+	$PHP_OUTPUT .= ('<tr>');
+	$PHP_OUTPUT .= ('<th align="center">Time written</th>');
+	$PHP_OUTPUT .= ('<th align="center">Message</th>');
+	$PHP_OUTPUT .= ('</tr>');
 
 	while ($db->nextRecord()) {
 		$time = $db->getInt('time');
 		$message_on_wall = $db->getField('message');
 
-		$PHP_OUTPUT.=('<tr>');
-		$PHP_OUTPUT.=('<td align="center"><b> ' . date(DATE_FULL_SHORT, $time) . ' </b></td>');
-		$PHP_OUTPUT.=('<td align="center"><b>'.$message_on_wall.'</b></td>');
-		$PHP_OUTPUT.=('</tr>');
+		$PHP_OUTPUT .= ('<tr>');
+		$PHP_OUTPUT .= ('<td align="center"><b> ' . date(DATE_FULL_SHORT, $time) . ' </b></td>');
+		$PHP_OUTPUT .= ('<td align="center"><b>' . $message_on_wall . '</b></td>');
+		$PHP_OUTPUT .= ('</tr>');
 	}
-	$PHP_OUTPUT.=('</table>');
+	$PHP_OUTPUT .= ('</table>');
 }
-$template->assign('PageTopic','Write on the wall');
+$template->assign('PageTopic', 'Write on the wall');
 
-$PHP_OUTPUT.=('<br />');
+$PHP_OUTPUT .= ('<br />');
 
-$PHP_OUTPUT.=create_echo_form(create_container('skeleton.php', 'bar_read_wall.php'));
-$PHP_OUTPUT.=('<textarea spellcheck="true" name="wall" id="InputFieldsText"></textarea><br /><br />');
-$PHP_OUTPUT.=create_submit('Write it');
-$PHP_OUTPUT.=('</form>');
+$PHP_OUTPUT .= create_echo_form(create_container('skeleton.php', 'bar_read_wall.php'));
+$PHP_OUTPUT .= ('<textarea spellcheck="true" name="wall" id="InputFieldsText"></textarea><br /><br />');
+$PHP_OUTPUT .= create_submit('Write it');
+$PHP_OUTPUT .= ('</form>');

engine/Default/planet_main.php

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 
 //echo the dump cargo message or other message.
 if (isset($var['errorMsg'])) {
-	$template->assign('ErrorMsg',$var['errorMsg']);
+	$template->assign('ErrorMsg', $var['errorMsg']);
 }
 if (isset($var['msg'])) {
 	$template->assign('Msg', bbifyMessage($var['msg']));
@@ -12,4 +12,4 @@ 
 
 doTickerAssigns($template, $player, $db);
 
-$template->assign('LaunchFormLink',SmrSession::getNewHREF(create_container('planet_launch_processing.php', '')));
+$template->assign('LaunchFormLink', SmrSession::getNewHREF(create_container('planet_launch_processing.php', '')));

engine/Default/feature_request_comments.php

Spacing +6 added lines, -6 removed lines

@@ -2,11 +2,11 @@ 
 if (!Globals::isFeatureRequestOpen())
 	create_error('Feature requests are currently not being accepted.');
 
-$template->assign('PageTopic','Feature Request Comments');
+$template->assign('PageTopic', 'Feature Request Comments');
 
 $container = $var;
 $container['body'] = 'feature_request.php';
-$template->assign('BackHref',SmrSession::getNewHREF($container));
+$template->assign('BackHref', SmrSession::getNewHREF($container));
 
 $db->query('SELECT *
 			FROM feature_request
@@ -15,7 +15,7 @@ 
 			ORDER BY comment_id ASC');
 if ($db->getNumRows() > 0) {
 	$featureModerator = $account->hasPermission(PERMISSION_MODERATE_FEATURE_REQUEST);
-	$template->assign('FeatureModerator',$featureModerator);
+	$template->assign('FeatureModerator', $featureModerator);
 
 	// variables needed to set the status for this feature request
 	if ($featureModerator) {
@@ -29,10 +29,10 @@ 
 		$featureRequestComments[$commentID] = array(
 								'CommentID' => $commentID,
 								'Message' => $db->getField('text'),
-								'Time' => date(DATE_FULL_SHORT,$db->getField('posting_time')),
+								'Time' => date(DATE_FULL_SHORT, $db->getField('posting_time')),
 								'Anonymous' => $db->getBoolean('anonymous')
 		);
-		if($featureModerator || !$db->getBoolean('anonymous'))
+		if ($featureModerator || !$db->getBoolean('anonymous'))
 			$featureRequestComments[$commentID]['PosterAccount'] = SmrAccount::getAccount($db->getField('poster_id'));
 	}
 	$template->assign('Comments', $featureRequestComments);
@@ -41,4 +41,4 @@ 
 $container = $var;
 $container['url'] = 'feature_request_comment_processing.php';
 unset($container['body']);
-$template->assign('FeatureRequestCommentFormHREF',SmrSession::getNewHREF($container));
+$template->assign('FeatureRequestCommentFormHREF', SmrSession::getNewHREF($container));

engine/Default/message_send_processing.php

Spacing +6 added lines, -6 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-$message = htmlentities(trim($_REQUEST['message']),ENT_COMPAT,'utf-8');
+$message = htmlentities(trim($_REQUEST['message']), ENT_COMPAT, 'utf-8');
 
-if($_REQUEST['action'] == 'Preview message') {
+if ($_REQUEST['action'] == 'Preview message') {
 	$container = create_container('skeleton.php');
-	if(isset($var['alliance_id']))
+	if (isset($var['alliance_id']))
 		$container['body'] = 'alliance_broadcast.php';
 	else
 		$container['body'] = 'message_send.php';
@@ -17,7 +17,7 @@ 
 if (empty($message))
 	create_error('You have to enter a message to send!');
 
-if(isset($var['alliance_id'])) {
+if (isset($var['alliance_id'])) {
 	$db->query('SELECT account_id FROM player
 				WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . '
 				AND alliance_id = ' . $var['alliance_id'] . '
@@ -34,8 +34,8 @@ 
 	$player->sendGlobalMessage($message);
 }
 
-$container=create_container('skeleton.php');
-if(isset($var['alliance_id'])) {
+$container = create_container('skeleton.php');
+if (isset($var['alliance_id'])) {
 	$container['body'] = 'alliance_roster.php';
 	transfer('alliance_id');
 } else {

engine/Default/planet_ownership_processing.php

Spacing +3 added lines, -3 removed lines

@@ -4,7 +4,7 @@ 
 // get a planet from the sector where the player is in
 $planet = $player->getSectorPlanet();
 $action = $_REQUEST['action'];
-$password = isset($_REQUEST['password'])?$_REQUEST['password']:'';
+$password = isset($_REQUEST['password']) ? $_REQUEST['password'] : '';
 
 if ($action == 'Take Ownership') {
 	if ($planet->hasOwner() && $planet->getPassword() != $password)
@@ -26,14 +26,14 @@ 
 	// rename planet
 	$planet->setName($name);
 	$planet->update();
-	$account->log(LOG_TYPE_PLANETS, 'Player renames planet to '.$name.'.', $player->getSectorID());
+	$account->log(LOG_TYPE_PLANETS, 'Player renames planet to ' . $name . '.', $player->getSectorID());
 
 }
 else if ($action == 'Set Password') {
 	// set password
 	$planet->setPassword($password);
 	$planet->update();
-	$account->log(LOG_TYPE_PLANETS, 'Player sets planet password to '.$password, $player->getSectorID());
+	$account->log(LOG_TYPE_PLANETS, 'Player sets planet password to ' . $password, $player->getSectorID());
 }
 
 forward(create_container('skeleton.php', 'planet_ownership.php'));

engine/Default/trader_examine.php

Spacing +5 added lines, -5 removed lines

@@ -1,14 +1,14 @@
 <?php
 
 // Get the player we're attacking
-$targetPlayer = SmrPlayer::getPlayer($var['target'],$player->getGameID());
+$targetPlayer = SmrPlayer::getPlayer($var['target'], $player->getGameID());
 
-if($targetPlayer->isDead()) {
-	$container=create_container('skeleton.php', 'current_sector.php');
+if ($targetPlayer->isDead()) {
+	$container = create_container('skeleton.php', 'current_sector.php');
 	$container['msg'] = '<span class="red bold">ERROR:</span> Target already dead.';
 	forward($container);
 }
 
 
-$template->assign('PageTopic','Examine Ship');
-$template->assign('TargetPlayer',$targetPlayer);
+$template->assign('PageTopic', 'Examine Ship');
+$template->assign('TargetPlayer', $targetPlayer);

engine/Default/trader_attack_processing.php

Spacing +18 added lines, -18 removed lines

@@ -1,32 +1,32 @@ 
 <?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 whilst on a planet!');
-if($player->getTurns() < 3)
+if ($player->getTurns() < 3)
 	create_error('You have insufficient turns to perform that action.');
-if(!$player->canFight())
+if (!$player->canFight())
 	create_error('You are not allowed to fight!');
 
-$targetPlayer = SmrPlayer::getPlayer($var['target'],$player->getGameID());
+$targetPlayer = SmrPlayer::getPlayer($var['target'], $player->getGameID());
 
-	if($player->traderNAPAlliance($targetPlayer))
+	if ($player->traderNAPAlliance($targetPlayer))
 		create_error('Your alliance does not allow you to attack this trader.');
-	else if($targetPlayer->isDead())
+	else if ($targetPlayer->isDead())
 		create_error('Target is already dead.');
-	else if($targetPlayer->getSectorID() != $player->getSectorID())
+	else if ($targetPlayer->getSectorID() != $player->getSectorID())
 		create_error('Target is no longer in this sector.');
-	else if($targetPlayer->hasNewbieTurns())
+	else if ($targetPlayer->hasNewbieTurns())
 		create_error('Target is under newbie protection.');
-	else if($targetPlayer->isLandedOnPlanet())
+	else if ($targetPlayer->isLandedOnPlanet())
 		create_error('Target is protected by planetary shields.');
-	else if($targetPlayer->hasFederalProtection())
+	else if ($targetPlayer->hasFederalProtection())
 		create_error('Target is under federal protection.');
 
-$fightingPlayers = $sector->getFightingTraders($player,$targetPlayer);
+$fightingPlayers = $sector->getFightingTraders($player, $targetPlayer);
 
 //decloak all fighters
 foreach ($fightingPlayers as $teamPlayers) {
@@ -41,8 +41,8 @@ 
 
 function teamAttack(&$results, $fightingPlayers, $attack, $defend) {
 	foreach ($fightingPlayers[$attack] as $accountID => $teamPlayer) {
-		$playerResults =& $teamPlayer->shootPlayers($fightingPlayers[$defend]);
-		$results[$attack]['Traders'][$teamPlayer->getAccountID()] =& $playerResults;
+		$playerResults = & $teamPlayer->shootPlayers($fightingPlayers[$defend]);
+		$results[$attack]['Traders'][$teamPlayer->getAccountID()] = & $playerResults;
 		$results[$attack]['TotalDamage'] += $playerResults['TotalDamage'];
 
 		// Award assists (if there are multiple attackers)
@@ -67,7 +67,7 @@ 
 
 $ship->removeUnderAttack(); //Don't show attacker the under attack message.
 
-$account->log(LOG_TYPE_TRADER_COMBAT, 'Player attacks player, their team does ' . $results['Attackers']['TotalDamage'].' and the other team does '.$results['Defenders']['TotalDamage'], $sector->getSectorID());
+$account->log(LOG_TYPE_TRADER_COMBAT, 'Player attacks player, their team does ' . $results['Attackers']['TotalDamage'] . ' and the other team does ' . $results['Defenders']['TotalDamage'], $sector->getSectorID());
 
 $serializedResults = serialize($results);
 $db->query('INSERT INTO combat_logs VALUES(\'\',' . $db->escapeNumber($player->getGameID()) . ',\'PLAYER\',' . $db->escapeNumber($sector->getSectorID()) . ',' . $db->escapeNumber(TIME) . ',' . $db->escapeNumber($player->getAccountID()) . ',' . $db->escapeNumber($player->getAllianceID()) . ',' . $db->escapeNumber($var['target']) . ',' . $db->escapeNumber($targetPlayer->getAllianceID()) . ',' . $db->escapeBinary(gzcompress($serializedResults)) . ')');
@@ -76,13 +76,13 @@ 
 $container = create_container('skeleton.php', 'trader_attack.php');
 
 // If their target is dead there is no continue attack button
-if(!$targetPlayer->isDead())
+if (!$targetPlayer->isDead())
 	$container['target'] = $var['target'];
 else
 	$container['target'] = 0;
 
 // If they died on the shot they get to see the results
-if($player->isDead()) {
+if ($player->isDead()) {
 	$container['override_death'] = TRUE;
 	$container['target'] = 0;
 }

engine/Default/course_plot.php

Spacing +12 added lines, -12 removed lines

@@ -1,28 +1,28 @@
 <?php
 
-$template->assign('PageTopic','Plot A Course');
+$template->assign('PageTopic', 'Plot A Course');
 
 Menu::navigation($template, $player);
 
-$container=array();
+$container = array();
 $container['url'] = 'course_plot_processing.php';
 $container['body'] = '';
 
-$template->assign('PlotCourseFormLink',SmrSession::getNewHREF($container));
+$template->assign('PlotCourseFormLink', SmrSession::getNewHREF($container));
 $container['url'] = 'course_plot_nearest_processing.php';
-$template->assign('PlotNearestFormLink',SmrSession::getNewHREF($container));
+$template->assign('PlotNearestFormLink', SmrSession::getNewHREF($container));
 
 if ($ship->hasJump()) {
-	$container=create_container('sector_jump_processing.php','');
+	$container = create_container('sector_jump_processing.php', '');
 	$container['target_page'] = 'current_sector.php';
-	$template->assign('JumpDriveFormLink',SmrSession::getNewHREF($container));
+	$template->assign('JumpDriveFormLink', SmrSession::getNewHREF($container));
 }
-if(isset($_REQUEST['xtype']))
-	SmrSession::updateVar('XType',$_REQUEST['xtype']);
-else if(!isset($var['XType']))
-	SmrSession::updateVar('XType','Technology');
-$template->assign('XType',$var['XType']);
-$template->assign('AllXTypes',array('Technology','Ships','Weapons','Locations','Sell Goods','Buy Goods','Galaxies'));
+if (isset($_REQUEST['xtype']))
+	SmrSession::updateVar('XType', $_REQUEST['xtype']);
+else if (!isset($var['XType']))
+	SmrSession::updateVar('XType', 'Technology');
+$template->assign('XType', $var['XType']);
+$template->assign('AllXTypes', array('Technology', 'Ships', 'Weapons', 'Locations', 'Sell Goods', 'Buy Goods', 'Galaxies'));
 
 
 // get saved destinations