smrealms / smr

engine/Default/planet_defense_processing.php

Spacing +6 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
 		// now transfer
 		$planet->decreaseShields($amount);
 		$ship->increaseShields($amount);
-		$account->log(LOG_TYPE_PLANETS, 'Player takes '.$amount.' shields from planet.', $player->getSectorID());
+		$account->log(LOG_TYPE_PLANETS, 'Player takes ' . $amount . ' shields from planet.', $player->getSectorID());
 	}
 	else if ($type_id == HARDWARE_COMBAT) {
 		// do we want transfer more than we have?
@@ -45,7 +45,7 @@ 
 		// now transfer
 		$planet->decreaseCDs($amount);
 		$ship->increaseCDs($amount);
-		$account->log(LOG_TYPE_PLANETS, 'Player takes '.$amount.' drones from planet.', $player->getSectorID());
+		$account->log(LOG_TYPE_PLANETS, 'Player takes ' . $amount . ' drones from planet.', $player->getSectorID());
 	}
 	else if ($type_id == HARDWARE_ARMOUR) {
 		// do we want transfer more than we have?
@@ -59,7 +59,7 @@ 
 		// now transfer
 		$planet->decreaseArmour($amount);
 		$ship->increaseArmour($amount);
-		$account->log(LOG_TYPE_PLANETS, 'Player takes '.$amount.' armour from planet.', $player->getSectorID());
+		$account->log(LOG_TYPE_PLANETS, 'Player takes ' . $amount . ' armour from planet.', $player->getSectorID());
 	}
 	
 }
@@ -77,7 +77,7 @@ 
 		// now transfer
 		$planet->increaseShields($amount);
 		$ship->decreaseShields($amount);
-		$account->log(LOG_TYPE_PLANETS, 'Player puts '.$amount.' shields on planet.', $player->getSectorID());
+		$account->log(LOG_TYPE_PLANETS, 'Player puts ' . $amount . ' shields on planet.', $player->getSectorID());
 	// does the user wants to transfer drones?
 	}
 	else if ($type_id == HARDWARE_COMBAT) {
@@ -92,7 +92,7 @@ 
 		// now transfer
 		$planet->increaseCDs($amount);
 		$ship->decreaseCDs($amount);
-		$account->log(LOG_TYPE_PLANETS, 'Player puts '.$amount.' drones on planet.', $player->getSectorID());
+		$account->log(LOG_TYPE_PLANETS, 'Player puts ' . $amount . ' drones on planet.', $player->getSectorID());
 	}
 	// does the user wish to transfare armour?
 	else if ($type_id == HARDWARE_ARMOUR) {
@@ -107,7 +107,7 @@ 
 		// now transfer
 		$planet->increaseArmour($amount);
 		$ship->decreaseArmour($amount);
-		$account->log(LOG_TYPE_PLANETS, 'Player puts '.$amount.' armour on planet.', $player->getSectorID());
+		$account->log(LOG_TYPE_PLANETS, 'Player puts ' . $amount . ' armour on planet.', $player->getSectorID());
 	}
 	
 }

engine/Default/trader_attack.php

Spacing +6 added lines, -6 removed lines

@@ -1,9 +1,9 @@
 <?php
 $results = unserialize($var['results']);
-$template->assign('TraderCombatResults',$results);
-if($var['target'])
-	$template->assign('Target',SmrPlayer::getPlayer($var['target'],$player->getGameID()));
-if(isset($var['override_death']))
-	$template->assign('OverrideDeath',true);
+$template->assign('TraderCombatResults', $results);
+if ($var['target'])
+	$template->assign('Target', SmrPlayer::getPlayer($var['target'], $player->getGameID()));
+if (isset($var['override_death']))
+	$template->assign('OverrideDeath', true);
 else
-	$template->assign('OverrideDeath',false);
+	$template->assign('OverrideDeath', false);

engine/Default/news_read_advanced.php

Spacing +15 added lines, -15 removed lines

@@ -1,10 +1,10 @@ 
 <?php
-if(!isset($var['GameID'])) SmrSession::updateVar('GameID',$player->getGameID());
+if (!isset($var['GameID'])) SmrSession::updateVar('GameID', $player->getGameID());
 $gameID = $var['GameID'];
 
 $basicContainer = array('GameID'=>$gameID);
 
-$template->assign('PageTopic','Advanced News');
+$template->assign('PageTopic', 'Advanced News');
 Menu::news($template);
 
 //$db->query('
