smrealms / smr

templates/Default/engine/Default/includes/PlanetTraderTeamCombatResults.inc

Spacing +49 added lines, -49 removed lines

@@ -1,10 +1,10 @@ 
 <?php
-foreach($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
-	$ShootingPlayer =& $TraderResults['Player'];
-	$TotalDamage =& $TraderResults['TotalDamage'];
-	if($MinimalDisplay && !$ThisPlayer->equals($ShootingPlayer)) {
+foreach ($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
+	$ShootingPlayer = & $TraderResults['Player'];
+	$TotalDamage = & $TraderResults['TotalDamage'];
+	if ($MinimalDisplay && !$ThisPlayer->equals($ShootingPlayer)) {
 		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
@@ -12,29 +12,29 @@ 
 		continue;
 	}
 
-	if($TraderResults['DeadBeforeShot']) {
+	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'];
-				$TargetPlanet =& $WeaponResults['TargetPlanet'];
+		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'];
+				$TargetPlanet = & $WeaponResults['TargetPlanet'];
 				
-				echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?>the debris that was once <?php } echo $TargetPlanet->getDisplayName();
+				echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?>the debris that was once <?php } echo $TargetPlanet->getDisplayName();
 				if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
-					if(!$ShotHit) {
+					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
@@ -42,96 +42,96 @@ 
 					} else {
 						?> destroying <?php
 						$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; }
 
-						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 ($ShotHit && $ActualDamage['KillingShot']) {
-					$this->includeTemplate('includes/PlanetKillMessage.inc',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlanet'=>$TargetPlanet));
+					$this->includeTemplate('includes/PlanetKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlanet'=>$TargetPlanet));
 				}
 			}
 		}
