smrealms / smr

engine/Default/galactic_post_application_processing.php

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 $amount = $_REQUEST['amount'];
 if (empty($exp) || empty($message) || empty($amount))
 	create_error('You left some value blank.');
-if(!is_numeric($amount)) {
+if (!is_numeric($amount)) {
 	create_error('Articles per day must be a number.');
 }
 if ($exp == 1)
@@ -15,7 +15,7 @@ 
 if ($db->nextRecord())
 	create_error('You have already applied once.  Please be patient and your application will be answered at a later time.');
 
-$db->query('INSERT INTO galactic_post_applications (game_id, account_id, description, written_before, articles_per_day) VALUES (' . $db->escapeNumber($player->getGameID()) . ', ' . $db->escapeNumber($player->getAccountID()) . ', ' . $db->escapeString($message) . ', '.$db->escapeString($value).', '.$db->escapeNumber($amount).')');
+$db->query('INSERT INTO galactic_post_applications (game_id, account_id, description, written_before, articles_per_day) VALUES (' . $db->escapeNumber($player->getGameID()) . ', ' . $db->escapeNumber($player->getAccountID()) . ', ' . $db->escapeString($message) . ', ' . $db->escapeString($value) . ', ' . $db->escapeNumber($amount) . ')');
 
 $container = create_container('skeleton.php', 'current_sector.php');
 $container['msg'] = 'Thank you for your application.  It has been sent to the main editor and he will let you know if you have been accepted.';

engine/Default/logoff.php

Spacing +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php
 
-$account->log(LOG_TYPE_LOGIN, 'logged off from '.getIpAddress());
+$account->log(LOG_TYPE_LOGIN, 'logged off from ' . getIpAddress());
 
 // Remove the lock if we're holding one (ie logged off from game screen)
-if($lock) {
+if ($lock) {
 	release_lock();
 }
 SmrSession::destroy();

engine/Default/forces_attack_processing.php

Spacing +11 added lines, -11 removed lines

@@ -5,11 +5,11 @@ 
 
 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 forces whilst on a planet!');
-if(!$player->canFight())
+if (!$player->canFight())
 	create_error('You are not allowed to fight!');
 if ($player->forceNAPAlliance($forceOwner))
 	create_error('You cannot attack allied forces!');
@@ -28,7 +28,7 @@ 
 	if (!$forces->hasMines())
 		create_error('No mines in sector!');
 } else {
-	if(!$forces->exists())
+	if (!$forces->exists())
 		create_error('These forces no longer exist.');
 	if ($player->getTurns() < $forces->getAttackTurnCost($ship))
 		create_error('You do not have enough turns to attack these forces!');
@@ -72,18 +72,18 @@ 
 
 // If mines are bumped, the forces shoot first. Otherwise player shoots first.
 if ($bump) {
-	$results['Forces'] =& $forces->shootPlayers($attackers, $bump);
+	$results['Forces'] = & $forces->shootPlayers($attackers, $bump);
 }
 
 $results['Attackers'] = array('TotalDamage' => 0);
 foreach ($attackers as $attacker) {
-	$playerResults =& $attacker->shootForces($forces);
-	$results['Attackers']['Traders'][$attacker->getAccountID()]  =& $playerResults;
+	$playerResults = & $attacker->shootForces($forces);
+	$results['Attackers']['Traders'][$attacker->getAccountID()] = & $playerResults;
 	$results['Attackers']['TotalDamage'] += $playerResults['TotalDamage'];
 }
 
 if (!$bump) {
-	$results['Forces'] =& $forces->shootPlayers($attackers, $bump);
+	$results['Forces'] = & $forces->shootPlayers($attackers, $bump);
 	$forces->updateExpire();
 }
 
@@ -96,20 +96,20 @@ 
 $logId = $db->getInsertID();
 
 if ($sendMessage) {
-	$message = 'Your forces in sector '.Globals::getSectorBBLink($forces->getSectorID()).' are under <span class="red">attack</span> by '.$player->getBBLink().'! [combatlog='.$logId.']';
+	$message = 'Your forces in sector ' . Globals::getSectorBBLink($forces->getSectorID()) . ' are under <span class="red">attack</span> by ' . $player->getBBLink() . '! [combatlog=' . $logId . ']';
 	$forces->ping($message, $player, true);
 }
 
 $container = create_container('skeleton.php', 'forces_attack.php');
 
 // If their target is dead there is no continue attack button
-if($forces->exists())
+if ($forces->exists())
 	$container['owner_id'] = $forces->getOwnerID();
 else
 	$container['owner_id'] = 0;
 
 // If they died on the shot they get to see the results
-if($player->isDead()) {
+if ($player->isDead()) {
 	$container['override_death'] = TRUE;
 	$container['owner_id'] = 0;
 }

engine/Default/history_alliance_detail.php

Spacing +2 added lines, -2 removed lines

@@ -10,9 +10,9 @@
 $game_id = $var['view_game_id'];
 $id = $var['alliance_id'];
 $db = new $var['HistoryDatabase']();
-$db->query('SELECT * FROM alliance WHERE alliance_id = '.$db->escapeNumber($id).' AND game_id = '.$db->escapeNumber($game_id));
+$db->query('SELECT * FROM alliance WHERE alliance_id = ' . $db->escapeNumber($id) . ' AND game_id = ' . $db->escapeNumber($game_id));
 $db->nextRecord();
-$template->assign('PageTopic','Alliance Roster - ' . stripslashes($db->getField('alliance_name')));
+$template->assign('PageTopic', 'Alliance Roster - ' . stripslashes($db->getField('alliance_name')));
 
 //get alliance members
 $db->query('SELECT * FROM player WHERE alliance_id = ' . $db->escapeNumber($id) . ' AND game_id = ' . $db->escapeNumber($game_id) . ' ORDER BY experience DESC');

engine/Default/bar_lotto_claim.php

Spacing +4 added lines, -4 removed lines

@@ -9,14 +9,14 @@
 	$NHLAmount = ($prize - 1000000) / 9;
 	$db->query('UPDATE player SET bank = bank + ' . $db->escapeNumber($NHLAmount) . ' WHERE account_id = ' . $db->escapeNumber(ACCOUNT_ID_NHL) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()));
 	$player->increaseCredits($prize);
-	$player->increaseHOF($prize,array('Bar','Lotto','Money','Claimed'), HOF_PUBLIC);
-	$player->increaseHOF(1,array('Bar','Lotto','Results','Claims'), HOF_PUBLIC);
+	$player->increaseHOF($prize, array('Bar', 'Lotto', 'Money', 'Claimed'), HOF_PUBLIC);
+	$player->increaseHOF(1, array('Bar', 'Lotto', 'Results', 'Claims'), HOF_PUBLIC);
 	$message .= '<div align="center">You have claimed <span class="red">$' . number_format($prize) . '</span>!<br /></div><br />';
 	$db->query('DELETE FROM player_has_ticket WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . '
 				AND account_id = ' . $db->escapeNumber($player->getAccountID()) . ' AND prize = ' . $db->escapeNumber($prize) . ' AND time = 0 LIMIT 1');
-	$db->query('DELETE FROM news WHERE type = \'lotto\' AND game_id = '.$db->escapeNumber($player->getGameID()));
+	$db->query('DELETE FROM news WHERE type = \'lotto\' AND game_id = ' . $db->escapeNumber($player->getGameID()));
 }
 //offer another drink and such
-$container=create_container('skeleton.php','bar_main.php');
+$container = create_container('skeleton.php', 'bar_main.php');
 $container['message'] = $message;
 forward($container);

engine/Default/chess_play.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <?php
 
-$template->assign('ChessGame',ChessGame::getChessGame($var['ChessGameID']));
-$template->assign('ChessMoveHREF',SmrSession::getNewHREF(create_container('chess_move_processing.php','',array('AJAX' => true, 'ChessGameID' => $var['ChessGameID']))));
+$template->assign('ChessGame', ChessGame::getChessGame($var['ChessGameID']));
+$template->assign('ChessMoveHREF', SmrSession::getNewHREF(create_container('chess_move_processing.php', '', array('AJAX' => true, 'ChessGameID' => $var['ChessGameID']))));

engine/Default/news_read_current.php

Spacing +8 added lines, -8 removed lines

@@ -1,19 +1,19 @@ 
 <?php
-if(!isset($var['GameID'])) SmrSession::updateVar('GameID',$player->getGameID());
+if (!isset($var['GameID'])) SmrSession::updateVar('GameID', $player->getGameID());
 $gameID = $var['GameID'];
 
-$template->assign('PageTopic','Current News');
+$template->assign('PageTopic', 'Current News');
 Menu::news($template);
 
 require_once(get_file_loc('news.functions.inc'));
-doBreakingNewsAssign($gameID,$template);
-doLottoNewsAssign($gameID,$template);
+doBreakingNewsAssign($gameID, $template);
+doLottoNewsAssign($gameID, $template);
 
 
-if(!isset($var['LastNewsUpdate']))
-	SmrSession::updateVar('LastNewsUpdate',$player->getLastNewsUpdate());
+if (!isset($var['LastNewsUpdate']))
+	SmrSession::updateVar('LastNewsUpdate', $player->getLastNewsUpdate());
 
-$db->query('SELECT * FROM news WHERE game_id = '.$db->escapeNumber($gameID).' AND time > '.$db->escapeNumber($var['LastNewsUpdate']).' AND type != \'lotto\' ORDER BY news_id DESC');
+$db->query('SELECT * FROM news WHERE game_id = ' . $db->escapeNumber($gameID) . ' AND time > ' . $db->escapeNumber($var['LastNewsUpdate']) . ' AND type != \'lotto\' ORDER BY news_id DESC');
 $player->updateLastNewsUpdate();
 
 if ($db->getNumRows()) {
@@ -21,5 +21,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/bounty_place_processing.php

Spacing +10 added lines, -10 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!$player->getSector()->hasLocation($var['LocationID'])) {
+if (!$player->getSector()->hasLocation($var['LocationID'])) {
 	create_error('That location does not exist in this sector');
 }
 
@@ -11,7 +11,7 @@ 
 	$container['body'] = 'government.php';
 	$type = 'HQ';
 }
-else if($location->isUG()) {
+else if ($location->isUG()) {
 	$container['body'] = 'underground.php';
 	$type = 'UG';
 }
@@ -41,16 +41,16 @@ 
 $player->decreaseCredits($amount);
 $account->decreaseSmrCredits($smrCredits);
 
-$player->increaseHOF($smrCredits,array('Bounties','Placed','SMR Credits'), HOF_PUBLIC);
-$player->increaseHOF($amount,array('Bounties','Placed','Money'), HOF_PUBLIC);
-$player->increaseHOF(1,array('Bounties','Placed','Number'), HOF_PUBLIC);
+$player->increaseHOF($smrCredits, array('Bounties', 'Placed', 'SMR Credits'), HOF_PUBLIC);
+$player->increaseHOF($amount, array('Bounties', 'Placed', 'Money'), HOF_PUBLIC);
+$player->increaseHOF(1, array('Bounties', 'Placed', 'Number'), HOF_PUBLIC);
 
 $placed = SmrPlayer::getPlayer($account_id, $player->getGameID());
-$placed->increaseCurrentBountyAmount($type,$amount);
-$placed->increaseCurrentBountySmrCredits($type,$smrCredits);
-$placed->increaseHOF($smrCredits,array('Bounties','Received','SMR Credits'), HOF_PUBLIC);
-$placed->increaseHOF($amount,array('Bounties','Received','Money'), HOF_PUBLIC);
-$placed->increaseHOF(1,array('Bounties','Received','Number'), HOF_PUBLIC);
+$placed->increaseCurrentBountyAmount($type, $amount);
+$placed->increaseCurrentBountySmrCredits($type, $smrCredits);
+$placed->increaseHOF($smrCredits, array('Bounties', 'Received', 'SMR Credits'), HOF_PUBLIC);
+$placed->increaseHOF($amount, array('Bounties', 'Received', 'Money'), HOF_PUBLIC);
+$placed->increaseHOF(1, array('Bounties', 'Received', 'Number'), HOF_PUBLIC);
 
 //Update for top bounties list
 $player->update();

engine/Default/government.php

Spacing +3 added lines, -3 removed lines

@@ -4,11 +4,11 @@ 
 if ($player->getAlignment() <= ALIGNMENT_EVIL) {
 	create_error('You are not allowed to enter our Government HQ!');
 }
-if(!$player->getSector()->hasLocation($var['LocationID'])) {
+if (!$player->getSector()->hasLocation($var['LocationID'])) {
 	create_error('That location does not exist in this sector');
 }
 $location = SmrLocation::getLocation($var['LocationID']);
-if(!$location->isHQ()) {
+if (!$location->isHQ()) {
 	create_error('There is no headquarters. Obviously.');
 }
 $raceID = $location->getRaceID();
@@ -28,7 +28,7 @@ 
 if ($raceID != RACE_NEUTRAL) {
 	$races = Globals::getRaces();
 	$raceRelations = Globals::getRaceRelations($player->getGameID(), $raceID);
-	foreach($raceRelations as $otherRaceID => $relation) {
+	foreach ($raceRelations as $otherRaceID => $relation) {
 		if ($relation <= RELATIONS_WAR) {
 			$warRaces[] = $races[$otherRaceID]['Race Name'];
 		}