brusselopole / Worldopole

core/process/aru.php

Spacing +120 added lines, -120 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 	= SYS_PATH.'/core/json/variables.json';
-$config 	= json_decode(file_get_contents($variables));
+$variables = SYS_PATH.'/core/json/variables.json';
+$config = json_decode(file_get_contents($variables));
 
 
 
@@ -37,19 +37,19 @@ 
 
 
 # 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 = "";
 if (isset($_GET['type'])) {
-$request 	= $_GET['type'];
+$request = $_GET['type'];
 }
 $postRequest = "";
 if (isset($_POST['type'])) {
 	$postRequest = $_POST['type'];
-	$request= "postRequest";
+	$request = "postRequest";
 }
 switch ($request) {
 	############################
@@ -62,64 +62,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;
@@ -159,12 +159,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()) {
@@ -204,13 +204,13 @@ 
 							$html .= '
 							<div class="progress" style="height: 15px; margin-bottom: 0">
 								<div title="'.$locales->IV_ATTACK.': '.$iv->attack.'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$iv->attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px";>
-									<span class="sr-only">'.$locales->IV_ATTACK.': '.$iv->attack.'</span>'.$iv->attack .'
+									<span class="sr-only">'.$locales->IV_ATTACK.': '.$iv->attack.'</span>'.$iv->attack.'
 								</div>
 								<div title="'.$locales->IV_DEFENSE.': '.$iv->defense.'" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$iv->defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px";>
-									<span class="sr-only">'.$locales->IV_DEFENSE.': '.$iv->defense.'</span>'.$iv->defense .'
+									<span class="sr-only">'.$locales->IV_DEFENSE.': '.$iv->defense.'</span>'.$iv->defense.'
 								</div>
 								<div title="'.$locales->IV_STAMINA.': '.$iv->stamina.'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$iv->stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px";>
-									<span class="sr-only">'.$locales->IV_STAMINA.': '.$iv->stamina.'</span>'.$iv->stamina .'
+									<span class="sr-only">'.$locales->IV_STAMINA.': '.$iv->stamina.'</span>'.$iv->stamina.'
 								</div>
 							</div>';
 						} else {
@@ -219,10 +219,10 @@ 
 					    		<div title="'.$locales->IV_ATTACK.': '.$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">'.$locales->IV_ATTACK.': '.$iv->attack.'</span>
 					    		</div>
-					    		<div title="'.$locales->IV_DEFENSE.': '.$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).'%">
+					    		<div title="'.$locales->IV_DEFENSE.': '.$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">'.$locales->IV_DEFENSE.': '.$iv->defense.'</span>
 					    		</div>
-					    		<div title="'.$locales->IV_STAMINA.': '.$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).'%">
+					    		<div title="'.$locales->IV_STAMINA.': '.$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">'.$locales->IV_STAMINA.': '.$iv->stamina.'</span>
 					    		</div>
 							</div>';
@@ -280,9 +280,9 @@ 
 		} else {
 			$req 		= "SELECT latitude, longitude, lure_expiration, UTC_TIMESTAMP() as now, (CONVERT_TZ(lure_expiration, '+00:00', '".$time_offset."')) as lure_expiration_real FROM pokestop WHERE lure_expiration > UTC_TIMESTAMP()";
 		}
-		$result 	= $mysqli->query($req);
+		$result = $mysqli->query($req);
 
-		$i=0;
+		$i = 0;
 
 		while ($data = $result->fetch_object()) {
 			if ($data->lure_expiration >= $data->now) {
@@ -320,19 +320,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);
@@ -351,11 +351,11 @@ 
 
 
 	case 'gym_map':
-		$req 		= "SELECT gym_id, team_id, guard_pokemon_id, gym_points, latitude, longitude, (CONVERT_TZ(last_scanned, '+00:00', '".$time_offset."')) as last_scanned FROM gym";
-		$result 	= $mysqli->query($req);
+		$req = "SELECT gym_id, team_id, guard_pokemon_id, gym_points, latitude, longitude, (CONVERT_TZ(last_scanned, '+00:00', '".$time_offset."')) as last_scanned FROM gym";
+		$result = $mysqli->query($req);
 
 
-		$i=0;
+		$i = 0;
 
 		while ($data = $result->fetch_object()) {
 			// Team
@@ -367,50 +367,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.
@@ -461,8 +461,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_scanned, '+00:00', '".$time_offset."')) as last_scanned, 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_scanned, '+00:00', '".$time_offset."')) as last_scanned, 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;
@@ -478,35 +478,35 @@ 
 			$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 DISTINCT gympokemon.pokemon_uid, "
