brusselopole / Worldopole

core/cron/pokemon.cron.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 $rarityarray = array();
 foreach ($counts as $poke_id => $total) {
 	$rarity = $pokemons->pokemon->$poke_id->rarity;
-	isset($rarityarray[$rarity]) ? $rarityarray[$rarity]+=$total : $rarityarray[$rarity]=$total;
+	isset($rarityarray[$rarity]) ? $rarityarray[$rarity] += $total : $rarityarray[$rarity] = $total;
 }
 
 // Set amount of Pokemon for each rarity to 0 if there weren't any at that time

core/js/trainer.graph.js.php

Indentation +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 $trainer_lvl = [];
 # For all 3 teams
 for ($teamid = 1; $teamid <= 3; $teamid++) {
-    $data = $manager->getTrainerLevelCount($teamid);
+	$data = $manager->getTrainerLevelCount($teamid);
 	$trainer_lvl[$teamid] = $data;
 }
 

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 // Load Query Manager
 // ###################
 
-include_once __DIR__ . '/../process/queries/QueryManager.php';
+include_once __DIR__.'/../process/queries/QueryManager.php';
 $manager = QueryManager::current();
 
 # Chart Graph datas	 

core/process/data.loader.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 // Load Query Manager
 // ###################
 
-include_once __DIR__ . '/queries/QueryManager.php';
+include_once __DIR__.'/queries/QueryManager.php';
 $manager = QueryManager::current();
 
 
@@ -268,7 +268,7 @@ 
 
 
 				// Gym owned and average points
-				$data	= $manager->getOwnedAndPoints($team_values->id);
+				$data = $manager->getOwnedAndPoints($team_values->id);
 
 				$teams->$team_key->gym_owned = $data->total;
 				$teams->$team_key->average = $data->average_points;

install/tester.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 // Load Query Manager
 // ###################
 
-include_once __DIR__ . '/../core/process/queries/QueryManager.php';
+include_once __DIR__.'/../core/process/queries/QueryManager.php';
 
 
 ########################################################################

core/process/queries/QueryManagerPostgresql.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/QueryManagerPostgresqlMonocleAlternate.php';
+include_once __DIR__.'/QueryManagerPostgresqlMonocleAlternate.php';
 
 
 abstract class QueryManagerPostgresql extends QueryManager {
@@ -12,7 +12,7 @@ 
 		$this->db = pg_connect("host=".SYS_DB_HOST." port=".SYS_DB_PORT." dbname=".SYS_DB_NAME." user=".SYS_DB_USER." password=".SYS_DB_PSWD);
 
 		if ($this->db === false) {
-			header('Location:' . HOST_URL . 'offline.html');
+			header('Location:'.HOST_URL.'offline.html');
 			exit();
 		}
 	}

Braces +8 added lines, -4 removed lines

@@ -3,11 +3,13 @@ 
 include_once __DIR__ . '/QueryManagerPostgresqlMonocleAlternate.php';
 
 
