smrealms / smr

src/templates/Default/engine/Default/combat_log_viewer.php

Indentation +4 added lines, -4 removed lines

@@ -20,11 +20,11 @@
 	$this->includeTemplate('includes/ForceFullCombatResults.inc.php', array('FullForceCombatResults'=>$CombatResults));
 } elseif ($CombatResultsType == 'PORT') {
 	$this->includeTemplate('includes/PortFullCombatResults.inc.php', array('FullPortCombatResults'=>$CombatResults,
-	                                                                  'MinimalDisplay'=>false,
-	                                                                  'AlreadyDestroyed'=>false));
+																	  'MinimalDisplay'=>false,
+																	  'AlreadyDestroyed'=>false));
 } elseif ($CombatResultsType == 'PLANET') {
 	$this->includeTemplate('includes/PlanetFullCombatResults.inc.php', array('FullPlanetCombatResults'=>$CombatResults,
-	                                                                    'MinimalDisplay'=>false,
-	                                                                    'AlreadyDestroyed'=>false));
+																		'MinimalDisplay'=>false,
+																		'AlreadyDestroyed'=>false));
 }
 ?>

src/templates/Default/engine/Default/includes/TraderCombatKillMessage.inc.php

Indentation +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@
 } else {
 	// Killed by port, planet, forces
 	echo 'The <span class="creds"> ' . number_format($KillResults['LostCredits'])
-	     . '</span> credits that were onboard ' . $TargetPlayer->getDisplayName()
-	     . "'s ship are lost in the wreckage.<br />";
+		 . '</span> credits that were onboard ' . $TargetPlayer->getDisplayName()
+		 . "'s ship are lost in the wreckage.<br />";
 }
 ?>

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

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; ?>" />

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

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)) {

src/templates/Default/admin/Default/1.6/GameDetails.inc.php

Braces +4 added lines, -1 removed lines

@@ -44,7 +44,10 @@
 		<td>
 			<select name="game_type"><?php
 			foreach (SmrGame::GAME_TYPES as $GameTypeID => $GameType) {
-				?><option value="<?php echo $GameTypeID; ?>" <?php if ($GameType == $Game['gameType']) echo 'selected'; ?>><?php echo $GameType; ?></option><?php
+				?><option value="<?php echo $GameTypeID; ?>" <?php if ($GameType == $Game['gameType']) {
+					echo 'selected';
+				}
+				?>><?php echo $GameType; ?></option><?php
 			} ?>
 			</select>
 		</td>

src/lib/Default/hof.inc.php

Indentation +3 added lines, -3 removed lines

@@ -55,9 +55,9 @@
 function applyHofVisibilityMask($amount, $vis, $gameID, $accountID) {
 	global $account, $player;
 	if (($vis == HOF_PRIVATE && $account->getAccountID() != $accountID) ||
-	    ($vis == HOF_ALLIANCE && isset($gameID) &&
-	     !SmrGame::getGame($gameID)->hasEnded() &&
-	     !SmrPlayer::getPlayer($accountID, $gameID)->sameAlliance($player)))
+		($vis == HOF_ALLIANCE && isset($gameID) &&
+		 !SmrGame::getGame($gameID)->hasEnded() &&
+		 !SmrPlayer::getPlayer($accountID, $gameID)->sameAlliance($player)))
 	{
 		return '-';
 	} else {

src/lib/Default/smr.inc.php

Braces +3 added lines, -2 removed lines

@@ -469,8 +469,9 @@
 
 		if (!$player->isDead() && $player->getNewbieTurns() <= NEWBIE_TURNS_WARNING_LIMIT &&
 			$player->getNewbieWarning() &&
-			$var['url'] != 'newbie_warning_processing.php')
-			forward(create_container('newbie_warning_processing.php'));
+			$var['url'] != 'newbie_warning_processing.php') {
+					forward(create_container('newbie_warning_processing.php'));
+		}
 	}
 
 	// Initialize the template

src/lib/Default/help.inc.php

Spacing +25 added lines, -25 removed lines

@@ -7,7 +7,7 @@ 
 	$db3 = MySqlDatabase::getInstance();
 
 	// get current entry
-	$db->query('SELECT * FROM manual WHERE topic_id = '.$db->escapeNumber($topic_id));
+	$db->query('SELECT * FROM manual WHERE topic_id = ' . $db->escapeNumber($topic_id));
 	if ($db->nextRecord()) {
 		$parent_topic_id = $db->getInt('parent_topic_id');
 		$order_id = $db->getInt('order_id');
@@ -19,17 +19,17 @@ 
 		// **************************
 		// **  PREVIOUS
 		// **************************
-		$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id - 1));
+		$db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($order_id - 1));
 
 		// no result?
 		if (!$db2->getNumRows())