@@ -33,12 +33,12 @@ 
 
 $newsAlliances = array();
 $newsAlliances[0] = array('ID' => 0, 'Name' => 'None');
-while($db->nextRecord()) {
+while ($db->nextRecord()) {
 	$newsAlliances[$db->getField('alliance_id')] = array('ID' => $db->getField('alliance_id'), 'Name' => $db->getField('alliance_name'));
 }
-$template->assign('NewsAlliances',$newsAlliances);
+$template->assign('NewsAlliances', $newsAlliances);
 
-$template->assign('AdvancedNewsFormHref',SmrSession::getNewHREF(create_container('skeleton.php','news_read_advanced.php',$basicContainer)));
+$template->assign('AdvancedNewsFormHref', SmrSession::getNewHREF(create_container('skeleton.php', 'news_read_advanced.php', $basicContainer)));
 
 
 if (isset($_REQUEST['submit'])) $submit_value = $_REQUEST['submit'];
@@ -49,30 +49,30 @@ 
 	if (isset($_REQUEST['playerName'])) $p_name = $_REQUEST['playerName'];
 	else $p_name = $var['playerName'];
 	$template->assign('ResultsFor', $p_name);
-	$db->query('SELECT * FROM player WHERE player_name LIKE ' . $db->escapeString('%'.$p_name.'%') . ' AND game_id = ' . $db->escapeNumber($gameID).' LIMIT 3');
+	$db->query('SELECT * FROM player WHERE player_name LIKE ' . $db->escapeString('%' . $p_name . '%') . ' AND game_id = ' . $db->escapeNumber($gameID) . ' LIMIT 3');
 	$IDs = array(0);
-	while($db->nextRecord()) {
+	while ($db->nextRecord()) {
 		$IDs[] = $db->getInt('account_id');
 	}
 	$db->query('SELECT * FROM news WHERE game_id = ' . $db->escapeNumber($gameID) . ' AND (killer_id IN (' . $db->escapeArray($IDs) . ') OR dead_id IN (' . $db->escapeArray($IDs) . ')) ORDER BY news_id DESC');
 }
 elseif ($submit_value == 'Search For Alliance') {
-	if (isset($_REQUEST['allianceID'])) SmrSession::updateVar('AllianceID',$_REQUEST['allianceID']);
-	if(!isset($var['AllianceID'])) create_error('No alliance was specified!');
+	if (isset($_REQUEST['allianceID'])) SmrSession::updateVar('AllianceID', $_REQUEST['allianceID']);
+	if (!isset($var['AllianceID'])) create_error('No alliance was specified!');
 	$allianceID = $var['AllianceID'];
 	$template->assign('ResultsFor', $newsAlliances[$allianceID]['Name']);
-	$db->query('SELECT * FROM news WHERE game_id = ' . $db->escapeNumber($gameID) . ' AND ((killer_alliance = ' . $db->escapeNumber($allianceID) . ' AND killer_id != '.$db->escapeNumber(ACCOUNT_ID_PORT).') OR (dead_alliance = ' . $db->escapeNumber($allianceID) . ' AND dead_id != '.$db->escapeNumber(ACCOUNT_ID_PORT).')) ORDER BY news_id DESC');
+	$db->query('SELECT * FROM news WHERE game_id = ' . $db->escapeNumber($gameID) . ' AND ((killer_alliance = ' . $db->escapeNumber($allianceID) . ' AND killer_id != ' . $db->escapeNumber(ACCOUNT_ID_PORT) . ') OR (dead_alliance = ' . $db->escapeNumber($allianceID) . ' AND dead_id != ' . $db->escapeNumber(ACCOUNT_ID_PORT) . ')) ORDER BY news_id DESC');
 }
 elseif ($submit_value == 'Search For Players') {
 	$template->assign('ResultsFor', $_REQUEST['player1'] . ' vs. ' . $_REQUEST['player2']);
-	$db->query('SELECT * FROM player WHERE player_name LIKE ' . $db->escapeString('%'.$_REQUEST['player1'].'%') . ' AND game_id = ' . $db->escapeNumber($gameID).' LIMIT 3');
+	$db->query('SELECT * FROM player WHERE player_name LIKE ' . $db->escapeString('%' . $_REQUEST['player1'] . '%') . ' AND game_id = ' . $db->escapeNumber($gameID) . ' LIMIT 3');
 	$IDs = array(0);
-	while($db->nextRecord()) {
+	while ($db->nextRecord()) {
 		$IDs[] = $db->getInt('account_id');
 	}
-	$db->query('SELECT * FROM player WHERE player_name LIKE ' . $db->escapeString('%'.$_REQUEST['player2'].'%') . ' AND game_id = ' . $db->escapeNumber($gameID).' LIMIT 3');
+	$db->query('SELECT * FROM player WHERE player_name LIKE ' . $db->escapeString('%' . $_REQUEST['player2'] . '%') . ' AND game_id = ' . $db->escapeNumber($gameID) . ' LIMIT 3');
 	$IDs2 = array(0);
-	while($db->nextRecord()) {
+	while ($db->nextRecord()) {
 		$IDs2[] = $db->getInt('account_id');
 	}
 	$db->query('SELECT * FROM news
@@ -102,5 +102,5 @@ 
 	while ($db->nextRecord()) {
 		$NewsItems[] = array('Time' => $db->getField('time'), 'Message' => bbifyMessage($db->getField('news_message')));
 	}
-	$template->assign('NewsItems',$NewsItems);
+	$template->assign('NewsItems', $NewsItems);
 }

engine/Default/preferences.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@ 
 <?php
-$template->assign('PageTopic','Preferences');
+$template->assign('PageTopic', 'Preferences');
 
 if (isset($var['reason']))
-	$template->assign('Reason',$var['reason']);
+	$template->assign('Reason', $var['reason']);
 
 $template->assign('PreferencesFormHREF', SmrSession::getNewHREF(create_container('preferences_processing.php', '')));
 
@@ -23,4 +23,4 @@ 
 		$transferAccounts[$db->getField('account_id')] = $db->getField('hof_name');
 	}
 //}
-$template->assign('TransferAccounts',$transferAccounts);
+$template->assign('TransferAccounts', $transferAccounts);

engine/Default/message_delete_processing.php

Spacing +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
 						AND send_time >= ' . $db->escapeNumber($temp[1]) . '
 						AND send_time <= ' . $db->escapeNumber($temp[2]) . '
 						AND account_id = ' . $db->escapeNumber($player->getAccountID()) . '
-						AND message_type_id = ' . $db->escapeNumber(MSG_SCOUT).' AND receiver_delete = ' . $db->escapeBoolean(false));
+						AND message_type_id = ' . $db->escapeNumber(MSG_SCOUT) . ' AND receiver_delete = ' . $db->escapeBoolean(false));
 			while ($db->nextRecord()) {
 				$message_id_list[] = $db->getInt('message_id');
 			}
@@ -24,16 +24,16 @@ 
 			$message_id_list[] = $id;
 		}
 	}
-	if($var['folder_id']==MSG_SENT)
-		$db->query('UPDATE message SET sender_delete = ' . $db->escapeBoolean(true) . ' WHERE message_id IN ('.$db->escapeArray($message_id_list).')');
+	if ($var['folder_id'] == MSG_SENT)
+		$db->query('UPDATE message SET sender_delete = ' . $db->escapeBoolean(true) . ' WHERE message_id IN (' . $db->escapeArray($message_id_list) . ')');
 	else
-		$db->query('UPDATE message SET receiver_delete = ' . $db->escapeBoolean(true) . ' WHERE message_id IN ('.$db->escapeArray($message_id_list).')');
+		$db->query('UPDATE message SET receiver_delete = ' . $db->escapeBoolean(true) . ' WHERE message_id IN (' . $db->escapeArray($message_id_list) . ')');
 }
 else {
 	if ($var['folder_id'] == MSG_SCOUT) {
 		$db->query('UPDATE message SET receiver_delete = ' . $db->escapeBoolean(true) . '
 					WHERE account_id = ' . $db->escapeNumber($player->getAccountID()) . '
-						AND message_type_id = '.$db->escapeNumber($var['folder_id']).'
+						AND message_type_id = '.$db->escapeNumber($var['folder_id']) . '
 						AND game_id = ' . $db->escapeNumber($player->getGameID()));
 	}
 	else if ($var['folder_id'] == MSG_SENT) {

engine/Default/shop_hardware_processing.php

Spacing +8 added lines, -8 removed lines

@@ -18,21 +18,21 @@ 
 if ($action == 'Buy') {
 	// do we have enough cash?
 	if ($player->getCredits() < $cost * $amount) {
-		create_error('You don\'t have enough credits to buy '.$amount.' items!');
+		create_error('You don\'t have enough credits to buy ' . $amount . ' items!');
 	}
 
 	// chec for max. we can hold!
 	if ($amount > $ship->getMaxHardware($hardware_id) - $ship->getHardware($hardware_id)) {
-		create_error('You can\'t buy more '.$hardware_name.' than you can transport!');
+		create_error('You can\'t buy more ' . $hardware_name . ' than you can transport!');
 	}
 
 	$player->decreaseCredits($cost * $amount);
 	$ship->increaseHardware($hardware_id, $amount);
 
 	//HoF
-	if ($hardware_id == HARDWARE_COMBAT) $player->increaseHOF($amount,array('Forces','Bought','Combat Drones'), HOF_ALLIANCE);
-	if ($hardware_id == HARDWARE_SCOUT) $player->increaseHOF($amount,array('Forces','Bought','Scout Drones'), HOF_ALLIANCE);
-	if ($hardware_id == HARDWARE_MINE) $player->increaseHOF($amount,array('Forces','Bought','Mines'), HOF_ALLIANCE);
+	if ($hardware_id == HARDWARE_COMBAT) $player->increaseHOF($amount, array('Forces', 'Bought', 'Combat Drones'), HOF_ALLIANCE);
+	if ($hardware_id == HARDWARE_SCOUT) $player->increaseHOF($amount, array('Forces', 'Bought', 'Scout Drones'), HOF_ALLIANCE);
+	if ($hardware_id == HARDWARE_MINE) $player->increaseHOF($amount, array('Forces', 'Bought', 'Mines'), HOF_ALLIANCE);
 }
 else if ($action == 'Sell') {
 	// We only allow selling combat drones
@@ -42,17 +42,17 @@ 
 
 	// Make sure we have the specified amount to sell
 	if ($amount > $ship->getCDs()) {
-		create_error('You can\'t sell more '.$hardware_name.' than you have aboard your ship!');
+		create_error('You can\'t sell more ' . $hardware_name . ' than you have aboard your ship!');
 	}
 
 	$player->increaseCredits(round($cost * CDS_REFUND_PERCENT) * $amount);
-	$ship->decreaseCDs($amount, true);  // 2nd arg avoids under attack warning
+	$ship->decreaseCDs($amount, true); // 2nd arg avoids under attack warning
 }
 else {
 	throw new Exception('Action must be either Buy or Sell.');
 }
 
-$account->log(LOG_TYPE_HARDWARE, 'Player '.$action.'s '.$amount.' '.$hardware_name, $player->getSectorID());
+$account->log(LOG_TYPE_HARDWARE, 'Player ' . $action . 's ' . $amount . ' ' . $hardware_name, $player->getSectorID());
 
 $player->update();
 $ship->updateHardware();

engine/Default/alliance_mod.php

Spacing +2 added lines, -2 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());
@@ -38,7 +38,7 @@ 
 $db->query('SELECT * FROM alliance_has_roles WHERE alliance_id = ' . $db->escapeNumber($player->getAllianceID()) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND role_id = ' . $db->escapeNumber($role_id));
 $db->nextRecord();
 if ($db->getBoolean('change_mod') || $db->getBoolean('change_pass')) {
-	$container=create_container('skeleton.php','alliance_stat.php');
+	$container = create_container('skeleton.php', 'alliance_stat.php');
 	$container['alliance_id'] = $alliance->getAllianceID();
 	$template->assign('EditHREF', SmrSession::getNewHREF($container));
 }

engine/Default/rankings_player_death.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$template->assign('PageTopic','Death Rankings');
+$template->assign('PageTopic', 'Death Rankings');
 
 Menu::rankings(0, 3);
 

engine/Default/vote_link.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 		$voting = '<b><span class="red">v</span>o<span class="blue">t</span><span class="red">i</span>n<span class="blue">g</span></b>';
 		$container['msg'] = "Thank you for $voting! You will receive bonus turns once your vote is processed.";
 	} else {
-		create_error('You cannot gain bonus turns in this game yet, please wait '.format_time($startFreeTurnsDate - min(TIME, $player->getLastTurnUpdate())).'.');
+		create_error('You cannot gain bonus turns in this game yet, please wait ' . format_time($startFreeTurnsDate - min(TIME, $player->getLastTurnUpdate())) . '.');
 	}
 }