smrealms / smr

engine/Default/preferences_confirm.php

Spacing +14 added lines, -14 removed lines

@@ -1,8 +1,8 @@ 
 <?php
-if(isset($_REQUEST['amount']))
-	SmrSession::updateVar('amount',$_REQUEST['amount']);
-if(isset($_REQUEST['account_id']))
-	SmrSession::updateVar('account_id',$_REQUEST['account_id']);
+if (isset($_REQUEST['amount']))
+	SmrSession::updateVar('amount', $_REQUEST['amount']);
+if (isset($_REQUEST['account_id']))
+	SmrSession::updateVar('account_id', $_REQUEST['account_id']);
 $amount = $var['amount'];
 $account_id = $var['account_id'];
 if (!is_numeric($amount))
@@ -16,22 +16,22 @@ 
 if ($amount > $account->getSmrCredits())
 	create_error('You can\'t transfer more than you have!');
 
-$template->assign('PageTopic','Confirmation');
+$template->assign('PageTopic', 'Confirmation');
 
-$PHP_OUTPUT.=('Are you sure you want to transfer '.$amount.' credits to<br />');
+$PHP_OUTPUT .= ('Are you sure you want to transfer ' . $amount . ' credits to<br />');
 
-$PHP_OUTPUT.=('Player with HoF name '.SmrAccount::getAccount($account_id)->getHofName().'?<br />');
+$PHP_OUTPUT .= ('Player with HoF name ' . SmrAccount::getAccount($account_id)->getHofName() . '?<br />');
 
-$PHP_OUTPUT.=('<br/><h3>Please make sure this is definitely the correct person before confirming.</h3>');
-$PHP_OUTPUT.=('<p>&nbsp;</p>');
+$PHP_OUTPUT .= ('<br/><h3>Please make sure this is definitely the correct person before confirming.</h3>');
+$PHP_OUTPUT .= ('<p>&nbsp;</p>');
 
 $container = array();
 $container['url'] = 'preferences_processing.php';
 $container['account_id'] = $account_id;
 $container['amount'] = $amount;
-$PHP_OUTPUT.=create_echo_form($container);
+$PHP_OUTPUT .= create_echo_form($container);
 
-$PHP_OUTPUT.=create_submit('Yes');
-$PHP_OUTPUT.=('&nbsp;&nbsp;');
-$PHP_OUTPUT.=create_submit('No');
-$PHP_OUTPUT.=('</form>');
+$PHP_OUTPUT .= create_submit('Yes');
+$PHP_OUTPUT .= ('&nbsp;&nbsp;');
+$PHP_OUTPUT .= create_submit('No');
+$PHP_OUTPUT .= ('</form>');

engine/Default/beta_func_processing.php

Spacing +8 added lines, -8 removed lines