-			$db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
+			$db2->query('SELECT * FROM manual WHERE topic_id = ' . $db2->escapeNumber($parent_topic_id));
 
 		echo ('<th width="32">');
 		if ($db2->nextRecord()) {
 			$previous_topic_id = $db2->getInt('topic_id');
 			$previous_topic = stripslashes($db2->getField('topic'));
-			echo ('<a href="/manual.php?'.$previous_topic_id.'"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>');
+			echo ('<a href="/manual.php?' . $previous_topic_id . '"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>');
 		} else
 			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
 		echo ('</th>');
@@ -37,12 +37,12 @@ 
 		// **************************
 		// **  UP
 		// **************************
-		$db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
+		$db2->query('SELECT * FROM manual WHERE topic_id = ' . $db2->escapeNumber($parent_topic_id));
 		echo ('<th width="32">');
 		if ($db2->nextRecord()) {
 			$up_topic_id = $db2->getInt('topic_id');
 			$up_topic = stripslashes($db2->getField('topic'));
-			echo ('<a href="/manual.php?'.$up_topic_id.'"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>');
+			echo ('<a href="/manual.php?' . $up_topic_id . '"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>');
 		} else
 			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
 		echo ('</th>');
@@ -50,35 +50,35 @@ 
 		// **************************
 		// **  NEXT
 		// **************************
-		$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($topic_id).' AND order_id = 1');
+		$db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($topic_id) . ' AND order_id = 1');
 
 		if (!$db2->getNumRows())
-			$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id + 1));
+			$db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($order_id + 1));
 
 		$seenParentIDs = array(0);
 		$curr_parent_topic_id = $parent_topic_id;
 		while (!$db2->getNumRows() && !in_array($curr_parent_topic_id, $seenParentIDs)) {
 			$seenParentIDs[] = $curr_parent_topic_id;
-			$db3->query('SELECT * FROM manual WHERE topic_id = '.$db3->escapeNumber($parent_topic_id));
+			$db3->query('SELECT * FROM manual WHERE topic_id = ' . $db3->escapeNumber($parent_topic_id));
 			$db3->nextRecord();
 			$curr_order_id = $db3->getInt('order_id');
 			$curr_parent_topic_id = $db3->getInt('parent_topic_id');
 
-			$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($curr_order_id + 1));
+			$db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($curr_order_id + 1));
 		}
 
 		echo ('<th width="32">');
 		if ($db2->nextRecord()) {
 			$next_topic_id = $db2->getInt('topic_id');
 			$next_topic = stripslashes($db2->getField('topic'));
-			echo ('<a href="/manual.php?'.$next_topic_id.'"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>');
+			echo ('<a href="/manual.php?' . $next_topic_id . '"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>');
 		}
 		else {
 			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
 		}
 		echo ('</th>');
 
-		echo ('<th width="100%" class="center" validn="middle" style="font-size:18pt;font-weight:bold;">' . get_numbering($topic_id) . $topic.'</th>');
+		echo ('<th width="100%" class="center" validn="middle" style="font-size:18pt;font-weight:bold;">' . get_numbering($topic_id) . $topic . '</th>');
 		echo ('<th width="32"><a href="/manual_toc.php"><img src="/images/help/contents.jpg" width="32" height="32" border="0"></a></th>');
 
 		echo ('</tr>');
@@ -86,11 +86,11 @@ 
 		echo ('<tr>');
 		echo ('<td colspan="5">');
 		if (isset($previous_topic_id) && $previous_topic_id > 0)
-			echo ('<b>Previous:</b> <a href="/manual.php?'.$previous_topic_id.'">' . get_numbering($previous_topic_id) . $previous_topic.'</a>&nbsp;&nbsp;&nbsp;');
+			echo ('<b>Previous:</b> <a href="/manual.php?' . $previous_topic_id . '">' . get_numbering($previous_topic_id) . $previous_topic . '</a>&nbsp;&nbsp;&nbsp;');
 		if (isset($up_topic_id) && $up_topic_id > 0)
-			echo ('<b>Up:</b> <a href="/manual.php?'.$up_topic_id.'">' . get_numbering($up_topic_id) . $up_topic.'</a>&nbsp;&nbsp;&nbsp;');
+			echo ('<b>Up:</b> <a href="/manual.php?' . $up_topic_id . '">' . get_numbering($up_topic_id) . $up_topic . '</a>&nbsp;&nbsp;&nbsp;');
 		if (isset($next_topic_id) && $next_topic_id > 0)
