smrealms / smr

engine/Default/alliance_invite_accept.php

Spacing +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 // Check that the invitation is registered in the database
 $newAlliance = SmrAlliance::getAlliance($var['alliance_id'], $player->getGameID());
 $db->query('SELECT 1 FROM alliance_invites_player
-            WHERE game_id = '.$db->escapeNumber($player->getGameID()).'
-              AND alliance_id = '.$db->escapeNumber($newAlliance->getAllianceID()).'
+            WHERE game_id = '.$db->escapeNumber($player->getGameID()) . '
+              AND alliance_id = '.$db->escapeNumber($newAlliance->getAllianceID()) . '
               AND account_id = '.$db->escapeNumber($player->getAccountID()));
 if (!$db->nextRecord()) {
 	create_error('You do not have an invitation to join this alliance!');

engine/Default/alliance_treaties_confirm.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 $alliance_id_1 = $player->getAllianceID();
 $alliance_id_2 = $_REQUEST['proposedAlliance'];
 
-$db->query('SELECT alliance_id_1, alliance_id_2, game_id FROM alliance_treaties WHERE (alliance_id_1 = ' . $db->escapeNumber($alliance_id_1) . ' OR alliance_id_1 = '.$alliance_id_2.') AND (alliance_id_2 = ' . $db->escapeNumber($alliance_id_1) . ' OR alliance_id_2 = ' . $db->escapeNumber($alliance_id_2) . ') AND game_id = ' . $db->escapeNumber($player->getGameID()));
+$db->query('SELECT alliance_id_1, alliance_id_2, game_id FROM alliance_treaties WHERE (alliance_id_1 = ' . $db->escapeNumber($alliance_id_1) . ' OR alliance_id_1 = ' . $alliance_id_2 . ') AND (alliance_id_2 = ' . $db->escapeNumber($alliance_id_1) . ' OR alliance_id_2 = ' . $db->escapeNumber($alliance_id_2) . ') AND game_id = ' . $db->escapeNumber($player->getGameID()));
 if ($db->nextRecord()) {
 	$container = create_container('skeleton.php', 'alliance_treaties.php');
 	$container['message'] = '<span class="red bold">ERROR:</span> There is already an outstanding treaty with that alliance.';

engine/Default/skeleton.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 
-$PHP_OUTPUT='';
+$PHP_OUTPUT = '';
 
 require_once(get_file_loc($var['body']));
-$template->assign('PHP_OUTPUT',$PHP_OUTPUT);
+$template->assign('PHP_OUTPUT', $PHP_OUTPUT);

engine/Default/changelog_view.php

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 
-$template->assign('PageTopic','Change Log');
+$template->assign('PageTopic', 'Change Log');
 
-if(isset($var['Since'])) {
+if (isset($var['Since'])) {
 	$container = create_container('logged_in.php');
 	$template->assign('ContinueHREF', SmrSession::getNewHREF($container));
 }

engine/Default/alliance_create_processing.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if($player->getAllianceJoinable() > TIME) {
+if ($player->getAllianceJoinable() > TIME) {
 	create_error('You cannot create an alliance for another ' . format_time($player->getAllianceJoinable() - TIME) . '.');
 }
 
@@ -28,7 +28,7 @@ 
 	create_error('That is not a valid alliance name!');
 }
 $filteredName = word_filter($name);
-if($name != $filteredName) {
+if ($name != $filteredName) {
 	create_error('The alliance name contains one or more filtered words, please reconsider the name.');
 }
 
@@ -42,13 +42,13 @@ 
 $db->query('SELECT max(alliance_id) FROM alliance WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND (alliance_id < 302 OR alliance_id > 309) LIMIT 1');
 $db->nextRecord();
 $alliance_id = $db->getInt('max(alliance_id)') + 1;
-if($alliance_id >= 302 && $alliance_id <= 309) {
+if ($alliance_id >= 302 && $alliance_id <= 309) {
 	$alliance_id = 310;
 }
 
 
 $description = word_filter($description);
-$player->sendMessageToBox(BOX_ALLIANCE_DESCRIPTIONS,'Alliance '.$name.'('.$alliance_id.') had their description changed to:'.EOL.EOL.$description);
+$player->sendMessageToBox(BOX_ALLIANCE_DESCRIPTIONS, 'Alliance ' . $name . '(' . $alliance_id . ') had their description changed to:' . EOL . EOL . $description);
 // actually create the alliance here
 $db->query('INSERT INTO alliance (alliance_id, game_id, alliance_name, alliance_description, alliance_password, leader_id, recruiting)
 			VALUES(' . $db->escapeNumber($alliance_id) . ', ' . $db->escapeNumber($player->getGameID()) . ', ' . $db->escapeString($name) . ', ' . $db->escapeString($description) . ', ' . $db->escapeString($password) . ', ' . $db->escapeNumber($player->getAccountID()) . ', ' . $db->escapeBoolean($recruit) . ')');

engine/Default/feature_request_vote_processing.php

Spacing +12 added lines, -12 removed lines

@@ -1,28 +1,28 @@ 
 <?php
-if($_REQUEST['action']=='Vote') {
+if ($_REQUEST['action'] == 'Vote') {
 	if ($account->getAccountID() == ACCOUNT_ID_NHL) {
 		create_error('This account is not allowed to cast a vote!');
 	}
-	if(is_array($_REQUEST['vote'])) {
+	if (is_array($_REQUEST['vote'])) {
 		$query = 'REPLACE INTO account_votes_for_feature VALUES ';
-		foreach($_REQUEST['vote'] as $requestID => $vote) {
-			$query.='('.$db->escapeNumber($account->getAccountID()).', '.$db->escapeNumber($requestID).','.$db->escapeString($vote).'),';
+		foreach ($_REQUEST['vote'] as $requestID => $vote) {
+			$query .= '(' . $db->escapeNumber($account->getAccountID()) . ', ' . $db->escapeNumber($requestID) . ',' . $db->escapeString($vote) . '),';
 		}
-		$db->query(substr($query,0,-1));
+		$db->query(substr($query, 0, -1));
 	}
-	if(!empty($_REQUEST['favourite']) && is_numeric($_REQUEST['favourite']))
-		$db->query('REPLACE INTO account_votes_for_feature VALUES('.$db->escapeNumber($account->getAccountID()).', '.$db->escapeNumber($_REQUEST['favourite']).',\'FAVOURITE\')');
+	if (!empty($_REQUEST['favourite']) && is_numeric($_REQUEST['favourite']))
+		$db->query('REPLACE INTO account_votes_for_feature VALUES(' . $db->escapeNumber($account->getAccountID()) . ', ' . $db->escapeNumber($_REQUEST['favourite']) . ',\'FAVOURITE\')');
 
 	forward(create_container('skeleton.php', 'feature_request.php'));
 }
-else if($_REQUEST['action']=='Set Status') {
-	if(empty($_REQUEST['status'])) {
+else if ($_REQUEST['action'] == 'Set Status') {
+	if (empty($_REQUEST['status'])) {
 		create_error('You have to select a status to set');
 	}
 	$status = $_REQUEST['status'];
-	if(empty($_REQUEST['set_status_ids']))
+	if (empty($_REQUEST['set_status_ids']))
 		create_error('You have to select a feature');
-	if(!$account->hasPermission(PERMISSION_MODERATE_FEATURE_REQUEST))
+	if (!$account->hasPermission(PERMISSION_MODERATE_FEATURE_REQUEST))
 		create_error('You do not have permission to do that');
 
 	$db->query('UPDATE feature_request fr SET status = ' . $db->escapeString($status) . '
@@ -45,7 +45,7 @@ 
 					AND vote_type=' . $db->escapeString('NO') . '
 			)
 			WHERE feature_request_id IN (' . $db->escapeArray($_REQUEST['set_status_ids']) . ')');
-	foreach($_REQUEST['set_status_ids'] as $featureID) {
+	foreach ($_REQUEST['set_status_ids'] as $featureID) {
 		$db->query('INSERT INTO feature_request_comments (feature_request_id, poster_id, posting_time, anonymous, text)
 					VALUES(' . $db->escapeNumber($featureID) . ', ' . $db->escapeNumber($account->getAccountID()) . ',' . $db->escapeNumber(TIME) . ',' . $db->escapeBoolean(false) . ',' . $db->escapeString($status) . ')');
 	}

engine/Default/alliance_roster.php

Spacing +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@ 
 <?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());
+$alliance = SmrAlliance::getAlliance($var['alliance_id'], $player->getGameID());
 $template->assign('Alliance', $alliance);
 
 $template->assign('PageTopic', $alliance->getAllianceName(false, true));
@@ -29,7 +29,7 @@ 
 	}
 	$template->assign('Roles', $roles);
 
-	$container=create_container('alliance_roles_save_processing.php');
+	$container = create_container('alliance_roles_save_processing.php');
 	$container['alliance_id'] = $alliance->getAllianceID();
 	$template->assign('SaveAllianceRolesHREF', SmrSession::getNewHREF($container));
 }
@@ -50,7 +50,7 @@ 
 $template->assign('AllianceExp', $db->getInt('alliance_xp'));
 $template->assign('AllianceAverageExp', $db->getInt('alliance_avg'));
 
-if($account->getAccountID() == $alliance->getLeaderID() || $account->hasPermission(PERMISSION_EDIT_ALLIANCE_DESCRIPTION)) {
+if ($account->getAccountID() == $alliance->getLeaderID() || $account->hasPermission(PERMISSION_EDIT_ALLIANCE_DESCRIPTION)) {
 	$container = create_container('skeleton.php', 'alliance_stat.php');
 	$container['alliance_id'] = $alliance->getAllianceID();
 	$template->assign('EditAllianceDescriptionHREF', SmrSession::getNewHREF($container));
@@ -68,7 +68,7 @@ 
 	// Alliance members get to see active/inactive status of members
 	$template->assign('ActiveIDs', $alliance->getActiveIDs());
 	$container = create_container('skeleton.php', 'alliance_roster.php');
-	if($showRoles) {
+	if ($showRoles) {
 		$container['action'] = 'Hide Alliance Roles';
 	}
 	else {

engine/Default/galactic_post_application_answer.php

Spacing +3 added lines, -3 removed lines

@@ -2,11 +2,11 @@
 $id = $var['id'];
 $action = $_REQUEST['action'];
 if ($action == 'Accept') {
-	$db->query('INSERT INTO galactic_post_writer (account_id, game_id, position) VALUES ('.$db->escapeNumber($id).', ' . $db->escapeNumber($player->getGameID()) . ', \'writer\')');
+	$db->query('INSERT INTO galactic_post_writer (account_id, game_id, position) VALUES (' . $db->escapeNumber($id) . ', ' . $db->escapeNumber($player->getGameID()) . ', \'writer\')');
 	$player->sendMessage($id, MSG_PLAYER, 'You have been accepted as a <i>Galactic Post</i> writter.  Click the link on the left to start writing!', false);
-	$db->query('DELETE FROM galactic_post_applications WHERE account_id = '.$db->escapeNumber($id).' AND game_id = ' . $db->escapeNumber($player->getGameID()));
+	$db->query('DELETE FROM galactic_post_applications WHERE account_id = ' . $db->escapeNumber($id) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()));
 } else {
-	$db->query('DELETE FROM galactic_post_applications WHERE account_id = '.$db->escapeNumber($id).' AND game_id = ' . $db->escapeNumber($player->getGameID()));
+	$db->query('DELETE FROM galactic_post_applications WHERE account_id = ' . $db->escapeNumber($id) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()));
 	$player->sendMessage($id, MSG_PLAYER, 'We are sorry to inform you that you were not accepted as a writer for the <i>Galactic Post</i>.', false);
 }
 $container = array();

engine/Default/message_notify_processing.php

Spacing +2 added lines, -2 removed lines

@@ -16,13 +16,13 @@
 // get message form db
 $db->query('SELECT account_id, sender_id, message_text
 			FROM message
-			WHERE message_id = ' . $var['message_id'].' AND receiver_delete = \'FALSE\'');
+			WHERE message_id = ' . $var['message_id'] . ' AND receiver_delete = \'FALSE\'');
 if (!$db->nextRecord())
 	create_error('Could not find the message you selected!');
 
 // insert
 $db->query('INSERT INTO message_notify
 			(notify_id, game_id, from_id, to_id, text, sent_time, notify_time)
-			VALUES ('.$notify_id.', ' . $db->escapeNumber($player->getGameID()) . ', ' . $db->getField('sender_id') . ', ' . $db->getField('account_id') . ', ' . $db->escapeString($db->getField('message_text')) . ', ' . $var['sent_time'] . ', ' . $var['notified_time'] . ')');
+			VALUES ('.$notify_id . ', ' . $db->escapeNumber($player->getGameID()) . ', ' . $db->getField('sender_id') . ', ' . $db->getField('account_id') . ', ' . $db->escapeString($db->getField('message_text')) . ', ' . $var['sent_time'] . ', ' . $var['notified_time'] . ')');
 
 forward(create_container('skeleton.php', 'message_view.php'));