smrealms / smr

engine/Default/forces_list.php

Spacing +2 added lines, -2 removed lines

@@ -1,12 +1,12 @@
 <?php
 
-$template->assign('PageTopic','View Forces');
+$template->assign('PageTopic', 'View Forces');
 
 $db->query('SELECT *
 			FROM sector_has_forces
 			WHERE owner_id = ' . $db->escapeNumber($player->getAccountID()) . '
 			AND game_id = ' . $db->escapeNumber($player->getGameID()) . '
-			AND expire_time >= '.$db->escapeNumber(TIME).'
+			AND expire_time >= '.$db->escapeNumber(TIME) . '
 			ORDER BY sector_id ASC');
 
 $forces = array();

engine/Default/alliance_invite_player.php

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
 // Get list of pending invitations
 $pendingInvites = array();
 $db->query('SELECT * FROM alliance_invites_player
-            WHERE game_id = '.$db->escapeNumber($player->getGameID()).'
+            WHERE game_id = '.$db->escapeNumber($player->getGameID()) . '
               AND alliance_id = '.$db->escapeNumber($alliance->getAllianceID()));
 while ($db->nextRecord()) {
 	$invited = SmrPlayer::getPlayer($db->getInt('account_id'), $player->getGameID());
@@ -30,9 +30,9 @@ 
 $invitePlayers = array();
 if ($alliance->getNumMembers() < $game->getAllianceMaxPlayers()) {
 	$db->query('SELECT account_id FROM player
-	            WHERE game_id = '.$db->escapeNumber($player->getGameID()).'
-	              AND alliance_id != '.$db->escapeNumber($alliance->getAllianceID()).'
-	              AND npc = '.$db->escapeBoolean(false).'
+	            WHERE game_id = '.$db->escapeNumber($player->getGameID()) . '
+	              AND alliance_id != '.$db->escapeNumber($alliance->getAllianceID()) . '
+	              AND npc = '.$db->escapeBoolean(false) . '
 	            ORDER BY player_id DESC');
 	while ($db->nextRecord()) {
 		$invitePlayer = SmrPlayer::getPlayer($db->getInt('account_id'), $player->getGameID());

engine/Default/alliance_message_add_processing.php

Spacing +5 added lines, -5 removed lines

@@ -1,11 +1,11 @@ 
 <?php
-$body = htmlentities(trim($_REQUEST['body']),ENT_COMPAT,'utf-8');
+$body = htmlentities(trim($_REQUEST['body']), ENT_COMPAT, 'utf-8');
 $topic = isset($_REQUEST['topic']) ? $_REQUEST['topic'] : '';
 $allEyesOnly = isset($_REQUEST['allEyesOnly']);
 
-if($_REQUEST['action'] == 'Preview Thread' || $_REQUEST['action'] == 'Preview Reply') {
+if ($_REQUEST['action'] == 'Preview Thread' || $_REQUEST['action'] == 'Preview Reply') {
 	$container = create_container('skeleton.php', '', $var);
-	if(!isset($var['thread_index'])) {
+	if (!isset($var['thread_index'])) {
 		$container['body'] = 'alliance_message.php';
 	}
 	else {
@@ -83,14 +83,14 @@ 
 			VALUES(' . $db->escapeNumber($player->getGameID()) . ', ' . $db->escapeNumber($alliance_id) . ', ' . $db->escapeNumber($thread_id) . ', ' . $db->escapeNumber($reply_id) . ', ' . $db->escapeString($body) . ', ' . $db->escapeNumber($player->getAccountID()) . ', ' . $db->escapeNumber(TIME) . ')');
 $db->query('REPLACE INTO player_read_thread
 			(account_id, game_id, alliance_id, thread_id, time)
-			VALUES(' . $db->escapeNumber($player->getAccountID()) . ', ' . $db->escapeNumber($player->getGameID()) . ', ' . $db->escapeNumber($alliance_id) . ', ' . $db->escapeNumber($thread_id) . ', ' . $db->escapeNumber(TIME+2) . ')');
+			VALUES(' . $db->escapeNumber($player->getAccountID()) . ', ' . $db->escapeNumber($player->getGameID()) . ', ' . $db->escapeNumber($alliance_id) . ', ' . $db->escapeNumber($thread_id) . ', ' . $db->escapeNumber(TIME + 2) . ')');
 
 $container = create_container('skeleton.php');
 $container['alliance_id'] = $alliance_id;
 if (isset($var['alliance_eyes'])) {
 	$container['alliance_eyes'] = $var['alliance_eyes'];
 }
-if(isset($var['thread_index'])) {
+if (isset($var['thread_index'])) {
 	$container['body'] = 'alliance_message_view.php';
 	$container['thread_index'] = $thread_index;
 	$container['thread_ids'] = $var['thread_ids'];

engine/Default/bar_galmap_buy.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if(Globals::getGameStartDate($player->getGameID())+TIME_MAP_BUY_WAIT > TIME) {
-	create_error('You cannot buy maps for another '.format_time(Globals::getGameStartDate($player->getGameID())+TIME_MAP_BUY_WAIT-TIME).'!');
+if (Globals::getGameStartDate($player->getGameID()) + TIME_MAP_BUY_WAIT > TIME) {
+	create_error('You cannot buy maps for another ' . format_time(Globals::getGameStartDate($player->getGameID()) + TIME_MAP_BUY_WAIT - TIME) . '!');
 }
 
 if ($account->getTotalSmrCredits() < CREDITS_PER_GAL_MAP) {
@@ -15,18 +15,18 @@ 
 	}
 	
 	//get start sector
-	$galaxy = SmrGalaxy::getGalaxy($player->getGameID(),$galaxyID);
+	$galaxy = SmrGalaxy::getGalaxy($player->getGameID(), $galaxyID);
 	$low = $galaxy->getStartSector();
 	//get end sector
 	$high = $galaxy->getEndSector();
 
 	// Have they already got this map? (Are there any unexplored sectors?
 	$db->query('SELECT * FROM player_visited_sector WHERE sector_id >= ' . $db->escapeNumber($low) . ' AND sector_id <= ' . $db->escapeNumber($high) . ' AND account_id = ' . $db->escapeNumber($player->getAccountID()) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()) . ' LIMIT 1');
-	if(!$db->nextRecord()) {
+	if (!$db->nextRecord()) {
 		create_error('You already have maps of this galaxy!');
 	}
 	
-	$player->increaseHOF(1,array('Bar','Maps Bought'), HOF_PUBLIC);
+	$player->increaseHOF(1, array('Bar', 'Maps Bought'), HOF_PUBLIC);
 	//take money
 	$account->decreaseTotalSmrCredits(CREDITS_PER_GAL_MAP);
 	//now give maps
@@ -42,7 +42,7 @@ 
 		$port->addCachePort($player->getAccountID());
 	}
 	
-	$container=create_container('skeleton.php','bar_main.php');
+	$container = create_container('skeleton.php', 'bar_main.php');
 	transfer('LocationID');
 	$container['message'] = '<div align="center">Galaxy maps have been added. Enjoy!</div><br />';
 	forward($container);

engine/Default/combat_log_viewer.php

Spacing +11 added lines, -11 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
-$template->assign('PageTopic','Combat Logs');
+$template->assign('PageTopic', 'Combat Logs');
 Menu::combat_log();
 
-if(!isset($var['log_ids']) && !isset($var['current_log'])) {
+if (!isset($var['log_ids']) && !isset($var['current_log'])) {
 	create_error('You must select a combat log to view');
 }
 
@@ -11,25 +11,25 @@ 
 // We initialize it with the current $var, then modify it to set
 // which log to view when we press the next/previous log buttons.
 $container = create_container('skeleton.php', 'combat_log_viewer.php', $var);
-if($var['current_log'] > 0) {
+if ($var['current_log'] > 0) {
 	$container['current_log'] = $var['current_log'] - 1;
-	$template->assign('PreviousLogHREF',SmrSession::getNewHREF($container));
+	$template->assign('PreviousLogHREF', SmrSession::getNewHREF($container));
 }
-if($var['current_log'] < count($container['log_ids']) - 1) {
+if ($var['current_log'] < count($container['log_ids']) - 1) {
 	$container['current_log'] = $var['current_log'] + 1;
-	$template->assign('NextLogHREF',SmrSession::getNewHREF($container));
+	$template->assign('NextLogHREF', SmrSession::getNewHREF($container));
 }
 
 // Set properties for the current display page
 $display_id = $var['log_ids'][$var['current_log']];
 $db->query('SELECT timestamp,sector_id,result,type FROM combat_logs WHERE log_id=' . $db->escapeNumber($display_id) . ' LIMIT 1');
 
-if($db->nextRecord()) {
-	$template->assign('CombatLogSector',$db->getField('sector_id'));
-	$template->assign('CombatLogTimestamp',date(DATE_FULL_SHORT,$db->getField('timestamp')));
+if ($db->nextRecord()) {
+	$template->assign('CombatLogSector', $db->getField('sector_id'));
+	$template->assign('CombatLogTimestamp', date(DATE_FULL_SHORT, $db->getField('timestamp')));
 	$results = unserialize(gzuncompress($db->getField('result')));
-	$template->assign('CombatResultsType',$db->getField('type'));
-	$template->assign('CombatResults',$results);
+	$template->assign('CombatResultsType', $db->getField('type'));
+	$template->assign('CombatResults', $results);
 }
 else {
 	create_error('Combat log not found');

engine/Default/note_delete_processing.php

Spacing +5 added lines, -5 removed lines

@@ -11,18 +11,18 @@
  * 		Deletes selected notes
  */
  
-if(isset($_POST['note_id'])) {
+if (isset($_POST['note_id'])) {
 	$note_ids = $_POST['note_id'];
 	$verified = true;
-	foreach($note_ids as $note_id) {
-		if(preg_match('/[^0-9]/',$note_id)) {
+	foreach ($note_ids as $note_id) {
+		if (preg_match('/[^0-9]/', $note_id)) {
 			$verified = false;
 		}
 	}
-	if($verified) {
+	if ($verified) {
 		$db->query('DELETE FROM player_has_notes WHERE game_id=' . $db->escapeNumber($player->getGameID()) . '
 					AND account_id=' . $db->escapeNumber($player->getAccountID()) . '
-					AND note_id IN (' . $db->escapeArray($note_ids)  . ')');
+					AND note_id IN (' . $db->escapeArray($note_ids) . ')');
 	}
 }
 

engine/Default/alliance_create.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$template->assign('PageTopic','Create Alliance');
+$template->assign('PageTopic', 'Create Alliance');
 
 $container = create_container('alliance_create_processing.php');
 $template->assign('CreateHREF', SmrSession::getNewHREF($container));

engine/Default/galactic_post_delete.php

Spacing +5 added lines, -5 removed lines

@@ -1,21 +1,21 @@
 <?php
 $db2 = new SmrMySqlDatabase();
 if (isset($var['article'])) {
-	$db->query('DELETE FROM galactic_post_article WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND article_id = '.$db->escapeNumber($var['id']));
+	$db->query('DELETE FROM galactic_post_article WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND article_id = ' . $db->escapeNumber($var['id']));
 }
 else {
 	//we are deleting an entire paper
 	//find out which articles need to be deleted as well
-	$db->query('SELECT * FROM galactic_post_paper_content WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND paper_id = '.$db->escapeNumber($var['id']));
-	while($db->nextRecord()) {
+	$db->query('SELECT * FROM galactic_post_paper_content WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND paper_id = ' . $db->escapeNumber($var['id']));
+	while ($db->nextRecord()) {
 		//delete this article that is part of this paper
 		$db2->query('DELETE FROM galactic_post_article WHERE article_id = ' . $db->escapeNumber($db->getInt('article_id')) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()));
 	}
 
 	//we have deleted the articles now delete the paper
-	$db->query('DELETE FROM galactic_post_paper WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND paper_id = '.$db->escapeNumber($var['id']));
+	$db->query('DELETE FROM galactic_post_paper WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND paper_id = ' . $db->escapeNumber($var['id']));
 	//now delete form the content table
-	$db->query('DELETE FROM galactic_post_paper_content WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND paper_id = '.$db->escapeNumber($var['id']));
+	$db->query('DELETE FROM galactic_post_paper_content WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND paper_id = ' . $db->escapeNumber($var['id']));
 }
 
 $container = create_container('skeleton.php', 'galactic_post.php');

engine/Default/galactic_post_delete_confirm.php

Spacing +21 added lines, -21 removed lines

@@ -3,52 +3,52 @@
 $db2 = new SmrMySqlDatabase();
 $db3 = new SmrMySqlDatabase();
 if (isset($var['article'])) {
-	$db->query('SELECT * FROM galactic_post_article WHERE article_id = '.$db->escapeNumber($var['id']).' AND game_id = ' . $db->escapeNumber($player->getGameID()));
+	$db->query('SELECT * FROM galactic_post_article WHERE article_id = ' . $db->escapeNumber($var['id']) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()));
 	$db->nextRecord();
 	$title = $db->getField('title');
-	$PHP_OUTPUT.=('Are you sure you want to delete the article named '.$title.'?');
+	$PHP_OUTPUT .= ('Are you sure you want to delete the article named ' . $title . '?');
 	$container = array();
 	$container['url'] = 'galactic_post_delete.php';
 	transfer('article');
 	transfer('id');
-	$PHP_OUTPUT.=create_echo_form($container);
-	$PHP_OUTPUT.=create_submit('Yes');
-	$PHP_OUTPUT.=('</form>');
+	$PHP_OUTPUT .= create_echo_form($container);
+	$PHP_OUTPUT .= create_submit('Yes');
+	$PHP_OUTPUT .= ('</form>');
 	$container = array();
 	$container['url'] = 'skeleton.php';
 	$container['body'] = 'galactic_post_view_article.php';
 	transfer('id');
-	$PHP_OUTPUT.=create_echo_form($container);
-	$PHP_OUTPUT.=create_submit('No');
-	$PHP_OUTPUT.=('</form>');
+	$PHP_OUTPUT .= create_echo_form($container);
+	$PHP_OUTPUT .= create_submit('No');
+	$PHP_OUTPUT .= ('</form>');
 }
 else {
-	$db->query('SELECT * FROM galactic_post_paper WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND paper_id = '.$db->escapeNumber($var['id']));
+	$db->query('SELECT * FROM galactic_post_paper WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND paper_id = ' . $db->escapeNumber($var['id']));
 	$db->nextRecord();
 	$title = $db->getField('title');
-	$PHP_OUTPUT.=('Are you sure you want to delete the paper titled '.$title.' and the following articles with it<br /><br />');
-	$db2->query('SELECT * FROM galactic_post_paper_content WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND paper_id = '.$db->escapeNumber($var['id']));
-	while($db2->nextRecord()) {
+	$PHP_OUTPUT .= ('Are you sure you want to delete the paper titled ' . $title . ' and the following articles with it<br /><br />');
+	$db2->query('SELECT * FROM galactic_post_paper_content WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND paper_id = ' . $db->escapeNumber($var['id']));
+	while ($db2->nextRecord()) {
 		$article_id = $db2->getField('article_id');
-		$db3->query('SELECT * FROM galactic_post_article WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND article_id = '.$db->escapeNumber($article_id));
+		$db3->query('SELECT * FROM galactic_post_article WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND article_id = ' . $db->escapeNumber($article_id));
 		$db3->nextRecord();
 		$article_title = bbifyMessage($db3->getField('title'));
-		$PHP_OUTPUT.=($article_title.'<br />');
+		$PHP_OUTPUT .= ($article_title . '<br />');
 	}
-	$PHP_OUTPUT.=('<br />');
+	$PHP_OUTPUT .= ('<br />');
 
 	$container = array();
 	$container['url'] = 'galactic_post_delete.php';
 	transfer('paper');
 	transfer('id');
-	$PHP_OUTPUT.=create_echo_form($container);
-	$PHP_OUTPUT.=create_submit('Yes');
-	$PHP_OUTPUT.=('</form>');
+	$PHP_OUTPUT .= create_echo_form($container);
+	$PHP_OUTPUT .= create_submit('Yes');
+	$PHP_OUTPUT .= ('</form>');
 	$container = array();
 	$container['url'] = 'skeleton.php';
 	$container['body'] = 'galactic_post_view_article.php';
 	transfer('id');
-	$PHP_OUTPUT.=create_echo_form($container);
-	$PHP_OUTPUT.=create_submit('No');
-	$PHP_OUTPUT.=('</form>');
+	$PHP_OUTPUT .= create_echo_form($container);
+	$PHP_OUTPUT .= create_submit('No');
+	$PHP_OUTPUT .= ('</form>');
 }