smrealms / smr

engine/Default/sector_move_processing.php

Spacing +18 added lines, -18 removed lines

@@ -3,7 +3,7 @@ 
 if ($var['target_sector'] == $player->getSectorID())
 	forward(create_container('skeleton.php', $var['target_page']));
 
-if($sector->getWarp() == $var['target_sector'])
+if ($sector->getWarp() == $var['target_sector'])
 	$turns = TURNS_PER_WARP;
 else
 	$turns = TURNS_PER_SECTOR;
@@ -16,13 +16,13 @@ 
 	$player->update();
 					
 	// get new sector object
-	$sector =& $player->getSector();
+	$sector = & $player->getSector();
 	$sector->markVisited($player);
 	forward(create_container('skeleton.php', $var['target_page']));
 }
 
 $action = '';
-if(isset($_REQUEST['action'])) {
+if (isset($_REQUEST['action'])) {
 	$action = $_REQUEST['action'];
 	if ($action == 'No')
 		forward(create_container('skeleton.php', $var['target_page']));
@@ -41,10 +41,10 @@ 
 // If you bump into mines in the sector you are trying to leave...
 if ($player->getLastSectorID() != $var['target_sector']) {
 	$sectorForces = $sector->getForces();
-	Sorter::sortByNumMethod($sectorForces,'getMines',true);
+	Sorter::sortByNumMethod($sectorForces, 'getMines', true);
 	$mine_owner_id = false;
 	foreach ($sectorForces as $forces) {
-		if(!$mine_owner_id && $forces->hasMines() && !$player->forceNAPAlliance($forces->getOwner())) {
+		if (!$mine_owner_id && $forces->hasMines() && !$player->forceNAPAlliance($forces->getOwner())) {
 			$mine_owner_id = $forces->getOwnerID();
 			break;
 		}
@@ -52,12 +52,12 @@ 
 	// set last sector
 	$player->setLastSectorID($var['target_sector']);
 	
-	if($mine_owner_id) {
+	if ($mine_owner_id) {
 		if ($player->hasNewbieTurns()) {
 			$turns = $sectorForces[$mine_owner_id]->getBumpTurnCost($ship);
-			$player->takeTurns($turns,$turns);
+			$player->takeTurns($turns, $turns);
 			$container = create_container('skeleton.php', 'current_sector.php');
-			$container['msg']= 'You have just flown past a sprinkle of mines.<br />Because of your newbie status you have been spared from the harsh reality of the forces.<br />It has cost you ' . $turns.' turn'.($turns==1?'':'s') . ' to navigate the minefield safely';
+			$container['msg'] = 'You have just flown past a sprinkle of mines.<br />Because of your newbie status you have been spared from the harsh reality of the forces.<br />It has cost you ' . $turns . ' turn' . ($turns == 1 ? '' : 's') . ' to navigate the minefield safely';
 			forward($container);
 		}
 		else {
@@ -74,12 +74,12 @@ 
 $player->actionTaken('WalkSector', array('Sector' => $targetSector));
 
 // send scout msg
-$sector->leavingSector($player,MOVEMENT_WALK);
+$sector->leavingSector($player, MOVEMENT_WALK);
 
 // Move the user around
 // TODO: (Must be done while holding both sector locks)
 $player->setSectorID($var['target_sector']);
-$player->takeTurns($turns,$turns);
+$player->takeTurns($turns, $turns);
 $player->update();
 
 // We need to release the lock on our old sector
@@ -89,25 +89,25 @@ 
 acquire_lock($var['target_sector']);
 
 // get new sector object
-$sector =& $player->getSector();
+$sector = & $player->getSector();
 
 //add that the player explored here if it hasnt been explored...for HoF
 if (!$sector->isVisited($player)) {
 	$player->increaseExperience(EXPLORATION_EXPERIENCE);
-	$player->increaseHOF(EXPLORATION_EXPERIENCE,array('Movement','Exploration Experience Gained'), HOF_ALLIANCE);
-	$player->increaseHOF(1,array('Movement','Sectors Explored'), HOF_ALLIANCE);
+	$player->increaseHOF(EXPLORATION_EXPERIENCE, array('Movement', 'Exploration Experience Gained'), HOF_ALLIANCE);
+	$player->increaseHOF(1, array('Movement', 'Sectors Explored'), HOF_ALLIANCE);
 }
 // make current sector visible to him
 $sector->markVisited($player);
 
 // send scout msgs
-$sector->enteringSector($player,MOVEMENT_WALK);
+$sector->enteringSector($player, MOVEMENT_WALK);
 
 $sectorForces = $sector->getForces();
 $mine_owner_id = false;
-Sorter::sortByNumMethod($sectorForces,'getMines',true);
+Sorter::sortByNumMethod($sectorForces, 'getMines', true);
 foreach ($sectorForces as $forces) {
-	if(!$mine_owner_id && $forces->hasMines() && !$player->forceNAPAlliance($forces->getOwner())) {
+	if (!$mine_owner_id && $forces->hasMines() && !$player->forceNAPAlliance($forces->getOwner())) {
 		$mine_owner_id = $forces->getOwnerID();
 		break;
 	}
@@ -117,9 +117,9 @@ 
 if ($mine_owner_id) {
 	if ($player->hasNewbieTurns()) {
 		$turns = $sectorForces[$mine_owner_id]->getBumpTurnCost($ship);
-		$player->takeTurns($turns,$turns);
+		$player->takeTurns($turns, $turns);
 		$container = create_container('skeleton.php', 'current_sector.php');
-		$container['msg']= 'You have just flown past a sprinkle of mines.<br />Because of your newbie status you have been spared from the harsh reality of the forces.<br />It has cost you ' . $turns.' turn'.($turns==1?'':'s') . ' to navigate the minefield safely.';
+		$container['msg'] = 'You have just flown past a sprinkle of mines.<br />Because of your newbie status you have been spared from the harsh reality of the forces.<br />It has cost you ' . $turns . ' turn' . ($turns == 1 ? '' : 's') . ' to navigate the minefield safely.';
 		forward($container);
 	}
 	else {

engine/Default/galactic_post_view_members.php

Spacing +19 added lines, -19 removed lines

@@ -1,40 +1,40 @@
 <?php
 
-$template->assign('PageTopic','Viewing Members');
+$template->assign('PageTopic', 'Viewing Members');
 Menu::galactic_post();
 
 $container = array();
 $container['url'] = 'skeleton.php';
 $container['body'] = 'galactic_post_view_members.php';
 if ($action == 'Remove')
-	$db->query('DELETE FROM galactic_post_writer WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND account_id = '.$db->escapeNumber($var['id']));
+	$db->query('DELETE FROM galactic_post_writer WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND account_id = ' . $db->escapeNumber($var['id']));
 
 $db->query('SELECT * FROM galactic_post_writer WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND account_id != ' . $db->escapeNumber($player->getAccountID()));
 if ($db->getNumRows()) {
 
-	$PHP_OUTPUT.=create_table();
-	$PHP_OUTPUT.=('<tr>');
-	$PHP_OUTPUT.=('<th align="center">Player Name</th>');
-	$PHP_OUTPUT.=('<th align="center">Last Wrote</th>');
-	$PHP_OUTPUT.=('<th align="center">Options</th>');
-	$PHP_OUTPUT.=('</tr>');
+	$PHP_OUTPUT .= create_table();
+	$PHP_OUTPUT .= ('<tr>');
+	$PHP_OUTPUT .= ('<th align="center">Player Name</th>');
+	$PHP_OUTPUT .= ('<th align="center">Last Wrote</th>');
+	$PHP_OUTPUT .= ('<th align="center">Options</th>');
+	$PHP_OUTPUT .= ('</tr>');
 
 	while ($db->nextRecord()) {
 
-		$curr_writter =& SmrPlayer::getPlayer($db->getField('account_id'), $player->getGameID());
+		$curr_writter = & SmrPlayer::getPlayer($db->getField('account_id'), $player->getGameID());
 		$time = $db->getField('last_wrote');
-		$PHP_OUTPUT.=('<tr>');
-		$PHP_OUTPUT.=('<td align="center">'.$curr_writter->getPlayerName().'</td>');
-		$PHP_OUTPUT.=('<td align="center"> ' . date(DATE_FULL_SHORT, $time) . '</td>');
+		$PHP_OUTPUT .= ('<tr>');
+		$PHP_OUTPUT .= ('<td align="center">' . $curr_writter->getPlayerName() . '</td>');
+		$PHP_OUTPUT .= ('<td align="center"> ' . date(DATE_FULL_SHORT, $time) . '</td>');
 		$container['id'] = $curr_writter->getAccountID();
-		$PHP_OUTPUT.=create_echo_form($container);
-		$PHP_OUTPUT.=('<td>');
-		$PHP_OUTPUT.=create_submit('Remove');
-		$PHP_OUTPUT.=('</td>');
-		$PHP_OUTPUT.=('</tr>');
-		$PHP_OUTPUT.=('</form>');
+		$PHP_OUTPUT .= create_echo_form($container);
+		$PHP_OUTPUT .= ('<td>');
+		$PHP_OUTPUT .= create_submit('Remove');
+		$PHP_OUTPUT .= ('</td>');
+		$PHP_OUTPUT .= ('</tr>');
+		$PHP_OUTPUT .= ('</form>');
 
 	}
-	$PHP_OUTPUT.=('</table>');
+	$PHP_OUTPUT .= ('</table>');
 
 }

engine/Default/game_join_processing.php

Spacing +9 added lines, -9 removed lines

@@ -3,7 +3,7 @@ 
 // 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;
@@ -31,7 +31,7 @@ 
 $race_id = $_REQUEST['race_id'];
 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'];
@@ -49,7 +49,7 @@ 
 // does it cost something to join that game?
 $credits = Globals::getGameCreditsRequired($gameID);
 if ($credits > 0) {
-	if($account->getTotalSmrCredits() < $credits) {
+	if ($account->getTotalSmrCredits() < $credits) {
 		create_error('You do not have enough credits to join this game!');
 	}
 	$account->decreaseTotalSmrCredits($credits);
@@ -68,7 +68,7 @@ 
 }
 else {
 	$startingNewbieTurns = STARTING_NEWBIE_TURNS_VET;
-	switch($race_id) {
+	switch ($race_id) {
 		case RACE_ALSKANT:
 			$ship_id = SHIP_TYPE_SMALL_TIMER;
 		break;
@@ -123,7 +123,7 @@ 
 
 // insert into player table.
 $db->query('INSERT INTO player (account_id, game_id, player_id, player_name, race_id, ship_type_id, credits, alliance_id, sector_id, last_turn_update, last_cpl_action, last_active, newbie_turns, npc, newbie_status)
-			VALUES(' . $db->escapeNumber($account->getAccountID()) . ', ' . $db->escapeNumber($gameID) . ', '.$db->escapeNumber($player_id).', ' . $db->escapeString($player_name) . ', '.$db->escapeNumber($race_id).', '.$db->escapeNumber($ship_id).', '.$db->escapeNumber(Globals::getStartingCredits($gameID)).', '.$db->escapeNumber($alliance_id).', '.$db->escapeNumber($home_sector_id).', '.$db->escapeNumber($last_turn_update).', ' . $db->escapeNumber(TIME) . ', ' . $db->escapeNumber(TIME) . ',' . $db->escapeNumber($startingNewbieTurns) . ',' . $db->escapeBoolean(defined('NPC_SCRIPT')) . ',' . $db->escapeBoolean($isNewbie) . ')');
+			VALUES(' . $db->escapeNumber($account->getAccountID()) . ', ' . $db->escapeNumber($gameID) . ', ' . $db->escapeNumber($player_id) . ', ' . $db->escapeString($player_name) . ', ' . $db->escapeNumber($race_id) . ', ' . $db->escapeNumber($ship_id) . ', ' . $db->escapeNumber(Globals::getStartingCredits($gameID)) . ', ' . $db->escapeNumber($alliance_id) . ', ' . $db->escapeNumber($home_sector_id) . ', ' . $db->escapeNumber($last_turn_update) . ', ' . $db->escapeNumber(TIME) . ', ' . $db->escapeNumber(TIME) . ',' . $db->escapeNumber($startingNewbieTurns) . ',' . $db->escapeBoolean(defined('NPC_SCRIPT')) . ',' . $db->escapeBoolean($isNewbie) . ')');
 
 $db->unlock();
 
@@ -134,7 +134,7 @@ 
 $ship->setShields($amount_shields, true);
 $ship->setArmour($amount_armour, true);
 $ship->setCargoHolds(40);
-$ship->addWeapon(46);  // Laser
+$ship->addWeapon(46); // Laser
 
 // The `player_visited_sector` table holds *unvisited* sectors, so that once
 // all sectors are visited (the majority of the game), the table is empty.
@@ -150,14 +150,14 @@ 
 	$player->joinAlliance(NHA_ID);
 
 	//we need to send them some messages
-	$message = 'Welcome to Space Merchant Realms! You have been automatically placed into the <u>[alliance='.NHA_ID.']</u>, which is led by a veteran player who can assist you while you learn the basics of the game. Your alliance leader is denoted with a star on your alliance roster.<br />
-	For more tips to help you get started with the game, check out your alliance message boards. These can be reached by clicking the "Alliance" link on the left side of the page, and then clicking the "Message Board" menu link. The <u><a href="'.WIKI_URL.'" target="_blank">SMR Wiki</a></u> also gives detailed information on all aspects of the game.<br />
+	$message = 'Welcome to Space Merchant Realms! You have been automatically placed into the <u>[alliance=' . NHA_ID . ']</u>, which is led by a veteran player who can assist you while you learn the basics of the game. Your alliance leader is denoted with a star on your alliance roster.<br />
+	For more tips to help you get started with the game, check out your alliance message boards. These can be reached by clicking the "Alliance" link on the left side of the page, and then clicking the "Message Board" menu link. The <u><a href="'.WIKI_URL . '" target="_blank">SMR Wiki</a></u> also gives detailed information on all aspects of the game.<br />
 	SMR is integrated with both IRC and Discord. These are free chat services where you can talk to other players and coordinate with your alliance. Simply click the "Join Chat" link at the bottom left panel of the page.';
 
 	SmrPlayer::sendMessageFromAdmin($gameID, $account->getAccountID(), $message);
 }
 
-if($race_id == RACE_ALSKANT) { // Give Alskants 250 personal relations to start.
+if ($race_id == RACE_ALSKANT) { // Give Alskants 250 personal relations to start.
 	foreach (Globals::getRaces() as $raceID => $raceInfo) {
 		$player->setRelations(250, $raceID);
 	}

engine/Default/mission_claim_processing.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 if ($var['MissionID']) {
-	create_error('red','Error','You can only have 3 missions at a time.');
+	create_error('red', 'Error', 'You can only have 3 missions at a time.');
 }
 
 $rewardText = $player->claimMissionReward($var['MissionID']);

engine/Default/bank_anon_detail.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 SmrSession::getRequestVar('maxValue');
 SmrSession::getRequestVar('minValue');
 
-$template->assign('PageTopic', 'Anonymous Account #'.$account_num);
+$template->assign('PageTopic', 'Anonymous Account #' . $account_num);
 Menu::bank();
 
 $db->query('SELECT *
@@ -48,7 +48,7 @@ 
 	$minValue = max(1, $maxValue - 5);
 }
 
-if(isset($var['minValue'])
+if (isset($var['minValue'])
 	&& $var['minValue'] <= $maxValue
 	&& $var['minValue'] > 0
 	&& is_numeric($var['minValue'])) {
@@ -85,7 +85,7 @@ 
 	$transactions = [];
 	while ($db->nextRecord()) {
 		$container['player_id'] = $db->getInt('player_id');
-		$link = create_link($container, get_colored_text($db->getInt('alignment'),$db->getField('player_name')));
+		$link = create_link($container, get_colored_text($db->getInt('alignment'), $db->getField('player_name')));
 		$transaction = $db->getField('transaction');
 		$amount = number_format($db->getInt('amount'));
 		$transactions[$db->getInt('transaction_id')] = [

engine/Default/council_vote.php

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
 	create_error('You have to be on the council in order to vote.');
 }
 
-$template->assign('PageTopic','Ruling Council Of '.$player->getRaceName());
+$template->assign('PageTopic', 'Ruling Council Of ' . $player->getRaceName());
 Menu::council($player->getRaceID());
 
 // determine for what we voted
@@ -13,14 +13,14 @@ 
 				AND game_id = ' . $db->escapeNumber($player->getGameID()));
 $votedForRace = -1;
 if ($db->nextRecord()) {
-	$votedForRace	= $db->getField('race_id_2');
-	$votedFor		= $db->getField('action');
+	$votedForRace = $db->getField('race_id_2');
+	$votedFor = $db->getField('action');
 }
 
 $voteRelations = array();
 $globalRelations = Globals::getRaceRelations($player->getGameID(), $player->getRaceID());
 foreach (Globals::getRaces() as $raceID => $raceInfo) {
-	if($raceID == RACE_NEUTRAL || $raceID == $player->getRaceID())
+	if ($raceID == RACE_NEUTRAL || $raceID == $player->getRaceID())
 		continue;
 	$container = create_container('council_vote_processing.php', '', array('race_id' => $raceID));
 	$voteRelations[$raceID] = array(
@@ -34,7 +34,7 @@ 
 
 $voteTreaties = array();
 $db->query('SELECT * FROM race_has_voting
-			WHERE '.$db->escapeNumber(TIME).' < end_time
+			WHERE '.$db->escapeNumber(TIME) . ' < end_time
 			AND game_id = ' . $db->escapeNumber($player->getGameID()) . '
 			AND race_id_1 = ' . $db->escapeNumber($player->getRaceID()));
 if ($db->getNumRows() > 0) {

engine/Default/death_processing.php

Spacing +1 added lines, -1 removed lines

@@ -3,4 +3,4 @@
 $player->deletePlottedCourse();
 
 $account->log(LOG_TYPE_TRADER_COMBAT, 'Player sees death screen', $player->getSectorID());
-forward(create_container('skeleton.php','death.php'));
+forward(create_container('skeleton.php', 'death.php'));

engine/Default/course_destination_button_processing.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 $type = trim($_POST['type']);
 
-switch($type){
+switch ($type) {
 	case 'add':
 		$sectorId = trim($_POST['sectorId']);
 		$label = trim($_POST['label']);

engine/Default/alliance_roles_save_processing.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(count($_REQUEST['role']) > 0) {
+if (count($_REQUEST['role']) > 0) {
 	foreach ($_REQUEST['role'] as $accountID => $roleID) {
 		$db->query('REPLACE INTO player_has_alliance_role
 					(account_id, game_id, role_id, alliance_id)
@@ -7,6 +7,6 @@ 
 	}
 }
 
-$container=create_container('skeleton.php','alliance_roster.php');
+$container = create_container('skeleton.php', 'alliance_roster.php');
 $container['action'] = 'Show Alliance Roles';
 forward($container);