smrealms / smr

engine/Default/trader_attack_processing.php

Spacing +2 added lines, -2 removed lines

@@ -41,8 +41,8 @@
 
 function teamAttack(&$results, $fightingPlayers, $attack, $defend) {
 	foreach ($fightingPlayers[$attack] as $accountID => $teamPlayer) {
-		$playerResults =& $teamPlayer->shootPlayers($fightingPlayers[$defend]);
-		$results[$attack]['Traders'][$teamPlayer->getAccountID()] =& $playerResults;
+		$playerResults = & $teamPlayer->shootPlayers($fightingPlayers[$defend]);
+		$results[$attack]['Traders'][$teamPlayer->getAccountID()] = & $playerResults;
 		$results[$attack]['TotalDamage'] += $playerResults['TotalDamage'];
 
 		// Award assists (if there are multiple attackers)

engine/Default/forces_attack_processing.php

Spacing +4 added lines, -4 removed lines

@@ -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();
 }
 

lib/Default/bar.functions.inc

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		// Delete all tickets and re-insert the winning ticket
 		$db->query('DELETE FROM player_has_ticket WHERE game_id = ' . $db->escapeNumber($gameID));
 		$db->query('INSERT INTO player_has_ticket (game_id, account_id, time, prize) '
-		           .'VALUES (' . $db->escapeNumber($gameID) . ',' . $db->escapeNumber($winner_id) . ',\'0\',' . $db->escapeNumber($lottoInfo['Prize']) . ')');
+				   .'VALUES (' . $db->escapeNumber($gameID) . ',' . $db->escapeNumber($winner_id) . ',\'0\',' . $db->escapeNumber($lottoInfo['Prize']) . ')');
 
 		//get around locked table problem
 		$lottoWon = true;

admin/Default/newsletter_send_processing.php

Indentation +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
 // Set the body of the e-mail
 set_mail_body($mail, $var['newsletter_html'], $var['newsletter_text'],
-              $_REQUEST['salutation']);
+			  $_REQUEST['salutation']);
 
 if ($_REQUEST['to_email'] == '*') {
 	// Send the newsletter to all players.

templates/Default/engine/Default/includes/Head.inc

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-<title><?php echo PAGE_TITLE; ?><?php if (isset($GameName)) echo ": $GameName"; ?></title>
+<title><?php echo PAGE_TITLE; ?><?php if (isset($GameName)) {
+	echo ": $GameName";
+}
+?></title>
 <meta http-equiv="pragma" content="no-cache" /><?php
 if (!is_object($ThisAccount) || $ThisAccount->isDefaultCSSEnabled()) { ?>
 	<link rel="stylesheet" type="text/css" href="<?php echo $CSSLink; ?>" />

engine/Default/shop_goods.php

Indentation +3 added lines, -3 removed lines

@@ -50,9 +50,9 @@
 			//get base for ports that dont happen to trade that good
 			$GOODS = Globals::getGoods();
 			$fine = $totalFine = $port->getLevel() *
-			    (($ship->getCargo(GOODS_SLAVES) * $GOODS[GOODS_SLAVES]['BasePrice']) +
-			     ($ship->getCargo(GOODS_WEAPONS) * $GOODS[GOODS_WEAPONS]['BasePrice']) +
-			     ($ship->getCargo(GOODS_NARCOTICS) * $GOODS[GOODS_NARCOTICS]['BasePrice']));
+				(($ship->getCargo(GOODS_SLAVES) * $GOODS[GOODS_SLAVES]['BasePrice']) +
+				 ($ship->getCargo(GOODS_WEAPONS) * $GOODS[GOODS_WEAPONS]['BasePrice']) +
+				 ($ship->getCargo(GOODS_NARCOTICS) * $GOODS[GOODS_NARCOTICS]['BasePrice']));
 			$player->increaseHOF($ship->getCargo(GOODS_SLAVES) + $ship->getCargo(GOODS_WEAPONS) + $ship->getCargo(GOODS_NARCOTICS), array('Trade', 'Search', 'Caught', 'Goods Confiscated'), HOF_PUBLIC);
 			$player->increaseHOF($totalFine, array('Trade', 'Search', 'Caught', 'Amount Fined'), HOF_PUBLIC);
 			$template->assign('TotalFine', $totalFine);

templates/Default/engine/Default/preferences.php

Indentation +2 added lines, -2 removed lines

@@ -316,8 +316,8 @@
 					foreach (Globals::getAvailableTemplates() as $AvailableTemplate => $ColourSchemes) {
 						foreach ($ColourSchemes as $ColourScheme) {
 							$selected = ($ThisAccount->getTemplate() == $AvailableTemplate &&
-							             $ThisAccount->getColourScheme() == $ColourScheme &&
-							             $ThisAccount->isDefaultCSSEnabled()) ? 'selected' : '';
+										 $ThisAccount->getColourScheme() == $ColourScheme &&
+										 $ThisAccount->isDefaultCSSEnabled()) ? 'selected' : '';
 							$name = $AvailableTemplate . ' - ' . $ColourScheme;
 							?><option value="<?php echo $name; ?>" <?php echo $selected; ?>><?php echo $name; ?></option><?php
 						}

templates/Default/engine/Default/includes/SectorMap.inc

Indentation +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
 						if (!$UniGen) {
 							$CanScanSector = ($ThisShip->hasScanner() && $isLinkedSector) || $isCurrentSector;
 							$ShowFriendlyForces = isset($HideAlliedForces) && $HideAlliedForces ?
-							                      $Sector->hasPlayerForces($MapPlayer) : $Sector->hasFriendlyForces($MapPlayer);
+												  $Sector->hasPlayerForces($MapPlayer) : $Sector->hasFriendlyForces($MapPlayer);
 							if (($CanScanSector && ($Sector->hasForces() || $Sector->hasPlayers())) || $ShowFriendlyForces || $Sector->hasFriendlyTraders($MapPlayer)) { ?>
 								<div class="lmtf"><?php
 									if ($CanScanSector && $Sector->hasEnemyTraders($MapPlayer)) {

templates/Default/engine/Default/map_local.php

Braces +4 added lines, -1 removed lines

@@ -10,7 +10,10 @@
 		<td style="width: 80%" class="center">
 			Local Map of the Known <span class="big bold"><?php echo $GalaxyName ?></span> Galaxy
 			<br /><br />
-			<?php if (isset($Error)) echo $Error; ?>
+			<?php if (isset($Error)) {
+	echo $Error;
+}
+?>
 		</td>
 		<td style="width: 10%"></td>
 	</tr>