-			echo ('<b>Next:</b> <a href="/manual.php?'.$next_topic_id.'">' . get_numbering($next_topic_id) . $next_topic.'</a>');
+			echo ('<b>Next:</b> <a href="/manual.php?' . $next_topic_id . '">' . get_numbering($next_topic_id) . $next_topic . '</a>');
 		echo ('</tr>');
 
 		echo ('</table>');
@@ -103,7 +103,7 @@ 
 	$db = MySqlDatabase::getInstance();
 
 	// get current entry
-	$db->query('SELECT * FROM manual WHERE topic_id = '.$topic_id);
+	$db->query('SELECT * FROM manual WHERE topic_id = ' . $topic_id);
 	if ($db->nextRecord()) {
 		$parent_topic_id = $db->getInt('parent_topic_id');
 		$order_id = $db->getInt('order_id');
@@ -111,8 +111,8 @@ 
 		$text = stripslashes($db->getField('text'));
 
 		echo ('<div id="help_content">');
-		echo ('<h1>' . get_numbering($topic_id) . $topic.'</h1>');
-		echo ('<p>'.$text.'<p>');
+		echo ('<h1>' . get_numbering($topic_id) . $topic . '</h1>');
+		echo ('<p>' . $text . '<p>');
 		echo ('</div>');
 	} else
 		echo ('Invalid Topic!');
@@ -121,9 +121,9 @@ 
 function echo_subsection($topic_id) {
 	// database object
 	$db = MySqlDatabase::getInstance();
-	$return='';
+	$return = '';
 	// check if there are subsections
-	$db->query('SELECT * FROM manual WHERE parent_topic_id = '.$db->escapeNumber($topic_id).' ORDER BY order_id');
+	$db->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db->escapeNumber($topic_id) . ' ORDER BY order_id');
 	if ($db->getNumRows()) {
 		echo ('<hr noshade width="75%" size="1" class="center"/>');
 		echo ('<div id="help_menu">');
@@ -137,19 +137,19 @@ 
 }
 
 function echo_menu($topic_id) {
-	$return='';
+	$return = '';
 	// database object
 	$db = MySqlDatabase::getInstance();
 
-	$db->query('SELECT * FROM manual WHERE parent_topic_id = '.$db->escapeNumber($topic_id).' ORDER BY order_id');
+	$db->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db->escapeNumber($topic_id) . ' ORDER BY order_id');
 	if ($db->getNumRows()) {
 		echo ('<ul type="disc">');
-		while($db->nextRecord()) {
+		while ($db->nextRecord()) {
 			$sub_topic_id = $db->getInt('topic_id');
 			$order_id = $db->getInt('order_id');
 			$sub_topic = stripslashes($db->getField('topic'));
 
-			echo ('<li><a href="/manual.php?'.$sub_topic_id.'">' . get_numbering($sub_topic_id) . $sub_topic.'</a></li>');
+			echo ('<li><a href="/manual.php?' . $sub_topic_id . '">' . get_numbering($sub_topic_id) . $sub_topic . '</a></li>');
 			echo_menu($sub_topic_id);
 		}
 		echo ('</ul>');
@@ -160,7 +160,7 @@ 
 function get_numbering($topic_id) {
 	$db = MySqlDatabase::getInstance();
 
-	$db->query('SELECT * FROM manual WHERE topic_id = '.$db->escapeNumber($topic_id));
+	$db->query('SELECT * FROM manual WHERE topic_id = ' . $db->escapeNumber($topic_id));
 	if ($db->nextRecord()) {
 		$up_topic_id = $db->getInt('parent_topic_id');
 		$order_id = $db->getInt('order_id');

Braces +30 added lines, -22 removed lines

@@ -22,16 +22,18 @@ 
 		$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id - 1));
 
 		// no result?
-		if (!$db2->getNumRows())
-			$db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
+		if (!$db2->getNumRows()) {
+					$db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
+		}
 
 		echo ('<th width="32">');
 		if ($db2->nextRecord()) {
 			$previous_topic_id = $db2->getInt('topic_id');
 			$previous_topic = stripslashes($db2->getField('topic'));
 			echo ('<a href="/manual.php?'.$previous_topic_id.'"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>');
-		} else
-			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
+		} else {
+					echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
+		}
 		echo ('</th>');
 
 		// **************************
@@ -43,8 +45,9 @@ 
 			$up_topic_id = $db2->getInt('topic_id');
 			$up_topic = stripslashes($db2->getField('topic'));
 			echo ('<a href="/manual.php?'.$up_topic_id.'"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>');
-		} else
-			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
+		} else {
+					echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
+		}
 		echo ('</th>');
 
 		// **************************
@@ -52,8 +55,9 @@ 
 		// **************************
 		$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($topic_id).' AND order_id = 1');
 