+		$req = "SELECT DISTINCT gympokemon.pokemon_uid, "
 				. "pokemon_id, iv_attack, iv_defense, iv_stamina, MAX(cp) as cp, gymmember.gym_id "
 				. "FROM gympokemon inner join gymmember on gympokemon.pokemon_uid=gymmember.pokemon_uid "
 				. "GROUP BY gympokemon.pokemon_uid, pokemon_id, iv_attack, iv_defense, iv_stamina, gym_id"
 				. " HAVING gymmember.gym_id='".$gym_id."' ORDER BY cp DESC";
-		$result 	= $mysqli->query($req);
-		$i=0;
+		$result = $mysqli->query($req);
+		$i = 0;
 
 
 
@@ -528,10 +528,10 @@ 
 								<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 .'
+									<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 .'
+									<span class="sr-only">'.$locales->IV_STAMINA.' : '.$data->iv_stamina.'</span>'.$data->iv_stamina.'
 								</div>
 							</div>
 						</div>';
@@ -579,16 +579,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']);
@@ -599,16 +599,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 ".
@@ -627,7 +627,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, DATEDIFF(UTC_TIMESTAMP(), gympokemon.last_seen) AS last_scanned, gympokemon.trainer_name, gympokemon.iv_defense, gympokemon.iv_stamina, gympokemon.iv_attack, TRUNCATE(gympokemon.cp_multiplier,6) as cp_multiplier, gympokemon.num_upgrades, filtered_gymmember.gym_id, '1' as active ".
 				"FROM gympokemon INNER JOIN ".
@@ -637,7 +637,7 @@ 
 
 			$resultPkms = $mysqli->query($req);
 			$trainer->pokemons = array();
