smrealms / smr

templates/Default/engine/Default/includes/ForcesCombatResults.inc

Spacing +26 added lines, -26 removed lines

@@ -1,34 +1,34 @@ 
 <?php
-if(isset($ForcesCombatResults['Results']) && is_array($ForcesCombatResults['Results'])) {
-	foreach($ForcesCombatResults['Results'] as $ForceType => $ForceResults) {
-		$ShootingWeapon =& $ForceResults['Weapon'];
-		$ShotHit =& $ForceResults['Hit'];
-		$ActualDamage =& $ForceResults['ActualDamage'];
-		$WeaponDamage =& $ForceResults['WeaponDamage'];
-		$TargetPlayer =& $ForceResults['TargetPlayer'];
+if (isset($ForcesCombatResults['Results']) && is_array($ForcesCombatResults['Results'])) {
+	foreach ($ForcesCombatResults['Results'] as $ForceType => $ForceResults) {
+		$ShootingWeapon = & $ForceResults['Weapon'];
+		$ShotHit = & $ForceResults['Hit'];
+		$ActualDamage = & $ForceResults['ActualDamage'];
+		$WeaponDamage = & $ForceResults['WeaponDamage'];
+		$TargetPlayer = & $ForceResults['TargetPlayer'];
 		?>
 		<span class="cds"><?php echo $ActualDamage['Launched'] ?? $WeaponDamage['Launched']; ?></span><?php
-		if($ForceType == 'Mines') {
+		if ($ForceType == 'Mines') {
 			?> mines kamikaze themselves against <?php
-		} else if($ForceType == 'Drones') {
+		} else if ($ForceType == 'Drones') {
 			?> combat drones launch at <?php
-		} else if($ForceType == 'Scouts') {
+		} else if ($ForceType == 'Scouts') {
 			?> scout drones kamikaze themselves against <?php
 		}
 		
-		if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?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 {
 					?> but it cannot do any damage<?php
@@ -37,31 +37,31 @@ 
 				?> 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> 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'=>$ForceResults['KillResults'],'TargetPlayer'=>$TargetPlayer));
+			$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$ForceResults['KillResults'], 'TargetPlayer'=>$TargetPlayer));
 		}
 	}
 }
-if(isset($ForcesCombatResults['ForcesDestroyed']) && $ForcesCombatResults['ForcesDestroyed']) {
+if (isset($ForcesCombatResults['ForcesDestroyed']) && $ForcesCombatResults['ForcesDestroyed']) {
 	?>Forces are <span class="red">DESTROYED!</span><br /><?php
 }
 
-$TotalDamage =& $ForcesCombatResults['TotalDamage'] ?>
-The forces <?php if($TotalDamage > 0){ ?>hit for a total of <span class="red"><?php echo number_format($TotalDamage) ?></span> damage in this round of combat<?php } else{ ?>do no damage this round<?php } ?>.
+$TotalDamage = & $ForcesCombatResults['TotalDamage'] ?>
+The forces <?php if ($TotalDamage > 0) { ?>hit for a total of <span class="red"><?php echo number_format($TotalDamage) ?></span> damage in this round of combat<?php } else { ?>do no damage this round<?php } ?>.

admin/Default/manage_draft_leaders.php

Indentation +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 $db->query('SELECT game_id, game_name FROM game WHERE game_type=' . $db->escapeNumber(SmrGame::GAME_TYPE_DRAFT) . ' AND join_time < ' . $db->escapeNumber(TIME) . ' AND end_time > ' . $db->escapeNumber(TIME) . ' ORDER BY start_time DESC');
 while ($db->nextRecord()) {
 	$activeGames[] = array('game_name' => $db->getField('game_name'),
-	                       'game_id' => $db->getInt('game_id'));
+						   'game_id' => $db->getInt('game_id'));
 }
 $template->assign('ActiveGames', $activeGames);
 

admin/Default/1.6/game_edit_processing.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 // Get the dates ("|" sets hr/min/sec to 0)
 $join = DateTime::createFromFormat('d/m/Y|', Request::get('game_join'));
 $start = empty(Request::get('game_start')) ? $join :
-         DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
+		 DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
 $end = DateTime::createFromFormat('d/m/Y|', Request::get('game_end'));
 
 $game = SmrGame::getGame($var['game_id']);

Spacing +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 // Get the dates ("|" sets hr/min/sec to 0)
 $join = DateTime::createFromFormat('d/m/Y|', Request::get('game_join'));
-$start = empty(Request::get('game_start')) ? $join :
-         DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
+$start = empty(Request::get('game_start')) ? $join : DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
 $end = DateTime::createFromFormat('d/m/Y|', Request::get('game_end'));
 
 $game = SmrGame::getGame($var['game_id']);

admin/Default/1.6/game_create_processing.php

Indentation +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 // Get the dates ("|" sets hr/min/sec to 0)
 $join = DateTime::createFromFormat('d/m/Y|', Request::get('game_join'));
 $start = empty(Request::get('game_start')) ? $join :
-         DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
+		 DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
 $end = DateTime::createFromFormat('d/m/Y|', Request::get('game_end'));
 
 $game = SmrGame::createGame($newID);

Spacing +3 added lines, -4 removed lines

@@ -1,22 +1,21 @@
 <?php declare(strict_types=1);
 
 //first create the game
-$db->query('SELECT game_id FROM game WHERE game_name='.$db->escapeString(Request::get('game_name')).' LIMIT 1');
+$db->query('SELECT game_id FROM game WHERE game_name=' . $db->escapeString(Request::get('game_name')) . ' LIMIT 1');
 if ($db->nextRecord()) {
 	create_error('That game name is already taken.');
 }
 
 $db->query('SELECT game_id FROM game ORDER BY game_id DESC LIMIT 1');
 if ($db->nextRecord()) {
-	$newID = $db->getInt('game_id')+1;
+	$newID = $db->getInt('game_id') + 1;
 } else {
 	$newID = 1;
 }
 
 // Get the dates ("|" sets hr/min/sec to 0)
 $join = DateTime::createFromFormat('d/m/Y|', Request::get('game_join'));
-$start = empty(Request::get('game_start')) ? $join :
-         DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
+$start = empty(Request::get('game_start')) ? $join : DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
 $end = DateTime::createFromFormat('d/m/Y|', Request::get('game_end'));
 
 $game = SmrGame::createGame($newID);

admin/Default/1.6/universe_create_save_processing.php

Braces +5 added lines, -3 removed lines

@@ -105,13 +105,15 @@
 		$numberOfPlanets = Request::getInt('type' . $planetTypeID);
 		for ($i = 1; $i <= $numberOfPlanets; $i++) {
 			$galSector = $galSectors[array_rand($galSectors)];
-			while ($galSector->hasPlanet()) $galSector = $galSectors[array_rand($galSectors)]; //1 per sector
+			while ($galSector->hasPlanet()) {
+				$galSector = $galSectors[array_rand($galSectors)];
+			}
+			//1 per sector
 			$galSector->createPlanet($planetTypeID);
 		}
 	}
 	$var['message'] = '<span class="green">Success</span> : Succesfully added planets.';
