smrealms / smr

engine/Default/hall_of_fame_player_detail.php

Spacing +2 added lines, -2 removed lines

@@ -20,13 +20,13 @@
 const USER_SCORE_NAME = 'User Score';
 $hofTypes = array(DONATION_NAME=>true, USER_SCORE_NAME=>true);
 while ($db->nextRecord()) {
-	$hof =& $hofTypes;
+	$hof = & $hofTypes;
 	$typeList = explode(':', $db->getField('type'));
 	foreach ($typeList as $type) {
 		if (!isset($hof[$type])) {
 			$hof[$type] = array();
 		}
-		$hof =& $hof[$type];
+		$hof = & $hof[$type];
 	}
 	$hof = true;
 }

lib/Default/smr.inc

Braces +80 added lines, -58 removed lines

@@ -8,8 +8,9 @@ 
 
 function parseBoolean($check) {
 	// Only negative strings are not implicitly converted to the correct bool
-	if (is_string($check) && (strcasecmp($check, 'NO') == 0 || strcasecmp($check, 'FALSE') == 0))
-		return false;
+	if (is_string($check) && (strcasecmp($check, 'NO') == 0 || strcasecmp($check, 'FALSE') == 0)) {
+			return false;
+	}
 	return (bool)$check;
 }
 
@@ -32,8 +33,9 @@ 
 			break;
 			case 'player':
 				$playerID = $default;
-				if (!is_numeric($playerID))
-					$playerID = $tagParams['id'];
+				if (!is_numeric($playerID)) {
+									$playerID = $tagParams['id'];
+				}
 				$bbPlayer = SmrPlayer::getPlayerByPlayerID($playerID, $overrideGameID);
 				if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 					return true;
@@ -46,8 +48,9 @@ 
 			break;
 			case 'alliance':
 				$allianceID = $default;
-				if (!is_numeric($allianceID))
-					$allianceID = $tagParams['id'];
+				if (!is_numeric($allianceID)) {
+									$allianceID = $tagParams['id'];
+				}
 				$alliance = SmrAlliance::getAlliance($allianceID, $overrideGameID);
 				if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 					return true;
@@ -56,10 +59,11 @@ 
 				if ($disableBBLinks === false && $overrideGameID == SmrSession::getGameID()) {
 					$container = create_container('skeleton.php');
 					$container['alliance_id'] = $alliance->getAllianceID();
-					if (is_object($player) && $alliance->getAllianceID() == $player->getAllianceID())
-						$container['body'] = 'alliance_mod.php';
-					else
-						$container['body'] = 'alliance_roster.php';
+					if (is_object($player) && $alliance->getAllianceID() == $player->getAllianceID()) {
+											$container['body'] = 'alliance_mod.php';
+					} else {
+											$container['body'] = 'alliance_roster.php';
+					}
 					return create_link($container, $alliance->getAllianceName());
 				}
 				return $alliance->getAllianceName();
@@ -83,8 +87,9 @@ 
 					return true;
 				}
 				if ($timeString != '' && ($time = strtotime($timeString)) !== false) {
-					if (is_object($account))
-						$time += $account->getOffset() * 3600;
+					if (is_object($account)) {
+											$time += $account->getOffset() * 3600;
+					}
 					return date(DATE_FULL_SHORT, $time);
 				}
 			break;
@@ -127,8 +132,7 @@ 
 				return '<div class="buttonA"><a class="buttonA" href="' . SmrSession::getNewHREF($container) . '">Join ' . $alliance->getAllianceName() . '</a></div>';
 			break;
 		}
-	}
-	catch (Exception $e) {
+	} catch (Exception $e) {
 	}
 	if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 		return false;
@@ -173,15 +177,15 @@ 
 		$bbParser->addRule('join_alliance', $smrRule);
 	}
 	global $disableBBLinks;
-	if ($noLinks === true)
-		$disableBBLinks = true;
-	else
-		$disableBBLinks = false;
+	if ($noLinks === true) {
+			$disableBBLinks = true;
+	} else {
+			$disableBBLinks = false;
+	}
 	if (strpos($message, '[') !== false) { //We have BBCode so let's do a full parse.
 		$message = $bbParser->parse($message);
 		$message = str_replace('&lt;br /&gt;', '<br />', $message);
-	}
-	else { //Otherwise just convert newlines
+	} else { //Otherwise just convert newlines
 		$message = nl2br($message, true);
 	}
 	return $message;