@@ -42,7 +42,7 @@ 
 }
 elseif ($var['func'] == 'Warp') {
 	$sector_to = trim($_REQUEST['sector_to']);
-	if(!is_numeric($sector_to)) {
+	if (!is_numeric($sector_to)) {
 		create_error('Sector ID has to be a number.');
 	}
 	if (!SmrSector::sectorExists($player->getGameID(), $sector_to)) {
@@ -59,7 +59,7 @@ 
 	$player->setExperience($exp);
 }
 elseif ($var['func'] == 'Align') {
-	$align=max(-500, min(500, (int)$_REQUEST['align']));
+	$align = max(-500, min(500, (int)$_REQUEST['align']));
 	$player->setAlignment($align);
 }
 elseif ($var['func'] == 'RemWeapon') {
@@ -74,22 +74,22 @@ 
 elseif ($var['func'] == 'Relations') {
 	$amount = (int)$_REQUEST['amount'];
 	$race = (int)$_REQUEST['race'];
-	$player->setRelations($amount,$race);
+	$player->setRelations($amount, $race);
 }
 elseif ($var['func'] == 'Race_Relations') {
 	$amount = $_REQUEST['amount'];
 	$race = $_REQUEST['race'];
-	if(!is_numeric($amount) || !is_numeric($race)) {
+	if (!is_numeric($amount) || !is_numeric($race)) {
 		create_error('Amount and Race IDs have to be numbers.');
 	}
-	if($player->getRaceID()==$race) {
+	if ($player->getRaceID() == $race) {
 		create_error('You cannot change race relations with your own race.');
 	}
 	$db->query('UPDATE race_has_relation SET relation = ' . $db->escapeNumber($amount) . ' WHERE race_id_1 = ' . $db->escapeNumber($player->getRaceID()) . ' AND race_id_2 = ' . $db->escapeNumber($race) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()));
 	$db->query('UPDATE race_has_relation SET relation = ' . $db->escapeNumber($amount) . ' WHERE race_id_1 = ' . $db->escapeNumber($race) . ' AND race_id_2 = ' . $db->escapeNumber($player->getRaceID()) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()));
 } elseif ($var['func'] == 'Race') {
 	$race = $_REQUEST['race'];
-	if(!is_numeric($race)) {
+	if (!is_numeric($race)) {
 		create_error('Amount and Race IDs have to be numbers.');
 	}
 	$player->setRaceID($race);
@@ -118,8 +118,8 @@ 
 
 function doUNO($ship) {
 	$maxHardware = $ship->getMaxHardware();
-	foreach($maxHardware as $key => $max) {
-		$ship->setHardware($key,$max);
+	foreach ($maxHardware as $key => $max) {
+		$ship->setHardware($key, $max);
 	}
 	$ship->removeUnderAttack();
 }

engine/Default/current_sector.php

Spacing +34 added lines, -34 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 
 // If on a planet, forward to planet_main.php
-if($player->isLandedOnPlanet()) {
+if ($player->isLandedOnPlanet()) {
 	forward(create_container('skeleton.php', 'planet_main.php', $var));
 }
 
-$template->assign('SpaceView',true);
+$template->assign('SpaceView', true);
 
-$template->assign('PageTopic','Current Sector: ' . $player->getSectorID() . ' (' .$sector->getGalaxyName() . ')');
+$template->assign('PageTopic', 'Current Sector: ' . $player->getSectorID() . ' (' . $sector->getGalaxyName() . ')');
 
 Menu::navigation($template, $player);
 
@@ -28,25 +28,25 @@ 
 
 $unvisited = array();
 
-$db->query('SELECT sector_id FROM player_visited_sector WHERE sector_id IN (' . $db->escapeString($links,false) . ') AND account_id=' . $db->escapeNumber($player->getAccountID()) . ' AND game_id=' . $db->escapeNumber($player->getGameID()));
-while($db->nextRecord()) {
+$db->query('SELECT sector_id FROM player_visited_sector WHERE sector_id IN (' . $db->escapeString($links, false) . ') AND account_id=' . $db->escapeNumber($player->getAccountID()) . ' AND game_id=' . $db->escapeNumber($player->getGameID()));
+while ($db->nextRecord()) {
 	$unvisited[$db->getField('sector_id')] = TRUE;
 }
 
-foreach($links as $key => $linkArray) {
-	if($linkArray['ID']>0 && $linkArray['ID']!=$player->getSectorID()) {
+foreach ($links as $key => $linkArray) {
+	if ($linkArray['ID'] > 0 && $linkArray['ID'] != $player->getSectorID()) {
 		if ($player->getLastSectorID() == $linkArray['ID']) $class = 'lastVisited';
-		else if(isset($unvisited[$linkArray['ID']])) $class = 'unvisited';
+		else if (isset($unvisited[$linkArray['ID']])) $class = 'unvisited';
 		else $class = 'visited';
-		$links[$key]['Class']=$class;
+		$links[$key]['Class'] = $class;
 	}
 }
 
-$template->assign('Sectors',$links);
+$template->assign('Sectors', $links);
 
 doTickerAssigns($template, $player, $db);
 
-if(!isset($var['UnreadMissions'])) {
+if (!isset($var['UnreadMissions'])) {
 	$unreadMissions = $player->markMissionsRead();
 	SmrSession::updateVar('UnreadMissions', $unreadMissions);
 }
@@ -62,7 +62,7 @@ 
 if ($game->getStartTurnsDate() > TIME) {
 	$turnsMessage = 'Turns will be given when the game starts in ' . format_time($game->getStartTurnsDate() - TIME) . '!';
 } else {
-	switch($player->getTurnsLevel()) {
+	switch ($player->getTurnsLevel()) {
 		case 'NONE':
 			$turnsMessage = '<span class="red">WARNING</span>: You have run out of turns!';
 		break;
@@ -74,7 +74,7 @@ 
 		break;
 	}
 }
-$template->assign('TurnsMessage',$turnsMessage);
+$template->assign('TurnsMessage', $turnsMessage);
 
 $protectionMessage = '';
 if ($player->getNewbieTurns()) {
@@ -87,11 +87,11 @@ 
 elseif ($player->hasFederalProtection()) {
 	$protectionMessage = '<span class="blue">PROTECTION</span>: You are under <span class="blue">FEDERAL</span> protection.';
 }
-elseif($sector->offersFederalProtection())
+elseif ($sector->offersFederalProtection())
 	$protectionMessage = '<span class="blue">PROTECTION</span>: You are <span class="red">NOT</span> under protection.';
 
-if(!empty($protectionMessage))
-	$template->assign('ProtectionMessage',$protectionMessage);
+if (!empty($protectionMessage))
+	$template->assign('ProtectionMessage', $protectionMessage);
 
 //enableProtectionDependantRefresh($template,$player);
 
@@ -133,43 +133,43 @@ 
 // *
 // *******************************************
 
-if($sector->hasPort()) {
+if ($sector->hasPort()) {
 	$port = $sector->getPort();
-	$template->assign('PortIsAtWar',$player->getRelation($port->getRaceID()) < RELATIONS_WAR);
+	$template->assign('PortIsAtWar', $player->getRelation($port->getRaceID()) < RELATIONS_WAR);
 }
 
 function checkForForceRefreshMessage(&$msg) {
-	global $db,$player,$template;
+	global $db, $player, $template;
 	$contains = 0;
-	$msg = str_replace('[Force Check]','',$msg,$contains);
-	if($contains>0) {
-		if(!$template->hasTemplateVar('ForceRefreshMessage')) {
-			$forceRefreshMessage ='';
+	$msg = str_replace('[Force Check]', '', $msg, $contains);
+	if ($contains > 0) {
+		if (!$template->hasTemplateVar('ForceRefreshMessage')) {
+			$forceRefreshMessage = '';
 			$db->query('SELECT refresh_at FROM sector_has_forces WHERE refresh_at >= ' . $db->escapeNumber(TIME) . ' AND sector_id = ' . $db->escapeNumber($player->getSectorID()) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND refresher = ' . $db->escapeNumber($player->getAccountID()) . ' ORDER BY refresh_at DESC LIMIT 1');
 			if ($db->nextRecord()) {
 				$remainingTime = $db->getField('refresh_at') - TIME;
-				$forceRefreshMessage = '<span class="green">REFRESH</span>: All forces will be refreshed in '.$remainingTime.' seconds.';
+				$forceRefreshMessage = '<span class="green">REFRESH</span>: All forces will be refreshed in ' . $remainingTime . ' seconds.';
 				$db->query('REPLACE INTO sector_message (game_id, account_id, message) VALUES (' . $db->escapeNumber($player->getGameID()) . ', ' . $db->escapeNumber($player->getAccountID()) . ', \'[Force Check]\')');
 			}
 			else $forceRefreshMessage = '<span class="green">REFRESH</span>: All forces have finished refreshing.';
-			$template->assign('ForceRefreshMessage',$forceRefreshMessage);
+			$template->assign('ForceRefreshMessage', $forceRefreshMessage);
 		}
 	}
 }
 
 function checkForAttackMessage(&$msg) {
-	global $db,$player,$template;
+	global $db, $player, $template;
 	$contains = 0;
-	$msg = str_replace('[ATTACK_RESULTS]','',$msg,$contains);
-	if($contains>0) {
-		SmrSession::updateVar('AttackMessage','[ATTACK_RESULTS]'.$msg);
-		if(!$template->hasTemplateVar('AttackResults')) {
+	$msg = str_replace('[ATTACK_RESULTS]', '', $msg, $contains);
+	if ($contains > 0) {
+		SmrSession::updateVar('AttackMessage', '[ATTACK_RESULTS]' . $msg);
+		if (!$template->hasTemplateVar('AttackResults')) {
 			$db->query('SELECT sector_id,result,type FROM combat_logs WHERE log_id=' . $db->escapeNumber($msg) . ' LIMIT 1');
-			if($db->nextRecord()) {
-				if($player->getSectorID()==$db->getField('sector_id')) {
+			if ($db->nextRecord()) {
+				if ($player->getSectorID() == $db->getField('sector_id')) {
 					$results = unserialize(gzuncompress($db->getField('result')));
-					$template->assign('AttackResultsType',$db->getField('type'));
-					$template->assign('AttackResults',$results);
+					$template->assign('AttackResultsType', $db->getField('type'));
+					$template->assign('AttackResults', $results);
 				}
 			}
 		}

engine/Default/council_embassy_processing.php

Spacing +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 
-if(!$player->isPresident()) {
+if (!$player->isPresident()) {
 	create_error('Only the president can view the embassy.');
 }
 
 $race_id = $var['race_id'];
 $type = strtoupper($_REQUEST['action']);
-$time = TIME + TIME_FOR_COUNCIL_VOTE;// / Globals::getGameSpeed($player->getGameID());
+$time = TIME + TIME_FOR_COUNCIL_VOTE; // / Globals::getGameSpeed($player->getGameID());
 
 $db->query('SELECT count(*) FROM race_has_voting
 			WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . '
@@ -17,8 +17,8 @@ 
 
 if ($type == 'PEACE') {
 	$db->query('SELECT 1 FROM race_has_voting
-				WHERE race_id_1='.$db->escapeNumber($race_id).' AND race_id_2='.$db->escapeNumber($player->getRaceID()).' AND game_id = '.$db->escapeNumber($player->getGameID()));
-	if($db->nextRecord()) {
+				WHERE race_id_1='.$db->escapeNumber($race_id) . ' AND race_id_2=' . $db->escapeNumber($player->getRaceID()) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()));
+	if ($db->nextRecord()) {
 		create_error('You cannot start a vote with that race.');
 	}
 }
@@ -26,13 +26,13 @@ 
 // Create the vote for the player's race
 $db->query('REPLACE INTO race_has_voting
 			(game_id, race_id_1, race_id_2, type, end_time)
-			VALUES(' . $db->escapeNumber($player->getGameID()) . ', ' . $db->escapeNumber($player->getRaceID()) . ', '.$db->escapeNumber($race_id).', '.$db->escapeString($type).', '.$db->escapeNumber($time).')');
+			VALUES(' . $db->escapeNumber($player->getGameID()) . ', ' . $db->escapeNumber($player->getRaceID()) . ', ' . $db->escapeNumber($race_id) . ', ' . $db->escapeString($type) . ', ' . $db->escapeNumber($time) . ')');
 
 // If voting for peace, the other race also has to vote
 if ($type == 'PEACE') {
 	$db->query('REPLACE INTO race_has_voting
 				(game_id, race_id_1, race_id_2, type, end_time)
-				VALUES(' . $db->escapeNumber($player->getGameID()) . ', '.$race_id.', ' . $db->escapeNumber($player->getRaceID()) . ', '.$db->escapeString($type).', '.$time.')');
+				VALUES(' . $db->escapeNumber($player->getGameID()) . ', ' . $race_id . ', ' . $db->escapeNumber($player->getRaceID()) . ', ' . $db->escapeString($type) . ', ' . $time . ')');
 }
 
 
@@ -54,7 +54,7 @@ 
            . "! You have " . format_time(TIME_FOR_COUNCIL_VOTE)
            . " to cast your vote.";
 
-foreach($councilMembers as $accountID) {
+foreach ($councilMembers as $accountID) {
 	// don't send to the player who started the vote
 	if ($player->getAccountID() != $accountID) {
 		SmrPlayer::sendMessageFromRace($player->getRaceID(), $player->getGameID(),

engine/Default/validate.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if(isset($var['msg']))
+if (isset($var['msg']))
 	$template->assign('Message', $var['msg']);
 
 $template->assign('PageTopic', 'Validation Reminder');

engine/Default/galactic_post_read.php

Spacing +4 added lines, -4 removed lines

@@ -14,13 +14,13 @@ 
 		$template->assign('BackHREF', SmrSession::getNewHREF($container));
 	}
 
-	$db->query('SELECT * FROM galactic_post_paper WHERE game_id = ' . $db->escapeNumber($var['game_id']) . ' AND paper_id = '.$var['paper_id']);
+	$db->query('SELECT * FROM galactic_post_paper WHERE game_id = ' . $db->escapeNumber($var['game_id']) . ' AND paper_id = ' . $var['paper_id']);
 	$db->nextRecord();
 	$paper_name = bbifyMessage($db->getField('title'));
-	$template->assign('PageTopic','Reading <i>Galactic Post</i> Edition : '.$paper_name);
+	$template->assign('PageTopic', 'Reading <i>Galactic Post</i> Edition : ' . $paper_name);
 
 	//now get the articles in this paper.
-	$db->query('SELECT * FROM galactic_post_paper_content JOIN galactic_post_article USING(game_id, article_id) WHERE paper_id = '.$db->escapeNumber($var['paper_id']).' AND game_id = '.$db->escapeNumber($var['game_id']));
+	$db->query('SELECT * FROM galactic_post_paper_content JOIN galactic_post_article USING(game_id, article_id) WHERE paper_id = ' . $db->escapeNumber($var['paper_id']) . ' AND game_id = ' . $db->escapeNumber($var['game_id']));
 
 	$articles = [];
 	while ($db->nextRecord()) {
@@ -44,5 +44,5 @@ 
 	$template->assign('ArticleLayout', $articleLayout);
 }
 else {
-	$template->assign('PageTopic','Galactic Post');
+	$template->assign('PageTopic', 'Galactic Post');
 }

engine/Default/forces_drop.php

Spacing +4 added lines, -4 removed lines

@@ -2,19 +2,19 @@
 
 if (isset($var['owner_id'])) {
 	$owner = SmrPlayer::getPlayer($var['owner_id'], $player->getGameID());
-	$template->assign('PageTopic','Change '.$owner->getPlayerName().'\'s Forces');
+	$template->assign('PageTopic', 'Change ' . $owner->getPlayerName() . '\'s Forces');
 	$owner_id = $var['owner_id'];
 }
 else {
-	$template->assign('PageTopic','Drop Forces');
+	$template->assign('PageTopic', 'Drop Forces');
 	$owner_id = $player->getAccountID();
 }
 
 $forces = SmrForce::getForce($player->getGameID(), $player->getSectorID(), $owner_id);
 
 $container = array();
-$container['url']		= 'forces_drop_processing.php';
-$container['owner_id']	= $owner_id;
+$container['url'] = 'forces_drop_processing.php';
+$container['owner_id'] = $owner_id;
 
 $template->assign('Forces', $forces);
 $template->assign('SubmitHREF', SmrSession::getNewHREF($container));

engine/Default/combat_simulator.php

Spacing +40 added lines, -40 removed lines

@@ -1,91 +1,91 @@
 <?php
-$template->assign('PageTopic','Combat Simulator');
+$template->assign('PageTopic', 'Combat Simulator');
 
-$template->assign('EditDummysLink',SmrSession::getNewHREF(create_container('skeleton.php','edit_dummys.php')));
+$template->assign('EditDummysLink', SmrSession::getNewHREF(create_container('skeleton.php', 'edit_dummys.php')));
 $template->assign('DummyNames', DummyPlayer::getDummyPlayerNames());
 
 $duplicates = false;
 $usedNames = array();
 $realAttackers = array();
 $attackers = array();
-$i=1;
-if(isset($_POST['attackers']))
-	foreach($_POST['attackers'] as $attackerName) {
-		if($attackerName=='none')
+$i = 1;
+if (isset($_POST['attackers']))
+	foreach ($_POST['attackers'] as $attackerName) {
+		if ($attackerName == 'none')
 			continue;
-		if(isset($usedNames[$attackerName])) {
+		if (isset($usedNames[$attackerName])) {
 			$duplicates = true;
 			continue;
 		}
 		$usedNames[$attackerName] = true;
-		$attackers[$i] =& DummyPlayer::getCachedDummyPlayer($attackerName);
+		$attackers[$i] = & DummyPlayer::getCachedDummyPlayer($attackerName);
 		$attackers[$i]->setAllianceID(1);
-		$realAttackers[$i] =& $attackers[$i];
+		$realAttackers[$i] = & $attackers[$i];
 		++$i;
 	}
 
-for(;$i<=10;++$i)
+for (;$i <= 10; ++$i)
 	$attackers[$i] = null;
-$template->assign('Attackers',$attackers);
+$template->assign('Attackers', $attackers);
 
-$i=1;
+$i = 1;
 $realDefenders = array();
 $defenders = array();
-if(isset($_POST['defenders']))
-	foreach($_POST['defenders'] as $defenderName) {
-		if($defenderName=='none')
+if (isset($_POST['defenders']))
+	foreach ($_POST['defenders'] as $defenderName) {
+		if ($defenderName == 'none')
 			continue;
-		if(isset($usedNames[$defenderName])) {
+		if (isset($usedNames[$defenderName])) {
 			$duplicates = true;
 			continue;
 		}
 		$usedNames[$attackerName] = true;
-		$defenders[$i] =& DummyPlayer::getCachedDummyPlayer($defenderName);
+		$defenders[$i] = & DummyPlayer::getCachedDummyPlayer($defenderName);
 		$defenders[$i]->setAllianceID(2);
-		$realDefenders[$i] =& $defenders[$i];
+		$realDefenders[$i] = & $defenders[$i];
 		++$i;
 	}
 	
-for(;$i<=10;++$i)
+for (;$i <= 10; ++$i)
 	$defenders[$i] = null;
-$template->assign('Defenders',$defenders);
+$template->assign('Defenders', $defenders);
 
-$template->assign('Duplicates',$duplicates);
+$template->assign('Duplicates', $duplicates);
 
-$template->assign('CombatSimHREF',SmrSession::getNewHREF(create_container('skeleton.php','combat_simulator.php')));
+$template->assign('CombatSimHREF', SmrSession::getNewHREF(create_container('skeleton.php', 'combat_simulator.php')));
 
-if(is_array($realAttackers) && is_array($realDefenders) && count($realAttackers)>0 && count($realDefenders)>0) {
-	if(isset($_REQUEST['run'])) {
-		runAnAttack($realAttackers,$realDefenders);
+if (is_array($realAttackers) && is_array($realDefenders) && count($realAttackers) > 0 && count($realDefenders) > 0) {
+	if (isset($_REQUEST['run'])) {
+		runAnAttack($realAttackers, $realDefenders);
 	}
-	if(isset($_REQUEST['death_run'])) {
-		while(count($realAttackers)>0 && count($realDefenders)>0) {
-			runAnAttack($realAttackers,$realDefenders);
-			foreach($realAttackers as $key => &$teamPlayer) {
-				if($teamPlayer->isDead())
+	if (isset($_REQUEST['death_run'])) {
+		while (count($realAttackers) > 0 && count($realDefenders) > 0) {
+			runAnAttack($realAttackers, $realDefenders);
+			foreach ($realAttackers as $key => &$teamPlayer) {
+				if ($teamPlayer->isDead())
 					unset($realAttackers[$key]);
 			} unset($teamPlayer);
-			foreach($realDefenders as $key => &$teamPlayer) {
-				if($teamPlayer->isDead())
+			foreach ($realDefenders as $key => &$teamPlayer) {
+				if ($teamPlayer->isDead())
 					unset($realDefenders[$key]);
 			} unset($teamPlayer);
 		}
 	}
 }
 
-function runAnAttack($realAttackers,$realDefenders) {
+function runAnAttack($realAttackers, $realDefenders) {
 	global $template;
 	$results = array('Attackers' => array('Traders' => array(), 'TotalDamage' => 0), 
 					'Defenders' => array('Traders' => array(), 'TotalDamage' => 0));
-	foreach($realAttackers as $accountID => &$teamPlayer) {
-		$playerResults =& $teamPlayer->shootPlayers($realDefenders);
-		$results['Attackers']['Traders'][] =& $playerResults;
+	foreach ($realAttackers as $accountID => &$teamPlayer) {
+		$playerResults = & $teamPlayer->shootPlayers($realDefenders);
+		$results['Attackers']['Traders'][] = & $playerResults;
 		$results['Attackers']['TotalDamage'] += $playerResults['TotalDamage'];
 	} unset($teamPlayer);
-	foreach($realDefenders as $accountID => &$teamPlayer) {
-		$playerResults =& $teamPlayer->shootPlayers($realAttackers);
-		$results['Defenders']['Traders'][]  =& $playerResults;
+	foreach ($realDefenders as $accountID => &$teamPlayer) {
+		$playerResults = & $teamPlayer->shootPlayers($realAttackers);
+		$results['Defenders']['Traders'][] = & $playerResults;
 		$results['Defenders']['TotalDamage'] += $playerResults['TotalDamage'];
 	} unset($teamPlayer);
-	$template->assign('TraderCombatResults',$results);
+	$template->assign('TraderCombatResults', $results);
 }

engine/Default/alliance_message_view.php

Spacing +14 added lines, -14 removed lines

@@ -1,42 +1,42 @@ 
 <?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());
 $thread_index = $var['thread_index'];
 $thread_id = $var['thread_ids'][$thread_index];
 
-if(empty($thread_id)) {
+if (empty($thread_id)) {
 	create_error('Unable to find thread id.');
 }
 
-$template->assign('PageTopic',$var['thread_topics'][$thread_index]);
+$template->assign('PageTopic', $var['thread_topics'][$thread_index]);
 Menu::alliance($alliance->getAllianceID(), $alliance->getLeaderID());
 
 $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->getAllianceID()) . ', ' . $db->escapeNumber($thread_id) . ', ' . $db->escapeNumber(TIME+2) . ')');
+			VALUES(' . $db->escapeNumber($player->getAccountID()) . ', ' . $db->escapeNumber($player->getGameID()) . ', ' . $db->escapeNumber($alliance->getAllianceID()) . ', ' . $db->escapeNumber($thread_id) . ', ' . $db->escapeNumber(TIME + 2) . ')');
 
 $mbWrite = true;
 if ($alliance->getAllianceID() != $player->getAllianceID()) {
 	$db->query('SELECT mb_read FROM alliance_treaties
-					WHERE (alliance_id_1 = ' . $db->escapeNumber($alliance->getAllianceID()) . ' OR alliance_id_1 = ' . $db->escapeNumber($player->getAllianceID()) . ')'.
-					' AND (alliance_id_2 = ' . $db->escapeNumber($alliance->getAllianceID()) . ' OR alliance_id_2 = ' . $db->escapeNumber($player->getAllianceID()) . ')'.
+					WHERE (alliance_id_1 = ' . $db->escapeNumber($alliance->getAllianceID()) . ' OR alliance_id_1 = ' . $db->escapeNumber($player->getAllianceID()) . ')' .
+					' AND (alliance_id_2 = ' . $db->escapeNumber($alliance->getAllianceID()) . ' OR alliance_id_2 = ' . $db->escapeNumber($player->getAllianceID()) . ')' .
 					' AND game_id = ' . $db->escapeNumber($player->getGameID()) .
 					' AND mb_write = 1 AND official = \'TRUE\'');
 	$mbWrite = $db->nextRecord();
 }
 
-$container = create_container('skeleton.php','alliance_message_view.php',$var);
+$container = create_container('skeleton.php', 'alliance_message_view.php', $var);
 
 if (isset($var['thread_ids'][$thread_index - 1])) {
 	$container['thread_index'] = $thread_index - 1;
-	$template->assign('PrevThread',array('Topic' => $var['thread_topics'][$thread_index - 1], 'Href' => SmrSession::getNewHREF($container)));
+	$template->assign('PrevThread', array('Topic' => $var['thread_topics'][$thread_index - 1], 'Href' => SmrSession::getNewHREF($container)));
 }
 if (isset($var['thread_ids'][$thread_index + 1])) {
 	$container['thread_index'] = $thread_index + 1;
-	$template->assign('NextThread',array('Topic' => $var['thread_topics'][$thread_index + 1], 'Href' => SmrSession::getNewHREF($container)));
+	$template->assign('NextThread', array('Topic' => $var['thread_topics'][$thread_index + 1], 'Href' => SmrSession::getNewHREF($container)));
 }
 
 $thread = array();
@@ -68,22 +68,22 @@ 
 
 $thread['CanDelete'] = $db->getNumRows() > 1 && $thread['CanDelete'];
 $thread['Replies'] = array();
-$container = create_container('alliance_message_delete_processing.php','',$var);
+$container = create_container('alliance_message_delete_processing.php', '', $var);
 $container['thread_id'] = $thread_id;
 while ($db->nextRecord()) {
 	$thread['Replies'][$db->getInt('reply_id')] = array('Sender' => $players[$db->getInt('sender_id')], 'Message' => $db->getField('text'), 'SendTime' => $db->getInt('time'));
-	if($thread['CanDelete']) {
+	if ($thread['CanDelete']) {
 		$container['reply_id'] = $db->getInt('reply_id');
 		$thread['Replies'][$db->getInt('reply_id')]['DeleteHref'] = SmrSession::getNewHREF($container);
 	}
 }
 
 if ($mbWrite || in_array($player->getAccountID(), Globals::getHiddenPlayers())) {
-	$container = create_container('alliance_message_add_processing.php','',$var);
+	$container = create_container('alliance_message_add_processing.php', '', $var);
 	$container['thread_index'] = $thread_index;
 	$thread['CreateThreadReplyFormHref'] = SmrSession::getNewHREF($container);
 }
-$template->assign('Thread',$thread);
-if(isset($var['preview'])) {
+$template->assign('Thread', $thread);
+if (isset($var['preview'])) {
 	$template->assign('Preview', $var['preview']);
 }