-}
-elseif ($submit == 'Create Ports') {
+} elseif ($submit == 'Create Ports') {
 	$numLevelPorts = [];
 	for ($i = 1; $i <= SmrPort::MAX_LEVEL; $i++) {
 		$numLevelPorts[$i] = Request::getInt('port' . $i);

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::get('salutation'));
+			  Request::get('salutation'));
 
 if (Request::get('to_email') == '*') {
 	// Send the newsletter to all players.

lib/Default/SocialLogins/Twitter.class.php

Indentation +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 		}
 		$helper = self::getTwitterObj($_SESSION['TwitterToken']);
 		$accessToken = $helper->oauth('oauth/access_token',
-		                              ['oauth_verifier' => \Request::get('oauth_verifier')]);
+									  ['oauth_verifier' => \Request::get('oauth_verifier')]);
 		$auth = self::getTwitterObj($accessToken);
 		$userInfo = $auth->get('account/verify_credentials', ['include_email' => 'true']);
 		if ($auth->getLastHttpCode() == 200) {

lib/Default/AbstractMenu.class.php

Indentation +4 added lines, -4 removed lines

@@ -100,16 +100,16 @@
 		$container['view_game_id'] = $var['view_game_id'];
 		$container['game_name'] = $var['game_name'];
 		$menuItems[] = ['Link' => SmrSession::getNewHREF($container),
-		                'Text' => 'Game Details'];
+						'Text' => 'Game Details'];
 		$container['body'] = 'history_games_detail.php';
 		$menuItems[] = ['Link' => SmrSession::getNewHREF($container),
-		                'Text' => 'Extended Stats'];
+						'Text' => 'Extended Stats'];
 		$container['body'] = 'history_games_hof.php';
 		$menuItems[] = ['Link' => SmrSession::getNewHREF($container),
-		                'Text' => 'Hall of Fame'];
+						'Text' => 'Hall of Fame'];
 		$container['body'] = 'history_games_news.php';
 		$menuItems[] = ['Link' => SmrSession::getNewHREF($container),
-		                'Text' => 'Game News'];
+						'Text' => 'Game News'];
 		// make the selected index bold
 		$boldItem =& $menuItems[$selected_index]['Text'];
 		$boldItem = '<b>' . $boldItem . '</b>';

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 		$menuItems[] = array('Link'=>Globals::getPlanetListHREF($alliance_id), 'Text'=>'Defense');
 		$menuItems[] = array('Link'=>Globals::getPlanetListFinancialHREF($alliance_id), 'Text'=>'Financial');
 		// make the selected index bold
-		$boldItem =& $menuItems[$selected_index]['Text'];
+		$boldItem = & $menuItems[$selected_index]['Text'];
 		$boldItem = '<span class="bold">' . $boldItem . '</span>';
 		$template->assign('MenuItems', $menuItems);
 	}
@@ -107,7 +107,7 @@ 
 		$menuItems[] = ['Link' => SmrSession::getNewHREF($container),
 		                'Text' => 'Game News'];
 		// make the selected index bold
-		$boldItem =& $menuItems[$selected_index]['Text'];
+		$boldItem = & $menuItems[$selected_index]['Text'];
 		$boldItem = '<b>' . $boldItem . '</b>';
 		$template->assign('MenuItems', $menuItems);
 	}

htdocs/login_processing.php

Indentation +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 			exit;
 		}
 		$account->addAuthMethod($_SESSION['socialLogin']->getLoginType(),
-		                        $_SESSION['socialLogin']->getUserID());
+								$_SESSION['socialLogin']->getUserID());
 		session_destroy();
 	}