@@ -221,8 +225,7 @@ 
 
 	if (!is_array($actions)) {
 		$form['submit'] = '<input class="submit" type="submit" name="action" value="' . htmlspecialchars($actions) . '">';
-	}
-	else {
+	} else {
 		$form['submit'] = array();
 		foreach ($actions as $action) {
 			$form['submit'][$action[0]] = '<input class="submit" type="submit" name="action" value="' . htmlspecialchars($action[1]) . '">';
@@ -267,8 +270,9 @@ 
 }
 
 function forward($new_container) {
-	if (defined('OVERRIDE_FORWARD') && OVERRIDE_FORWARD === true)
-		return overrideForward($new_container);
+	if (defined('OVERRIDE_FORWARD') && OVERRIDE_FORWARD === true) {
+			return overrideForward($new_container);
+	}
 	resetContainer($new_container);
 	do_voodoo();
 }
@@ -284,8 +288,9 @@ 
 	global $var, $container;
 
 	// transfer this value to next container
-	if (isset($var[$what]))
-		$container[$what] = $var[$what];
+	if (isset($var[$what])) {
+			$container[$what] = $var[$what];
+	}
 
 }
 
@@ -313,8 +318,7 @@ 
 	}
 	if ($maxValue - $minValue == 0) {
 		return $text;
-	}
-	else {
+	} else {
 		$normalisedValue = round(510 * max(0, min($maxValue, $value) - $minValue) / ($maxValue - $minValue)) - 255;
 	}
 	if ($type == 'Game') {
@@ -324,28 +328,33 @@ 
 			if (strlen($g_component) == 1) {
 				$g_component = '0' . $g_component;
 			}
-		}
-		else if ($normalisedValue > 0) {
+		} else if ($normalisedValue > 0) {
 			$g_component = 'ff';
 			$r_component = dechex(255 - $normalisedValue);
 			if (strlen($r_component) == 1) {
 				$r_component = '0' . $r_component;
 			}
-		}
-		else {
+		} else {
 			$r_component = 'ff';
 			$g_component = 'ff';
 		}
 		$colour = $r_component . $g_component . '00';
-		if ($return_type == 'Colour') return $colour;
+		if ($return_type == 'Colour') {
+			return $colour;
+		}
 		return '<span style="color:#' . $colour . '">' . $text . '</span>';
-	}
-	elseif ($type == 'IRC') {
+	} elseif ($type == 'IRC') {
 		//IRC color codes
-		if ($normalisedValue == 255) $colour = '[k03]';
-		elseif ($normalisedValue == -255) $colour = '[k04]';
-		else $colour = '[k08]';
-		if ($return_type == 'Colour') return $colour;
+		if ($normalisedValue == 255) {
+			$colour = '[k03]';
+		} elseif ($normalisedValue == -255) {
+			$colour = '[k04]';
+		} else {
+			$colour = '[k08]';
+		}
+		if ($return_type == 'Colour') {
+			return $colour;
+		}
 		return $colour . $text;
 	}
 }
@@ -416,10 +425,18 @@ 
 	// create account object
 	$account = SmrSession::getAccount();
 
-	if (!defined('DATE_DATE_SHORT')) define('DATE_DATE_SHORT', $account->getShortDateFormat());
-	if (!defined('DATE_TIME_SHORT')) define('DATE_TIME_SHORT', $account->getShortTimeFormat());
-	if (!defined('DATE_FULL_SHORT')) define('DATE_FULL_SHORT', DATE_DATE_SHORT . ' ' . DATE_TIME_SHORT);
-	if (!defined('DATE_FULL_SHORT_SPLIT')) define('DATE_FULL_SHORT_SPLIT', DATE_DATE_SHORT . '\<b\r /\>' . DATE_TIME_SHORT);
+	if (!defined('DATE_DATE_SHORT')) {
+		define('DATE_DATE_SHORT', $account->getShortDateFormat());
+	}
+	if (!defined('DATE_TIME_SHORT')) {
+		define('DATE_TIME_SHORT', $account->getShortTimeFormat());
+	}
+	if (!defined('DATE_FULL_SHORT')) {
+		define('DATE_FULL_SHORT', DATE_DATE_SHORT . ' ' . DATE_TIME_SHORT);
+	}
+	if (!defined('DATE_FULL_SHORT_SPLIT')) {
+		define('DATE_FULL_SHORT_SPLIT', DATE_DATE_SHORT . '\<b\r /\>' . DATE_TIME_SHORT);
+	}
 
 	if ($var['url'] == 'game_play_preprocessing.php') { // Would rather not have these here but if we go through the initialisation based on game id when leaving a classic game it breaks.
 		SmrSession::clearLinks();
@@ -478,8 +495,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
@@ -557,8 +575,9 @@ 
 function acquire_lock($sector) {
 	global $db, $lock, $locksFailed;
 
-	if ($lock)
-		return true;
+	if ($lock) {
+			return true;
+	}
 
 	// Insert ourselves into the queue.
 	$db->query('INSERT INTO locks_queue (game_id,account_id,sector_id,timestamp) VALUES(' . $db->escapeNumber(SmrSession::getGameID()) . ',' . $db->escapeNumber(SmrSession::getAccountID()) . ',' . $db->escapeNumber($sector) . ',' . $db->escapeNumber(TIME) . ')');
@@ -584,8 +603,7 @@ 
 
 			usleep(25000 * $locksInQueue);
 			continue;
-		}
-		else {
+		} else {
 			return true;
 		}
 	}
