brusselopole / Worldopole

pages/home.page.php

Spacing +3 added lines, -3 removed lines

@@ -65,13 +65,13 @@
 				if ($config->system->recents_show_iv) {
 					if ($pokemon->iv->available) { ?>
 					<div class="progress" style="height: 6px; width: 80%; margin: 5px auto 15px auto;">
-						<div title="Stamina IV: <?= $pokemon->iv->stamina ?>" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?= $pokemon->iv->stamina ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= ((100/15)*$pokemon->iv->stamina)/3 ?>%">
+						<div title="Stamina IV: <?= $pokemon->iv->stamina ?>" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?= $pokemon->iv->stamina ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= ((100 / 15) * $pokemon->iv->stamina) / 3 ?>%">
 							<span class="sr-only">Stamina IV: <?= $pokemon->iv->stamina ?></span>
 						</div>
-						<div title="Attack IV: <?= $pokemon->iv->attack ?>" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="<?= $pokemon->iv->attack ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= ((100/15)*$pokemon->iv->attack)/3 ?>%">
+						<div title="Attack IV: <?= $pokemon->iv->attack ?>" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="<?= $pokemon->iv->attack ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= ((100 / 15) * $pokemon->iv->attack) / 3 ?>%">
 							<span class="sr-only">Attack IV: <?= $pokemon->iv->attack ?></span>
 						</div>
-						<div title="Defense IV: <?= $pokemon->iv->defense ?>" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="<?= $pokemon->iv->defense ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= ((100/15)*$pokemon->iv->defense)/3 ?>%">
+						<div title="Defense IV: <?= $pokemon->iv->defense ?>" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="<?= $pokemon->iv->defense ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= ((100 / 15) * $pokemon->iv->defense) / 3 ?>%">
 							<span class="sr-only">Defense IV: <?= $pokemon->iv->defense ?></span>
 						</div>
 					</div>

core/process/data.loader.php

Spacing +82 added lines, -82 removed lines

@@ -3,8 +3,8 @@ 
 // Include & load the variables
 // ############################
 
-$variables 	= realpath(dirname(__FILE__)).'/../json/variables.json';
-$config 	= json_decode(file_get_contents($variables));
+$variables = realpath(dirname(__FILE__)).'/../json/variables.json';
+$config = json_decode(file_get_contents($variables));
 
 if (!isset($config->system)) {
 	echo 'Could not load variables.';
@@ -31,7 +31,7 @@ 
 #################
 
 
-$mysqli 	= new mysqli(SYS_DB_HOST, SYS_DB_USER, SYS_DB_PSWD, SYS_DB_NAME, SYS_DB_PORT);
+$mysqli = new mysqli(SYS_DB_HOST, SYS_DB_USER, SYS_DB_PSWD, SYS_DB_NAME, SYS_DB_PORT);
 
 
 if ($mysqli->connect_error != '') {
@@ -88,12 +88,12 @@ 
 // ( for Brusselopole we use CRONTAB but as we're not sure that every had access to it we build this really simple false crontab system
 // => check filemtime, if > 24h launch an update. )
 
-$pokedex_rarity_filetime	= filemtime($pokedex_rarity_file);
-$now				= time();
-$diff				= $now - $pokedex_rarity_filetime;
+$pokedex_rarity_filetime = filemtime($pokedex_rarity_file);
+$now = time();
+$diff = $now - $pokedex_rarity_filetime;
 
 // Update each 24h
-$update_delay		= 86400;
+$update_delay = 86400;
 
 if ($diff > $update_delay) {
 	include_once(SYS_PATH.'/core/cron/pokemon.rarity.php');
@@ -124,7 +124,7 @@ 
 			// ---------------------
 
 
-			$pokemon_id 			= mysqli_real_escape_string($mysqli, $_GET['id']);
+			$pokemon_id = mysqli_real_escape_string($mysqli, $_GET['id']);
 
 			if (!is_object($pokemons->pokemon->$pokemon_id)) {
 				header('Location:/404');
@@ -134,7 +134,7 @@ 
 
 			$pokemon			= new stdClass();
 			$pokemon			= $pokemons->pokemon->$pokemon_id;
-			$pokemon->id			= $pokemon_id;
+			$pokemon->id = $pokemon_id;
 
 
 
@@ -152,54 +152,54 @@ 
 
 			// Total gym protected
 
-			$req 		= "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE guard_pokemon_id = '".$pokemon_id."'  ";
-			$result 	= $mysqli->query($req);
-			$data 		= $result->fetch_object();
+			$req = "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE guard_pokemon_id = '".$pokemon_id."'  ";
+			$result = $mysqli->query($req);
+			$data = $result->fetch_object();
 
 			$pokemon->protected_gyms = $data->total;
 
 
 			// Total spawn
 
-			$req 		= "SELECT COUNT(*) as total FROM pokemon WHERE pokemon_id = '".$pokemon_id."'";
-			$result 	= $mysqli->query($req);
-			$data 		= $result->fetch_object();
+			$req = "SELECT COUNT(*) as total FROM pokemon WHERE pokemon_id = '".$pokemon_id."'";
+			$result = $mysqli->query($req);
+			$data = $result->fetch_object();
 
-			$pokemon->total_spawn 	= $data->total;
+			$pokemon->total_spawn = $data->total;
 
 
 			// Spawn rate
 
 			if ($pokemon->total_spawn > 0) {
 				$req 		= "SELECT COUNT(DISTINCT DATE(disappear_time)) as total FROM pokemon";
-				$result 	= $mysqli->query($req);
+				$result = $mysqli->query($req);
 				$data		= $result->fetch_object();
 
 				$pokemon->total_days = $data->total;
-				$pokemon->spawn_rate 	= round(($pokemon->total_spawn/$pokemon->total_days), 2);
+				$pokemon->spawn_rate 	= round(($pokemon->total_spawn / $pokemon->total_days), 2);
 			} else {
 				$pokemon->total_days 	= 0;
-				$pokemon->spawn_rate	= 0;
+				$pokemon->spawn_rate = 0;
 			}
 
 
 			// Last seen
 
-			$req 		= "SELECT disappear_time, (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) as disappear_time_real, latitude, longitude
+			$req = "SELECT disappear_time, (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) as disappear_time_real, latitude, longitude
 			FROM pokemon
 			WHERE pokemon_id = '".$pokemon_id."'
 			ORDER BY disappear_time DESC
 			LIMIT 0,1";
-			$result 	= $mysqli->query($req);
-			$data 		= $result->fetch_object();
+			$result = $mysqli->query($req);
+			$data = $result->fetch_object();
 
 			if (isset($data)) {
-				$last_spawn 				= $data;
+				$last_spawn = $data;
 
-				$pokemon->last_seen			= strtotime($data->disappear_time_real);
-				$pokemon->last_position			= new stdClass();
-				$pokemon->last_position->latitude 	= $data->latitude;
-				$pokemon->last_position->longitude 	= $data->longitude;
+				$pokemon->last_seen = strtotime($data->disappear_time_real);
+				$pokemon->last_position = new stdClass();
+				$pokemon->last_position->latitude = $data->latitude;
+				$pokemon->last_position->longitude = $data->longitude;
 			}
 
 
@@ -237,23 +237,23 @@ 
 
 
 			$max 		= $config->system->max_pokemon;
-			$pokedex 	= new stdClass();
+			$pokedex = new stdClass();
 
 			$req 		= "SELECT COUNT(*) as total,pokemon_id FROM pokemon GROUP by pokemon_id ";
-			$result 	= $mysqli->query($req);
+			$result = $mysqli->query($req);
 			$data_array = array();
 
 			while ($data = $result->fetch_object()) {
 				$data_array[$data->pokemon_id] = $data->total;
 			};
 
-			for ($i= 1; $i <= $max; $i++) {
-				$pokedex->$i			= new stdClass();
+			for ($i = 1; $i <= $max; $i++) {
+				$pokedex->$i = new stdClass();
 				$pokedex->$i->id 		= $i;
-				$pokedex->$i->permalink 	= 'pokemon/'.$i;
+				$pokedex->$i->permalink = 'pokemon/'.$i;
 				$pokedex->$i->img		= 'core/pokemons/'.$i.'.png';
-				$pokedex->$i->name		= $pokemons->pokemon->$i->name;
-				$pokedex->$i->spawn 		= isset($data_array[$i])? $data_array[$i] : 0;
+				$pokedex->$i->name = $pokemons->pokemon->$i->name;
+				$pokedex->$i->spawn = isset($data_array[$i]) ? $data_array[$i] : 0;
 			}
 
 
@@ -264,17 +264,17 @@ 
 		############
 
 		case 'pokestops':
-			$pokestop 	= new stdClass();
+			$pokestop = new stdClass();
 
-			$req 		= "SELECT COUNT(*) as total FROM pokestop";
-			$result 	= $mysqli->query($req);
-			$data 		= $result->fetch_object();
+			$req = "SELECT COUNT(*) as total FROM pokestop";
+			$result = $mysqli->query($req);
+			$data = $result->fetch_object();
 
 			$pokestop->total = $data->total;
 
-			$req 		= "SELECT COUNT(*) as total FROM pokestop WHERE lure_expiration > UTC_TIMESTAMP()";
-			$result 	= $mysqli->query($req);
-			$data 		= $result->fetch_object();
+			$req = "SELECT COUNT(*) as total FROM pokestop WHERE lure_expiration > UTC_TIMESTAMP()";
+			$result = $mysqli->query($req);
+			$data = $result->fetch_object();
 
 			$pokestop->lured = $data->total;
 
@@ -291,36 +291,36 @@ 
 			// 3 Teams (teamm rocket is neutral)
 			// 1 Fight
 
-			$teams 				= new stdClass();
+			$teams = new stdClass();
 
-			$teams->mystic 			= new stdClass();
-			$teams->mystic->guardians 	= new stdClass();
-			$teams->mystic->id 		= 1;
+			$teams->mystic = new stdClass();
+			$teams->mystic->guardians = new stdClass();
+			$teams->mystic->id = 1;
 
-			$teams->valor 			= new stdClass();
-			$teams->valor->guardians 	= new stdClass();
-			$teams->valor->id 		= 2;
+			$teams->valor = new stdClass();
+			$teams->valor->guardians = new stdClass();
+			$teams->valor->id = 2;
 
-			$teams->instinct 		= new stdClass();
-			$teams->instinct->guardians 	= new stdClass();
-			$teams->instinct->id 		= 3;
+			$teams->instinct = new stdClass();
+			$teams->instinct->guardians = new stdClass();
+			$teams->instinct->id = 3;
 
-			$teams->rocket 			= new stdClass();
-			$teams->rocket->guardians 	= new stdClass();
-			$teams->rocket->id 		= 0;
+			$teams->rocket = new stdClass();
+			$teams->rocket->guardians = new stdClass();
+			$teams->rocket->id = 0;
 
 
 
 			foreach ($teams as $team_key => $team_values) {
 				// Team Guardians
 
-				$req 	= "SELECT COUNT(*) as total, guard_pokemon_id FROM gym WHERE team_id = '".$team_values->id."' GROUP BY guard_pokemon_id ORDER BY total DESC LIMIT 0,3 ";
+				$req = "SELECT COUNT(*) as total, guard_pokemon_id FROM gym WHERE team_id = '".$team_values->id."' GROUP BY guard_pokemon_id ORDER BY total DESC LIMIT 0,3 ";
 				$result = $mysqli->query($req);
 
-				$i=0;
+				$i = 0;
 
 				while ($data = $result->fetch_object()) {
-					$teams->$team_key->guardians->$i	= $data->guard_pokemon_id;
+					$teams->$team_key->guardians->$i = $data->guard_pokemon_id;
 
 					$i++;
 				}
@@ -332,8 +332,8 @@ 
 				$result = $mysqli->query($req);
 				$data	= $result->fetch_object();
 
-				$teams->$team_key->gym_owned	= $data->total;
-				$teams->$team_key->average	= $data->average_points;
+				$teams->$team_key->gym_owned = $data->total;
+				$teams->$team_key->average = $data->average_points;
 			}
 
 
@@ -346,7 +346,7 @@ 
 		case 'dashboard':
 			// This case is only used for test purpose.
 
-			$stats_file	= SYS_PATH.'/core/json/gym.stats.json';
+			$stats_file = SYS_PATH.'/core/json/gym.stats.json';
 
 			if (!is_file($stats_file)) {
 				echo "Sorry, no Gym stats file was found. <br> Did you enable cron? ";
@@ -354,7 +354,7 @@ 
 			}
 
 
-			$stats_file	= SYS_PATH.'/core/json/pokemon.stats.json';
+			$stats_file = SYS_PATH.'/core/json/pokemon.stats.json';
 
 			if (!is_file($stats_file)) {
 				echo "Sorry, no Pokémon stats file was found. <br> Did you enabled cron?";
@@ -362,7 +362,7 @@ 
 			}
 
 
-			$stats_file	= SYS_PATH.'/core/json/pokestop.stats.json';
+			$stats_file = SYS_PATH.'/core/json/pokestop.stats.json';
 
 			if (!is_file($stats_file)) {
 				echo "Sorry, no Pokéstop stats file was found. <br> Did you enabled cron?";
@@ -383,9 +383,9 @@ 
 	// Right now
 	// ---------
 
-	$req 		= "SELECT COUNT(*) as total FROM pokemon WHERE disappear_time > UTC_TIMESTAMP()";
-	$result 	= $mysqli->query($req);
-	$data 		= $result->fetch_object();
+	$req = "SELECT COUNT(*) as total FROM pokemon WHERE disappear_time > UTC_TIMESTAMP()";
+	$result = $mysqli->query($req);
+	$data = $result->fetch_object();
 
 
 	$home->pokemon_now = $data->total;
@@ -394,9 +394,9 @@ 
 	// Lured stops
 	// -----------
 
-	$req 		= "SELECT COUNT(*) as total FROM pokestop WHERE lure_expiration > UTC_TIMESTAMP()";
-	$result 	= $mysqli->query($req);
-	$data 		= $result->fetch_object();
+	$req = "SELECT COUNT(*) as total FROM pokestop WHERE lure_expiration > UTC_TIMESTAMP()";
+	$result = $mysqli->query($req);
+	$data = $result->fetch_object();
 
 	$home->pokestop_lured = $data->total;
 
@@ -404,9 +404,9 @@ 
 	// Gyms
 	// ----
 
-	$req 		= "SELECT COUNT(DISTINCT(gym_id)) as total FROM gym";
-	$result 	= $mysqli->query($req);
-	$data 		= $result->fetch_object();
+	$req = "SELECT COUNT(DISTINCT(gym_id)) as total FROM gym";
+	$result = $mysqli->query($req);
+	$data = $result->fetch_object();
 
 	$home->gyms = $data->total;
 
@@ -416,19 +416,19 @@ 
 
 	if ($config->system->mythic_recents) {
 		// get all mythic pokemon ids
-		$mythic_pokemons  = array();
+		$mythic_pokemons = array();
 		foreach ($pokemons->pokemon as $id => $pokemon) {
 			if ($pokemon->spawn_rate < 0.01) {
 				$mythic_pokemons[] = $id;
 			}
 		}
 		// get all mythic pokemon
-		$req 		= "SELECT DISTINCT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) as disappear_time_real, latitude, longitude, individual_attack, individual_defense, individual_stamina FROM pokemon
+		$req = "SELECT DISTINCT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) as disappear_time_real, latitude, longitude, individual_attack, individual_defense, individual_stamina FROM pokemon
 				   WHERE pokemon_id IN (".implode(",", $mythic_pokemons).")
 				   ORDER BY last_modified DESC LIMIT 0,12";
 	} else {
 		// get all pokemon
-		$req		= "SELECT DISTINCT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) as disappear_time_real, latitude, longitude, individual_attack, individual_defense, individual_stamina FROM pokemon
+		$req = "SELECT DISTINCT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) as disappear_time_real, latitude, longitude, individual_attack, individual_defense, individual_stamina FROM pokemon
 				   ORDER BY last_modified DESC LIMIT 0,12";
 	}
 	$result 	= $mysqli->query($req);
@@ -474,28 +474,28 @@ 
 
 	$req = "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '1'  ";
 	$result = $mysqli->query($req);
-	$data 	= $result->fetch_object();
+	$data = $result->fetch_object();
 
-	$home->teams->mystic 	= $data->total;
+	$home->teams->mystic = $data->total;
 
 
 	$req = "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '2'  ";
 	$result = $mysqli->query($req);
-	$data 	= $result->fetch_object();
+	$data = $result->fetch_object();
 
-	$home->teams->valor 	= $data->total;
+	$home->teams->valor = $data->total;
 
 
 	$req = "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '3'  ";
 	$result = $mysqli->query($req);
-	$data 	= $result->fetch_object();
+	$data = $result->fetch_object();
 
-	$home->teams->instinct 	= $data->total;
+	$home->teams->instinct = $data->total;
 
 
 	$req = "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '0'  ";
 	$result = $mysqli->query($req);
-	$data 	= $result->fetch_object();
+	$data = $result->fetch_object();
 
-	$home->teams->rocket 	= $data->total;
+	$home->teams->rocket = $data->total;
 }

core/process/aru.php

Indentation +40 added lines, -40 removed lines

@@ -157,39 +157,39 @@ 
 		}
 		$result = $mysqli->query($req);
 		while ($data = $result->fetch_object()) {
-		    $new_spawn = array();
-		    $pokeid = $data->pokemon_id;
-		    $pokeuid = $data->encounter_id;
-
-		    if ($_GET['last_uid'] != $pokeuid) {
-			    $last_seen = strtotime($data->disappear_time_real);
-
-			    $last_location = new stdClass();
-			    $last_location->latitude = $data->latitude;
-			    $last_location->longitude = $data->longitude;
-
-			    if ($config->system->recents_show_iv) {
-				    $iv = new stdClass();
-				    $iv->attack = $data->individual_attack;
-				    $iv->defense = $data->individual_defense;
-				    $iv->stamina = $data->individual_stamina;
-				    if (isset($iv->attack) && isset($iv->defense) && isset($iv->stamina)) {
-					    $iv->available = true;
-				    } else {
-					    $iv->available = false;
-				    }
-			    }
-
-			    $html = '
+			$new_spawn = array();
+			$pokeid = $data->pokemon_id;
+			$pokeuid = $data->encounter_id;
+
+			if ($_GET['last_uid'] != $pokeuid) {
+				$last_seen = strtotime($data->disappear_time_real);
+
+				$last_location = new stdClass();
+				$last_location->latitude = $data->latitude;
+				$last_location->longitude = $data->longitude;
+
+				if ($config->system->recents_show_iv) {
+					$iv = new stdClass();
+					$iv->attack = $data->individual_attack;
+					$iv->defense = $data->individual_defense;
+					$iv->stamina = $data->individual_stamina;
+					if (isset($iv->attack) && isset($iv->defense) && isset($iv->stamina)) {
+						$iv->available = true;
+					} else {
+						$iv->available = false;
+					}
+				}
+
+				$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="core/pokemons/'.$pokeid.'.png" 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="https://maps.google.com/?q='.$last_location->latitude.','.$last_location->longitude.'&ll='.$last_location->latitude.','.$last_location->longitude.'&z=16" target="_blank">
 				    <small class="pokemon-timer">00:00:00</small>
 				</a>';
-			    if ($config->system->recents_show_iv) {
-				    if ($iv->available) {
-					    $html .= '
+				if ($config->system->recents_show_iv) {
+					if ($iv->available) {
+						$html .= '
 					<div class="progress" style="height: 6px; width: 80%; margin: 5px auto 0 auto;">
 					    <div title="Stamina IV: '. $iv->stamina .'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'. $iv->stamina .'" aria-valuemin="0" aria-valuemax="45" style="width: '. ((100/15)*$iv->stamina)/3 .'%">
 						<span class="sr-only">Stamina IV: '. $iv->stamina .'</span>
@@ -201,25 +201,25 @@ 
 						<span class="sr-only">Defense IV: '. $iv->defense .'</span>
 					    </div>
 					</div>';
-				    } else {
-					    $html .= '
+					} else {
+						$html .= '
 					    <div class="progress" style="height: 6px; width: 80%; margin: 5px auto 15px auto;">
 						    <div title="IV not available" class="progress-bar" role="progressbar" style="width: 100%; background-color: rgba(240,240,240,1);" aria-valuenow="1" aria-valuemin="0" aria-valuemax="1">
 							    <span class="sr-only">IV not available</span>
 						    </div>
 					    </div>';
-				    }
-			    }
-			    $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);

Spacing +97 added lines, -97 removed lines

@@ -6,7 +6,7 @@ 
 
 $pos = !empty($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], getenv('HTTP_HOST'));
 
-if ($pos===false) {
+if ($pos === false) {
 	http_response_code(401);
 	die('Restricted access');
 }
@@ -19,8 +19,8 @@ 
 // Include & load the variables
 // ############################
 
-$variables 	= realpath(dirname(__FILE__)).'/../json/variables.json';
-$config 	= json_decode(file_get_contents($variables));
+$variables = realpath(dirname(__FILE__)).'/../json/variables.json';
+$config = json_decode(file_get_contents($variables));
 
 
 
@@ -37,12 +37,12 @@ 
 
 
 # MySQL
-$mysqli 	= new mysqli(SYS_DB_HOST, SYS_DB_USER, SYS_DB_PSWD, SYS_DB_NAME, SYS_DB_PORT);
+$mysqli = new mysqli(SYS_DB_HOST, SYS_DB_USER, SYS_DB_PSWD, SYS_DB_NAME, SYS_DB_PORT);
 if ($mysqli->connect_error != '') {
 	exit('Error MySQL Connect');
 }
 $mysqli->set_charset('utf8');
-$request 	= $_GET['type'];
+$request = $_GET['type'];
 
 switch ($request) {
 	############################
@@ -55,64 +55,64 @@ 
 		// Right now
 		// ---------
 
-		$req 		= "SELECT COUNT(*) as total FROM pokemon WHERE disappear_time > UTC_TIMESTAMP()";
-		$result 	= $mysqli->query($req);
-		$data 		= $result->fetch_object();
+		$req = "SELECT COUNT(*) as total FROM pokemon WHERE disappear_time > UTC_TIMESTAMP()";
+		$result = $mysqli->query($req);
+		$data = $result->fetch_object();
 
-		$values[] 	= $data->total;
+		$values[] = $data->total;
 
 
 		// Lured stops
 		// -----------
 
-		$req 		= "SELECT COUNT(*) as total FROM pokestop WHERE lure_expiration > UTC_TIMESTAMP()";
-		$result 	= $mysqli->query($req);
-		$data 		= $result->fetch_object();
+		$req = "SELECT COUNT(*) as total FROM pokestop WHERE lure_expiration > UTC_TIMESTAMP()";
+		$result = $mysqli->query($req);
+		$data = $result->fetch_object();
 
-		$values[] 	= $data->total;
+		$values[] = $data->total;
 
 
 
 		// Team battle
 		// -----------
 
-		$req 		= "SELECT count( DISTINCT(gym_id) ) as total FROM gym";
-		$result 	= $mysqli->query($req);
-		$data 		= $result->fetch_object();
+		$req = "SELECT count( DISTINCT(gym_id) ) as total FROM gym";
+		$result = $mysqli->query($req);
+		$data = $result->fetch_object();
 
-		$values[] 	= $data->total;
+		$values[] = $data->total;
 
 		// Team
 		// 1 = bleu
 		// 2 = rouge
 		// 3 = jaune
 
-		$req	= "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '2'  ";
-		$result	= $mysqli->query($req);
-		$data	= $result->fetch_object();
+		$req = "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '2'  ";
+		$result = $mysqli->query($req);
+		$data = $result->fetch_object();
 
 		// Red
 		$values[] = $data->total;
 
 
-		$req	= "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '1'  ";
-		$result	= $mysqli->query($req);
-		$data	= $result->fetch_object();
+		$req = "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '1'  ";
+		$result = $mysqli->query($req);
+		$data = $result->fetch_object();
 
 		// Blue
 		$values[] = $data->total;
 
 
-		$req	= "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '3'  ";
-		$result	= $mysqli->query($req);
-		$data	= $result->fetch_object();
+		$req = "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '3'  ";
+		$result = $mysqli->query($req);
+		$data = $result->fetch_object();
 
 		// Yellow
 		$values[] = $data->total;
 
-		$req	= "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '0'  ";
-		$result	= $mysqli->query($req);
-		$data	= $result->fetch_object();
+		$req = "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '0'  ";
+		$result = $mysqli->query($req);
+		$data = $result->fetch_object();
 
 		// Neutral
 		$values[] = $data->total;
@@ -148,12 +148,12 @@ 
 			}
 
 			// get last mythic pokemon
-			$req		= "SELECT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) as disappear_time_real, latitude, longitude, individual_attack, individual_defense, individual_stamina FROM pokemon
+			$req = "SELECT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) as disappear_time_real, latitude, longitude, individual_attack, individual_defense, individual_stamina FROM pokemon
                         WHERE pokemon_id IN (".implode(",", $mythic_pokemons).")
                         ORDER BY last_modified DESC LIMIT 0,12";
 		} else {
 			// get last pokemon
-			$req		= "SELECT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) as disappear_time_real, latitude, longitude, individual_attack, individual_defense, individual_stamina FROM pokemon ORDER BY last_modified DESC LIMIT 0,12";
+			$req = "SELECT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) as disappear_time_real, latitude, longitude, individual_attack, individual_defense, individual_stamina FROM pokemon ORDER BY last_modified DESC LIMIT 0,12";
 		}
 		$result = $mysqli->query($req);
 		while ($data = $result->fetch_object()) {
@@ -191,14 +191,14 @@ 
 				    if ($iv->available) {
 					    $html .= '
 					<div class="progress" style="height: 6px; width: 80%; margin: 5px auto 0 auto;">
-					    <div title="Stamina IV: '. $iv->stamina .'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'. $iv->stamina .'" aria-valuemin="0" aria-valuemax="45" style="width: '. ((100/15)*$iv->stamina)/3 .'%">
-						<span class="sr-only">Stamina IV: '. $iv->stamina .'</span>
+					    <div title="Stamina IV: '. $iv->stamina.'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$iv->stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.((100 / 15) * $iv->stamina) / 3.'%">
+						<span class="sr-only">Stamina IV: '. $iv->stamina.'</span>
 					    </div>
-					    <div title="Attack IV: '. $iv->attack .'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'. $iv->attack .'" aria-valuemin="0" aria-valuemax="45" style="width: '. ((100/15)*$iv->attack)/3 .'%">
-						<span class="sr-only">Attack IV: '. $iv->attack .'</span>
+					    <div title="Attack IV: '. $iv->attack.'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$iv->attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.((100 / 15) * $iv->attack) / 3.'%">
+						<span class="sr-only">Attack IV: '. $iv->attack.'</span>
 					    </div>
-					    <div title="Defense IV: '. $iv->defense .'" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'. $iv->defense .'" aria-valuemin="0" aria-valuemax="45" style="width: '. ((100/15)*$iv->defense)/3 .'%">
-						<span class="sr-only">Defense IV: '. $iv->defense .'</span>
+					    <div title="Defense IV: '. $iv->defense.'" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$iv->defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.((100 / 15) * $iv->defense) / 3.'%">
+						<span class="sr-only">Defense IV: '. $iv->defense.'</span>
 					    </div>
 					</div>';
 				    } else {
@@ -234,15 +234,15 @@ 
 	####################################
 
 	case 'pokestop':
-		$req 		= "SELECT latitude, longitude, lure_expiration FROM pokestop";
-		$result 	= $mysqli->query($req);
+		$req = "SELECT latitude, longitude, lure_expiration FROM pokestop";
+		$result = $mysqli->query($req);
 
-		$i=0;
+		$i = 0;
 
 		while ($data = $result->fetch_object()) {
 			if ($data->lure_expiration != '') {
 				$icon = 'pokestap_lured.png';
-				$text = 'Lured expire @ '.date('h:i:s', strtotime($data->lure_expiration)+(3600*2)) ;
+				$text = 'Lured expire @ '.date('h:i:s', strtotime($data->lure_expiration) + (3600 * 2));
 			} else {
 				$icon = 'pokestap.png';
 				$text = 'Normal stop';
@@ -275,19 +275,19 @@ 
 	####################################
 
 	case 'update_gym':
-		$teams			= new stdClass();
-		$teams->mystic 		= 1;
-		$teams->valor 		= 2;
-		$teams->instinct 	= 3;
+		$teams = new stdClass();
+		$teams->mystic = 1;
+		$teams->valor = 2;
+		$teams->instinct = 3;
 
 
 		foreach ($teams as $team_name => $team_id) {
-			$req	= "SELECT COUNT(DISTINCT(gym_id)) as total, ROUND(AVG(gym_points),0) as average_points FROM gym WHERE team_id = '".$team_id."'  ";
-			$result	= $mysqli->query($req);
-			$data	= $result->fetch_object();
+			$req = "SELECT COUNT(DISTINCT(gym_id)) as total, ROUND(AVG(gym_points),0) as average_points FROM gym WHERE team_id = '".$team_id."'  ";
+			$result = $mysqli->query($req);
+			$data = $result->fetch_object();
 
-			$return[] 	= $data->total;
-			$return[]	= $data->average_points;
+			$return[] = $data->total;
+			$return[] = $data->average_points;
 		}
 
 		$json = json_encode($return);
@@ -306,11 +306,11 @@ 
 
 
 	case 'gym_map':
-		$req 		= "SELECT gym_id, team_id, guard_pokemon_id, gym_points, latitude, longitude, (CONVERT_TZ(last_modified, '+00:00', '".$time_offset."')) as last_modified FROM gym";
-		$result 	= $mysqli->query($req);
+		$req = "SELECT gym_id, team_id, guard_pokemon_id, gym_points, latitude, longitude, (CONVERT_TZ(last_modified, '+00:00', '".$time_offset."')) as last_modified FROM gym";
+		$result = $mysqli->query($req);
 
 
-		$i=0;
+		$i = 0;
 
 		while ($data = $result->fetch_object()) {
 			// Team
@@ -322,50 +322,50 @@ 
 				case 0:
 					$icon	= 'map_white.png';
 					$team	= 'No Team (yet)';
-					$color	= 'rgba(0, 0, 0, .6)';
+					$color = 'rgba(0, 0, 0, .6)';
 					break;
 
 				case 1:
 					$icon	= 'map_blue_';
 					$team	= 'Team Mystic';
-					$color	= 'rgba(74, 138, 202, .6)';
+					$color = 'rgba(74, 138, 202, .6)';
 					break;
 
 				case 2:
 					$icon	= 'map_red_';
 					$team	= 'Team Valor';
-					$color	= 'rgba(240, 68, 58, .6)';
+					$color = 'rgba(240, 68, 58, .6)';
 					break;
 
 				case 3:
 					$icon	= 'map_yellow_';
 					$team	= 'Team Instinct';
-					$color	= 'rgba(254, 217, 40, .6)';
+					$color = 'rgba(254, 217, 40, .6)';
 					break;
 			}
 
 			// Set gym level
-			$data->gym_level=0;
+			$data->gym_level = 0;
 			if ($data->gym_points < 2000) {
-				$data->gym_level=1;
+				$data->gym_level = 1;
 			} elseif ($data->gym_points < 4000) {
-				$data->gym_level=2;
+				$data->gym_level = 2;
 			} elseif ($data->gym_points < 8000) {
-				$data->gym_level=3;
+				$data->gym_level = 3;
 			} elseif ($data->gym_points < 12000) {
-				$data->gym_level=4;
+				$data->gym_level = 4;
 			} elseif ($data->gym_points < 16000) {
-				$data->gym_level=5;
+				$data->gym_level = 5;
 			} elseif ($data->gym_points < 20000) {
-				$data->gym_level=6;
+				$data->gym_level = 6;
 			} elseif ($data->gym_points < 30000) {
-				$data->gym_level=7;
+				$data->gym_level = 7;
 			} elseif ($data->gym_points < 40000) {
-				$data->gym_level=8;
+				$data->gym_level = 8;
 			} elseif ($data->gym_points < 50000) {
-				$data->gym_level=9;
+				$data->gym_level = 9;
 			} else {
-				$data->gym_level=10;
+				$data->gym_level = 10;
 			}
 
 			## I know, I revert commit 6e8d2e7 from @kiralydavid but the way it was done broke the page.
@@ -416,8 +416,8 @@ 
 
 	case 'gym_defenders':
 		$gym_id = $mysqli->real_escape_string($_GET['gym_id']);
-		$req 		= "SELECT gymdetails.name as name, gymdetails.description as description, gym.gym_points as points, gymdetails.url as url, gym.team_id as team, (CONVERT_TZ(gym.last_modified, '+00:00', '".$time_offset."')) as last_modified, gym.guard_pokemon_id as guard_pokemon_id FROM gymdetails LEFT JOIN gym on gym.gym_id = gymdetails.gym_id WHERE gym.gym_id='".$gym_id."'";
-		$result 	= $mysqli->query($req);
+		$req = "SELECT gymdetails.name as name, gymdetails.description as description, gym.gym_points as points, gymdetails.url as url, gym.team_id as team, (CONVERT_TZ(gym.last_modified, '+00:00', '".$time_offset."')) as last_modified, gym.guard_pokemon_id as guard_pokemon_id FROM gymdetails LEFT JOIN gym on gym.gym_id = gymdetails.gym_id WHERE gym.gym_id='".$gym_id."'";
+		$result = $mysqli->query($req);
 		$gymData['gymDetails']['gymInfos'] = false;
 		while ($data = $result->fetch_object()) {
 			$gymData['gymDetails']['gymInfos']['name'] = $data->name;
@@ -433,31 +433,31 @@ 
 			$gymData['gymDetails']['gymInfos']['team'] = $data->team;
 			$gymData['gymDetails']['gymInfos']['guardPokemonId'] = $data->guard_pokemon_id;
 			if ($data->points < 2000) {
-				$gymData['gymDetails']['gymInfos']['level']=1;
+				$gymData['gymDetails']['gymInfos']['level'] = 1;
 			} elseif ($data->points < 4000) {
-				$gymData['gymDetails']['gymInfos']['level']=2;
+				$gymData['gymDetails']['gymInfos']['level'] = 2;
 			} elseif ($data->points < 8000) {
-				$gymData['gymDetails']['gymInfos']['level']=3;
+				$gymData['gymDetails']['gymInfos']['level'] = 3;
 			} elseif ($data->points < 12000) {
-				$gymData['gymDetails']['gymInfos']['level']=4;
+				$gymData['gymDetails']['gymInfos']['level'] = 4;
 			} elseif ($data->points < 16000) {
-				$gymData['gymDetails']['gymInfos']['level']=5;
+				$gymData['gymDetails']['gymInfos']['level'] = 5;
 			} elseif ($data->points < 20000) {
-				$gymData['gymDetails']['gymInfos']['level']=6;
+				$gymData['gymDetails']['gymInfos']['level'] = 6;
 			} elseif ($data->points < 30000) {
-				$gymData['gymDetails']['gymInfos']['level']=7;
+				$gymData['gymDetails']['gymInfos']['level'] = 7;
 			} elseif ($data->points < 40000) {
-				$gymData['gymDetails']['gymInfos']['level']=8;
+				$gymData['gymDetails']['gymInfos']['level'] = 8;
 			} elseif ($data->points < 50000) {
-				$gymData['gymDetails']['gymInfos']['level']=9;
+				$gymData['gymDetails']['gymInfos']['level'] = 9;
 			} else {
-				$gymData['gymDetails']['gymInfos']['level']=10;
+				$gymData['gymDetails']['gymInfos']['level'] = 10;
 			}
 		}
 		//print_r($gymData);
-		$req 		= "SELECT * FROM gympokemon inner join gymmember on gympokemon.pokemon_uid=gymmember.pokemon_uid where gym_id='".$gym_id."' ORDER BY cp DESC";
-		$result 	= $mysqli->query($req);
-		$i=0;
+		$req = "SELECT * FROM gympokemon inner join gymmember on gympokemon.pokemon_uid=gymmember.pokemon_uid where gym_id='".$gym_id."' ORDER BY cp DESC";
+		$result = $mysqli->query($req);
+		$i = 0;
 
 
 
@@ -475,15 +475,15 @@ 
 					</a>
 					<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="Stamina IV: '.$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).'%">
+						<div title="Stamina IV: '.$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">Stamina IV: '.$data->iv_stamina.'</span>
 						</div>
 
-						<div title="Attack IV: '.$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).'%">
+						<div title="Attack IV: '.$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">Attack IV: '.$data->iv_attack.'</span>
 						</div>
 
-						<div title="Defense IV: '.$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).'%">
+						<div title="Defense IV: '.$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">Defense IV: '.$data->iv_defense.'</span>
 						</div>
 					</div>
@@ -513,16 +513,16 @@ 
 		$name = "";
 		$page = "0";
 		$where = "";
-		$order="";
-		$team=0;
-		$ranking=0;
+		$order = "";
+		$team = 0;
+		$ranking = 0;
 		if (isset($_GET['name'])) {
 			$trainer_name = mysqli_real_escape_string($mysqli, $_GET['name']);
 			$where = " HAVING name LIKE '%".$trainer_name."%'";
 		}
-		if (isset($_GET['team']) && $_GET['team']!=0) {
+		if (isset($_GET['team']) && $_GET['team'] != 0) {
 			$team = mysqli_real_escape_string($mysqli, $_GET['team']);
-			$where .= ($where==""?" HAVING":"AND ")." team = ".$team;
+			$where .= ($where == "" ? " HAVING" : "AND ")." team = ".$team;
 		}
 		if (isset($_GET['page'])) {
 			$page = mysqli_real_escape_string($mysqli, $_GET['page']);
@@ -533,16 +533,16 @@ 
 
 		switch ($ranking) {
 			case 1:
-				$order=" ORDER BY active DESC ";
+				$order = " ORDER BY active DESC ";
 				break;
 			case 2:
-				$order=" ORDER BY maxCp DESC ";
+				$order = " ORDER BY maxCp DESC ";
 				break;
 			default:
-				$order=" ORDER BY level DESC, active DESC ";
+				$order = " ORDER BY level DESC, active DESC ";
 		}
 
-		$limit = " LIMIT ".($page*10).",10 ";
+		$limit = " LIMIT ".($page * 10).",10 ";
 
 
 		$req = "SELECT trainer.*, count(actives_pokemons.trainer_name) as active, max(actives_pokemons.cp) as maxCp ".
@@ -561,7 +561,7 @@ 
 			$reqRanking = "SELECT count(1) as rank FROM trainer where trainer.level >= ".$trainer->level;
 			$resultRanking = $mysqli->query($reqRanking);
 			while ($data = $resultRanking->fetch_object()) {
-				$trainer->rank = $data->rank ;
+				$trainer->rank = $data->rank;
 			}
 			$req = "(SELECT DISTINCT gympokemon.pokemon_id, gympokemon.pokemon_uid, gympokemon.cp, gympokemon.trainer_name, gympokemon.iv_defense, gympokemon.iv_stamina, gympokemon.iv_attack, filtered_gymmember.gym_id, '1' as active ".
 				"FROM gympokemon INNER JOIN ".
@@ -571,7 +571,7 @@ 
 
 			$resultPkms = $mysqli->query($req);
 			$trainer->pokemons = array();
-			$active_gyms=0;
+			$active_gyms = 0;
 			$pkmCount = 0;
 			while ($resultPkms && $dataPkm = $resultPkms->fetch_object()) {
 				$active_gyms++;