brusselopole / Worldopole

core/process/locales.loader.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
  *
  * @return array Sorted list of "accept" options
  */
-$sortAccept = function ($header) {
+$sortAccept = function($header) {
 	$matches = array();
 	foreach (explode(',', $header) as $option) {
 		$option = array_map('trim', explode(';', $option));
@@ -52,7 +52,7 @@ 
  *
  * @return string|NULL a matched option, or NULL if no match
  */
-$matchAccept = function ($header, $supported) use ($sortAccept) {
+$matchAccept = function($header, $supported) use ($sortAccept) {
 	$matches = $sortAccept($header);
 	foreach ($matches as $key => $q) {
 		if (isset($supported[$key])) {
@@ -83,7 +83,7 @@ 
  *
  * @return string The negotiated language result or the supplied default.
  */
-$negotiateLanguage = function ($supported, $default = 'en-US') use ($matchAccept) {
+$negotiateLanguage = function($supported, $default = 'en-US') use ($matchAccept) {
 	$supp = array();
 	foreach ($supported as $lang => $isSupported) {
 		if ($isSupported) {

Braces +6 added lines, -3 removed lines

@@ -19,7 +19,8 @@ 
  *
  * @return array Sorted list of "accept" options
  */
-$sortAccept = function ($header) {
+$sortAccept = function ($header)
+{
 	$matches = array();
 	foreach (explode(',', $header) as $option) {
 		$option = array_map('trim', explode(';', $option));
@@ -52,7 +53,8 @@ 
  *
  * @return string|NULL a matched option, or NULL if no match
  */
-$matchAccept = function ($header, $supported) use ($sortAccept) {
+$matchAccept = function ($header, $supported) use ($sortAccept)
+{
 	$matches = $sortAccept($header);
 	foreach ($matches as $key => $q) {
 		if (isset($supported[$key])) {
@@ -83,7 +85,8 @@ 
  *
  * @return string The negotiated language result or the supplied default.
  */
-$negotiateLanguage = function ($supported, $default = 'en-US') use ($matchAccept) {
+$negotiateLanguage = function ($supported, $default = 'en-US') use ($matchAccept)
+{
 	$supp = array();
 	foreach ($supported as $lang => $isSupported) {
 		if ($isSupported) {

pages/pokemon.page.php

Braces +1 added lines, -2 removed lines

@@ -323,8 +323,7 @@
 									} elseif (isset($obj->info)) {
 										$infoName = 'INFO_' . $obj->info;
 										echo '<br>(' . $locales->$infoName . ')';
-									}
-									else {
+									} else {
 										echo '<br> </br>';
 									}
 									?>

Indentation +5 added lines, -5 removed lines

@@ -316,11 +316,11 @@
 								<img src="core/img/arrow<?=$obj->array_sufix?>.png" alt="Arrow" class="img">
 								<p class="pkmn-name">
 									<?php
-                                    if (isset($obj->candies)) {
-                                        echo $obj->candies . ' ' . $locales->POKEMON_CANDIES;
-                                    } else {
-                                        echo '? ' . $locales->POKEMON_CANDIES;
-                                    }
+									if (isset($obj->candies)) {
+										echo $obj->candies . ' ' . $locales->POKEMON_CANDIES;
+									} else {
+										echo '? ' . $locales->POKEMON_CANDIES;
+									}
 
 									if (isset($obj->item)) {
 										$itemName = 'ITEM_' . $obj->item;

Spacing +6 added lines, -6 removed lines

@@ -317,17 +317,17 @@
 								<p class="pkmn-name">
 									<?php
                                     if (isset($obj->candies)) {
-                                        echo $obj->candies . ' ' . $locales->POKEMON_CANDIES;
+                                        echo $obj->candies.' '.$locales->POKEMON_CANDIES;
                                     } else {
-                                        echo '? ' . $locales->POKEMON_CANDIES;
+                                        echo '? '.$locales->POKEMON_CANDIES;
                                     }
 
 									if (isset($obj->item)) {
-										$itemName = 'ITEM_' . $obj->item;
-										echo '<br>+ ' . $locales->$itemName;
+										$itemName = 'ITEM_'.$obj->item;
+										echo '<br>+ '.$locales->$itemName;
 									} elseif (isset($obj->info)) {
-										$infoName = 'INFO_' . $obj->info;
-										echo '<br>(' . $locales->$infoName . ')';
+										$infoName = 'INFO_'.$obj->info;
+										echo '<br>('.$locales->$infoName.')';
 									}
 									else {
 										echo '<br> </br>';

core/process/aru.php

Spacing +3 added lines, -3 removed lines

@@ -743,7 +743,7 @@ 
 							FROM gymmember
 							LEFT JOIN gympokemon
 							ON gymmember.pokemon_uid = gympokemon.pokemon_uid
-							WHERE gymmember.gym_id = '". $data->gym_id ."'
+							WHERE gymmember.gym_id = '". $data->gym_id."'
 							ORDER BY deployment_time";
 				$pkm_result = $mysqli->query($pkm_req);
 				while ($pkm_result && $pkm_data = $pkm_result->fetch_object()) {
@@ -810,7 +810,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);
@@ -823,7 +823,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;
 					}
 				}

Switch Indentation +451 added lines, -451 removed lines

@@ -58,162 +58,162 @@ 
 	//
 	############################
 
-	case 'home_update':
-		// Right now
-		// ---------
+		case 'home_update':
+			// 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
-		// -----------
+			// 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;
 
 
-		// Active Raids
-		// -----------
+			// Active Raids
+			// -----------
 
-		$req = "SELECT COUNT(*) AS total FROM raid WHERE start <= UTC_TIMESTAMP AND  end >= UTC_TIMESTAMP()";
-		$result = $mysqli->query($req);
-		$data = $result->fetch_object();
+			$req = "SELECT COUNT(*) AS total FROM raid WHERE start <= UTC_TIMESTAMP AND  end >= UTC_TIMESTAMP()";
+			$result = $mysqli->query($req);
+			$data = $result->fetch_object();
 
-		$values[] = $data->total;
+			$values[] = $data->total;
 
 
-		// Team battle
-		// -----------
+			// 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
+			// 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;
+			// 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;
+			// 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;
+			// 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;
+			// Neutral
+			$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
-			$req = "SELECT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) AS disappear_time_real,
+				// 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, cp, 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,
+			} 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, cp, 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()) {
-			$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;
+			}
+			$result = $mysqli->query($req);
+			while ($data = $result->fetch_object()) {
+				$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.'
@@ -225,8 +225,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>
@@ -238,11 +238,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>?
@@ -254,123 +254,123 @@ 
 									<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':
-		$where = "";
-		$req = "SELECT latitude, longitude, lure_expiration, UTC_TIMESTAMP() AS now, (CONVERT_TZ(lure_expiration, '+00:00', '".$time_offset."')) AS lure_expiration_real FROM pokestop ";
+		case 'pokestop':
+			$where = "";
+			$req = "SELECT latitude, longitude, lure_expiration, UTC_TIMESTAMP() AS now, (CONVERT_TZ(lure_expiration, '+00:00', '".$time_offset."')) AS lure_expiration_real FROM pokestop ";
 
-		$result = $mysqli->query($req);
+			$result = $mysqli->query($req);
 
-		$pokestops = [];
+			$pokestops = [];
 
-		while ($data = $result->fetch_object()) {
-			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;
-			}
+			while ($data = $result->fetch_object()) {
+				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) {
-			$req = "SELECT COUNT(DISTINCT(gym_id)) AS total, ROUND(AVG(total_cp),0) AS average_points FROM gym WHERE team_id = '".$team_id."'";
-			$result = $mysqli->query($req);
-			$data = $result->fetch_object();
+			foreach ($teams as $team_name => $team_id) {
+				$req = "SELECT COUNT(DISTINCT(gym_id)) AS total, ROUND(AVG(total_cp),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;
+			}
 
-		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':
-		$req = "SELECT gym_id, team_id, latitude, longitude, (CONVERT_TZ(last_scanned, '+00:00', '".$time_offset."')) AS last_scanned, (6 - slots_available) AS level FROM gym";
-		$result = $mysqli->query($req);
+		case 'gym_map':
+			$req = "SELECT gym_id, team_id, latitude, longitude, (CONVERT_TZ(last_scanned, '+00:00', '".$time_offset."')) AS last_scanned, (6 - slots_available) AS level FROM gym";
+			$result = $mysqli->query($req);
 
-		$gyms = [];
+			$gyms = [];
 
-		while ($data = $result->fetch_object()) {
-			// Team
-			// 1 = bleu
-			// 2 = rouge
-			// 3 = jaune
+			while ($data = $result->fetch_object()) {
+				// 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)';
@@ -394,7 +394,7 @@ 
 					$team	= 'Team Instinct';
 					$color = 'rgba(254, 217, 40, .6)';
 					break;
-			}
+				}
 
 			if ($data->team_id != 0) {
 				$icon .= $data->level.".png";
@@ -420,50 +420,50 @@ 
 	//
 	####################################
 
-	case 'gym_defenders':
-		$gym_id = $mysqli->real_escape_string($_GET['gym_id']);
-		$req = "SELECT gymdetails.name AS name, gymdetails.description AS description, gymdetails.url AS url, gym.team_id AS team,
+		case 'gym_defenders':
+			$gym_id = $mysqli->real_escape_string($_GET['gym_id']);
+			$req = "SELECT gymdetails.name AS name, gymdetails.description AS description, 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, gym.total_cp AS total_cp, (6 - gym.slots_available) AS level
 					FROM gymdetails
 					LEFT JOIN gym ON gym.gym_id = gymdetails.gym_id
 					WHERE gym.gym_id='".$gym_id."'";
-		$result = $mysqli->query($req);
+			$result = $mysqli->query($req);
 
-		$gymData['gymDetails']['gymInfos'] = false;
+			$gymData['gymDetails']['gymInfos'] = false;
 
-		while ($data = $result->fetch_object()) {
-			$gymData['gymDetails']['gymInfos']['name'] = $data->name;
-			$gymData['gymDetails']['gymInfos']['description'] = $data->description;
-			if ($data->url == null) {
-				$gymData['gymDetails']['gymInfos']['url'] = '';
-			} else {
-				$gymData['gymDetails']['gymInfos']['url'] = $data->url;
+			while ($data = $result->fetch_object()) {
+				$gymData['gymDetails']['gymInfos']['name'] = $data->name;
+				$gymData['gymDetails']['gymInfos']['description'] = $data->description;
+				if ($data->url == null) {
+					$gymData['gymDetails']['gymInfos']['url'] = '';
+				} else {
+					$gymData['gymDetails']['gymInfos']['url'] = $data->url;
+				}
+				$gymData['gymDetails']['gymInfos']['points'] = $data->total_cp;
+				$gymData['gymDetails']['gymInfos']['level'] = $data->level;
+				$gymData['gymDetails']['gymInfos']['last_scanned'] = $data->last_scanned;
+				$gymData['gymDetails']['gymInfos']['team'] = $data->team;
+				$gymData['gymDetails']['gymInfos']['guardPokemonId'] = $data->guard_pokemon_id;
 			}
-			$gymData['gymDetails']['gymInfos']['points'] = $data->total_cp;
-			$gymData['gymDetails']['gymInfos']['level'] = $data->level;
-			$gymData['gymDetails']['gymInfos']['last_scanned'] = $data->last_scanned;
-			$gymData['gymDetails']['gymInfos']['team'] = $data->team;
-			$gymData['gymDetails']['gymInfos']['guardPokemonId'] = $data->guard_pokemon_id;
-		}
 
-		$req = "SELECT DISTINCT gympokemon.pokemon_uid, pokemon_id, iv_attack, iv_defense, iv_stamina, MAX(cp) AS cp, gymmember.gym_id
+			$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);
+			$result = $mysqli->query($req);
 
-		$i = 0;
+			$i = 0;
 
-		$gymData['infoWindow'] = '
+			$gymData['infoWindow'] = '
 			<div class="gym_defenders">
 			';
-		while ($data = $result->fetch_object()) {
-			$gymData['gymDetails']['pokemons'][] = $data;
-			if ($data != false) {
-				$pokemon_id = $data->pokemon_id;
-				if ($config->system->iv_numbers) {
-					$gymData['infoWindow'] .= '
+			while ($data = $result->fetch_object()) {
+				$gymData['gymDetails']['pokemons'][] = $data;
+				if ($data != false) {
+					$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" >
@@ -481,8 +481,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" >
@@ -500,80 +500,80 @@ 
 							</div>
 						</div>
 					</div>'
-						; }
-			} else {
-				$pokemon_id = $gymData['gymDetails']['gymInfos']['guardPokemonId'];
-				$gymData['infoWindow'] .= '
+							; }
+				} else {
+					$pokemon_id = $gymData['gymDetails']['gymInfos']['guardPokemonId'];
+					$gymData['infoWindow'] .= '
 				<div style="text-align: center; width: 50px; display: inline-block; margin-right: 3px">
 					<a href="pokemon/'.$gymData['gymDetails']['gymInfos']['guardPokemonId'].'">
 					<img src="'.$pokemons->pokemon->$pokemon_id->img.'" height="50" style="display:inline-block" >
 					</a>
 					<p class="pkmn-name">???</p>
 				</div>'
-				;
+					;
+				}
+				$i++;
 			}
-			$i++;
-		}
 
-		// check whether we could retrieve gym infos, otherwise use basic gym info
-		if (!$gymData['gymDetails']['gymInfos']) {
-			$req = "SELECT gym_id, team_id, guard_pokemon_id, latitude, longitude, (CONVERT_TZ(last_scanned, '+00:00', '".$time_offset."')) AS last_scanned, total_cp, (6 - slots_available) AS level
+			// check whether we could retrieve gym infos, otherwise use basic gym info
+			if (!$gymData['gymDetails']['gymInfos']) {
+				$req = "SELECT gym_id, team_id, guard_pokemon_id, latitude, longitude, (CONVERT_TZ(last_scanned, '+00:00', '".$time_offset."')) AS last_scanned, total_cp, (6 - slots_available) AS level
 				FROM gym WHERE gym_id='".$gym_id."'";
-			$result = $mysqli->query($req);
-			$data = $result->fetch_object();
-
-			$gymData['gymDetails']['gymInfos']['name'] = $locales->NOT_AVAILABLE;
-			$gymData['gymDetails']['gymInfos']['description'] = $locales->NOT_AVAILABLE;
-			$gymData['gymDetails']['gymInfos']['url'] = 'https://upload.wikimedia.org/wikipedia/commons/thumb/8/86/Solid_grey.svg/200px-Solid_grey.svg.png';
-			$gymData['gymDetails']['gymInfos']['points'] = $data->total_cp;
-			$gymData['gymDetails']['gymInfos']['level'] = $data->level;
-			$gymData['gymDetails']['gymInfos']['last_scanned'] = $data->last_scanned;
-			$gymData['gymDetails']['gymInfos']['team'] = $data->team_id;
-			$gymData['gymDetails']['gymInfos']['guardPokemonId'] = $data->guard_pokemon_id;
-
-			$pokemon_id = $data->guard_pokemon_id;
-			$gymData['infoWindow'] .= '
+				$result = $mysqli->query($req);
+				$data = $result->fetch_object();
+
+				$gymData['gymDetails']['gymInfos']['name'] = $locales->NOT_AVAILABLE;
+				$gymData['gymDetails']['gymInfos']['description'] = $locales->NOT_AVAILABLE;
+				$gymData['gymDetails']['gymInfos']['url'] = 'https://upload.wikimedia.org/wikipedia/commons/thumb/8/86/Solid_grey.svg/200px-Solid_grey.svg.png';
+				$gymData['gymDetails']['gymInfos']['points'] = $data->total_cp;
+				$gymData['gymDetails']['gymInfos']['level'] = $data->level;
+				$gymData['gymDetails']['gymInfos']['last_scanned'] = $data->last_scanned;
+				$gymData['gymDetails']['gymInfos']['team'] = $data->team_id;
+				$gymData['gymDetails']['gymInfos']['guardPokemonId'] = $data->guard_pokemon_id;
+
+				$pokemon_id = $data->guard_pokemon_id;
+				$gymData['infoWindow'] .= '
 				<div style="text-align: center; width: 50px; display: inline-block; margin-right: 3px">
 					<a href="pokemon/'.$data->guard_pokemon_id.'">
 					<img src="'.$pokemons->pokemon->$pokemon_id->img.'" height="50" style="display:inline-block" >
 					</a>
 					<p class="pkmn-name">???</p>
 				</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";
-		$where = "";
-		$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) {
-			$team = mysqli_real_escape_string($mysqli, $_GET['team']);
-			$where .= ($where == "" ? " HAVING" : " AND")." team = ".$team;
-		}
-		if (!empty($config->system->trainer_blacklist)) {
-			$where .= ($where == "" ? " HAVING" : " AND")." name NOT IN ('".implode("','", $config->system->trainer_blacklist)."')";
-		}
-		if (isset($_GET['page'])) {
-			$page = mysqli_real_escape_string($mysqli, $_GET['page']);
-		}
-		if (isset($_GET['ranking'])) {
-			$ranking = mysqli_real_escape_string($mysqli, $_GET['ranking']);
-		}
+		case 'trainer':
+			$name = "";
+			$page = "0";
+			$where = "";
+			$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) {
+				$team = mysqli_real_escape_string($mysqli, $_GET['team']);
+				$where .= ($where == "" ? " HAVING" : " AND")." team = ".$team;
+			}
+			if (!empty($config->system->trainer_blacklist)) {
+				$where .= ($where == "" ? " HAVING" : " AND")." name NOT IN ('".implode("','", $config->system->trainer_blacklist)."')";
+			}
+			if (isset($_GET['page'])) {
+				$page = mysqli_real_escape_string($mysqli, $_GET['page']);
+			}
+			if (isset($_GET['ranking'])) {
+				$ranking = mysqli_real_escape_string($mysqli, $_GET['ranking']);
+			}
 
-		switch ($ranking) {
+			switch ($ranking) {
 			case 1:
 				$order = " ORDER BY active DESC, level DESC";
 				break;
@@ -582,7 +582,7 @@ 
 				break;
 			default:
 				$order = " ORDER BY level DESC, active DESC";
-		}
+			}
 
 		$order .= ", last_seen DESC, name ";
 
@@ -658,73 +658,73 @@ 
 		break;
 
 
-	case 'raids':
-		$page = "0";
-		if (isset($_GET['page'])) {
-			$page = mysqli_real_escape_string($mysqli, $_GET['page']);
-		}
+		case 'raids':
+			$page = "0";
+			if (isset($_GET['page'])) {
+				$page = mysqli_real_escape_string($mysqli, $_GET['page']);
+			}
 
-		$limit = " LIMIT ".($page * 10).",10";
+			$limit = " LIMIT ".($page * 10).",10";
 
-		$req = "SELECT raid.gym_id, raid.level, raid.pokemon_id, raid.cp, raid.move_1, raid.move_2, CONVERT_TZ(raid.spawn, '+00:00', '".$time_offset."') AS spawn, CONVERT_TZ(raid.start, '+00:00', '".$time_offset."') AS start, CONVERT_TZ(raid.end, '+00:00', '".$time_offset."') AS end, CONVERT_TZ(raid.last_scanned, '+00:00', '".$time_offset."') AS last_scanned, gymdetails.name, gym.latitude, gym.longitude FROM raid
+			$req = "SELECT raid.gym_id, raid.level, raid.pokemon_id, raid.cp, raid.move_1, raid.move_2, CONVERT_TZ(raid.spawn, '+00:00', '".$time_offset."') AS spawn, CONVERT_TZ(raid.start, '+00:00', '".$time_offset."') AS start, CONVERT_TZ(raid.end, '+00:00', '".$time_offset."') AS end, CONVERT_TZ(raid.last_scanned, '+00:00', '".$time_offset."') AS last_scanned, gymdetails.name, gym.latitude, gym.longitude FROM raid
 				JOIN gymdetails ON gymdetails.gym_id = raid.gym_id
 				JOIN gym ON gym.gym_id = raid.gym_id
 				WHERE raid.end > UTC_TIMESTAMP()
 				ORDER BY raid.level DESC, raid.start".$limit;
 
-		$result = $mysqli->query($req);
-		$raids = array();
-		while ($data = $result->fetch_object()) {
-			$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 = "?";
+			$result = $mysqli->query($req);
+			$raids = array();
+			while ($data = $result->fetch_object()) {
+				$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[$data->gym_id] = $data;
 			}
-			$raids[$data->gym_id] = $data;
-		}
-		$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';
-		$where = '';
-		$order = '';
-		$ranking = 0;
-		if (isset($_GET['name']) && $_GET['name'] != '') {
-			$gym_name = mysqli_real_escape_string($mysqli, $_GET['name']);
-			$where = " WHERE name LIKE '%".$gym_name."%'";
-		}
-		if (isset($_GET['team']) && $_GET['team'] != '') {
-			$team = mysqli_real_escape_string($mysqli, $_GET['team']);
-			$where .= ($where == "" ? " WHERE" : " AND")." team_id = ".$team;
-		}
-		if (isset($_GET['page'])) {
-			$page = mysqli_real_escape_string($mysqli, $_GET['page']);
-		}
-		if (isset($_GET['ranking'])) {
-			$ranking = mysqli_real_escape_string($mysqli, $_GET['ranking']);
-		}
+		case 'gyms':
+			$page = '0';
+			$where = '';
+			$order = '';
+			$ranking = 0;
+			if (isset($_GET['name']) && $_GET['name'] != '') {
+				$gym_name = mysqli_real_escape_string($mysqli, $_GET['name']);
+				$where = " WHERE name LIKE '%".$gym_name."%'";
+			}
+			if (isset($_GET['team']) && $_GET['team'] != '') {
+				$team = mysqli_real_escape_string($mysqli, $_GET['team']);
+				$where .= ($where == "" ? " WHERE" : " AND")." team_id = ".$team;
+			}
+			if (isset($_GET['page'])) {
+				$page = mysqli_real_escape_string($mysqli, $_GET['page']);
+			}
+			if (isset($_GET['ranking'])) {
+				$ranking = mysqli_real_escape_string($mysqli, $_GET['ranking']);
+			}
 
-		switch ($ranking) {
+			switch ($ranking) {
 			case 1:
 				$order = " ORDER BY name, last_modified DESC";
 				break;
@@ -733,7 +733,7 @@ 
 				break;
 			default:
 				$order = " ORDER BY last_modified DESC, name";
-		}
+			}
 
 		$limit = " LIMIT ".($page * 10).",10";
 
@@ -775,163 +775,163 @@ 
 		break;
 
 
-	case 'gymhistory':
-		$gym_id = '';
-		$page = '0';
-		if (isset($_GET['gym_id'])) {
-			$gym_id = mysqli_real_escape_string($mysqli, $_GET['gym_id']);
-			$gym_id = str_replace('_', '.', $gym_id);
-		}
-		if (isset($_GET['page'])) {
-			$page = mysqli_real_escape_string($mysqli, $_GET['page']);
-		}
+		case 'gymhistory':
+			$gym_id = '';
+			$page = '0';
+			if (isset($_GET['gym_id'])) {
+				$gym_id = mysqli_real_escape_string($mysqli, $_GET['gym_id']);
+				$gym_id = str_replace('_', '.', $gym_id);
+			}
+			if (isset($_GET['page'])) {
+				$page = mysqli_real_escape_string($mysqli, $_GET['page']);
+			}
 
-		$entries = array();
+			$entries = array();
 
-		if ($gym_id != '') {
-			$req = "SELECT gym_id, team_id, total_cp, pokemon_uids, pokemon_count, (CONVERT_TZ(last_modified, '+00:00', '".$time_offset."')) as last_modified
+			if ($gym_id != '') {
+				$req = "SELECT gym_id, team_id, total_cp, pokemon_uids, pokemon_count, (CONVERT_TZ(last_modified, '+00:00', '".$time_offset."')) as last_modified
 					FROM gymhistory
 					WHERE gym_id='".$gym_id."'
 					ORDER BY last_modified DESC
 					LIMIT ".($page * 10).",11";
 
-			$result = $mysqli->query($req);
-			while ($result && $data = $result->fetch_object()) {
-				$pkm = array();
-				if ($data->total_cp == 0) { $data->pokemon_uids = ''; }
-				if ($data->pokemon_uids != '') {
-					$pkm_uids = explode(',', $data->pokemon_uids);
-					$pkm_req = "SELECT DISTINCT pokemon_uid, pokemon_id, cp, trainer_name
+				$result = $mysqli->query($req);
+				while ($result && $data = $result->fetch_object()) {
+					$pkm = array();
+					if ($data->total_cp == 0) { $data->pokemon_uids = ''; }
+					if ($data->pokemon_uids != '') {
+						$pkm_uids = explode(',', $data->pokemon_uids);
+						$pkm_req = "SELECT DISTINCT pokemon_uid, pokemon_id, cp, trainer_name
 								FROM gympokemon
 								WHERE pokemon_uid IN ('".implode("','", $pkm_uids)."')
 								ORDER BY FIND_IN_SET(pokemon_uid, '".implode(",", $pkm_uids)."')";
-					$pkm_result = $mysqli->query($pkm_req);
-					while ($pkm_result && $pkm_data = $pkm_result->fetch_object()) {
-						$pkm[$pkm_data->pokemon_uid] = $pkm_data;
+						$pkm_result = $mysqli->query($pkm_req);
+						while ($pkm_result && $pkm_data = $pkm_result->fetch_object()) {
+							$pkm[$pkm_data->pokemon_uid] = $pkm_data;
+						}
 					}
+					$data->pokemon = $pkm;
+					$data->gym_id = str_replace('.', '_', $data->gym_id);
+					$entries[] = $data;
 				}
-				$data->pokemon = $pkm;
-				$data->gym_id = str_replace('.', '_', $data->gym_id);
-				$entries[] = $data;
-			}
-
-			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;
+
+				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 = array();
-		$json['entries'] = $entries;
-		$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 'pokemon_slider_init':
+			$req = "SELECT MIN(disappear_time) AS min, MAX(disappear_time) AS max FROM pokemon";
+			$result 	= $mysqli->query($req);
+			$bounds		= $result->fetch_object();
 
-	case 'pokemon_slider_init':
-		$req = "SELECT MIN(disappear_time) AS min, MAX(disappear_time) AS max FROM pokemon";
-		$result 	= $mysqli->query($req);
-		$bounds		= $result->fetch_object();
+			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 = mysqli_real_escape_string($mysqli, $_GET['pokemon_id']);
+				$where = " WHERE pokemon_id = ".$pokemon_id." "
+						. "AND disappear_time BETWEEN '".$start."' AND '".$end."'";
+				$req 		= "SELECT latitude, longitude FROM pokemon".$where." ORDER BY disappear_time DESC LIMIT 10000";
+				$result = $mysqli->query($req);
+				$points = array();
+				while ($result && $data = $result->fetch_object()) {
+					$points[] = $data;
+				}
 
-	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 = mysqli_real_escape_string($mysqli, $_GET['pokemon_id']);
-			$where = " WHERE pokemon_id = ".$pokemon_id." "
-					. "AND disappear_time BETWEEN '".$start."' AND '".$end."'";
-			$req 		= "SELECT latitude, longitude FROM pokemon".$where." ORDER BY disappear_time DESC LIMIT 10000";
-			$result = $mysqli->query($req);
-			$points = array();
-			while ($result && $data = $result->fetch_object()) {
-				$points[] = $data;
+				$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':
-		$json = "";
-		$req = "SELECT MAX(latitude) AS max_latitude, MIN(latitude) AS min_latitude, MAX(longitude) AS max_longitude, MIN(longitude) as min_longitude FROM spawnpoint";
-		$result = $mysqli->query($req);
-		$coordinates = $result->fetch_object();
+		case 'maps_localization_coordinates':
+			$json = "";
+			$req = "SELECT MAX(latitude) AS max_latitude, MIN(latitude) AS min_latitude, MAX(longitude) AS max_longitude, MIN(longitude) as min_longitude FROM spawnpoint";
+			$result = $mysqli->query($req);
+			$coordinates = $result->fetch_object();
 
-		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 = mysqli_real_escape_string($mysqli, $_GET['pokemon_id']);
-			$req = "SELECT COUNT(*) AS total,
+		case 'pokemon_graph_data':
+			$json = "";
+			if (isset($_GET['pokemon_id'])) {
+				$pokemon_id = mysqli_real_escape_string($mysqli, $_GET['pokemon_id']);
+				$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."' ORDER BY disappear_time LIMIT 10000) AS pokemonFiltered
 					GROUP BY disappear_hour
 					ORDER BY disappear_hour";
-			$result = $mysqli->query($req);
-			$array = array_fill(0, 24, 0);
-			while ($result && $data = $result->fetch_object()) {
-				$array[$data->disappear_hour] = $data->total;
+				$result = $mysqli->query($req);
+				$array = array_fill(0, 24, 0);
+				while ($result && $data = $result->fetch_object()) {
+					$array[$data->disappear_hour] = $data->total;
+				}
+				// shift array because AM/PM starts at 1AM not 0:00
+				$array[] = $array[0];
+				array_shift($array);
+
+				$json = json_encode($array);
 			}
-			// shift array because AM/PM starts at 1AM not 0:00
-			$array[] = $array[0];
-			array_shift($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 != "") {

core/cron/crontabs.include.php

Spacing +2 added lines, -2 removed lines

@@ -53,10 +53,10 @@
 	$pokedatas	= json_decode(file_get_contents($pokemonstats_file), true);
 }
 if (is_file($pokedex_counts_file)) {
-	$pokecountdatas	= json_decode(file_get_contents($pokedex_counts_file), true);
+	$pokecountdatas = json_decode(file_get_contents($pokedex_counts_file), true);
 }
 if (is_file($pokedex_raids_file)) {
-	$raiddatas	= json_decode(file_get_contents($pokedex_raids_file), true);
+	$raiddatas = json_decode(file_get_contents($pokedex_raids_file), true);
 }
 
 

functions.php

Braces +22 added lines, -12 removed lines

@@ -177,7 +177,8 @@ 
 //
 // Retruns max depth of array
 ########################################################################
-function get_depth($arr) {
+function get_depth($arr)
+{
 	$it = new RecursiveIteratorIterator(new RecursiveArrayIterator($arr));
 	$depth = 0;
 	foreach ($it as $v) {
@@ -195,12 +196,16 @@ 
 //
 // Return all pokemon with data at a certain tree depth
 ########################################################################
-function get_tree_at_depth($trees, $depth, $max_pokemon, $currentDepth = 0) {
-	if ($depth == $currentDepth) { // Found depth
+function get_tree_at_depth($trees, $depth, $max_pokemon, $currentDepth = 0)
+{
+	if ($depth == $currentDepth) {
+// Found depth
 		return tree_remove_bellow($trees, $max_pokemon);
-	} else { // Go deeper
+	} else {
+// Go deeper
 		$arr = array();
-		foreach ($trees as $temp) { // Go into all trees
+		foreach ($trees as $temp) {
+// Go into all trees
 			$tree = $temp->evolutions;
 			$results = tree_remove_bellow(get_tree_at_depth($tree, $depth, $max_pokemon, $currentDepth + 1), $max_pokemon);
 			$arr = tree_check_array($results, $arr, $depth - $currentDepth == 1);
@@ -212,12 +217,16 @@ 
 ########################################################################
 // used in get_tree_at_depth
 ########################################################################
-function tree_check_array($array_check, $array_add, $correct_arrow) {
+function tree_check_array($array_check, $array_add, $correct_arrow)
+{
 	$count = count($array_check);
 	$i = 0;
-	if (!is_null($array_check)) { // check if exists
-		foreach ($array_check as $res) { // Check if above, equal or bellow center
-			if ($count != 1 && $correct_arrow) { // only add arrow once
+	if (!is_null($array_check)) {
+// check if exists
+		foreach ($array_check as $res) {
+// Check if above, equal or bellow center
+			if ($count != 1 && $correct_arrow) {
+// only add arrow once
 				$num = $i / ($count - 1);
 				if ($num < 0.5) {
 					$res->array_sufix = "_up";
@@ -245,7 +254,8 @@ 
 		return null;
 	}
 	$arr = array();
-	foreach ($tree as $item) { // Check if above, equal or bellow center
+	foreach ($tree as $item) {
+// Check if above, equal or bellow center
 		if ($item->id <= $max_pokemon) {
 			$arr[] = $item;
 		}
@@ -279,7 +289,7 @@ 
 ########################################################################
 // HTML output for Menu and Submenu
 ########################################################################
-function printMenuitems($menu, $level, $locales) 
+function printMenuitems($menu, $level, $locales)
 {
 	if (isset($menu->locale)) {
 		$locale = $menu->locale;
@@ -299,7 +309,7 @@ 
 			<ul class="dropdown">
 			
 			<?php 
-			foreach ($menu->members as $childmenu) { 
+			foreach ($menu->members as $childmenu) {
 				printMenuitems($childmenu, $level + 1, $locales);
 			}
 			?>