@@ -782,7 +800,9 @@ 
 		$container['player_id'] = $player->getPlayerID();
 		$template->assign('PlayerNameLink', SmrSession::getNewHREF($container));
 
-		if (is_array(Globals::getHiddenPlayers()) && in_array($player->getAccountID(), Globals::getHiddenPlayers())) $template->assign('PlayerInvisible', true);
+		if (is_array(Globals::getHiddenPlayers()) && in_array($player->getAccountID(), Globals::getHiddenPlayers())) {
+			$template->assign('PlayerInvisible', true);
+		}
 
 		// ******* Hardware *******
 		$container = create_container('skeleton.php', 'configure_hardware.php');
@@ -921,16 +941,18 @@ 
 
 function number_colour_format($number, $justSign = false) {
 	$formatted = '<span';
-	if ($number > 0)
-		$formatted .= ' class="green">+';
-	else if ($number < 0)
-		$formatted .= ' class="red">-';
-	else
-		$formatted .= '>';
+	if ($number > 0) {
+			$formatted .= ' class="green">+';
+	} else if ($number < 0) {
+			$formatted .= ' class="red">-';
+	} else {
+			$formatted .= '>';
+	}
 	if ($justSign === false) {
 		$decimalPlaces = 0;
-		if (($pos = strpos($number, '.')) !== false)
-			$decimalPlaces = strlen(substr($number, $pos + 1));
+		if (($pos = strpos($number, '.')) !== false) {
+					$decimalPlaces = strlen(substr($number, $pos + 1));
+		}
 		$formatted .= number_format(abs($number), $decimalPlaces);
 	}
 	$formatted .= '</span>';

templates/Default/admin/Default/location_edit.php

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
 	</tr><?php
 if (isset($Locations)) {
 	$this->includeTemplate('includes/ViewLocations.inc', array('Locations'=>$Locations));
-}
-else { ?>
+} else { ?>
 	<tr>
 		<td><input name="name" type="text" value="<?php echo htmlspecialchars($Location->getName()); ?>" /></td>
 		<td><input name="action" type="text" value="<?php echo htmlspecialchars($Location->getAction()); ?>" /></td>

templates/Default/engine/Default/includes/PlanetFullCombatResults.inc

Braces +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
 		<h1>Attacker Results</h1><br /><?php
 	}
 	$this->includeTemplate('includes/PlanetTraderTeamCombatResults.inc', array('TraderTeamCombatResults'=>$FullPlanetCombatResults['Attackers'], 'MinimalDisplay'=>$MinimalDisplay));
-}
-else if (!$MinimalDisplay) {
+} else if (!$MinimalDisplay) {
 	?><span class="bold">The planet is already destroyed.</span><?php
 }
 ?><br /><?php

templates/Default/engine/Default/includes/ForceTraderTeamCombatResults.inc

Spacing +52 added lines, -52 removed lines

@@ -1,119 +1,119 @@
 <?php
 