-		if(isset($TraderResults['Drones'])) {
-			$Drones =& $TraderResults['Drones'];
-			$ActualDamage =& $Drones['ActualDamage'];
-			$WeaponDamage =& $Drones['WeaponDamage'];
-			$TargetPlanet =& $Drones['TargetPlanet'];
+		if (isset($TraderResults['Drones'])) {
+			$Drones = & $TraderResults['Drones'];
+			$ActualDamage = & $Drones['ActualDamage'];
+			$WeaponDamage = & $Drones['WeaponDamage'];
+			$TargetPlanet = & $Drones['TargetPlanet'];
 			$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 $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']) {
+				if ($ActualDamage['TargetAlreadyDead']) {
 					?>the debris that was once <?php
 				}
 				echo $TargetPlanet->getDisplayName();
-				if(!$ActualDamage['TargetAlreadyDead']) {
-					if($ActualDamage['TotalDamage'] == 0) {
-						if($WeaponDamage['Shield'] > 0) {
-							if($ActualDamage['HasCDs']) {
+				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
 							}
 						}
-						if($ActualDamage['Armour'] > 0) {
+						if ($ActualDamage['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/PlanetKillMessage.inc',array('KillResults'=>$Drones['KillResults'],'TargetPlanet'=>$TargetPlanet));
+			if ($ActualDamage['KillingShot']) {
+				$this->includeTemplate('includes/PlanetKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPlanet'=>$TargetPlanet));
 			}
 		}
 	}
 	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 } ?>.<br /><?php
+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 } ?>.<br /><?php
 foreach ($TraderTeamCombatResults['Downgrades'] as $structureID => $numDestroyed) { ?>
 	This team destroys <span class="red"><?php echo $numDestroyed; ?> </span><?php echo pluralise($TargetPlanet->getStructureTypes($structureID)->name(), $numDestroyed); ?>.<br /><?php
 } ?>

templates/Default/engine/Default/includes/PlanetCombatResults.inc

Spacing +43 added lines, -43 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 $CombatPlanet = $PlanetCombatResults['Planet'];
 $TotalDamage = $PlanetCombatResults['TotalDamage'];
-if($MinimalDisplay) {
+if ($MinimalDisplay) {
 	echo $CombatPlanet->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 $PlanetCombatResults['TotalDamagePerTargetPlayer'][$ThisPlayer->getAccountID()]; ?></span> was done to you<?php
 	}
 	else {
@@ -11,29 +11,29 @@ 
 	} ?>. <?php echo $AttackLogLink;
 	return;
 }
-if(isset($PlanetCombatResults['Weapons']) && is_array($PlanetCombatResults['Weapons'])) {
-	foreach($PlanetCombatResults['Weapons'] as $WeaponResults) {
-		$ShootingWeapon =& $WeaponResults['Weapon'];
-		$ShotHit =& $WeaponResults['Hit'];
-		$ActualDamage =& $WeaponResults['ActualDamage'];
-		$WeaponDamage =& $WeaponResults['WeaponDamage'];
-		$TargetPlayer =& $WeaponResults['TargetPlayer'];
+if (isset($PlanetCombatResults['Weapons']) && is_array($PlanetCombatResults['Weapons'])) {
+	foreach ($PlanetCombatResults['Weapons'] as $WeaponResults) {
+		$ShootingWeapon = & $WeaponResults['Weapon'];
+		$ShotHit = & $WeaponResults['Hit'];
+		$ActualDamage = & $WeaponResults['ActualDamage'];
+		$WeaponDamage = & $WeaponResults['WeaponDamage'];
+		$TargetPlayer = & $WeaponResults['TargetPlayer'];
 		
-		echo $CombatPlanet->getDisplayName() ?> fires a <?php echo $ShootingWeapon->getName(); ?> at <?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
+		echo $CombatPlanet->getDisplayName() ?> fires a <?php echo $ShootingWeapon->getName(); ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
 		if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
-			if(!$ShotHit) {
+			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 {
@@ -43,56 +43,56 @@ 
 			else {
 				?> destroying <?php
 				$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; }
 
-				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 ($ShotHit && $ActualDamage['KillingShot']) {
-			$this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer));
+			$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer));
 		}
 	}
 }
-if(isset($PlanetCombatResults['Drones'])) {
-	$Drones =& $PlanetCombatResults['Drones'];
-	$ActualDamage =& $Drones['ActualDamage'];
-	$WeaponDamage =& $Drones['WeaponDamage'];
-	$TargetPlayer =& $Drones['TargetPlayer'];
+if (isset($PlanetCombatResults['Drones'])) {
+	$Drones = & $PlanetCombatResults['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 $CombatPlanet->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 {
@@ -101,28 +101,28 @@ 
 			}
 			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 $CombatPlanet->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 {

templates/Default/engine/Default/includes/TraderTeamCombatResults.inc

Spacing +48 added lines, -48 removed lines

@@ -1,36 +1,36 @@ 
 <?php
-if(is_array($TraderTeamCombatResults['Traders'])) {
-	foreach($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
-		$ShootingPlayer =& $TraderResults['Player'];
-		$TotalDamage =& $TraderResults['TotalDamage'];
+if (is_array($TraderTeamCombatResults['Traders'])) {
+	foreach ($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
+		$ShootingPlayer = & $TraderResults['Player'];
+		$TotalDamage = & $TraderResults['TotalDamage'];
 	
-		if($TraderResults['DeadBeforeShot']) {
+		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'];
 					
 					echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php
-					if($ShotHit && $ActualDamage['TargetAlreadyDead']) {
+					if ($ShotHit && $ActualDamage['TargetAlreadyDead']) {
 						?>the debris that was once <?php
 					}
 					echo $TargetPlayer->getDisplayName();
 					if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
-						if(!$ShotHit) {
+						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
@@ -38,94 +38,94 @@ 
 						} else {
 							?> destroying <?php
 							$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; }
 
-							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 ($ShotHit && $ActualDamage['KillingShot']) {
-						$this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer,'ShootingPlayer'=>$ShootingPlayer));
+						$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer, 'ShootingPlayer'=>$ShootingPlayer));
 					}
 				}
 			}
-			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['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 $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']) {
+					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']) {
+					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
 								}
 							}
-							if($ActualDamage['Armour'] > 0) {
+							if ($ActualDamage['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,'ShootingPlayer'=>$ShootingPlayer));
+				if ($ActualDamage['KillingShot']) {
+					$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPlayer'=>$TargetPlayer, 'ShootingPlayer'=>$ShootingPlayer));
 				}
 			}
 		}
 		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 } ?>.<br />
+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 } ?>.<br />

lib/Default/SmrMines.class.php

Spacing +4 added lines, -4 removed lines

@@ -94,7 +94,7 @@ 
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		if ($targetPlayer->getShip()->isFederal()) { // do less damage to fed ships 
 			$damage['MaxDamage'] = IRound($damage['MaxDamage'] * self::FED_SHIP_DAMAGE_MODIFIER);
 			$damage['Shield'] = IRound($damage['Shield'] * self::FED_SHIP_DAMAGE_MODIFIER);
@@ -131,12 +131,12 @@ 
 	}
 	
 	protected function &doForceDamageToPlayer(array &$return, SmrForce $forces, AbstractSmrPlayer $targetPlayer, $minesAreAttacker = false) {
-		$return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']);
 		$return['ActualDamage']['Launched'] = ICeil($return['WeaponDamage']['Launched'] * $return['ActualDamage']['TotalDamage'] / $return['WeaponDamage']['MaxDamage']);
 
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $targetPlayer->killPlayerByForces($forces);
+			$return['KillResults'] = & $targetPlayer->killPlayerByForces($forces);
 		}
 		return $return;
 	}