-abstract class QueryManagerPostgresql extends QueryManager {
+abstract class QueryManagerPostgresql extends QueryManager
+{
 
 	protected $db;
 
-	protected function __construct() {
+	protected function __construct()
+	{
 
 		$this->db = pg_connect("host=".SYS_DB_HOST." port=".SYS_DB_PORT." dbname=".SYS_DB_NAME." user=".SYS_DB_USER." password=".SYS_DB_PSWD);
 
@@ -17,7 +19,8 @@ 
 		}
 	}
 
-	public function __destruct() {
+	public function __destruct()
+	{
 		pg_close($this->db);
 	}
 
@@ -25,7 +28,8 @@ 
 	// Misc
 	/////////
 
-	public function getEcapedString($string) {
+	public function getEcapedString($string)
+	{
 		return pg_escape_string($this->db, $string);
 	}
 

core/process/queries/QueryManagerMysql.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 
-include_once __DIR__ . '/QueryManagerMysqlRocketmap.php';
-include_once __DIR__ . '/QueryManagerMysqlMonocleAlternate.php';
+include_once __DIR__.'/QueryManagerMysqlRocketmap.php';
+include_once __DIR__.'/QueryManagerMysqlMonocleAlternate.php';
 
 
 abstract class QueryManagerMysql extends QueryManager {

Braces +8 added lines, -4 removed lines

@@ -4,11 +4,13 @@ 
 include_once __DIR__ . '/QueryManagerMysqlMonocleAlternate.php';
 
 
-abstract class QueryManagerMysql extends QueryManager {
+abstract class QueryManagerMysql extends QueryManager
+{
 
 	protected $mysqli;
 
-	protected function __construct() {
+	protected function __construct()
+	{
 		$this->mysqli = new mysqli(SYS_DB_HOST, SYS_DB_USER, SYS_DB_PSWD, SYS_DB_NAME, SYS_DB_PORT);
 		if ($this->mysqli->connect_error != '') {
 			header('Location:'.HOST_URL.'offline.html');
@@ -22,7 +24,8 @@ 
 		}
 	}
 
-	public function __destruct() {
+	public function __destruct()
+	{
 		$this->mysqli->close();
 	}
 
@@ -30,7 +33,8 @@ 
 	// Misc
 	/////////
 
-	public function getEcapedString($string) {
+	public function getEcapedString($string)
+	{
 		return mysqli_real_escape_string($this->mysqli, $string);
 	}
 

core/process/queries/QueryManager.php

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-include_once __DIR__ . '/../../../config.php';
-include_once __DIR__ . '/QueryManagerMysql.php';
-include_once __DIR__ . '/QueryManagerPostgresql.php';
+include_once __DIR__.'/../../../config.php';
+include_once __DIR__.'/QueryManagerMysql.php';
+include_once __DIR__.'/QueryManagerPostgresql.php';
 
 abstract class QueryManager {
 
@@ -15,7 +15,7 @@ 
 
 		if (self::$current == null) {
 
-			$variables = realpath(dirname(__FILE__)) . '/../../json/variables.json';
+			$variables = realpath(dirname(__FILE__)).'/../../json/variables.json';
 			self::$config = json_decode(file_get_contents($variables));
 
 			include_once(SYS_PATH.'/core/process/timezone.loader.php');
@@ -37,7 +37,7 @@ 
 		}
 		return self::$current;
 	}
-	private function __construct(){}
+	private function __construct() {}
 
 	// Misc
 	abstract public function getEcapedString($string);

Braces +7 added lines, -3 removed lines

@@ -4,13 +4,15 @@ 
 include_once __DIR__ . '/QueryManagerMysql.php';
 include_once __DIR__ . '/QueryManagerPostgresql.php';
 
-abstract class QueryManager {
+abstract class QueryManager
+{
 
 	protected static $time_offset;
 	protected static $config;
 
 	private static $current;
-	public static function current() {
+	public static function current()
+	{
 		global $time_offset;
 
 		if (self::$current == null) {
@@ -37,7 +39,9 @@ 
 		}
 		return self::$current;
 	}
-	private function __construct(){}
+	private function __construct()
+	{
+}
 
 	// Misc
 	abstract public function getEcapedString($string);

core/process/aru.php

Spacing +48 added lines, -48 removed lines

@@ -40,7 +40,7 @@ 
 // Load Query Manager
 // ###################
 
-include_once __DIR__ . '/queries/QueryManager.php';
+include_once __DIR__.'/queries/QueryManager.php';
 $manager = QueryManager::current();
 
 $request = "";
@@ -161,10 +161,10 @@ 
 					}
 
 					$html = '
-                    <div class="col-md-1 col-xs-4 pokemon-single" data-pokeid="' . $pokeid . '" data-pokeuid="' . $pokeuid . '" style="display: none;">
-                    <a href="pokemon/' . $pokeid . '"><img src="' . $pokemons->pokemon->$pokeid->img . '" alt="' . $pokemons->pokemon->$pokeid->name . '" class="img-responsive"></a>
-                    <a href="pokemon/' . $pokeid . '"><p class="pkmn-name">' . $pokemons->pokemon->$pokeid->name . '</p></a>
-                    <a href="' . $location_link . '" target="_blank">
+                    <div class="col-md-1 col-xs-4 pokemon-single" data-pokeid="' . $pokeid.'" data-pokeuid="'.$pokeuid.'" style="display: none;">
+                    <a href="pokemon/' . $pokeid.'"><img src="'.$pokemons->pokemon->$pokeid->img.'" alt="'.$pokemons->pokemon->$pokeid->name.'" class="img-responsive"></a>
+                    <a href="pokemon/' . $pokeid.'"><p class="pkmn-name">'.$pokemons->pokemon->$pokeid->name.'</p></a>
+                    <a href="' . $location_link.'" target="_blank">
                         <small class="pokemon-timer">00:00:00</small>
                     </a>';
 					if ($config->system->recents_encounter_details) {
@@ -172,50 +172,50 @@ 
 							if ($config->system->iv_numbers) {
 								$html .= '
                                 <div class="progress" style="height: 15px; margin-bottom: 0">
-                                    <div title="' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $encdetails->attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px">
-                                        <span class="sr-only">' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '</span>' . $encdetails->attack . '
+                                    <div title="' . $locales->IV_ATTACK.': '.$encdetails->attack.'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$encdetails->attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px">
+                                        <span class="sr-only">' . $locales->IV_ATTACK.': '.$encdetails->attack.'</span>'.$encdetails->attack.'
                                     </div>
-                                    <div title="' . $locales->IV_DEFENSE . ': ' . $encdetails->defense . '" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="' . $encdetails->defense . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px">
-                                        <span class="sr-only">' . $locales->IV_DEFENSE . ': ' . $encdetails->defense . '</span>' . $encdetails->defense . '
+                                    <div title="' . $locales->IV_DEFENSE.': '.$encdetails->defense.'" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$encdetails->defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px">
+                                        <span class="sr-only">' . $locales->IV_DEFENSE.': '.$encdetails->defense.'</span>'.$encdetails->defense.'
                                     </div>
-                                    <div title="' . $locales->IV_STAMINA . ': ' . $encdetails->stamina . '" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="' . $encdetails->stamina . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px">
-                                        <span class="sr-only">' . $locales->IV_STAMINA . ': ' . $encdetails->stamina . '</span>' . $encdetails->stamina . '
+                                    <div title="' . $locales->IV_STAMINA.': '.$encdetails->stamina.'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$encdetails->stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px">
+                                        <span class="sr-only">' . $locales->IV_STAMINA.': '.$encdetails->stamina.'</span>'.$encdetails->stamina.'
                                     </div>
                                 </div>';
 							} else {
 								$html .= '
                                 <div class="progress" style="height: 6px; width: 80%; margin: 5px auto 0 auto">
-                                <div title="' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $encdetails->attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $encdetails->attack) / 3) . '%">
-                                        <span class="sr-only">' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '</span>
+                                <div title="' . $locales->IV_ATTACK.': '.$encdetails->attack.'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$encdetails->attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $encdetails->attack) / 3).'%">
+                                        <span class="sr-only">' . $locales->IV_ATTACK.': '.$encdetails->attack.'</span>
                                 </div>
-                                <div title="' . $locales->IV_DEFENSE . ': ' . $encdetails->defense . '" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="' . $encdetails->defense . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $encdetails->defense) / 3) . '%">
-                                        <span class="sr-only">' . $locales->IV_DEFENSE . ': ' . $encdetails->defense . '</span>
+                                <div title="' . $locales->IV_DEFENSE.': '.$encdetails->defense.'" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$encdetails->defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $encdetails->defense) / 3).'%">
+                                        <span class="sr-only">' . $locales->IV_DEFENSE.': '.$encdetails->defense.'</span>
                                 </div>
-                                <div title="' . $locales->IV_STAMINA . ': ' . $encdetails->stamina . '" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="' . $encdetails->stamina . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $encdetails->stamina) / 3) . '%">
-                                        <span class="sr-only">' . $locales->IV_STAMINA . ': ' . $encdetails->stamina . '</span>
+                                <div title="' . $locales->IV_STAMINA.': '.$encdetails->stamina.'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$encdetails->stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $encdetails->stamina) / 3).'%">
+                                        <span class="sr-only">' . $locales->IV_STAMINA.': '.$encdetails->stamina.'</span>
                                 </div>
                                 </div>';
 							}
-							$html .= '<small>' . $encdetails->cp . '</small>';
+							$html .= '<small>'.$encdetails->cp.'</small>';
 						} else {
 							if ($config->system->iv_numbers) {
 								$html .= '
                                 <div class="progress" style="height: 15px; margin-bottom: 0">
-                                    <div title="' . $locales->IV_ATTACK . ': not available" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $encdetails->attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px">
-                                        <span class="sr-only">' . $locales->IV_ATTACK . ': ' . $locales->NOT_AVAILABLE . '</span>?
+                                    <div title="' . $locales->IV_ATTACK.': not available" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$encdetails->attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px">
+                                        <span class="sr-only">' . $locales->IV_ATTACK.': '.$locales->NOT_AVAILABLE.'</span>?
                                     </div>
-                                    <div title="' . $locales->IV_DEFENSE . ': not available" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="' . $encdetails->defense . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px">
-                                        <span class="sr-only">' . $locales->IV_DEFENSE . ': ' . $locales->NOT_AVAILABLE . '</span>?
+                                    <div title="' . $locales->IV_DEFENSE.': not available" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$encdetails->defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px">
+                                        <span class="sr-only">' . $locales->IV_DEFENSE.': '.$locales->NOT_AVAILABLE.'</span>?
                                     </div>
-                                    <div title="' . $locales->IV_STAMINA . ': not available" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="' . $encdetails->stamina . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px">
-                                        <span class="sr-only">' . $locales->IV_STAMINA . ': ' . $locales->NOT_AVAILABLE . '</span>?
+                                    <div title="' . $locales->IV_STAMINA.': not available" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$encdetails->stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px">
+                                        <span class="sr-only">' . $locales->IV_STAMINA.': '.$locales->NOT_AVAILABLE.'</span>?
                                     </div>
                                 </div>';
 							} else {
 								$html .= '
                             <div class="progress" style="height: 6px; width: 80%; margin: 5px auto 0 auto">
                                 <div title="IV not available" class="progress-bar" role="progressbar" style="width: 100%; background-color: rgb(210,210,210)" aria-valuenow="1" aria-valuemin="0" aria-valuemax="1">
-                                    <span class="sr-only">IV ' . $locales->NOT_AVAILABLE . '</span>
+                                    <span class="sr-only">IV ' . $locales->NOT_AVAILABLE.'</span>
                                 </div>
                             </div>';
 							}
@@ -291,7 +291,7 @@ 
 
 		foreach ($teams as $team_name => $team_id) {
 
-			$data	= $manager->getOwnedAndPoints($team_id);
+			$data = $manager->getOwnedAndPoints($team_id);
 
 			$return[] = $data->total;
 			$return[] = $data->average_points;
@@ -414,38 +414,38 @@ 
 					if ($config->system->iv_numbers) {
 						$gymData['infoWindow'] .= '
 					<div style="text-align: center; width: 50px; display: inline-block; margin-right: 3px">
-						<a href="pokemon/' . $data->pokemon_id . '">
-						<img src="' . $pokemons->pokemon->$pokemon_id->img . '" height="50" style="display:inline-block" >
+						<a href="pokemon/' . $data->pokemon_id.'">
+						<img src="' . $pokemons->pokemon->$pokemon_id->img.'" height="50" style="display:inline-block" >
 						</a>
-						<p class="pkmn-name">' . $data->cp . '</p>
+						<p class="pkmn-name">' . $data->cp.'</p>
 						<div class="progress" style="height: 12px; margin-bottom: 0">
-							<div title="' . $locales->IV_ATTACK . ': ' . $data->iv_attack . '" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $data->iv_attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 13px; font-size: 11px">
-								<span class="sr-only">' . $locales->IV_ATTACK . ' : ' . $data->iv_attack . '</span>' . $data->iv_attack . '
+							<div title="' . $locales->IV_ATTACK.': '.$data->iv_attack.'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$data->iv_attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 13px; font-size: 11px">
+								<span class="sr-only">' . $locales->IV_ATTACK.' : '.$data->iv_attack.'</span>'.$data->iv_attack.'
 								</div>
-								<div title="' . $locales->IV_DEFENSE . ': ' . $data->iv_defense . '" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="' . $data->iv_defense . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 13px; font-size: 11px">
-									<span class="sr-only">' . $locales->IV_DEFENSE . ' : ' . $data->iv_defense . '</span>' . $data->iv_defense . '
+								<div title="' . $locales->IV_DEFENSE.': '.$data->iv_defense.'" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$data->iv_defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 13px; font-size: 11px">
+									<span class="sr-only">' . $locales->IV_DEFENSE.' : '.$data->iv_defense.'</span>'.$data->iv_defense.'
 								</div>
-								<div title="' . $locales->IV_STAMINA . ': ' . $data->iv_stamina . '" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="' . $data->iv_stamina . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 13px; font-size: 11px">
-									<span class="sr-only">' . $locales->IV_STAMINA . ' : ' . $data->iv_stamina . '</span>' . $data->iv_stamina . '
+								<div title="' . $locales->IV_STAMINA.': '.$data->iv_stamina.'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$data->iv_stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 13px; font-size: 11px">
+									<span class="sr-only">' . $locales->IV_STAMINA.' : '.$data->iv_stamina.'</span>'.$data->iv_stamina.'
 								</div>
 							</div>
 						</div>';
 					} else {
 						$gymData['infoWindow'] .= '
 					<div style="text-align: center; width: 50px; display: inline-block; margin-right: 3px">
-						<a href="pokemon/' . $data->pokemon_id . '">
-						<img src="' . $pokemons->pokemon->$pokemon_id->img . '" height="50" style="display:inline-block" >
+						<a href="pokemon/' . $data->pokemon_id.'">
+						<img src="' . $pokemons->pokemon->$pokemon_id->img.'" height="50" style="display:inline-block" >
 						</a>
-						<p class="pkmn-name">' . $data->cp . '</p>
+						<p class="pkmn-name">' . $data->cp.'</p>
 						<div class="progress" style="height: 4px; width: 40px; margin-bottom: 10px; margin-top: 2px; margin-left: auto; margin-right: auto">
-							<div title="' . $locales->IV_ATTACK . ': ' . $data->iv_attack . '" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $data->iv_attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $data->iv_attack) / 3) . '%">
-								<span class="sr-only">' . $locales->IV_ATTACK . ': ' . $data->iv_attack . '</span>
+							<div title="' . $locales->IV_ATTACK.': '.$data->iv_attack.'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$data->iv_attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $data->iv_attack) / 3).'%">
+								<span class="sr-only">' . $locales->IV_ATTACK.': '.$data->iv_attack.'</span>
 							</div>
-							<div title="' . $locales->IV_DEFENSE . ': ' . $data->iv_defense . '" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="' . $data->iv_defense . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $data->iv_defense) / 3) . '%">
-								<span class="sr-only">' . $locales->IV_DEFENSE . ': ' . $data->iv_defense . '</span>
+							<div title="' . $locales->IV_DEFENSE.': '.$data->iv_defense.'" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$data->iv_defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $data->iv_defense) / 3).'%">
+								<span class="sr-only">' . $locales->IV_DEFENSE.': '.$data->iv_defense.'</span>
 							</div>
-							<div title="' . $locales->IV_STAMINA . ': ' . $data->iv_stamina . '" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="' . $data->iv_stamina . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $data->iv_stamina) / 3) . '%">
-								<span class="sr-only">' . $locales->IV_STAMINA . ': ' . $data->iv_stamina . '</span>
+							<div title="' . $locales->IV_STAMINA.': '.$data->iv_stamina.'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$data->iv_stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $data->iv_stamina) / 3).'%">
+								<span class="sr-only">' . $locales->IV_STAMINA.': '.$data->iv_stamina.'</span>
 							</div>
 						</div>
 					</div>';
@@ -523,7 +523,7 @@ 
 			} else {
 				$data->charge_move = "?";
 			}
-			$raids[10*$page + $i] = $data;
+			$raids[10 * $page + $i] = $data;
 			$i++;
 		}
 		$json = array();
@@ -611,7 +611,7 @@ 
 				$entry->total_cp_diff = 0;
 				$entry->only_cp_changed = true;
 				if ($idx < count($entries) - 1) {
-					$next_entry = $entries[$idx+1];
+					$next_entry = $entries[$idx + 1];
 					$entry->total_cp_diff = $entry->total_cp - $next_entry->total_cp;
 					$entry->class = $entry->total_cp_diff > 0 ? 'gain' : ($entry->total_cp_diff < 0 ? 'loss' : '');
 					$entry_pokemon = preg_split('/,/', $entry->pokemon_uids, null, PREG_SPLIT_NO_EMPTY);
@@ -624,7 +624,7 @@ 
 					foreach ($old_pokemon as $pkm) {
 						$next_entry->pokemon[$pkm]->class = 'old';
 					}
-					if ($entry->team_id != $next_entry->team_id|| $entry->pokemon_uids != $next_entry->pokemon_uids) {
+					if ($entry->team_id != $next_entry->team_id || $entry->pokemon_uids != $next_entry->pokemon_uids) {
 						$entry->only_cp_changed = false;
 					}
 				}
@@ -646,7 +646,7 @@ 
 
 
 	case 'pokemon_slider_init':
-		$bounds		= $manager->getPokemonSliderMinMax();
+		$bounds = $manager->getPokemonSliderMinMax();
 
 		header('Content-Type: application/json');
 		echo json_encode($bounds);

Switch Indentation +406 added lines, -406 removed lines

@@ -59,118 +59,118 @@ 
 	//
 	############################
 
-	case 'home_update':
-		$values = [];
-		// Right now
-		// ---------
-		$data = $manager->getTotalPokemon();
-		$values[] = $data->total;
+		case 'home_update':
+			$values = [];
+			// Right now
+			// ---------
+			$data = $manager->getTotalPokemon();
+			$values[] = $data->total;
 
-		// Lured stops
-		// -----------
-		$data = $manager->getTotalLures();
-		$values[] = $data->total;
+			// Lured stops
+			// -----------
+			$data = $manager->getTotalLures();
+			$values[] = $data->total;
 
-		// Active Raids
-		// -----------
-		$data = $manager->getTotalRaids();
-		$values[] = $data->total;
+			// Active Raids
+			// -----------
+			$data = $manager->getTotalRaids();
+			$values[] = $data->total;
 
-		// Team battle
-		// -----------
-		$data = $manager->getTotalGyms();
-		$values[] = $data->total;
+			// Team battle
+			// -----------
+			$data = $manager->getTotalGyms();
+			$values[] = $data->total;
 
-		// Red
-		$data = $manager->getTotalGymsForTeam(2);
-		$values[] = $data->total;
+			// Red
+			$data = $manager->getTotalGymsForTeam(2);
+			$values[] = $data->total;
 
-		// Blue
-		$data = $manager->getTotalGymsForTeam(1);
-		$values[] = $data->total;
+			// Blue
+			$data = $manager->getTotalGymsForTeam(1);
+			$values[] = $data->total;
 
-		// Yellow
-		$data = $manager->getTotalGymsForTeam(3);
-		$values[] = $data->total;
+			// Yellow
+			$data = $manager->getTotalGymsForTeam(3);
+			$values[] = $data->total;
 
-		// Neutral
-		$data = $manager->getTotalGymsForTeam(0);
-		$values[] = $data->total;
+			// Neutral
+			$data = $manager->getTotalGymsForTeam(0);
+			$values[] = $data->total;
 
 
-		header('Content-Type: application/json');
-		echo json_encode($values);
+			header('Content-Type: application/json');
+			echo json_encode($values);
 
-		break;
+			break;
 
 
-	####################################
-	//
-	// Update latests spawn on homepage
-	//
-	####################################
+		####################################
+		//
+		// Update latests spawn on homepage
+		//
+		####################################
 
-	case 'spawnlist_update':
-		// Recent spawn
-		// ------------
-		$total_spawns = array();
-		$last_uid_param = "";
-		if (isset($_GET['last_uid'])) {
-			$last_uid_param = $_GET['last_uid'];
-		}
-		if ($config->system->recents_filter) {
-			// get all mythic pokemon ids
-			$mythic_pokemons = array();
-			foreach ($pokemons->pokemon as $id => $pokemon) {
-				if ($pokemon->spawn_rate < $config->system->recents_filter_rarity && $pokemon->rating >= $config->system->recents_filter_rating) {
-					$mythic_pokemons[] = $id;
-				}
+		case 'spawnlist_update':
+			// Recent spawn
+			// ------------
+			$total_spawns = array();
+			$last_uid_param = "";
+			if (isset($_GET['last_uid'])) {
+				$last_uid_param = $_GET['last_uid'];
 			}
+			if ($config->system->recents_filter) {
+				// get all mythic pokemon ids
+				$mythic_pokemons = array();
+				foreach ($pokemons->pokemon as $id => $pokemon) {
+					if ($pokemon->spawn_rate < $config->system->recents_filter_rarity && $pokemon->rating >= $config->system->recents_filter_rating) {
+						$mythic_pokemons[] = $id;
+					}
+				}
 
-			// get last mythic pokemon
-			$result = $manager->getRecentMythic($mythic_pokemons);
-		} else {
-			// get last pokemon
-			$result = $manager->getRecentAll();
-		}
+				// get last mythic pokemon
+				$result = $manager->getRecentMythic($mythic_pokemons);
+			} else {
+				// get last pokemon
+				$result = $manager->getRecentAll();
+			}
 
-		if (count($result) > 0) {
-			foreach ($result as $data) {
-				$new_spawn = array();
-				$pokeid = $data->pokemon_id;
-				$pokeuid = $data->encounter_id;
-
-				if ($last_uid_param != $pokeuid) {
-					$last_seen = strtotime($data->disappear_time_real);
-
-					$location_link = isset($config->system->location_url) ? $config->system->location_url : 'https://maps.google.com/?q={latitude},{longitude}&ll={latitude},{longitude}&z=16';
-					$location_link = str_replace('{latitude}', $data->latitude, $location_link);
-					$location_link = str_replace('{longitude}', $data->longitude, $location_link);
-
-					if ($config->system->recents_encounter_details) {
-						$encdetails = new stdClass();
-						$encdetails->cp = $data->cp;
-						$encdetails->attack = $data->individual_attack;
-						$encdetails->defense = $data->individual_defense;
-						$encdetails->stamina = $data->individual_stamina;
-						if (isset($encdetails->cp) && isset($encdetails->attack) && isset($encdetails->defense) && isset($encdetails->stamina)) {
-							$encdetails->available = true;
-						} else {
-							$encdetails->available = false;
+			if (count($result) > 0) {
+				foreach ($result as $data) {
+					$new_spawn = array();
+					$pokeid = $data->pokemon_id;
+					$pokeuid = $data->encounter_id;
+
+					if ($last_uid_param != $pokeuid) {
+						$last_seen = strtotime($data->disappear_time_real);
+
+						$location_link = isset($config->system->location_url) ? $config->system->location_url : 'https://maps.google.com/?q={latitude},{longitude}&ll={latitude},{longitude}&z=16';
+						$location_link = str_replace('{latitude}', $data->latitude, $location_link);
+						$location_link = str_replace('{longitude}', $data->longitude, $location_link);
+
+						if ($config->system->recents_encounter_details) {
+							$encdetails = new stdClass();
+							$encdetails->cp = $data->cp;
+							$encdetails->attack = $data->individual_attack;
+							$encdetails->defense = $data->individual_defense;
+							$encdetails->stamina = $data->individual_stamina;
+							if (isset($encdetails->cp) && isset($encdetails->attack) && isset($encdetails->defense) && isset($encdetails->stamina)) {
+								$encdetails->available = true;
+							} else {
+								$encdetails->available = false;
+							}
 						}
-					}
 
-					$html = '
+						$html = '
                     <div class="col-md-1 col-xs-4 pokemon-single" data-pokeid="' . $pokeid . '" data-pokeuid="' . $pokeuid . '" style="display: none;">
                     <a href="pokemon/' . $pokeid . '"><img src="' . $pokemons->pokemon->$pokeid->img . '" alt="' . $pokemons->pokemon->$pokeid->name . '" class="img-responsive"></a>
                     <a href="pokemon/' . $pokeid . '"><p class="pkmn-name">' . $pokemons->pokemon->$pokeid->name . '</p></a>
                     <a href="' . $location_link . '" target="_blank">
                         <small class="pokemon-timer">00:00:00</small>
                     </a>';
-					if ($config->system->recents_encounter_details) {
-						if ($encdetails->available) {
-							if ($config->system->iv_numbers) {
-								$html .= '
+						if ($config->system->recents_encounter_details) {
+							if ($encdetails->available) {
+								if ($config->system->iv_numbers) {
+									$html .= '
                                 <div class="progress" style="height: 15px; margin-bottom: 0">
                                     <div title="' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $encdetails->attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px">
                                         <span class="sr-only">' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '</span>' . $encdetails->attack . '
@@ -182,8 +182,8 @@ 
                                         <span class="sr-only">' . $locales->IV_STAMINA . ': ' . $encdetails->stamina . '</span>' . $encdetails->stamina . '
                                     </div>
                                 </div>';
-							} else {
-								$html .= '
+								} else {
+									$html .= '
                                 <div class="progress" style="height: 6px; width: 80%; margin: 5px auto 0 auto">
                                 <div title="' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $encdetails->attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $encdetails->attack) / 3) . '%">
                                         <span class="sr-only">' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '</span>
@@ -195,11 +195,11 @@ 
                                         <span class="sr-only">' . $locales->IV_STAMINA . ': ' . $encdetails->stamina . '</span>
                                 </div>
                                 </div>';
-							}
-							$html .= '<small>' . $encdetails->cp . '</small>';
-						} else {
-							if ($config->system->iv_numbers) {
-								$html .= '
+								}
+								$html .= '<small>' . $encdetails->cp . '</small>';
+							} else {
+								if ($config->system->iv_numbers) {
+									$html .= '
                                 <div class="progress" style="height: 15px; margin-bottom: 0">
                                     <div title="' . $locales->IV_ATTACK . ': not available" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $encdetails->attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px">
                                         <span class="sr-only">' . $locales->IV_ATTACK . ': ' . $locales->NOT_AVAILABLE . '</span>?
@@ -211,116 +211,116 @@ 
                                         <span class="sr-only">' . $locales->IV_STAMINA . ': ' . $locales->NOT_AVAILABLE . '</span>?
                                     </div>
                                 </div>';
-							} else {
-								$html .= '
+								} else {
+									$html .= '
                             <div class="progress" style="height: 6px; width: 80%; margin: 5px auto 0 auto">
                                 <div title="IV not available" class="progress-bar" role="progressbar" style="width: 100%; background-color: rgb(210,210,210)" aria-valuenow="1" aria-valuemin="0" aria-valuemax="1">
                                     <span class="sr-only">IV ' . $locales->NOT_AVAILABLE . '</span>
                                 </div>
                             </div>';
+								}
+								$html .= '<small>???</small>';
 							}
-							$html .= '<small>???</small>';
 						}
-					}
-					$html .= '
+						$html .= '
                     </div>';
-					$new_spawn['html'] = $html;
-					$countdown = $last_seen - time();
-					$new_spawn['countdown'] = $countdown;
-					$new_spawn['pokemon_uid'] = $pokeuid;
-					$total_spawns[] = $new_spawn;
-				} else {
-					break;
+						$new_spawn['html'] = $html;
+						$countdown = $last_seen - time();
+						$new_spawn['countdown'] = $countdown;
+						$new_spawn['pokemon_uid'] = $pokeuid;
+						$total_spawns[] = $new_spawn;
+					} else {
+						break;
+					}
 				}
 			}
-		}
 
-		header('Content-Type: application/json');
-		echo json_encode($total_spawns);
+			header('Content-Type: application/json');
+			echo json_encode($total_spawns);
 
-		break;
+			break;
 
 
-	####################################
-	//
-	// List Pokestop
-	//
-	####################################
+		####################################
+		//
+		// List Pokestop
+		//
+		####################################
 
-	case 'pokestop':
-		$datas = $manager->getAllPokestops();
+		case 'pokestop':
+			$datas = $manager->getAllPokestops();
 
-		$pokestops = [];
-		foreach ($datas as $data) {
-			if ($data->lure_expiration >= $data->now) {
-				$icon = 'pokestap_lured.png';
-				$text = sprintf($locales->POKESTOPS_MAP_LURED, date('H:i:s', strtotime($data->lure_expiration_real)));
-				$lured = true;
-			} else {
-				$icon = 'pokestap.png';
-				$text = $locales->POKESTOPS_MAP_REGULAR;
-				$lured = false;
-			}
+			$pokestops = [];
+			foreach ($datas as $data) {
+				if ($data->lure_expiration >= $data->now) {
+					$icon = 'pokestap_lured.png';
+					$text = sprintf($locales->POKESTOPS_MAP_LURED, date('H:i:s', strtotime($data->lure_expiration_real)));
+					$lured = true;
+				} else {
+					$icon = 'pokestap.png';
+					$text = $locales->POKESTOPS_MAP_REGULAR;
+					$lured = false;
+				}
 
-			$pokestops[] = [
-				$text,
-				$icon,
-				$data->latitude,
-				$data->longitude,
-				$lured
-			];
-		}
+				$pokestops[] = [
+					$text,
+					$icon,
+					$data->latitude,
+					$data->longitude,
+					$lured
+				];
+			}
 
-		header('Content-Type: application/json');
-		echo json_encode($pokestops);
+			header('Content-Type: application/json');
+			echo json_encode($pokestops);
 
-		break;
+			break;
 
 
-	####################################
-	//
-	// Update data for the gym battle
-	//
-	####################################
+		####################################
+		//
+		// Update data for the gym battle
+		//
+		####################################
 
-	case 'update_gym':
-		$teams = new stdClass();
-		$teams->mystic = 1;
-		$teams->valor = 2;
-		$teams->instinct = 3;
+		case 'update_gym':
+			$teams = new stdClass();
+			$teams->mystic = 1;
+			$teams->valor = 2;
+			$teams->instinct = 3;
 
-		foreach ($teams as $team_name => $team_id) {
+			foreach ($teams as $team_name => $team_id) {
 
-			$data	= $manager->getOwnedAndPoints($team_id);
+				$data	= $manager->getOwnedAndPoints($team_id);
 
-			$return[] = $data->total;
-			$return[] = $data->average_points;
-		}
+				$return[] = $data->total;
+				$return[] = $data->average_points;
+			}
 
-		header('Content-Type: application/json');
-		echo json_encode($return);
+			header('Content-Type: application/json');
+			echo json_encode($return);
 
-		break;
+			break;
 
 
-	####################################
-	//
-	// Get datas for the gym map
-	//
-	####################################
+		####################################
+		//
+		// Get datas for the gym map
+		//
+		####################################
 
 
-	case 'gym_map':
-		$datas = $manager->getAllGyms();
+		case 'gym_map':
+			$datas = $manager->getAllGyms();
 
-		$gyms = [];
-		foreach ($datas as $data) {
-			// Team
-			// 1 = bleu
-			// 2 = rouge
-			// 3 = jaune
+			$gyms = [];
+			foreach ($datas as $data) {
+				// Team
+				// 1 = bleu
+				// 2 = rouge
+				// 3 = jaune
 
-			switch ($data->team_id) {
+				switch ($data->team_id) {
 				case 0:
 					$icon	= 'map_white.png';
 					$team	= 'No Team (yet)';
@@ -344,7 +344,7 @@ 
 					$team	= 'Team Instinct';
 					$color = 'rgba(254, 217, 40, .6)';
 					break;
-			}
+				}
 
 			if ($data->team_id != 0) {
 				$icon .= $data->level.".png";
@@ -370,49 +370,49 @@ 
 	//
 	####################################
 
-	case 'gym_defenders':
-		$gym_id = $manager->getEcapedString($_GET['gym_id']);
+		case 'gym_defenders':
+			$gym_id = $manager->getEcapedString($_GET['gym_id']);
 
-		$data = $manager->getGymData($gym_id);
-		$gymData['gymDetails']['gymInfos'] = false;
+			$data = $manager->getGymData($gym_id);
+			$gymData['gymDetails']['gymInfos'] = false;
 
-		if (!is_null($data)) {
-			if ($data->name == null) {
-				$gymData['gymDetails']['gymInfos']['name'] = "?";
-			} else {
-				$gymData['gymDetails']['gymInfos']['name'] = $data->name;
-			}
-			$gymData['gymDetails']['gymInfos']['description'] = $data->description;
-			if ($data->url == null) {
-				$gymData['gymDetails']['gymInfos']['url'] = 'https://upload.wikimedia.org/wikipedia/commons/thumb/8/86/Solid_grey.svg/200px-Solid_grey.svg.png';
-			} else {
-				$gymData['gymDetails']['gymInfos']['url'] = $data->url;
-			}
-			if ($data->url == null) {
-				$gymData['gymDetails']['gymInfos']['points'] = "?";
-			} else {
-				$gymData['gymDetails']['gymInfos']['points'] = $data->total_cp;
-			}
-			$gymData['gymDetails']['gymInfos']['level'] = $data->level;
-			if ($data->last_scanned == null) {
-				$gymData['gymDetails']['gymInfos']['last_scanned'] = "?";
-			} else {
-				$gymData['gymDetails']['gymInfos']['last_scanned'] = $data->last_scanned;
-			}
-			$gymData['gymDetails']['gymInfos']['team'] = $data->team;
-			$gymData['gymDetails']['gymInfos']['guardPokemonId'] = $data->guard_pokemon_id;
+			if (!is_null($data)) {
+				if ($data->name == null) {
+					$gymData['gymDetails']['gymInfos']['name'] = "?";
+				} else {
+					$gymData['gymDetails']['gymInfos']['name'] = $data->name;
+				}
+				$gymData['gymDetails']['gymInfos']['description'] = $data->description;
+				if ($data->url == null) {
+					$gymData['gymDetails']['gymInfos']['url'] = 'https://upload.wikimedia.org/wikipedia/commons/thumb/8/86/Solid_grey.svg/200px-Solid_grey.svg.png';
+				} else {
+					$gymData['gymDetails']['gymInfos']['url'] = $data->url;
+				}
+				if ($data->url == null) {
+					$gymData['gymDetails']['gymInfos']['points'] = "?";
+				} else {
+					$gymData['gymDetails']['gymInfos']['points'] = $data->total_cp;
+				}
+				$gymData['gymDetails']['gymInfos']['level'] = $data->level;
+				if ($data->last_scanned == null) {
+					$gymData['gymDetails']['gymInfos']['last_scanned'] = "?";
+				} else {
+					$gymData['gymDetails']['gymInfos']['last_scanned'] = $data->last_scanned;
+				}
+				$gymData['gymDetails']['gymInfos']['team'] = $data->team;
+				$gymData['gymDetails']['gymInfos']['guardPokemonId'] = $data->guard_pokemon_id;
 
-			// Skip Query if team is none
-			if ($data->team > 0) {
-				$datas = $manager->getGymDefenders($gym_id);
-				$gymData['infoWindow'] = '
+				// Skip Query if team is none
+				if ($data->team > 0) {
+					$datas = $manager->getGymDefenders($gym_id);
+					$gymData['infoWindow'] = '
 				<div class="gym_defenders">
 				';
-				foreach ($datas as $data) {
-					$gymData['gymDetails']['pokemons'][] = $data;
-					$pokemon_id = $data->pokemon_id;
-					if ($config->system->iv_numbers) {
-						$gymData['infoWindow'] .= '
+					foreach ($datas as $data) {
+						$gymData['gymDetails']['pokemons'][] = $data;
+						$pokemon_id = $data->pokemon_id;
+						if ($config->system->iv_numbers) {
+							$gymData['infoWindow'] .= '
 					<div style="text-align: center; width: 50px; display: inline-block; margin-right: 3px">
 						<a href="pokemon/' . $data->pokemon_id . '">
 						<img src="' . $pokemons->pokemon->$pokemon_id->img . '" height="50" style="display:inline-block" >
@@ -430,8 +430,8 @@ 
 								</div>
 							</div>
 						</div>';
-					} else {
-						$gymData['infoWindow'] .= '
+						} else {
+							$gymData['infoWindow'] .= '
 					<div style="text-align: center; width: 50px; display: inline-block; margin-right: 3px">
 						<a href="pokemon/' . $data->pokemon_id . '">
 						<img src="' . $pokemons->pokemon->$pokemon_id->img . '" height="50" style="display:inline-block" >
@@ -449,254 +449,254 @@ 
 							</div>
 						</div>
 					</div>';
+						}
 					}
 				}
+				$gymData['infoWindow'] = $gymData['infoWindow'].'</div>';
 			}
-			$gymData['infoWindow'] = $gymData['infoWindow'].'</div>';
-		}
 
 
-		header('Content-Type: application/json');
-		echo json_encode($gymData);
+			header('Content-Type: application/json');
+			echo json_encode($gymData);
 
-		break;
+			break;
 
 
-	case 'trainer':
-		$name = "";
-		$page = "0";
-		$team = 0;
-		$ranking = 0;
-		if (isset($_GET['name'])) {
-			$trainer_name = $manager->getEcapedString($_GET['name']);
-		}
-		if (isset($_GET['team'])) {
-			$team = $manager->getEcapedString($_GET['team']);
-		}
-		if (isset($_GET['page'])) {
-			$page = $manager->getEcapedString($_GET['page']);
-		}
-		if (isset($_GET['ranking'])) {
-			$ranking = $manager->getEcapedString($_GET['ranking']);
-		}
-
-		$trainers = $manager->getTrainers($trainer_name, $team, $page, $ranking);
-		$json = array();
-		$json['trainers'] = $trainers;
-		$locale = array();
-		$locale["today"] = $locales->TODAY;
-		$locale["day"] = $locales->DAY;
-		$locale["days"] = $locales->DAYS;
-		$locale["ivAttack"] = $locales->IV_ATTACK;
-		$locale["ivDefense"] = $locales->IV_DEFENSE;
-		$locale["ivStamina"] = $locales->IV_STAMINA;
-		$json['locale'] = $locale;
+		case 'trainer':
+			$name = "";
+			$page = "0";
+			$team = 0;
+			$ranking = 0;
+			if (isset($_GET['name'])) {
+				$trainer_name = $manager->getEcapedString($_GET['name']);
+			}
+			if (isset($_GET['team'])) {
+				$team = $manager->getEcapedString($_GET['team']);
+			}
+			if (isset($_GET['page'])) {
+				$page = $manager->getEcapedString($_GET['page']);
+			}
+			if (isset($_GET['ranking'])) {
+				$ranking = $manager->getEcapedString($_GET['ranking']);
+			}
 
-		header('Content-Type: application/json');
-		echo json_encode($json);
+			$trainers = $manager->getTrainers($trainer_name, $team, $page, $ranking);
+			$json = array();
+			$json['trainers'] = $trainers;
+			$locale = array();
+			$locale["today"] = $locales->TODAY;
+			$locale["day"] = $locales->DAY;
+			$locale["days"] = $locales->DAYS;
+			$locale["ivAttack"] = $locales->IV_ATTACK;
+			$locale["ivDefense"] = $locales->IV_DEFENSE;
+			$locale["ivStamina"] = $locales->IV_STAMINA;
+			$json['locale'] = $locale;
 
-		break;
+			header('Content-Type: application/json');
+			echo json_encode($json);
 
+			break;
 
-	case 'raids':
-		$page = "0";
-		if (isset($_GET['page'])) {
-			$page = $manager->getEcapedString($_GET['page']);
-		}
 
-		$datas = $manager->getAllRaids($page);
-		$i = 1;
-		$raids = array();
-		foreach ($datas as $data) {
-			$data->starttime = date("H:i", strtotime($data->start));
-			$data->endtime = date("H:i", strtotime($data->end));
-			$data->gym_id = str_replace('.', '_', $data->gym_id);
-			if (isset($data->move_1)) {
-				$move1 = $data->move_1;
-				$data->quick_move = $move->$move1->name;
-			} else {
-				$data->quick_move = "?";
+		case 'raids':
+			$page = "0";
+			if (isset($_GET['page'])) {
+				$page = $manager->getEcapedString($_GET['page']);
 			}
-			if (isset($data->move_2)) {
-				$move2 = $data->move_2;
-				$data->charge_move = $move->$move2->name;
-			} else {
-				$data->charge_move = "?";
+
+			$datas = $manager->getAllRaids($page);
+			$i = 1;
+			$raids = array();
+			foreach ($datas as $data) {
+				$data->starttime = date("H:i", strtotime($data->start));
+				$data->endtime = date("H:i", strtotime($data->end));
+				$data->gym_id = str_replace('.', '_', $data->gym_id);
+				if (isset($data->move_1)) {
+					$move1 = $data->move_1;
+					$data->quick_move = $move->$move1->name;
+				} else {
+					$data->quick_move = "?";
+				}
+				if (isset($data->move_2)) {
+					$move2 = $data->move_2;
+					$data->charge_move = $move->$move2->name;
+				} else {
+					$data->charge_move = "?";
+				}
+				$raids[10*$page + $i] = $data;
+				$i++;
 			}
-			$raids[10*$page + $i] = $data;
-			$i++;
-		}
-		$json = array();
-		$json['raids'] = $raids;
-		$locale = array();
-		$locale['noraids'] = $locales->RAIDS_NONE;
-		$json['locale'] = $locale;
+			$json = array();
+			$json['raids'] = $raids;
+			$locale = array();
+			$locale['noraids'] = $locales->RAIDS_NONE;
+			$json['locale'] = $locale;
 
-		header('Content-Type: application/json');
-		echo json_encode($json);
+			header('Content-Type: application/json');
+			echo json_encode($json);
 
-		break;
+			break;
 
 
-	case 'gyms':
-		$page = '0';
-		$ranking = 0;
-		$gym_name = '';
-		$team = '';
-		if (isset($_GET['name']) && $_GET['name'] != '') {
-			$gym_name = $manager->getEcapedString($_GET['name']);
-		}
-		if (isset($_GET['team']) && $_GET['team'] != '') {
-			$team = $manager->getEcapedString($_GET['team']);
-		}
-		if (isset($_GET['page'])) {
-			$page = $manager->getEcapedString($_GET['page']);
-		}
-		if (isset($_GET['ranking'])) {
-			$ranking = $manager->getEcapedString($_GET['ranking']);
-		}
+		case 'gyms':
+			$page = '0';
+			$ranking = 0;
+			$gym_name = '';
+			$team = '';
+			if (isset($_GET['name']) && $_GET['name'] != '') {
+				$gym_name = $manager->getEcapedString($_GET['name']);
+			}
+			if (isset($_GET['team']) && $_GET['team'] != '') {
+				$team = $manager->getEcapedString($_GET['team']);
+			}
+			if (isset($_GET['page'])) {
+				$page = $manager->getEcapedString($_GET['page']);
+			}
+			if (isset($_GET['ranking'])) {
+				$ranking = $manager->getEcapedString($_GET['ranking']);
+			}
 
 
-		$datas = $manager->getGymHistories($gym_name, $team, $page, $ranking);
-		$gyms = array(); 
-		foreach ($datas as $data) {
-			$pkm = array();
-			if ($data->total_cp > 0) {
-				$pkm = $manager->getGymHistoriesPokemon($data->gym_id);
+			$datas = $manager->getGymHistories($gym_name, $team, $page, $ranking);
+			$gyms = array(); 
+			foreach ($datas as $data) {
+				$pkm = array();
+				if ($data->total_cp > 0) {
+					$pkm = $manager->getGymHistoriesPokemon($data->gym_id);
+				}
+				$data->pokemon = $pkm;
+				unset($data->pokemon_uids);
+				$data->gym_id = str_replace('.', '_', $data->gym_id);
+				$gyms[] = $data;
 			}
-			$data->pokemon = $pkm;
-			unset($data->pokemon_uids);
-			$data->gym_id = str_replace('.', '_', $data->gym_id);
-			$gyms[] = $data;
-		}
-		$json = array();
-		$json['gyms'] = $gyms;
-		$locale = array();
-		$json['locale'] = $locale;
+			$json = array();
+			$json['gyms'] = $gyms;
+			$locale = array();
+			$json['locale'] = $locale;
 
-		header('Content-Type: application/json');
-		echo json_encode($json);
+			header('Content-Type: application/json');
+			echo json_encode($json);
 
-		break;
+			break;
 
 
 
-	case 'gymhistory':
-		$gym_id = '';
-		$page = '0';
-		if (isset($_GET['gym_id'])) {
-			$gym_id = $manager->getEcapedString($_GET['gym_id']);
-			$gym_id = str_replace('_', '.', $gym_id);
-		}
-		if (isset($_GET['page'])) {
-			$page = $manager->getEcapedString($_GET['page']);
-		}
+		case 'gymhistory':
+			$gym_id = '';
+			$page = '0';
+			if (isset($_GET['gym_id'])) {
+				$gym_id = $manager->getEcapedString($_GET['gym_id']);
+				$gym_id = str_replace('_', '.', $gym_id);
+			}
+			if (isset($_GET['page'])) {
+				$page = $manager->getEcapedString($_GET['page']);
+			}
 
-		$entries = array();
+			$entries = array();
 
-		$last_page = true;
-		if ($gym_id != '') {
-			$datas = $manager->getHistoryForGym($page, $gym_id);
-			foreach ($datas['data'] as $data) {
-				$data->gym_id = str_replace('.', '_', $data->gym_id);
-				$entries[] = $data;
-			}
-			$last_page = $datas['last_page'];
-
-			foreach ($entries as $idx => $entry) {
-				$entry->total_cp_diff = 0;
-				$entry->only_cp_changed = true;
-				if ($idx < count($entries) - 1) {
-					$next_entry = $entries[$idx+1];
-					$entry->total_cp_diff = $entry->total_cp - $next_entry->total_cp;
-					$entry->class = $entry->total_cp_diff > 0 ? 'gain' : ($entry->total_cp_diff < 0 ? 'loss' : '');
-					$entry_pokemon = preg_split('/,/', $entry->pokemon_uids, null, PREG_SPLIT_NO_EMPTY);
-					$next_entry_pokemon = preg_split('/,/', $next_entry->pokemon_uids, null, PREG_SPLIT_NO_EMPTY);
-					$new_pokemon = array_diff($entry_pokemon, $next_entry_pokemon);
-					$old_pokemon = array_diff($next_entry_pokemon, $entry_pokemon);
-					foreach ($new_pokemon as $pkm) {
-						$entry->pokemon[$pkm]->class = 'new';
-					}
-					foreach ($old_pokemon as $pkm) {
-						$next_entry->pokemon[$pkm]->class = 'old';
-					}
-					if ($entry->team_id != $next_entry->team_id|| $entry->pokemon_uids != $next_entry->pokemon_uids) {
-						$entry->only_cp_changed = false;
+			$last_page = true;
+			if ($gym_id != '') {
+				$datas = $manager->getHistoryForGym($page, $gym_id);
+				foreach ($datas['data'] as $data) {
+					$data->gym_id = str_replace('.', '_', $data->gym_id);
+					$entries[] = $data;
+				}
+				$last_page = $datas['last_page'];
+
+				foreach ($entries as $idx => $entry) {
+					$entry->total_cp_diff = 0;
+					$entry->only_cp_changed = true;
+					if ($idx < count($entries) - 1) {
+						$next_entry = $entries[$idx+1];
+						$entry->total_cp_diff = $entry->total_cp - $next_entry->total_cp;
+						$entry->class = $entry->total_cp_diff > 0 ? 'gain' : ($entry->total_cp_diff < 0 ? 'loss' : '');
+						$entry_pokemon = preg_split('/,/', $entry->pokemon_uids, null, PREG_SPLIT_NO_EMPTY);
+						$next_entry_pokemon = preg_split('/,/', $next_entry->pokemon_uids, null, PREG_SPLIT_NO_EMPTY);
+						$new_pokemon = array_diff($entry_pokemon, $next_entry_pokemon);
+						$old_pokemon = array_diff($next_entry_pokemon, $entry_pokemon);
+						foreach ($new_pokemon as $pkm) {
+							$entry->pokemon[$pkm]->class = 'new';
+						}
+						foreach ($old_pokemon as $pkm) {
+							$next_entry->pokemon[$pkm]->class = 'old';
+						}
+						if ($entry->team_id != $next_entry->team_id|| $entry->pokemon_uids != $next_entry->pokemon_uids) {
+							$entry->only_cp_changed = false;
+						}
 					}
+					unset($entry->pokemon_uids);
 				}
-				unset($entry->pokemon_uids);
+
+				if (count($entries) > 10) { array_pop($entries); }
 			}
 
-			if (count($entries) > 10) { array_pop($entries); }
-		}
+			$json = array();
+			$json['entries'] = $entries;
+			$locale = array();
+			$json['locale'] = $locale;
+			$json['last_page'] = $last_page;
 
-		$json = array();
-		$json['entries'] = $entries;
-		$locale = array();
-		$json['locale'] = $locale;
-		$json['last_page'] = $last_page;
+			header('Content-Type: application/json');
+			echo json_encode($json);
 
-		header('Content-Type: application/json');
-		echo json_encode($json);
+			break;
 
-		break;
 
+		case 'pokemon_slider_init':
+			$bounds		= $manager->getPokemonSliderMinMax();
 
-	case 'pokemon_slider_init':
-		$bounds		= $manager->getPokemonSliderMinMax();
+			header('Content-Type: application/json');
+			echo json_encode($bounds);
 
-		header('Content-Type: application/json');
-		echo json_encode($bounds);
+			break;
 
-		break;
 
+		case 'pokemon_heatmap_points':
+			$json = "";
+			if (isset($_GET['start']) && isset($_GET['end']) && isset($_GET['pokemon_id'])) {
+				$start = date("Y-m-d H:i", (int) $_GET['start']);
+				$end = date("Y-m-d H:i", (int) $_GET['end']);
+				$pokemon_id = $manager->getEcapedString($_GET['pokemon_id']);
+				$points = $manager->getPokemonHeatmap($pokemon_id, $start, $end);
 
-	case 'pokemon_heatmap_points':
-		$json = "";
-		if (isset($_GET['start']) && isset($_GET['end']) && isset($_GET['pokemon_id'])) {
-			$start = date("Y-m-d H:i", (int) $_GET['start']);
-			$end = date("Y-m-d H:i", (int) $_GET['end']);
-			$pokemon_id = $manager->getEcapedString($_GET['pokemon_id']);
-			$points = $manager->getPokemonHeatmap($pokemon_id, $start, $end);
+				$json = json_encode($points);
+			}
 
-			$json = json_encode($points);
-		}
+			header('Content-Type: application/json');
+			echo $json;
+			break;
 
-		header('Content-Type: application/json');
-		echo $json;
-		break;
 
+		case 'maps_localization_coordinates':
+			$coordinates = $manager->getMapsCoords();
 
-	case 'maps_localization_coordinates':
-		$coordinates = $manager->getMapsCoords();
+			header('Content-Type: application/json');
+			echo json_encode($coordinates);
 
-		header('Content-Type: application/json');
-		echo json_encode($coordinates);
+			break;
 
-		break;
 
+		case 'pokemon_graph_data':
+			$json = "";
+			if (isset($_GET['pokemon_id'])) {
+				$pokemon_id = $manager->getEcapedString($_GET['pokemon_id']);
+				$array = $manager->getPokemonGraph($pokemon_id);
 
-	case 'pokemon_graph_data':
-		$json = "";
-		if (isset($_GET['pokemon_id'])) {
-			$pokemon_id = $manager->getEcapedString($_GET['pokemon_id']);
-			$array = $manager->getPokemonGraph($pokemon_id);
+				$json = json_encode($array);
+			}
 
-			$json = json_encode($array);
-		}
+			header('Content-Type: application/json');
+			echo $json;
+			break;
 
-		header('Content-Type: application/json');
-		echo $json;
-		break;
 
+		case 'postRequest':
+			break;
 
-	case 'postRequest':
+		default:
+			echo "What do you mean?";
+			exit();
 		break;
-
-	default:
-		echo "What do you mean?";
-		exit();
-	break;
 }
 
 if ($postRequest != "") {

pages/gymhistory.page.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 <script type="text/javascript">
 <?=
 $gymName = "";
-if (isset($_GET['name']) && $_GET['name']!="") {
+if (isset($_GET['name']) && $_GET['name'] != "") {
 	$gymName = html_entity_decode($_GET['name']);
 }
 ?>