-		if (!$db2->getNumRows())
-			$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id + 1));
+		if (!$db2->getNumRows()) {
+					$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id + 1));
+		}
 
 		$seenParentIDs = array(0);
 		$curr_parent_topic_id = $parent_topic_id;
@@ -72,8 +76,7 @@ 
 			$next_topic_id = $db2->getInt('topic_id');
 			$next_topic = stripslashes($db2->getField('topic'));
 			echo ('<a href="/manual.php?'.$next_topic_id.'"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>');
-		}
-		else {
+		} else {
 			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
 		}
 		echo ('</th>');
@@ -85,18 +88,22 @@ 
 
 		echo ('<tr>');
 		echo ('<td colspan="5">');
-		if (isset($previous_topic_id) && $previous_topic_id > 0)
-			echo ('<b>Previous:</b> <a href="/manual.php?'.$previous_topic_id.'">' . get_numbering($previous_topic_id) . $previous_topic.'</a>&nbsp;&nbsp;&nbsp;');
-		if (isset($up_topic_id) && $up_topic_id > 0)
-			echo ('<b>Up:</b> <a href="/manual.php?'.$up_topic_id.'">' . get_numbering($up_topic_id) . $up_topic.'</a>&nbsp;&nbsp;&nbsp;');
-		if (isset($next_topic_id) && $next_topic_id > 0)
-			echo ('<b>Next:</b> <a href="/manual.php?'.$next_topic_id.'">' . get_numbering($next_topic_id) . $next_topic.'</a>');
+		if (isset($previous_topic_id) && $previous_topic_id > 0) {
+					echo ('<b>Previous:</b> <a href="/manual.php?'.$previous_topic_id.'">' . get_numbering($previous_topic_id) . $previous_topic.'</a>&nbsp;&nbsp;&nbsp;');
+		}
+		if (isset($up_topic_id) && $up_topic_id > 0) {
+					echo ('<b>Up:</b> <a href="/manual.php?'.$up_topic_id.'">' . get_numbering($up_topic_id) . $up_topic.'</a>&nbsp;&nbsp;&nbsp;');
+		}
+		if (isset($next_topic_id) && $next_topic_id > 0) {
+					echo ('<b>Next:</b> <a href="/manual.php?'.$next_topic_id.'">' . get_numbering($next_topic_id) . $next_topic.'</a>');
+		}
 		echo ('</tr>');
 
 		echo ('</table>');
-	} else
-		echo ('Invalid Topic!');
-}
+	} else {
+			echo ('Invalid Topic!');
+	}
+	}
 
 function echo_content($topic_id) {
 	// database object
@@ -114,9 +121,10 @@ 
 		echo ('<h1>' . get_numbering($topic_id) . $topic.'</h1>');
 		echo ('<p>'.$text.'<p>');
 		echo ('</div>');
-	} else
-		echo ('Invalid Topic!');
-}
+	} else {
+			echo ('Invalid Topic!');
+	}
+	}
 
 function echo_subsection($topic_id) {
 	// database object

src/tools/npc/chess.php

Spacing +3 added lines, -3 removed lines

@@ -19,8 +19,8 @@ 
 		1 => array("pipe", "w")  // stdout is a pipe that the child will write to
 	);
 	$engine = proc_open(UCI_CHESS_ENGINE, $descriptorSpec, $pipes);
-	$toEngine =& $pipes[0];
-	$fromEngine =& $pipes[1];
+	$toEngine = & $pipes[0];
+	$fromEngine = & $pipes[1];
 
 	function readFromEngine($block = true) {
 		global $fromEngine;
@@ -84,5 +84,5 @@ 
 function debug($message, $debugObject = null) {
 	global $account, $var, $db;
 	echo date('Y-m-d H:i:s - ') . $message . ($debugObject !== null ? EOL . var_export($debugObject, true) : '') . EOL;
-	$db->query('INSERT INTO npc_logs (script_id, npc_id, time, message, debug_info, var) VALUES (' . (defined('SCRIPT_ID') ? SCRIPT_ID : 0) . ', ' . (is_object($account) ? $account->getAccountID() : 0) . ',NOW(),' . $db->escapeString($message) . ',' . $db->escapeString(var_export($debugObject,true)) . ',' . $db->escapeString(var_export($var, true)) . ')');
+	$db->query('INSERT INTO npc_logs (script_id, npc_id, time, message, debug_info, var) VALUES (' . (defined('SCRIPT_ID') ? SCRIPT_ID : 0) . ', ' . (is_object($account) ? $account->getAccountID() : 0) . ',NOW(),' . $db->escapeString($message) . ',' . $db->escapeString(var_export($debugObject, true)) . ',' . $db->escapeString(var_export($var, true)) . ')');
 }