lib/Default/SmrScoutDrones.class.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		$damage['Launched'] = ICeil($this->getNumberOfSDs() * $this->getModifiedForceAccuracyAgainstPlayer($forces, $targetPlayer) / 100);
 		$damage['MaxDamage'] = ICeil($damage['Launched'] * $damage['MaxDamage']);
 		$damage['Shield'] = ICeil($damage['Launched'] * $damage['Shield']);

lib/Default/SmrPlayer.class.php

Spacing +4 added lines, -4 removed lines

@@ -207,7 +207,7 @@ 
 	/**
 	 * Insert a new player into the database. Returns the new player object.
 	 */
-	public static function createPlayer($accountID, $gameID, $playerName, $raceID, $isNewbie, $npc=false) {
+	public static function createPlayer($accountID, $gameID, $playerName, $raceID, $isNewbie, $npc = false) {
 		// Put the player in a sector with an HQ
 		$startSectorID = self::getHome($gameID, $raceID);
 
@@ -1163,13 +1163,13 @@ 
 			$this->db->query('SELECT type,amount FROM player_hof WHERE ' . $this->SQL);
 			$this->HOF = array();
 			while ($this->db->nextRecord()) {
-				$hof =& $this->HOF;
+				$hof = & $this->HOF;
 				$typeList = explode(':', $this->db->getField('type'));
 				foreach ($typeList as $type) {
 					if (!isset($hof[$type])) {
 						$hof[$type] = array();
 					}
-					$hof =& $hof[$type];
+					$hof = & $hof[$type];
 				}
 				$hof = $this->db->getFloat('amount');
 			}
@@ -1611,7 +1611,7 @@ 
 			create_error('The saved sector must be in the box!');
 		}
 
-		$storedDestinations =& $this->getStoredDestinations();
+		$storedDestinations = & $this->getStoredDestinations();
 		foreach ($storedDestinations as &$sd) {
 			if ($sd['SectorID'] == $sectorID) {
 				$sd['OffsetTop'] = $offsetTop;

lib/Default/AbstractSmrShip.class.php

Spacing +9 added lines, -9 removed lines

@@ -301,7 +301,7 @@ 
 	public function setWeaponLocations(array $orderArray) {
 		$weapons = $this->weapons;
 		foreach ($orderArray as $newOrder => $oldOrder) {
-			$this->weapons[$newOrder] =& $weapons[$oldOrder];
+			$this->weapons[$newOrder] = & $weapons[$oldOrder];
 		}
 		$this->hasChangedWeapons = true;
 	}
@@ -901,14 +901,14 @@ 
 		}
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]);
+			$results['Weapons'][$orderID] = & $weapon->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]);
 			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 			}
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Drones'] =& $thisCDs->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]);
+			$results['Drones'] = & $thisCDs->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}
 		$thisPlayer->increaseExperience(IRound($results['TotalDamage'] * self::EXP_PER_DAMAGE_PLAYER));
@@ -926,7 +926,7 @@ 
 		}
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootForces($thisPlayer, $forces);
+			$results['Weapons'][$orderID] = & $weapon->shootForces($thisPlayer, $forces);
 			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 				$thisPlayer->increaseHOF($results['Weapons'][$orderID]['ActualDamage']['NumMines'], array('Combat', 'Forces', 'Mines', 'Killed'), HOF_PUBLIC);
@@ -940,7 +940,7 @@ 
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Drones'] =& $thisCDs->shootForces($thisPlayer, $forces);
+			$results['Drones'] = & $thisCDs->shootForces($thisPlayer, $forces);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 			$thisPlayer->increaseHOF($results['Drones']['ActualDamage']['NumMines'], array('Combat', 'Forces', 'Mines', 'Killed'), HOF_PUBLIC);
 			$thisPlayer->increaseHOF($results['Drones']['ActualDamage']['Mines'], array('Combat', 'Forces', 'Mines', 'Damage Done'), HOF_PUBLIC);