-if(is_array($TraderTeamCombatResults['Traders'])) {
-	foreach($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
-		$ShootingPlayer =& $TraderResults['Player'];
-		$TotalDamage =& $TraderResults['TotalDamage'];
-		if($TraderResults['DeadBeforeShot']) {
+if (is_array($TraderTeamCombatResults['Traders'])) {
+	foreach ($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
+		$ShootingPlayer = & $TraderResults['Player'];
+		$TotalDamage = & $TraderResults['TotalDamage'];
+		if ($TraderResults['DeadBeforeShot']) {
 			echo $ShootingPlayer->getDisplayName() ?> died before they were able to attack!<br /><?php
 		} else {
-			if(isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
-				foreach($TraderResults['Weapons'] as $WeaponResults) {
-					$ShootingWeapon =& $WeaponResults['Weapon'];
-					$ShotHit =& $WeaponResults['Hit'];
-					$ActualDamage =& $WeaponResults['ActualDamage'];
-					$WeaponDamage =& $WeaponResults['WeaponDamage'];
-					$TargetPlayer =& $WeaponResults['TargetPlayer'];
+			if (isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
+				foreach ($TraderResults['Weapons'] as $WeaponResults) {
+					$ShootingWeapon = & $WeaponResults['Weapon'];
+					$ShotHit = & $WeaponResults['Hit'];
+					$ActualDamage = & $WeaponResults['ActualDamage'];
+					$WeaponDamage = & $WeaponResults['WeaponDamage'];
+					$TargetPlayer = & $WeaponResults['TargetPlayer'];
 					$DamageTypes = 0;
-					if($ActualDamage['NumMines'] > 0){ $DamageTypes = $DamageTypes+1; }
-					if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-					if($ActualDamage['NumSDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-					echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at<?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once<?php } ?> the forces<?php
-					if(!$ActualDamage['TargetAlreadyDead']) {
-						if(!$ShotHit) {
+					if ($ActualDamage['NumMines'] > 0) { $DamageTypes = $DamageTypes + 1; }
+					if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+					if ($ActualDamage['NumSDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+					echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at<?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once<?php } ?> the forces<?php
+					if (!$ActualDamage['TargetAlreadyDead']) {
+						if (!$ShotHit) {
 							?> and misses<?php
-						} else if($ActualDamage['TotalDamage'] == 0) {
-							if($WeaponDamage['Shield'] > 0) {
-								?> which proves ineffective against the <?php if($ActualDamage['HasMines']){ ?>mines<?php } else if($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php }
-							} else if($WeaponDamage['Armour'] > 0) {
-								?> which is deflected by the <?php if($ActualDamage['HasMines']){ ?>mines<?php } else if($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php } ?> shields<?php
+						} else if ($ActualDamage['TotalDamage'] == 0) {
+							if ($WeaponDamage['Shield'] > 0) {
+								?> which proves ineffective against the <?php if ($ActualDamage['HasMines']) { ?>mines<?php } else if ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php }
+							} else if ($WeaponDamage['Armour'] > 0) {
+								?> which is deflected by the <?php if ($ActualDamage['HasMines']) { ?>mines<?php } else if ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php } ?> shields<?php
 							} else {
 								?> but it cannot do any damage<?php
 							}
 						} else {
 							?> destroying <?php
-							if($ActualDamage['NumMines'] > 0) {
+							if ($ActualDamage['NumMines'] > 0) {
 								?><span class="red"><?php echo number_format($ActualDamage['NumMines']) ?></span> mines<?php
 								$this->doDamageTypeReductionDisplay($DamageTypes);
 							}
-							if($ActualDamage['NumCDs'] > 0) {
+							if ($ActualDamage['NumCDs'] > 0) {
 								?><span class="red"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
 								$this->doDamageTypeReductionDisplay($DamageTypes);
 							}
-							if($ActualDamage['NumSDs'] > 0) {
+							if ($ActualDamage['NumSDs'] > 0) {
 								?><span class="red"><?php echo number_format($ActualDamage['NumSDs']) ?></span> scout drones<?php
 							}
 						}
 					} ?>.
 					<br />
-					<?php if($ActualDamage['KillingShot']) {
+					<?php if ($ActualDamage['KillingShot']) {
 						?>Forces are <span class="red">DESTROYED!</span><br /><?php
 					}
 				}
 			}
-			if(isset($TraderResults['Drones'])) {
-				$Drones =& $TraderResults['Drones'];
-				$ActualDamage =& $Drones['ActualDamage'];
-				$WeaponDamage =& $Drones['WeaponDamage'];
-				$TargetPlayer =& $Drones['TargetPlayer'];
+			if (isset($TraderResults['Drones'])) {
+				$Drones = & $TraderResults['Drones'];
+				$ActualDamage = & $Drones['ActualDamage'];
+				$WeaponDamage = & $Drones['WeaponDamage'];
+				$TargetPlayer = & $Drones['TargetPlayer'];
 				$DamageTypes = 0;
-				if($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) { $DamageTypes = $DamageTypes+1; }
-				if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-				if($ActualDamage['NumSDs'] > 0){ $DamageTypes = $DamageTypes+1; }
+				if ($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) { $DamageTypes = $DamageTypes + 1; }
+				if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+				if ($ActualDamage['NumSDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
 				echo $ShootingPlayer->getDisplayName();
-				if($WeaponDamage['Launched'] == 0) {
+				if ($WeaponDamage['Launched'] == 0) {
 					?> fails to launch their combat drones<?php
 				} else {
-					?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at<?php if($ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php } ?> the forces<?php
-					if(!$ActualDamage['TargetAlreadyDead']) {
-						if($ActualDamage['TotalDamage'] == 0) {
-							if($WeaponDamage['Shield'] > 0) {
-								?> which prove ineffective against the <?php if($ActualDamage['HasMines']){ ?>mines<?php } else if($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php }
-							} else if($WeaponDamage['Armour'] > 0) {
+					?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at<?php if ($ActualDamage['TargetAlreadyDead']) { ?> the debris that was once <?php } ?> the forces<?php
+					if (!$ActualDamage['TargetAlreadyDead']) {
+						if ($ActualDamage['TotalDamage'] == 0) {
+							if ($WeaponDamage['Shield'] > 0) {
+								?> which prove ineffective against the <?php if ($ActualDamage['HasMines']) { ?>mines<?php } else if ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php }
+							} else if ($WeaponDamage['Armour'] > 0) {
 								?> which is deflected by the <?php
-								if($ActualDamage['HasMines']){ ?>mines<?php } else if($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php } ?> shields<?php
+								if ($ActualDamage['HasMines']) { ?>mines<?php } else if ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php } ?> shields<?php
 							} else {
 								?> but they cannot do any damage<?php
 							}
 						} else {
-							if($WeaponDamage['Kamikaze'] == 0) {
+							if ($WeaponDamage['Kamikaze'] == 0) {
 								?> destroying <?php
 							} else {
 								?> of which <span class="cds"><?php echo $WeaponDamage['Kamikaze'] ?></span> kamikaze against <span class="red"><?php echo $WeaponDamage['Kamikaze'] ?></span> mines<?php
-								if($DamageTypes > 0) {
+								if ($DamageTypes > 0) {
 									?> whilst the others destroy <?php
 								}
 							}
-							if($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) {
+							if ($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) {
 								?><span class="red"><?php echo number_format($ActualDamage['NumMines']) ?></span> mines<?php
 								$this->doDamageTypeReductionDisplay($DamageTypes);
 							}
-							if($ActualDamage['NumCDs'] > 0) {
+							if ($ActualDamage['NumCDs'] > 0) {
 								?><span class="red"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
 								$this->doDamageTypeReductionDisplay($DamageTypes);
 							}
-							if($ActualDamage['NumSDs'] > 0) {
+							if ($ActualDamage['NumSDs'] > 0) {
 								?><span class="red"><?php echo number_format($ActualDamage['NumSDs']) ?></span> scout drones<?php
 							}
 						}
 					}
 				}?>.
 				<br />
-				<?php if($ActualDamage['KillingShot']) {
+				<?php if ($ActualDamage['KillingShot']) {
 					?>Forces are <span class="red">DESTROYED!</span><br /><?php
 				}
 			}
 		}
 		echo $ShootingPlayer->getDisplayName();
-		if($TotalDamage > 0) {
+		if ($TotalDamage > 0) {
 			?> hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php
 		} else {
 			?> does no damage this round.<?php
-			if(!$TraderResults['DeadBeforeShot']) {
+			if (!$TraderResults['DeadBeforeShot']) {
 				?> Maybe they should go back to the academy<?php
 			}
 		} ?>.<br /><br /><?php
 	}
 }
 $TotalDamage = $TraderTeamCombatResults['TotalDamage']; ?>
-This fleet <?php if($TotalDamage > 0){ ?>hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php } else{ ?>does no damage this round. You call that a fleet? They need a better recruiter<?php } ?>.
\ No newline at end of file
+This fleet <?php if ($TotalDamage > 0) { ?>hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php } else { ?>does no damage this round. You call that a fleet? They need a better recruiter<?php } ?>.
\ No newline at end of file

templates/Default/engine/Default/includes/PortCombatResults.inc

Spacing +46 added lines, -46 removed lines

@@ -1,116 +1,116 @@
 <?php
-$CombatPort =& $PortCombatResults['Port'];
+$CombatPort = & $PortCombatResults['Port'];
 $TotalDamage = $PortCombatResults['TotalDamage'];
-if($MinimalDisplay) {
+if ($MinimalDisplay) {
 	echo $CombatPort->getDisplayName();
-	if($TotalDamage > 0) {
+	if ($TotalDamage > 0) {
 		?> hit for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat of which <span class="red"><?php echo $PortCombatResults['TotalDamagePerTargetPlayer'][$ThisPlayer->getAccountID()]; ?></span> was done to you<?php
 	} else {
 		?> does no damage this round<?php
 	} ?>. <?php echo $AttackLogLink;
 	return;
 }
-if(isset($PortCombatResults['Weapons']) && is_array($PortCombatResults['Weapons'])) {
-	foreach($PortCombatResults['Weapons'] as $WeaponResults) {
-		$ShootingWeapon =& $WeaponResults['Weapon'];
-		$ShotHit =& $WeaponResults['Hit'];
-		$ActualDamage =& $WeaponResults['ActualDamage'];
-		$WeaponDamage =& $WeaponResults['WeaponDamage'];
-		$TargetPlayer =& $WeaponResults['TargetPlayer'];
+if (isset($PortCombatResults['Weapons']) && is_array($PortCombatResults['Weapons'])) {
+	foreach ($PortCombatResults['Weapons'] as $WeaponResults) {
+		$ShootingWeapon = & $WeaponResults['Weapon'];
+		$ShotHit = & $WeaponResults['Hit'];
+		$ActualDamage = & $WeaponResults['ActualDamage'];
+		$WeaponDamage = & $WeaponResults['WeaponDamage'];
+		$TargetPlayer = & $WeaponResults['TargetPlayer'];
 		$DamageTypes = 0;
-		if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
-		if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-		if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
+		if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
+		if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+		if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
 		
-		echo $CombatPort->getDisplayName() ?> fires an <?php echo $ShootingWeapon->getName() ?> at <?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
-		if(!$ActualDamage['TargetAlreadyDead']) {
-			if(!$ShotHit) {
+		echo $CombatPort->getDisplayName() ?> fires an <?php echo $ShootingWeapon->getName() ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
+		if (!$ActualDamage['TargetAlreadyDead']) {
+			if (!$ShotHit) {
 				?> and misses<?php
-			} else if($ActualDamage['TotalDamage'] == 0) {
-				if($WeaponDamage['Shield'] > 0) {
-					if($ActualDamage['HasCDs']) {
+			} else if ($ActualDamage['TotalDamage'] == 0) {
+				if ($WeaponDamage['Shield'] > 0) {
+					if ($ActualDamage['HasCDs']) {
 						?> which proves ineffective against their combat drones<?php
 					} else {
 						?> which washes harmlessly over their hull<?php
 					}
-				} else if($WeaponDamage['Armour'] > 0) {
+				} else if ($WeaponDamage['Armour'] > 0) {
 					?> which is deflected by their shields<?php
 				} else {
 					?> but it cannot do any damage<?php
 				}
 			} else {
 				?> destroying <?php
-				if($ActualDamage['Shield'] > 0) {
+				if ($ActualDamage['Shield'] > 0) {
 					?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
 					$this->doDamageTypeReductionDisplay($DamageTypes);
 				}
-				if($ActualDamage['NumCDs'] > 0) {
+				if ($ActualDamage['NumCDs'] > 0) {
 					?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
 					$this->doDamageTypeReductionDisplay($DamageTypes);
 				}
-				if($ActualDamage['Armour'] > 0) {
+				if ($ActualDamage['Armour'] > 0) {
 					?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
 				}
 			}
 		} ?>.
 		<br />
-		<?php if($ActualDamage['KillingShot']) {
-			$this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer));
+		<?php if ($ActualDamage['KillingShot']) {
+			$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer));
 		}
 	}
 }
-if(isset($PortCombatResults['Drones'])) {
-	$Drones =& $PortCombatResults['Drones'];
-	$ActualDamage =& $Drones['ActualDamage'];
-	$WeaponDamage =& $Drones['WeaponDamage'];
-	$TargetPlayer =& $Drones['TargetPlayer'];
+if (isset($PortCombatResults['Drones'])) {
+	$Drones = & $PortCombatResults['Drones'];
+	$ActualDamage = & $Drones['ActualDamage'];
+	$WeaponDamage = & $Drones['WeaponDamage'];
+	$TargetPlayer = & $Drones['TargetPlayer'];
 	$DamageTypes = 0;
-	if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
-	if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-	if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
+	if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
+	if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+	if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
 	
 	echo $CombatPort->getDisplayName();
-	if($WeaponDamage['Launched'] == 0) {
+	if ($WeaponDamage['Launched'] == 0) {
 		?> fails to launch it's combat drones<?php
 	} else {
-		?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php if($ActualDamage['TargetAlreadyDead']){ ?>the debris that was once <?php } echo $TargetPlayer->getDisplayName();
-		if(!$ActualDamage['TargetAlreadyDead']) {
-			if($ActualDamage['TotalDamage'] == 0) {
-				if($WeaponDamage['Shield'] > 0) {
-					if($ActualDamage['HasCDs']) {
+		?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php if ($ActualDamage['TargetAlreadyDead']) { ?>the debris that was once <?php } echo $TargetPlayer->getDisplayName();
+		if (!$ActualDamage['TargetAlreadyDead']) {
+			if ($ActualDamage['TotalDamage'] == 0) {
+				if ($WeaponDamage['Shield'] > 0) {
+					if ($ActualDamage['HasCDs']) {
 						?> which prove ineffective against their combat drones<?php
 					} else {
 						?> which washes harmlessly over their hull<?php
 					}
-				} else if($WeaponDamage['Armour'] > 0) {
+				} else if ($WeaponDamage['Armour'] > 0) {
 					?> which is deflected by their shields<?php
 				} else {
 					?> but they cannot do any damage<?php
 				}
 			} else {
 				?> destroying <?php
-				if($ActualDamage['Shield'] > 0) {
+				if ($ActualDamage['Shield'] > 0) {
 					?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
 					$this->doDamageTypeReductionDisplay($DamageTypes);
 				}
-				if($ActualDamage['NumCDs'] > 0) {
+				if ($ActualDamage['NumCDs'] > 0) {
 					?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
 					$this->doDamageTypeReductionDisplay($DamageTypes);
 				}
-				if($ActualDamage['Armour'] > 0) {
+				if ($ActualDamage['Armour'] > 0) {
 					?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
 				}
 			}
 		}
 	} ?>.
 	<br /><?php
-	if($ActualDamage['KillingShot']) {
-		$this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$Drones['KillResults'],'TargetPlayer'=>$TargetPlayer));
+	if ($ActualDamage['KillingShot']) {
+		$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPlayer'=>$TargetPlayer));
 	}
 }
 
 echo $CombatPort->getDisplayName();
-if($TotalDamage > 0) {
+if ($TotalDamage > 0) {
 	?> hit for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php
 } else {
 	?> does no damage this round<?php

engine/Default/bar_gambling_processing.php

Indentation +1 added lines, -1 removed lines

@@ -180,7 +180,7 @@
 	//heres the AIs cards
 	$i = 1;
 	if ((get_value($ai_card) == 21 && count($ai_card) == 2) ||
-	    (get_value($player_card) > 21 && get_value($ai_card) <= 21)) {
+		(get_value($player_card) > 21 && get_value($ai_card) <= 21)) {
 		$message .= ('<h1 class="red center">Bank Wins</h1>');
 	}
 	$message .= ('<div class="center">Bank\'s Cards are</div><br /><table class="center"><tr>');

lib/Album/album_functions.php

Braces +39 added lines, -30 removed lines

@@ -53,9 +53,9 @@ 
 
 			echo('<span style="font-size:85%;"><b>[' . date(defined('DATE_FULL_SHORT') ?DATE_FULL_SHORT:DEFAULT_DATE_FULL_SHORT, $created) . ']</b> Picture of <a href="?nick=' . urlencode($nick) . '">' . $nick . '</a> added</span><br />');
 		}
+	} else {
+			echo('<span style="font-size:85%;">no entries</span>');
 	}
-	else
-		echo('<span style="font-size:85%;">no entries</span>');
 	echo('</p>');
 }
 
@@ -87,8 +87,7 @@ 
 		$other = nl2br(stripslashes($db->getField('other')));
 		$page_views = $db->getField('page_views');
 		$disabled = $db->getField('disabled') == 'TRUE';
-	}
-	else {
+	} else {
 		echo('<h1>Error</h1>');
 		echo('This user doesn\'t have an entry in our album!');
 		return;
@@ -139,46 +138,54 @@ 
 	echo('<tr>');
 	echo('<td colspan="2" class="center" valign="middle">');
 
-	if ($disabled == false)
-		echo('<img src="../upload/' . $album_id . '">');
-	else
-		echo('<img src="../images/album/disabled.jpg">');
+	if ($disabled == false) {
+			echo('<img src="../upload/' . $album_id . '">');
+	} else {
+			echo('<img src="../images/album/disabled.jpg">');
+	}
 
 	echo('</td>');
 	echo('</tr>');
 
-	if (empty($location))
-		$location = 'N/A';
+	if (empty($location)) {
+			$location = 'N/A';
+	}
 	echo('<tr>');
 	echo('<td class="right bold" width="10%">Location:</td><td>' . $location . '</td>');
 	echo('</tr>');
 
-	if (empty($email))
-		$email = 'N/A';
+	if (empty($email)) {
+			$email = 'N/A';
+	}
 	echo('<tr>');
 	echo('<td class="right bold" width="10%">E-mail:</td><td>' . $email . '</td>');
 	echo('</tr>');
 
-	if (empty($website))
-		$website = 'N/A';
-	else
-		$website = '<a href="' . $website . '" target="_new">' . $website . '</a>';
+	if (empty($website)) {
+			$website = 'N/A';
+	} else {
+			$website = '<a href="' . $website . '" target="_new">' . $website . '</a>';
+	}
 	echo('<tr>');
 	echo('<td class="right bold" width="10%">Website:</td><td>' . $website . '</td>');
 	echo('</tr>');
 
 	echo('<tr>');
-	if (!empty($day) && !empty($month) && !empty($year))
-		$birthdate = $month . ' / ' . $day . ' / ' . $year;
-	if (empty($birthdate) && !empty($year))
-		$birthdate = 'Year ' . $year;
-	if (empty($birthdate))
-		$birthdate = 'N/A';
+	if (!empty($day) && !empty($month) && !empty($year)) {
+			$birthdate = $month . ' / ' . $day . ' / ' . $year;
+	}
+	if (empty($birthdate) && !empty($year)) {
+			$birthdate = 'Year ' . $year;
+	}
+	if (empty($birthdate)) {
+			$birthdate = 'N/A';
+	}
 	echo('<td class="right bold" width="10%">Birthdate:</td><td>' . $birthdate . '</td>');
 	echo('</tr>');
 
-	if (empty($other))
-		$other = 'N/A';
+	if (empty($other)) {
+			$other = 'N/A';
+	}
 	echo('<tr>');
 	echo('<td class="right bold" valign="top" width="10%">Other&nbsp;Info:</td><td>' . $other . '</td>');
 	echo('</tr>');
@@ -210,15 +217,16 @@ 
 					FROM account_has_permission
 					WHERE account_id = '.$db->escapeNumber(SmrSession::getAccountID()) . ' AND
 						permission_id = '.$db->escapeNumber(PERMISSION_MODERATE_PHOTO_ALBUM));
-		if ($db->nextRecord())
-			echo('<td style="color:green; font-size:70%;"><br /><input type="submit" name="action" value="Moderate" class="InputFields"></td>');
+		if ($db->nextRecord()) {
+					echo('<td style="color:green; font-size:70%;"><br /><input type="submit" name="action" value="Moderate" class="InputFields"></td>');
+		}
 
 		echo('</tr>');
 		echo('</table>');
 		echo('</form>');
+	} else {
+			echo('<p>Please <a href="/login.php?return_page=/album/?nick=' . urlencode($nick) . '"><u>login</u></a> if you want comment on this picture!</p>');
 	}
-	else
-		echo('<p>Please <a href="/login.php?return_page=/album/?nick=' . urlencode($nick) . '"><u>login</u></a> if you want comment on this picture!</p>');
 
 	echo('</td>');
 	echo('</tr>');
@@ -288,8 +296,9 @@ 
 
 
 function get_album_nick($album_id) {
-	if ($album_id == 0)
-		return 'System';
+	if ($album_id == 0) {
+			return 'System';
+	}
 
 	return SmrAccount::getAccount($album_id)->getHofName();
 }

htdocs/ship_list.php

Braces +1 added lines, -2 removed lines

@@ -16,8 +16,7 @@
 	$template->assign('shipArray', $shipArray);
 
 	$template->display('ship_list.php');
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	handleException($e);
 }
 

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
 
 	$template->display('ship_list.php');
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	handleException($e);
 }
 
@@ -25,7 +25,7 @@ 
 	$selector = '<select onchange="filterSelect(this)"><option>All</option>';
 	$db->query('SELECT DISTINCT ' . $name . ' FROM ' . $table . ' ORDER BY ' . $name);
 	while ($db->nextRecord()) {
-		$selector .= '<option>'.$db->getField($name).'</option>';
+		$selector .= '<option>' . $db->getField($name) . '</option>';
 	}
 	$selector .= '</select>';
 	return $selector;