-			$active_gyms=0;
+			$active_gyms = 0;
 			$pkmCount = 0;
 			while ($resultPkms && $dataPkm = $resultPkms->fetch_object()) {
 				$active_gyms++;
@@ -674,9 +674,9 @@ 
 		break;
 
 	case 'pokemon_slider_init':
-		$req 		= "SELECT MIN(pokemon.disappear_time) as min, MAX(pokemon.disappear_time) as max from pokemon";
+		$req = "SELECT MIN(pokemon.disappear_time) as min, MAX(pokemon.disappear_time) as max from pokemon";
 		$result 	= $mysqli->query($req);
-		$data 		= $result->fetch_object();
+		$data = $result->fetch_object();
 		$bounds 	= $data;
 
 		header('Content-Type: application/json');
@@ -686,18 +686,18 @@ 
 		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']);
+		$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 = mysqli_real_escape_string($mysqli, $_GET['pokemon_id']);
 			$where = " WHERE pokemon.pokemon_id = ".$pokemon_id." "
 					. "AND pokemon.disappear_time BETWEEN '".$start."' AND '".$end."'";
 			$req 		= "SELECT latitude, longitude FROM pokemon".$where." ORDER BY disappear_time DESC LIMIT 10000";
-			$result 	= $mysqli->query($req);
+			$result = $mysqli->query($req);
 			$points = array();
 			while ($result && $data = $result->fetch_object()) {
-				$points[] 	= $data;
+				$points[] = $data;
 			}
 
 			$json = json_encode($points);
@@ -710,7 +710,7 @@ 
 		break;
 
 	case 'pokedex':
-		$json="";
+		$json = "";
 		if (isset($_GET['pokemon_id'])) {
 			$pokemon_id = mysqli_real_escape_string($mysqli, $_GET['pokemon_id']);
 			$where = " WHERE pokemon.pokemon_id = ".$pokemon_id;
@@ -731,15 +731,15 @@ 
 		break;
 
 	case 'pokemon_graph_data':
-		$json="";
+		$json = "";
 		if (isset($_GET['pokemon_id'])) {
 			$pokemon_id = mysqli_real_escape_string($mysqli, $_GET['pokemon_id']);
-			$req 		= "SELECT COUNT(*) as total, "
+			$req = "SELECT COUNT(*) as total, "
 					. "HOUR(CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) as disappear_hour
 			FROM (SELECT disappear_time FROM pokemon WHERE pokemon_id = '".$pokemon_id."' LIMIT 10000) as pokemonFiltered
 			GROUP BY disappear_hour
 			ORDER BY disappear_hour";
-			$result 	= $mysqli->query($req);
+			$result = $mysqli->query($req);
 			$array = array_fill(0, 24, 0);
 			while ($result && $data = $result->fetch_object()) {
 				$array[$data->disappear_hour] = $data->total;
@@ -766,30 +766,30 @@ 
 
 	break;
 }
-if ($postRequest!="") {
+if ($postRequest != "") {
 	switch ($postRequest) {
 		case 'pokemon_live':
-			$json="";
-			if (isset( $_POST['pokemon_id'])) {
+			$json = "";
+			if (isset($_POST['pokemon_id'])) {
 				$pokemon_id = mysqli_real_escape_string($mysqli, $_POST['pokemon_id']);
-				$inmap_pkms_filter="";
+				$inmap_pkms_filter = "";
 				$where = " WHERE disappear_time >= UTC_TIMESTAMP() AND pokemon.pokemon_id = ".$pokemon_id;
 
 				$reqTestIv = "SELECT MAX(individual_attack) as iv FROM pokemon ".$where;
-				$resultTestIv 	= $mysqli->query($reqTestIv);
+				$resultTestIv = $mysqli->query($reqTestIv);
 				$testIv = $resultTestIv->fetch_object();
-				if (isset( $_POST['inmap_pokemons'])&&( $_POST['inmap_pokemons']!="")) {
+				if (isset($_POST['inmap_pokemons']) && ($_POST['inmap_pokemons'] != "")) {
 					foreach ($_POST['inmap_pokemons'] as $inmap) {
 						$inmap_pkms_filter .= "'".$inmap."',";
 					}
 					$inmap_pkms_filter = rtrim($inmap_pkms_filter, ",");
 					$where .= " AND pokemon.encounter_id NOT IN (".$inmap_pkms_filter.") ";
 				}
-				if ($testIv->iv!=null && isset( $_POST['ivMin'])&&( $_POST['ivMin']!="")) {
+				if ($testIv->iv != null && isset($_POST['ivMin']) && ($_POST['ivMin'] != "")) {
 					$ivMin = mysqli_real_escape_string($mysqli, $_POST['ivMin']);
 					$where .= " AND ((100/45)*(individual_attack+individual_defense+individual_stamina)) >= (".$ivMin.") ";
 				}
-				if ($testIv->iv!=null && isset( $_POST['ivMax'])&&( $_POST['ivMax']!="")) {
+				if ($testIv->iv != null && isset($_POST['ivMax']) && ($_POST['ivMax'] != "")) {
 					$ivMax = mysqli_real_escape_string($mysqli, $_POST['ivMax']);
 					$where .= " AND ((100/45)*(individual_attack+individual_defense+individual_stamina)) <=(".$ivMax.") ";
 				}
@@ -797,19 +797,19 @@ 
 						. " (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) as disappear_time_real, "
 						. " individual_attack, individual_defense, individual_stamina, move_1, move_2 "
 						. "FROM pokemon".$where." ORDER BY disappear_time DESC LIMIT 5000";
-				$result 	= $mysqli->query($req);
+				$result = $mysqli->query($req);
 				$json = array();
 				$json['points'] = array();
 				$locale = array();
-				$locale["ivAttack"] =  $locales->IV_ATTACK;
+				$locale["ivAttack"] = $locales->IV_ATTACK;
 				$locale["ivDefense"] = $locales->IV_DEFENSE;
-				$locale["ivStamina"] =  $locales->IV_STAMINA;
+				$locale["ivStamina"] = $locales->IV_STAMINA;
 				$json['locale'] = $locale;
 				while ($result && $data = $result->fetch_object()) {
-					$pokeid=$data->pokemon_id;
+					$pokeid = $data->pokemon_id;
 					$data->name = $pokemons->pokemon->$pokeid->name;
-					$move1=$data->move_1;
-					$move2=$data->move_2;
+					$move1 = $data->move_1;
+					$move2 = $data->move_2;
 					$data->quick_move = $move->$move1->name;
 					$data->charge_move = $move->$move2->name;
 					$json['points'][] 	= $data;