@@ -965,14 +965,14 @@ 
 		}
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootPort($thisPlayer, $port);
+			$results['Weapons'][$orderID] = & $weapon->shootPort($thisPlayer, $port);
 			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 			}
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Drones'] =& $thisCDs->shootPort($thisPlayer, $port);
+			$results['Drones'] = & $thisCDs->shootPort($thisPlayer, $port);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}
 		$thisPlayer->increaseExperience(IRound($results['TotalDamage'] * self::EXP_PER_DAMAGE_PORT));
@@ -1003,14 +1003,14 @@ 
 		}
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootPlanet($thisPlayer, $planet, $delayed);
+			$results['Weapons'][$orderID] = & $weapon->shootPlanet($thisPlayer, $planet, $delayed);
 			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 			}
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Drones'] =& $thisCDs->shootPlanet($thisPlayer, $planet, $delayed);
+			$results['Drones'] = & $thisCDs->shootPlanet($thisPlayer, $planet, $delayed);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}
 		$thisPlayer->increaseExperience(IRound($results['TotalDamage'] * self::EXP_PER_DAMAGE_PLANET));

lib/Default/AbstractSmrPlayer.class.php

Spacing +7 added lines, -7 removed lines

@@ -929,8 +929,8 @@ 
 		}
 		self::$HOFVis[$hofType] = $visibility;
 
-		$hof =& $this->HOF;
-		$hofChanged =& $this->hasHOFChanged;
+		$hof = & $this->HOF;
+		$hofChanged = & $this->hasHOFChanged;
 		$new = false;
 		foreach ($typeList as $type) {
 			if (!isset($hofChanged[$type])) {
@@ -940,8 +940,8 @@ 
 				$hof[$type] = array();
 				$new = true;
 			}
-			$hof =& $hof[$type];
-			$hofChanged =& $hofChanged[$type];
+			$hof = & $hof[$type];
+			$hofChanged = & $hofChanged[$type];
 		}
 		if ($hofChanged == null) {
 			$hofChanged = self::HOF_CHANGED;
@@ -1097,7 +1097,7 @@ 
 	}
 
 	private function setupMissionStep($missionID) {
-		$mission =& $this->missions[$missionID];
+		$mission = & $this->missions[$missionID];
 		if ($mission['On Step'] >= count(MISSIONS[$missionID]['Steps'])) {
 			// Nothing to do if this mission is already completed
 			return;
@@ -1142,7 +1142,7 @@ 
 			'Starting Sector' => $this->getSectorID()
 		);
 
-		$this->missions[$missionID] =& $mission;
+		$this->missions[$missionID] = & $mission;
 		$this->setupMissionStep($missionID);
 		$this->rebuildMission($missionID);
 
@@ -1201,7 +1201,7 @@ 
 
 	public function claimMissionReward($missionID) {
 		$this->getMissions();
-		$mission =& $this->missions[$missionID];
+		$mission = & $this->missions[$missionID];
 		if ($mission === false) {
 			throw new Exception('Unknown mission: ' . $missionID);
 		}

lib/Default/AbstractSmrAccount.class.php

Spacing +9 added lines, -9 removed lines

@@ -363,26 +363,26 @@
 	}
 
 	public function isNPC() {
-		if(!isset($this->npc)) {
-			$this->db->query('SELECT login FROM npc_logins WHERE login = '.$this->db->escapeString($this->getLogin()).' LIMIT 1;');
+		if (!isset($this->npc)) {
+			$this->db->query('SELECT login FROM npc_logins WHERE login = ' . $this->db->escapeString($this->getLogin()) . ' LIMIT 1;');
 			$this->npc = $this->db->nextRecord();
 		}
 		return $this->npc;
 	}
 
 	protected function getHOFData() {
-		if(!isset($this->HOF)) {
+		if (!isset($this->HOF)) {
 			//Get Player HOF
 			$this->db->query('SELECT type,sum(amount) as amount FROM player_hof WHERE ' . $this->SQL . ' AND game_id IN (SELECT game_id FROM game WHERE ignore_stats = \'FALSE\') GROUP BY type');
 			$this->HOF = array();
-			while($this->db->nextRecord()) {
-				$hof =& $this->HOF;
-				$typeList = explode(':',$this->db->getField('type'));
-				foreach($typeList as $type) {
-					if(!isset($hof[$type])) {
+			while ($this->db->nextRecord()) {
+				$hof = & $this->HOF;
+				$typeList = explode(':', $this->db->getField('type'));
+				foreach ($typeList as $type) {
+					if (!isset($hof[$type])) {
 						$hof[$type] = array();
 					}
-					$hof =& $hof[$type];
+					$hof = & $hof[$type];
 				}
 				$hof = $this->db->getFloat('amount');
 			}