brusselopole / Worldopole

install/tester.php

Indentation +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
 	$mysqli = new mysqli(SYS_DB_HOST, SYS_DB_USER, SYS_DB_PSWD, SYS_DB_NAME, SYS_DB_PORT);
 
 	// Pokemon Test
-    $result = $mysqli->query(req_tester_pokemon());
+	$result = $mysqli->query(req_tester_pokemon());
 
 	if (!is_object($result)) {
 		$lock_msg .= "Error: No Pokémon database found<br>";
@@ -39,7 +39,7 @@ 
 	}
 
 	// Gym Test
-    $result = $mysqli->query(req_tester_gym());
+	$result = $mysqli->query(req_tester_gym());
 
 	if (!is_object($result)) {
 		$lock_msg .= "Error: No Gym database found<br>";
@@ -54,7 +54,7 @@ 
 
 
 	// Pokéstop Test
-    $result = $mysqli->query(req_tester_pokestop());
+	$result = $mysqli->query(req_tester_pokestop());
 
 	if (!is_object($result)) {
 		$lock_msg .= "Error: No Pokestop database found<br>";

core/cron/pokedex_counts.cron.php

Indentation +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 $total_pokemon = 0;
 $pokedex_counts = new stdClass();
 for ($pid = 1; $pid <= $maxpid; $pid++) {
-    $result = $mysqli->query(req_pokemon_total_count($pid));
+	$result = $mysqli->query(req_pokemon_total_count($pid));
 	$data = $result->fetch_object();
 	
 	$pokedex_counts->$pid = (int) $data->pokemon_spawns;

core/cron/nests.cron.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 	$nests['c'] = $data->total_pokemon;
 	$nests['lat'] = $data->latitude;
 	$nests['lng'] = $data->longitude;
-    $starttime = $data->latest_seen - $data->duration;
+	$starttime = $data->latest_seen - $data->duration;
 	if ($starttime < 0) {
 		$starttime = 3600 + $starttime;
 	}

core/cron/captcha.cron.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 if ($config_secret->captcha_key == "") {
 	$captcha['timestamp'] = $timestamp;
 	// get amount of accounts requiring a captcha
-    $result = $mysqli->query(req_captcha_count());
+	$result = $mysqli->query(req_captcha_count());
 	$data = $result->fetch_object();
 	$captcha['captcha_accs'] = $data->total;
 	// Add the datas in file

core/js/trainer.graph.js.php

Indentation +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 $trainer_lvl = [];
 # For all 3 teams
 for ($teamid = 1; $teamid <= 3; $teamid++) {
-    if ($result = $mysqli->query(req_trainer_levels_for_team($teamid))) {
+	if ($result = $mysqli->query(req_trainer_levels_for_team($teamid))) {
 		# build level=>count array
 		$data = [];
 		while ($row = $result->fetch_assoc()) {

core/process/quarrys/rocketmap.php

Indentation +124 added lines, -124 removed lines

@@ -10,7 +10,7 @@ 
 
 function req_maps_localization_coordinates()
 {
-    return "SELECT MAX(latitude) AS max_latitude, MIN(latitude) AS min_latitude, MAX(longitude) AS max_longitude, MIN(longitude) AS min_longitude FROM spawnpoint";
+	return "SELECT MAX(latitude) AS max_latitude, MIN(latitude) AS min_latitude, MAX(longitude) AS max_longitude, MIN(longitude) AS min_longitude FROM spawnpoint";
 
 }
 
@@ -19,19 +19,19 @@ 
 
 function req_pokemon_count()
 {
-    return "SELECT COUNT(*) AS total FROM pokemon WHERE disappear_time >= UTC_TIMESTAMP()";
+	return "SELECT COUNT(*) AS total FROM pokemon WHERE disappear_time >= UTC_TIMESTAMP()";
 }
 
 function req_pokemon_count_id()
 {
-    return "SELECT pokemon_id FROM pokemon WHERE disappear_time >= UTC_TIMESTAMP()";
+	return "SELECT pokemon_id FROM pokemon WHERE disappear_time >= UTC_TIMESTAMP()";
 
 }
 
 function req_mystic_pokemon($mythic_pokemon)
 {
-    global $time_offset;
-    return "SELECT DISTINCT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '" . $time_offset . "')) AS disappear_time_real,
+	global $time_offset;
+	return "SELECT DISTINCT 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_pokemon) . ")
@@ -41,8 +41,8 @@ 
 
 function req_all_pokemon()
 {
-    global $time_offset;
-    return "SELECT DISTINCT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '" . $time_offset . "')) AS disappear_time_real,
+	global $time_offset;
+	return "SELECT DISTINCT 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
@@ -55,18 +55,18 @@ 
 
 function req_pokemon_total_count($pokemon_id)
 {
-    return "SELECT COUNT(*) AS pokemon_spawns FROM pokemon WHERE pokemon_id = '" . $pokemon_id . "'";
+	return "SELECT COUNT(*) AS pokemon_spawns FROM pokemon WHERE pokemon_id = '" . $pokemon_id . "'";
 }
 
 function req_pokemon_total_gym_protected($pokemon_id)
 {
-    return "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE guard_pokemon_id = '" . $pokemon_id . "'";
+	return "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE guard_pokemon_id = '" . $pokemon_id . "'";
 }
 
 function req_pokemon_last_seen($pokemon_id)
 {
-    global $time_offset;
-    return "SELECT disappear_time, (CONVERT_TZ(disappear_time, '+00:00', '" . $time_offset . "')) AS disappear_time_real, latitude, longitude
+	global $time_offset;
+	return "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
@@ -75,8 +75,8 @@ 
 
 function req_pokemon_get_top_50($pokemon_id, $top_order_by, $top_direction)
 {
-    global $time_offset;
-    return "SELECT (CONVERT_TZ(disappear_time, '+00:00', '" . $time_offset . "')) AS distime, pokemon_id, disappear_time, latitude, longitude,
+	global $time_offset;
+	return "SELECT (CONVERT_TZ(disappear_time, '+00:00', '" . $time_offset . "')) AS distime, pokemon_id, disappear_time, latitude, longitude,
 	            cp, individual_attack, individual_defense, individual_stamina,
 	            ROUND(SUM(100*(individual_attack+individual_defense+individual_stamina)/45),1) AS IV, move_1, move_2, form
 	            FROM pokemon
@@ -88,12 +88,12 @@ 
 
 function req_pokemon_get_top_trainers($pokemon_id, $best_order_by, $best_direction)
 {
-    global $config;
-    $trainer_blacklist = "";
-    if (!empty($config->system->trainer_blacklist)) {
-        $trainer_blacklist = " AND trainer_name NOT IN ('" . implode("','", $config->system->trainer_blacklist) . "')";
-    }
-    return "SELECT trainer_name, ROUND(SUM(100*(iv_attack+iv_defense+iv_stamina)/45),1) AS IV, move_1, move_2, cp,
+	global $config;
+	$trainer_blacklist = "";
+	if (!empty($config->system->trainer_blacklist)) {
+		$trainer_blacklist = " AND trainer_name NOT IN ('" . implode("','", $config->system->trainer_blacklist) . "')";
+	}
+	return "SELECT trainer_name, ROUND(SUM(100*(iv_attack+iv_defense+iv_stamina)/45),1) AS IV, move_1, move_2, cp,
 				DATE_FORMAT(last_seen, '%Y-%m-%d') AS lasttime, last_seen
 				FROM gympokemon
 				WHERE pokemon_id = '" . $pokemon_id . "'" . $trainer_blacklist . "
@@ -104,20 +104,20 @@ 
 
 function req_pokemon_slider_init()
 {
-    return "SELECT MIN(disappear_time) AS min, MAX(disappear_time) AS max FROM pokemon";
+	return "SELECT MIN(disappear_time) AS min, MAX(disappear_time) AS max FROM pokemon";
 }
 
 function req_pokemon_headmap_points($pokemon_id, $start, $end)
 {
-    $where = " WHERE pokemon_id = " . $pokemon_id . " "
-        . "AND disappear_time BETWEEN '" . $start . "' AND '" . $end . "'";
-    return "SELECT latitude, longitude FROM pokemon" . $where . " ORDER BY disappear_time DESC LIMIT 10000";
+	$where = " WHERE pokemon_id = " . $pokemon_id . " "
+		. "AND disappear_time BETWEEN '" . $start . "' AND '" . $end . "'";
+	return "SELECT latitude, longitude FROM pokemon" . $where . " ORDER BY disappear_time DESC LIMIT 10000";
 }
 
 function req_pokemon_graph_data($pokemon_id)
 {
-    global $time_offset;
-    return "SELECT COUNT(*) AS total,
+	global $time_offset;
+	return "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
@@ -126,31 +126,31 @@ 
 
 function req_pokemon_live_data_test($pokemon_id)
 {
-    $where = " WHERE disappear_time >= UTC_TIMESTAMP() AND pokemon_id = " . $pokemon_id;
-    return "SELECT MAX(individual_attack) AS iv FROM pokemon " . $where;
+	$where = " WHERE disappear_time >= UTC_TIMESTAMP() AND pokemon_id = " . $pokemon_id;
+	return "SELECT MAX(individual_attack) AS iv FROM pokemon " . $where;
 }
 
 function req_pokemon_live_data($pokemon_id, $testIv, $post)
 {
-    global $mysqli, $time_offset;
-    $inmap_pkms_filter = "";
-    $where = " WHERE disappear_time >= UTC_TIMESTAMP() AND pokemon_id = " . $pokemon_id;
-    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 encounter_id NOT IN (" . $inmap_pkms_filter . ") ";
-    }
-    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'] != "")) {
-        $ivMax = mysqli_real_escape_string($mysqli, $post['ivMax']);
-        $where .= " AND ((100/45)*(individual_attack+individual_defense+individual_stamina)) <=(" . $ivMax . ") ";
-    }
-    return "SELECT pokemon_id, encounter_id, latitude, longitude, disappear_time,
+	global $mysqli, $time_offset;
+	$inmap_pkms_filter = "";
+	$where = " WHERE disappear_time >= UTC_TIMESTAMP() AND pokemon_id = " . $pokemon_id;
+	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 encounter_id NOT IN (" . $inmap_pkms_filter . ") ";
+	}
+	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'] != "")) {
+		$ivMax = mysqli_real_escape_string($mysqli, $post['ivMax']);
+		$where .= " AND ((100/45)*(individual_attack+individual_defense+individual_stamina)) <=(" . $ivMax . ") ";
+	}
+	return "SELECT pokemon_id, encounter_id, latitude, longitude, disappear_time,
 						(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 . "
@@ -160,7 +160,7 @@ 
 
 function req_pokemon_count_24h()
 {
-    return "SELECT pokemon_id, COUNT(*) AS spawns_last_day
+	return "SELECT pokemon_id, COUNT(*) AS spawns_last_day
 		FROM pokemon
 		WHERE disappear_time >= (SELECT MAX(disappear_time) FROM pokemon) - INTERVAL 1 DAY
 		GROUP BY pokemon_id
@@ -173,18 +173,18 @@ 
 
 function req_pokestop_count()
 {
-    return "SELECT COUNT(*) AS total FROM pokestop";
+	return "SELECT COUNT(*) AS total FROM pokestop";
 }
 
 function req_pokestop_lure_count()
 {
-    return "SELECT COUNT(*) AS total FROM pokestop WHERE lure_expiration >= UTC_TIMESTAMP()";
+	return "SELECT COUNT(*) AS total FROM pokestop WHERE lure_expiration >= UTC_TIMESTAMP()";
 }
 
 function req_pokestop_data()
 {
-    global $time_offset;
-    return "SELECT latitude, longitude, lure_expiration, UTC_TIMESTAMP() AS now, (CONVERT_TZ(lure_expiration, '+00:00', '" . $time_offset . "')) AS lure_expiration_real FROM pokestop ";
+	global $time_offset;
+	return "SELECT latitude, longitude, lure_expiration, UTC_TIMESTAMP() AS now, (CONVERT_TZ(lure_expiration, '+00:00', '" . $time_offset . "')) AS lure_expiration_real FROM pokestop ";
 }
 
 // Gyms
@@ -192,41 +192,41 @@ 
 
 function req_gym_count()
 {
-    return "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym";
+	return "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym";
 }
 
 function req_gym_count_for_team($team_id)
 {
-    return "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE team_id = '$team_id'";
+	return "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE team_id = '$team_id'";
 }
 
 function req_gym_guards_for_team($team_id)
 {
-    return "SELECT COUNT(*) AS total, guard_pokemon_id FROM gym WHERE team_id = '$team_id' GROUP BY guard_pokemon_id ORDER BY total DESC LIMIT 0,3";
+	return "SELECT COUNT(*) AS total, guard_pokemon_id FROM gym WHERE team_id = '$team_id' GROUP BY guard_pokemon_id ORDER BY total DESC LIMIT 0,3";
 }
 
 function req_gym_count_cp_for_team($team_id)
 {
-    return "SELECT COUNT(DISTINCT(gym_id)) AS total, ROUND(AVG(total_cp),0) AS average_points FROM gym WHERE team_id = '$team_id'";
+	return "SELECT COUNT(DISTINCT(gym_id)) AS total, ROUND(AVG(total_cp),0) AS average_points FROM gym WHERE team_id = '$team_id'";
 }
 
 function req_gym_data()
 {
-    global $time_offset;
-    return "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";
+	global $time_offset;
+	return "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";
 }
 
 function req_gym_data_simple($gym_id)
 {
-    global $time_offset;
-    return "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
+	global $time_offset;
+	return "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 . "'";
 }
 
 function req_gym_defender_for($gym_id)
 {
-    global $time_offset;
-    return "SELECT gymdetails.name AS name, gymdetails.description AS description, gymdetails.url AS url, gym.team_id AS team,
+	global $time_offset;
+	return "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
@@ -235,7 +235,7 @@ 
 
 function req_gym_defender_stats_for($gym_id)
 {
-    return "SELECT DISTINCT gympokemon.pokemon_uid, pokemon_id, iv_attack, iv_defense, iv_stamina, MAX(cp) AS cp, gymmember.gym_id
+	return "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 . "'
@@ -247,38 +247,38 @@ 
 
 function req_trainers($get)
 {
-    global $config, $mysqli;
-    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) {
-        case 1:
-            $order = " ORDER BY active DESC, level DESC";
-            break;
-        case 2:
-            $order = " ORDER BY maxCp DESC, level DESC";
-            break;
-        default:
-            $order = " ORDER BY level DESC, active DESC";
-    }
-    $order .= ", last_seen DESC, name ";
-    $limit = " LIMIT " . ($page * 10) . ",10 ";
-    return "SELECT trainer.*, COUNT(actives_pokemons.trainer_name) AS active, max(actives_pokemons.cp) AS maxCp
+	global $config, $mysqli;
+	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) {
+		case 1:
+			$order = " ORDER BY active DESC, level DESC";
+			break;
+		case 2:
+			$order = " ORDER BY maxCp DESC, level DESC";
+			break;
+		default:
+			$order = " ORDER BY level DESC, active DESC";
+	}
+	$order .= ", last_seen DESC, name ";
+	$limit = " LIMIT " . ($page * 10) . ",10 ";
+	return "SELECT trainer.*, COUNT(actives_pokemons.trainer_name) AS active, max(actives_pokemons.cp) AS maxCp
 				FROM trainer
 				LEFT JOIN (SELECT DISTINCT gympokemon.pokemon_id, gympokemon.pokemon_uid, gympokemon.trainer_name, gympokemon.cp, DATEDIFF(UTC_TIMESTAMP(), gympokemon.last_seen) AS last_scanned
 				FROM gympokemon
@@ -289,8 +289,8 @@ 
 
 function req_trainer_active_pokemon($name)
 {
-    global $time_offset;
-    return "(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, filtered_gymmember.gym_id, CONVERT_TZ(filtered_gymmember.deployment_time, '+00:00', '" . $time_offset . "') as deployment_time, '1' AS active
+	global $time_offset;
+	return "(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, filtered_gymmember.gym_id, CONVERT_TZ(filtered_gymmember.deployment_time, '+00:00', '" . $time_offset . "') as deployment_time, '1' AS active
 	            FROM gympokemon INNER JOIN
 				(SELECT gymmember.pokemon_uid, gymmember.gym_id, gymmember.deployment_time FROM gymmember GROUP BY gymmember.pokemon_uid, gymmember.deployment_time, gymmember.gym_id HAVING gymmember.gym_id <> '') AS filtered_gymmember
 				ON gympokemon.pokemon_uid = filtered_gymmember.pokemon_uid
@@ -300,8 +300,8 @@ 
 
 function req_trainer_inactive_pokemon($name)
 {
-    global $time_offset;
-    return "(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, null AS gym_id, CONVERT_TZ(filtered_gymmember.deployment_time, '+00:00', '" . $time_offset . "') as deployment_time, '0' AS active
+	global $time_offset;
+	return "(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, null AS gym_id, CONVERT_TZ(filtered_gymmember.deployment_time, '+00:00', '" . $time_offset . "') as deployment_time, '0' AS active
 				FROM gympokemon LEFT JOIN
 				(SELECT * FROM gymmember HAVING gymmember.gym_id <> '') AS filtered_gymmember
 				ON gympokemon.pokemon_uid = filtered_gymmember.pokemon_uid
@@ -311,23 +311,23 @@ 
 
 function req_trainer_ranking($trainer)
 {
-    global $config;
-    $reqRanking = "SELECT COUNT(1) AS rank FROM trainer WHERE level = " . $trainer->level;
-    if (!empty($config->system->trainer_blacklist)) {
-        $reqRanking .= " AND name NOT IN ('" . implode("','", $config->system->trainer_blacklist) . "')";
-    }
-    return $reqRanking;
+	global $config;
+	$reqRanking = "SELECT COUNT(1) AS rank FROM trainer WHERE level = " . $trainer->level;
+	if (!empty($config->system->trainer_blacklist)) {
+		$reqRanking .= " AND name NOT IN ('" . implode("','", $config->system->trainer_blacklist) . "')";
+	}
+	return $reqRanking;
 }
 
 function req_trainer_levels_for_team($teamid)
 {
-    global $config;
-    $reqLevels = "SELECT level, count(level) AS count FROM trainer WHERE team = '" . $teamid . "'";
-    if (!empty($config->system->trainer_blacklist)) {
-        $reqLevels .= " AND name NOT IN ('" . implode("','", $config->system->trainer_blacklist) . "')";
-    }
-    $reqLevels .= " GROUP BY level";
-    return $reqLevels;
+	global $config;
+	$reqLevels = "SELECT level, count(level) AS count FROM trainer WHERE team = '" . $teamid . "'";
+	if (!empty($config->system->trainer_blacklist)) {
+		$reqLevels .= " AND name NOT IN ('" . implode("','", $config->system->trainer_blacklist) . "')";
+	}
+	$reqLevels .= " GROUP BY level";
+	return $reqLevels;
 }
 
 // Raids
@@ -335,9 +335,9 @@ 
 
 function req_raids_data($page)
 {
-    global $time_offset;
-    $limit = " LIMIT " . ($page * 10) . ",10";
-    return "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
+	global $time_offset;
+	$limit = " LIMIT " . ($page * 10) . ",10";
+	return "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()
@@ -349,7 +349,7 @@ 
 
 function req_captcha_count()
 {
-    return "SELECT SUM(accounts_captcha) AS total FROM mainworker";
+	return "SELECT SUM(accounts_captcha) AS total FROM mainworker";
 
 }
 
@@ -358,17 +358,17 @@ 
 
 function req_tester_pokemon()
 {
-    return "SELECT COUNT(*) AS total FROM pokemon";
+	return "SELECT COUNT(*) AS total FROM pokemon";
 }
 
 function req_tester_gym()
 {
-    return "SELECT COUNT(*) AS total FROM gym";
+	return "SELECT COUNT(*) AS total FROM gym";
 }
 
 function req_tester_pokestop()
 {
-    return "SELECT COUNT(*) AS total FROM pokestop";
+	return "SELECT COUNT(*) AS total FROM pokestop";
 }
 
 // Nests
@@ -376,12 +376,12 @@ 
 
 function req_map_data()
 {
-    global $config;
-    $pokemon_exclude_sql = "";
-    if (!empty($config->system->nest_exclude_pokemon)) {
-        $pokemon_exclude_sql = "AND p.pokemon_id NOT IN (" . implode(",", $config->system->nest_exclude_pokemon) . ")";
-    }
-    return "SELECT p.pokemon_id, max(p.latitude) AS latitude, max(p.longitude) AS longitude, count(p.pokemon_id) AS total_pokemon, s.latest_seen, (LENGTH(s.kind) - LENGTH( REPLACE ( kind, \"s\", \"\") )) * 900 AS duration
+	global $config;
+	$pokemon_exclude_sql = "";
+	if (!empty($config->system->nest_exclude_pokemon)) {
+		$pokemon_exclude_sql = "AND p.pokemon_id NOT IN (" . implode(",", $config->system->nest_exclude_pokemon) . ")";
+	}
+	return "SELECT p.pokemon_id, max(p.latitude) AS latitude, max(p.longitude) AS longitude, count(p.pokemon_id) AS total_pokemon, s.latest_seen, (LENGTH(s.kind) - LENGTH( REPLACE ( kind, \"s\", \"\") )) * 900 AS duration
           FROM pokemon p 
           INNER JOIN spawnpoint s ON (p.spawnpoint_id = s.id) 
           WHERE p.disappear_time > UTC_TIMESTAMP() - INTERVAL 24 HOUR 

Spacing +49 added lines, -49 removed lines

@@ -31,10 +31,10 @@ 
 function req_mystic_pokemon($mythic_pokemon)
 {
     global $time_offset;
-    return "SELECT DISTINCT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '" . $time_offset . "')) AS disappear_time_real,
+    return "SELECT DISTINCT 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_pokemon) . ")
+                WHERE pokemon_id IN (" . implode(",", $mythic_pokemon).")
                 ORDER BY last_modified DESC
                 LIMIT 0,12";
 }
@@ -42,7 +42,7 @@ 
 function req_all_pokemon()
 {
     global $time_offset;
-    return "SELECT DISTINCT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '" . $time_offset . "')) AS disappear_time_real,
+    return "SELECT DISTINCT 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
@@ -55,20 +55,20 @@ 
 
 function req_pokemon_total_count($pokemon_id)
 {
-    return "SELECT COUNT(*) AS pokemon_spawns FROM pokemon WHERE pokemon_id = '" . $pokemon_id . "'";
+    return "SELECT COUNT(*) AS pokemon_spawns FROM pokemon WHERE pokemon_id = '".$pokemon_id."'";
 }
 
 function req_pokemon_total_gym_protected($pokemon_id)
 {
-    return "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE guard_pokemon_id = '" . $pokemon_id . "'";
+    return "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE guard_pokemon_id = '".$pokemon_id."'";
 }
 
 function req_pokemon_last_seen($pokemon_id)
 {
     global $time_offset;
-    return "SELECT disappear_time, (CONVERT_TZ(disappear_time, '+00:00', '" . $time_offset . "')) AS disappear_time_real, latitude, longitude
+    return "SELECT disappear_time, (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) AS disappear_time_real, latitude, longitude
 	            FROM pokemon
-	            WHERE pokemon_id = '" . $pokemon_id . "'
+	            WHERE pokemon_id = '" . $pokemon_id."'
 	            ORDER BY disappear_time DESC
 	            LIMIT 0,1";
 }
@@ -76,11 +76,11 @@ 
 function req_pokemon_get_top_50($pokemon_id, $top_order_by, $top_direction)
 {
     global $time_offset;
-    return "SELECT (CONVERT_TZ(disappear_time, '+00:00', '" . $time_offset . "')) AS distime, pokemon_id, disappear_time, latitude, longitude,
+    return "SELECT (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) AS distime, pokemon_id, disappear_time, latitude, longitude,
 	            cp, individual_attack, individual_defense, individual_stamina,
 	            ROUND(SUM(100*(individual_attack+individual_defense+individual_stamina)/45),1) AS IV, move_1, move_2, form
 	            FROM pokemon
-	            WHERE pokemon_id = '" . $pokemon_id . "' AND move_1 IS NOT NULL AND move_1 <> '0'
+	            WHERE pokemon_id = '" . $pokemon_id."' AND move_1 IS NOT NULL AND move_1 <> '0'
 	            GROUP BY encounter_id
 	            ORDER BY $top_order_by $top_direction, disappear_time DESC
 	            LIMIT 0,50";
@@ -91,12 +91,12 @@ 
     global $config;
     $trainer_blacklist = "";
     if (!empty($config->system->trainer_blacklist)) {
-        $trainer_blacklist = " AND trainer_name NOT IN ('" . implode("','", $config->system->trainer_blacklist) . "')";
+        $trainer_blacklist = " AND trainer_name NOT IN ('".implode("','", $config->system->trainer_blacklist)."')";
     }
     return "SELECT trainer_name, ROUND(SUM(100*(iv_attack+iv_defense+iv_stamina)/45),1) AS IV, move_1, move_2, cp,
 				DATE_FORMAT(last_seen, '%Y-%m-%d') AS lasttime, last_seen
 				FROM gympokemon
-				WHERE pokemon_id = '" . $pokemon_id . "'" . $trainer_blacklist . "
+				WHERE pokemon_id = '" . $pokemon_id."'".$trainer_blacklist."
 				GROUP BY pokemon_uid
 				ORDER BY $best_order_by $best_direction, trainer_name ASC
 				LIMIT 0,50";
@@ -109,51 +109,51 @@ 
 
 function req_pokemon_headmap_points($pokemon_id, $start, $end)
 {
-    $where = " WHERE pokemon_id = " . $pokemon_id . " "
-        . "AND disappear_time BETWEEN '" . $start . "' AND '" . $end . "'";
-    return "SELECT latitude, longitude FROM pokemon" . $where . " ORDER BY disappear_time DESC LIMIT 10000";
+    $where = " WHERE pokemon_id = ".$pokemon_id." "
+        . "AND disappear_time BETWEEN '".$start."' AND '".$end."'";
+    return "SELECT latitude, longitude FROM pokemon".$where." ORDER BY disappear_time DESC LIMIT 10000";
 }
 
 function req_pokemon_graph_data($pokemon_id)
 {
     global $time_offset;
     return "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
+			    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";
 }
 
 function req_pokemon_live_data_test($pokemon_id)
 {
-    $where = " WHERE disappear_time >= UTC_TIMESTAMP() AND pokemon_id = " . $pokemon_id;
-    return "SELECT MAX(individual_attack) AS iv FROM pokemon " . $where;
+    $where = " WHERE disappear_time >= UTC_TIMESTAMP() AND pokemon_id = ".$pokemon_id;
+    return "SELECT MAX(individual_attack) AS iv FROM pokemon ".$where;
 }
 
 function req_pokemon_live_data($pokemon_id, $testIv, $post)
 {
     global $mysqli, $time_offset;
     $inmap_pkms_filter = "";
-    $where = " WHERE disappear_time >= UTC_TIMESTAMP() AND pokemon_id = " . $pokemon_id;
+    $where = " WHERE disappear_time >= UTC_TIMESTAMP() AND pokemon_id = ".$pokemon_id;
     if (isset($post['inmap_pokemons']) && ($post['inmap_pokemons'] != "")) {
         foreach ($post['inmap_pokemons'] as $inmap) {
-            $inmap_pkms_filter .= "'" . $inmap . "',";
+            $inmap_pkms_filter .= "'".$inmap."',";
         }
         $inmap_pkms_filter = rtrim($inmap_pkms_filter, ",");
-        $where .= " AND encounter_id NOT IN (" . $inmap_pkms_filter . ") ";
+        $where .= " AND encounter_id NOT IN (".$inmap_pkms_filter.") ";
     }
     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 . ") ";
+        $where .= " AND ((100/45)*(individual_attack+individual_defense+individual_stamina)) >= (".$ivMin.") ";
     }
     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 . ") ";
+        $where .= " AND ((100/45)*(individual_attack+individual_defense+individual_stamina)) <=(".$ivMax.") ";
     }
     return "SELECT pokemon_id, encounter_id, latitude, longitude, disappear_time,
-						(CONVERT_TZ(disappear_time, '+00:00', '" . $time_offset . "')) AS disappear_time_real,
+						(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 . "
+						FROM pokemon " . $where."
 						ORDER BY disappear_time DESC
 						LIMIT 5000";
 }
@@ -184,7 +184,7 @@ 
 function req_pokestop_data()
 {
     global $time_offset;
-    return "SELECT latitude, longitude, lure_expiration, UTC_TIMESTAMP() AS now, (CONVERT_TZ(lure_expiration, '+00:00', '" . $time_offset . "')) AS lure_expiration_real FROM pokestop ";
+    return "SELECT latitude, longitude, lure_expiration, UTC_TIMESTAMP() AS now, (CONVERT_TZ(lure_expiration, '+00:00', '".$time_offset."')) AS lure_expiration_real FROM pokestop ";
 }
 
 // Gyms
@@ -213,24 +213,24 @@ 
 function req_gym_data()
 {
     global $time_offset;
-    return "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";
+    return "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";
 }
 
 function req_gym_data_simple($gym_id)
 {
     global $time_offset;
-    return "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 . "'";
+    return "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."'";
 }
 
 function req_gym_defender_for($gym_id)
 {
     global $time_offset;
     return "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
+	            (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 . "'";
+			    WHERE gym.gym_id='" . $gym_id."'";
 }
 
 function req_gym_defender_stats_for($gym_id)
@@ -238,7 +238,7 @@ 
     return "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 . "'
+			    HAVING gymmember.gym_id='" . $gym_id."'
 			    ORDER BY cp DESC";
 }
 
@@ -250,14 +250,14 @@ 
     global $config, $mysqli;
     if (isset($get['name'])) {
         $trainer_name = mysqli_real_escape_string($mysqli, $get['name']);
-        $where = " HAVING name LIKE '%" . $trainer_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;
+        $where .= ($where == "" ? " HAVING" : " AND")." team = ".$team;
     }
     if (!empty($config->system->trainer_blacklist)) {
-        $where .= ($where == "" ? " HAVING" : " AND") . " name NOT IN ('" . implode("','", $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']);
@@ -277,44 +277,44 @@ 
             $order = " ORDER BY level DESC, active DESC";
     }
     $order .= ", last_seen DESC, name ";
-    $limit = " LIMIT " . ($page * 10) . ",10 ";
+    $limit = " LIMIT ".($page * 10).",10 ";
     return "SELECT trainer.*, COUNT(actives_pokemons.trainer_name) AS active, max(actives_pokemons.cp) AS maxCp
 				FROM trainer
 				LEFT JOIN (SELECT DISTINCT gympokemon.pokemon_id, gympokemon.pokemon_uid, gympokemon.trainer_name, gympokemon.cp, DATEDIFF(UTC_TIMESTAMP(), gympokemon.last_seen) AS last_scanned
 				FROM gympokemon
 				INNER JOIN (SELECT gymmember.pokemon_uid, gymmember.gym_id FROM gymmember GROUP BY gymmember.pokemon_uid, gymmember.gym_id HAVING gymmember.gym_id <> '') AS filtered_gymmember
 				ON gympokemon.pokemon_uid = filtered_gymmember.pokemon_uid) AS actives_pokemons ON actives_pokemons.trainer_name = trainer.name
-				GROUP BY trainer.name " . $where . $order . $limit;
+				GROUP BY trainer.name " . $where.$order.$limit;
 }
 
 function req_trainer_active_pokemon($name)
 {
     global $time_offset;
-    return "(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, filtered_gymmember.gym_id, CONVERT_TZ(filtered_gymmember.deployment_time, '+00:00', '" . $time_offset . "') as deployment_time, '1' AS active
+    return "(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, filtered_gymmember.gym_id, CONVERT_TZ(filtered_gymmember.deployment_time, '+00:00', '".$time_offset."') as deployment_time, '1' AS active
 	            FROM gympokemon INNER JOIN
 				(SELECT gymmember.pokemon_uid, gymmember.gym_id, gymmember.deployment_time FROM gymmember GROUP BY gymmember.pokemon_uid, gymmember.deployment_time, gymmember.gym_id HAVING gymmember.gym_id <> '') AS filtered_gymmember
 				ON gympokemon.pokemon_uid = filtered_gymmember.pokemon_uid
-				WHERE gympokemon.trainer_name='" . $name . "'
+				WHERE gympokemon.trainer_name='" . $name."'
 				ORDER BY gympokemon.cp DESC)";
 }
 
 function req_trainer_inactive_pokemon($name)
 {
     global $time_offset;
-    return "(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, null AS gym_id, CONVERT_TZ(filtered_gymmember.deployment_time, '+00:00', '" . $time_offset . "') as deployment_time, '0' AS active
+    return "(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, null AS gym_id, CONVERT_TZ(filtered_gymmember.deployment_time, '+00:00', '".$time_offset."') as deployment_time, '0' AS active
 				FROM gympokemon LEFT JOIN
 				(SELECT * FROM gymmember HAVING gymmember.gym_id <> '') AS filtered_gymmember
 				ON gympokemon.pokemon_uid = filtered_gymmember.pokemon_uid
-				WHERE filtered_gymmember.pokemon_uid IS NULL AND gympokemon.trainer_name='" . $name . "'
+				WHERE filtered_gymmember.pokemon_uid IS NULL AND gympokemon.trainer_name='" . $name."'
 				ORDER BY gympokemon.cp DESC)";
 }
 
 function req_trainer_ranking($trainer)
 {
     global $config;
-    $reqRanking = "SELECT COUNT(1) AS rank FROM trainer WHERE level = " . $trainer->level;
+    $reqRanking = "SELECT COUNT(1) AS rank FROM trainer WHERE level = ".$trainer->level;
     if (!empty($config->system->trainer_blacklist)) {
-        $reqRanking .= " AND name NOT IN ('" . implode("','", $config->system->trainer_blacklist) . "')";
+        $reqRanking .= " AND name NOT IN ('".implode("','", $config->system->trainer_blacklist)."')";
     }
     return $reqRanking;
 }
@@ -322,9 +322,9 @@ 
 function req_trainer_levels_for_team($teamid)
 {
     global $config;
-    $reqLevels = "SELECT level, count(level) AS count FROM trainer WHERE team = '" . $teamid . "'";
+    $reqLevels = "SELECT level, count(level) AS count FROM trainer WHERE team = '".$teamid."'";
     if (!empty($config->system->trainer_blacklist)) {
-        $reqLevels .= " AND name NOT IN ('" . implode("','", $config->system->trainer_blacklist) . "')";
+        $reqLevels .= " AND name NOT IN ('".implode("','", $config->system->trainer_blacklist)."')";
     }
     $reqLevels .= " GROUP BY level";
     return $reqLevels;
@@ -336,8 +336,8 @@ 
 function req_raids_data($page)
 {
     global $time_offset;
-    $limit = " LIMIT " . ($page * 10) . ",10";
-    return "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
+    $limit = " LIMIT ".($page * 10).",10";
+    return "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()
@@ -379,13 +379,13 @@ 
     global $config;
     $pokemon_exclude_sql = "";
     if (!empty($config->system->nest_exclude_pokemon)) {
-        $pokemon_exclude_sql = "AND p.pokemon_id NOT IN (" . implode(",", $config->system->nest_exclude_pokemon) . ")";
+        $pokemon_exclude_sql = "AND p.pokemon_id NOT IN (".implode(",", $config->system->nest_exclude_pokemon).")";
     }
     return "SELECT p.pokemon_id, max(p.latitude) AS latitude, max(p.longitude) AS longitude, count(p.pokemon_id) AS total_pokemon, s.latest_seen, (LENGTH(s.kind) - LENGTH( REPLACE ( kind, \"s\", \"\") )) * 900 AS duration
           FROM pokemon p 
           INNER JOIN spawnpoint s ON (p.spawnpoint_id = s.id) 
           WHERE p.disappear_time > UTC_TIMESTAMP() - INTERVAL 24 HOUR 
-          " . $pokemon_exclude_sql . " 
+          " . $pokemon_exclude_sql." 
           GROUP BY p.spawnpoint_id, p.pokemon_id 
           HAVING COUNT(p.pokemon_id) >= 6 
           ORDER BY p.pokemon_id";

core/process/aru.php

Indentation +29 added lines, -29 removed lines

@@ -67,7 +67,7 @@ 
 		// Right now
 		// ---------
 
-        $result = $mysqli->query(req_pokemon_count());
+		$result = $mysqli->query(req_pokemon_count());
 		$data = $result->fetch_object();
 
 		$values[] = $data->total;
@@ -76,7 +76,7 @@ 
 		// Lured stops
 		// -----------
 
-        $result = $mysqli->query(req_pokestop_lure_count());
+		$result = $mysqli->query(req_pokestop_lure_count());
 		$data = $result->fetch_object();
 
 		$values[] = $data->total;
@@ -86,7 +86,7 @@ 
 		// Team battle
 		// -----------
 
-        $result = $mysqli->query(req_gym_count());
+		$result = $mysqli->query(req_gym_count());
 		$data = $result->fetch_object();
 
 		$values[] = $data->total;
@@ -96,27 +96,27 @@ 
 		// 2 = rouge
 		// 3 = jaune
 
-        $result = $mysqli->query(req_gym_count_for_team(2));
+		$result = $mysqli->query(req_gym_count_for_team(2));
 		$data = $result->fetch_object();
 
 		// Red
 		$values[] = $data->total;
 
 
-        $result = $mysqli->query(req_gym_count_for_team(1));
+		$result = $mysqli->query(req_gym_count_for_team(1));
 		$data = $result->fetch_object();
 
 		// Blue
 		$values[] = $data->total;
 
 
-        $result = $mysqli->query(req_gym_count_for_team(3));
+		$result = $mysqli->query(req_gym_count_for_team(3));
 		$data = $result->fetch_object();
 
 		// Yellow
 		$values[] = $data->total;
 
-        $result = $mysqli->query(req_gym_count_for_team(0));
+		$result = $mysqli->query(req_gym_count_for_team(0));
 		$data = $result->fetch_object();
 
 		// Neutral
@@ -152,12 +152,12 @@ 
 			}
 
 			// get last mythic pokemon
-            $req_poke = req_mystic_pokemon($mythic_pokemons);
-        } else {
+			$req_poke = req_mystic_pokemon($mythic_pokemons);
+		} else {
 			// get last pokemon
-            $req_poke = req_all_pokemon();
-        }
-        $result = $mysqli->query($req_poke);
+			$req_poke = req_all_pokemon();
+		}
+		$result = $mysqli->query($req_poke);
 		while ($data = $result->fetch_object()) {
 			$new_spawn = array();
 			$pokeid = $data->pokemon_id;
@@ -270,7 +270,7 @@ 
 	####################################
 
 	case 'pokestop':
-        $result = $mysqli->query(req_pokestop_data());
+		$result = $mysqli->query(req_pokestop_data());
 
 		$pokestops = [];
 
@@ -314,7 +314,7 @@ 
 
 
 		foreach ($teams as $team_name => $team_id) {
-            $result = $mysqli->query(req_gym_count_cp_for_team($team_id));
+			$result = $mysqli->query(req_gym_count_cp_for_team($team_id));
 			$data = $result->fetch_object();
 
 			$return[] = $data->total;
@@ -335,7 +335,7 @@ 
 
 
 	case 'gym_map':
-        $result = $mysqli->query(req_gym_data());
+		$result = $mysqli->query(req_gym_data());
 
 		$gyms = [];
 
@@ -397,7 +397,7 @@ 
 
 	case 'gym_defenders':
 		$gym_id = $mysqli->real_escape_string($_GET['gym_id']);
-        $result = $mysqli->query(req_gym_defender_for($gym_id));
+		$result = $mysqli->query(req_gym_defender_for($gym_id));
 
 		$gymData['gymDetails']['gymInfos'] = false;
 
@@ -416,7 +416,7 @@ 
 			$gymData['gymDetails']['gymInfos']['guardPokemonId'] = $data->guard_pokemon_id;
 		}
 
-        $result = $mysqli->query(req_gym_defender_stats_for($gym_id));
+		$result = $mysqli->query(req_gym_defender_stats_for($gym_id));
 
 		$i = 0;
 
@@ -481,7 +481,7 @@ 
 		// check whether we could retrieve gym infos, otherwise use basic gym info
 		if (!$gymData['gymDetails']['gymInfos']) {
 
-            $result = $mysqli->query(req_gym_data_simple($gym_id));
+			$result = $mysqli->query(req_gym_data_simple($gym_id));
 			$data = $result->fetch_object();
 
 			$gymData['gymDetails']['gymInfos']['name'] = $locales->NOT_AVAILABLE;
@@ -517,19 +517,19 @@ 
 		$team = 0;
 		$ranking = 0;
 
-        $result = $mysqli->query(req_trainers($_GET));
+		$result = $mysqli->query(req_trainers($_GET));
 		$trainers = array();
 		while ($data = $result->fetch_object()) {
 			$data->last_seen = date("Y-m-d", strtotime($data->last_seen));
 			$trainers[$data->name] = $data;
 		}
 		foreach ($trainers as $trainer) {
-            $resultRanking = $mysqli->query(req_trainer_ranking($trainer));
+			$resultRanking = $mysqli->query(req_trainer_ranking($trainer));
 			while ($data = $resultRanking->fetch_object()) {
 				$trainer->rank = $data->rank;
 			}
 
-            $resultPkms = $mysqli->query(req_trainer_active_pokemon($trainer->name));
+			$resultPkms = $mysqli->query(req_trainer_active_pokemon($trainer->name));
 			$trainer->pokemons = array();
 			$active_gyms = 0;
 			$pkmCount = 0;
@@ -539,7 +539,7 @@ 
 			}
 			$trainer->gyms = $active_gyms;
 
-            $resultPkms = $mysqli->query(req_trainer_inactive_pokemon($trainer->name));
+			$resultPkms = $mysqli->query(req_trainer_inactive_pokemon($trainer->name));
 			while ($resultPkms && $dataPkm = $resultPkms->fetch_object()) {
 				$trainer->pokemons[$pkmCount++] = $dataPkm;
 			}
@@ -567,7 +567,7 @@ 
 			$page = mysqli_real_escape_string($mysqli, $_GET['page']);
 		}
 
-        $result = $mysqli->query(req_raids_data($page));
+		$result = $mysqli->query(req_raids_data($page));
 		$raids = array();
 		while ($data = $result->fetch_object()) {
 			$data->starttime = date("H:i", strtotime($data->start));
@@ -599,7 +599,7 @@ 
 		break;
 
 	case 'pokemon_slider_init':
-        $result = $mysqli->query(req_pokemon_slider_init());
+		$result = $mysqli->query(req_pokemon_slider_init());
 		$bounds		= $result->fetch_object();
 
 		header('Content-Type: application/json');
@@ -614,7 +614,7 @@ 
 			$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']);
-            $result = $mysqli->query(req_pokemon_headmap_points($pokemon_id, $start, $end));
+			$result = $mysqli->query(req_pokemon_headmap_points($pokemon_id, $start, $end));
 			$points = array();
 			while ($result && $data = $result->fetch_object()) {
 				$points[] = $data;
@@ -630,7 +630,7 @@ 
 
 	case 'maps_localization_coordinates':
 		$json = "";
-        $result = $mysqli->query(req_maps_localization_coordinates());
+		$result = $mysqli->query(req_maps_localization_coordinates());
 		$coordinates = $result->fetch_object();
 
 		header('Content-Type: application/json');
@@ -643,7 +643,7 @@ 
 		$json = "";
 		if (isset($_GET['pokemon_id'])) {
 			$pokemon_id = mysqli_real_escape_string($mysqli, $_GET['pokemon_id']);
-            $result = $mysqli->query(req_pokemon_graph_data($pokemon_id));
+			$result = $mysqli->query(req_pokemon_graph_data($pokemon_id));
 			$array = array_fill(0, 24, 0);
 			while ($result && $data = $result->fetch_object()) {
 				$array[$data->disappear_hour] = $data->total;
@@ -674,9 +674,9 @@ 
 		case 'pokemon_live':
 			$json = "";
 			if (isset($_POST['pokemon_id'])) {
-                $resultTestIv = $mysqli->query(req_pokemon_liva_data_test($pokemon_id));
+				$resultTestIv = $mysqli->query(req_pokemon_liva_data_test($pokemon_id));
 				$testIv = $resultTestIv->fetch_object();
-                $result = $mysqli->query(req_pokemon_live_data($pokemon_id, $testIv, $_POST));
+				$result = $mysqli->query(req_pokemon_live_data($pokemon_id, $testIv, $_POST));
 				$json = array();
 				$json['points'] = array();
 				$locale = array();

Switch Indentation +356 added lines, -356 removed lines

@@ -63,137 +63,137 @@ 
 	//
 	############################
 
-	case 'home_update':
-		// Right now
-		// ---------
+		case 'home_update':
+			// Right now
+			// ---------
 
-        $result = $mysqli->query(req_pokemon_count());
-		$data = $result->fetch_object();
+        	$result = $mysqli->query(req_pokemon_count());
+			$data = $result->fetch_object();
 
-		$values[] = $data->total;
+			$values[] = $data->total;
 
 
-		// Lured stops
-		// -----------
+			// Lured stops
+			// -----------
 
-        $result = $mysqli->query(req_pokestop_lure_count());
-		$data = $result->fetch_object();
+        	$result = $mysqli->query(req_pokestop_lure_count());
+			$data = $result->fetch_object();
 
-		$values[] = $data->total;
+			$values[] = $data->total;
 
 
 
-		// Team battle
-		// -----------
+			// Team battle
+			// -----------
 
-        $result = $mysqli->query(req_gym_count());
-		$data = $result->fetch_object();
+        	$result = $mysqli->query(req_gym_count());
+			$data = $result->fetch_object();
 
-		$values[] = $data->total;
+			$values[] = $data->total;
 
-		// Team
-		// 1 = bleu
-		// 2 = rouge
-		// 3 = jaune
+			// Team
+			// 1 = bleu
+			// 2 = rouge
+			// 3 = jaune
 
-        $result = $mysqli->query(req_gym_count_for_team(2));
-		$data = $result->fetch_object();
+        	$result = $mysqli->query(req_gym_count_for_team(2));
+			$data = $result->fetch_object();
 
-		// Red
-		$values[] = $data->total;
+			// Red
+			$values[] = $data->total;
 
 
-        $result = $mysqli->query(req_gym_count_for_team(1));
-		$data = $result->fetch_object();
+        	$result = $mysqli->query(req_gym_count_for_team(1));
+			$data = $result->fetch_object();
 
-		// Blue
-		$values[] = $data->total;
+			// Blue
+			$values[] = $data->total;
 
 
-        $result = $mysqli->query(req_gym_count_for_team(3));
-		$data = $result->fetch_object();
+        	$result = $mysqli->query(req_gym_count_for_team(3));
+			$data = $result->fetch_object();
 
-		// Yellow
-		$values[] = $data->total;
+			// Yellow
+			$values[] = $data->total;
 
-        $result = $mysqli->query(req_gym_count_for_team(0));
-		$data = $result->fetch_object();
+        	$result = $mysqli->query(req_gym_count_for_team(0));
+			$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'];
 			}
-
-			// get last mythic pokemon
-            $req_poke = req_mystic_pokemon($mythic_pokemons);
-        } else {
-			// get last pokemon
-            $req_poke = req_all_pokemon();
-        }
-        $result = $mysqli->query($req_poke);
-		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;
+			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;
 					}
 				}
 
-				$html = '
+				// get last mythic pokemon
+            	$req_poke = req_mystic_pokemon($mythic_pokemons);
+        	} else {
+				// get last pokemon
+            	$req_poke = req_all_pokemon();
+        	}
+        	$result = $mysqli->query($req_poke);
+			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 = '
 			    <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.$config->system->pokeimg_suffix.'" 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.'
@@ -205,8 +205,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>
@@ -218,11 +218,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>?
@@ -234,118 +234,118 @@ 
 									<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':
-        $result = $mysqli->query(req_pokestop_data());
+		case 'pokestop':
+        	$result = $mysqli->query(req_pokestop_data());
 
-		$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) {
-            $result = $mysqli->query(req_gym_count_cp_for_team($team_id));
-			$data = $result->fetch_object();
+			foreach ($teams as $team_name => $team_id) {
+            	$result = $mysqli->query(req_gym_count_cp_for_team($team_id));
+				$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':
-        $result = $mysqli->query(req_gym_data());
+		case 'gym_map':
+        	$result = $mysqli->query(req_gym_data());
 
-		$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)';
@@ -369,7 +369,7 @@ 
 					$team	= 'Team Instinct';
 					$color = 'rgba(254, 217, 40, .6)';
 					break;
-			}
+				}
 
 			if ($data->team_id != 0) {
 				$icon .= $data->level.".png";
@@ -395,39 +395,39 @@ 
 	//
 	####################################
 
-	case 'gym_defenders':
-		$gym_id = $mysqli->real_escape_string($_GET['gym_id']);
-        $result = $mysqli->query(req_gym_defender_for($gym_id));
+		case 'gym_defenders':
+			$gym_id = $mysqli->real_escape_string($_GET['gym_id']);
+        	$result = $mysqli->query(req_gym_defender_for($gym_id));
 
-		$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;
-		}
 
-        $result = $mysqli->query(req_gym_defender_stats_for($gym_id));
+        	$result = $mysqli->query(req_gym_defender_stats_for($gym_id));
 
-		$i = 0;
+			$i = 0;
 
-		$gymData['infoWindow'] = '
+			$gymData['infoWindow'] = '
 			<div class="gym_defenders">
 			';
-		while ($data = $result->fetch_object()) {
-			$gymData['gymDetails']['pokemons'][] = $data;
-			if ($data != false) {
-				if ($config->system->iv_numbers) {
-					$gymData['infoWindow'] .= '
+			while ($data = $result->fetch_object()) {
+				$gymData['gymDetails']['pokemons'][] = $data;
+				if ($data != false) {
+					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="core/pokemons/'.$data->pokemon_id.$config->system->pokeimg_suffix.'" height="50" style="display:inline-block" >
@@ -445,8 +445,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="core/pokemons/'.$data->pokemon_id.$config->system->pokeimg_suffix.'" height="50" style="display:inline-block" >
@@ -464,209 +464,209 @@ 
 							</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/'.$gymData['gymDetails']['gymInfos']['guardPokemonId'].'">
 					<img src="core/pokemons/'.$gymData['gymDetails']['gymInfos']['guardPokemonId'].$config->system->pokeimg_suffix.'" 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']) {
+			// check whether we could retrieve gym infos, otherwise use basic gym info
+			if (!$gymData['gymDetails']['gymInfos']) {
 
-            $result = $mysqli->query(req_gym_data_simple($gym_id));
-			$data = $result->fetch_object();
+            	$result = $mysqli->query(req_gym_data_simple($gym_id));
+				$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;
+				$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;
 
-			$gymData['infoWindow'] .= '
+				$gymData['infoWindow'] .= '
 				<div style="text-align: center; width: 50px; display: inline-block; margin-right: 3px">
 					<a href="pokemon/'.$data->guard_pokemon_id.'">
 					<img src="core/pokemons/'.$data->guard_pokemon_id.$config->system->pokeimg_suffix.'" 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;
+		case 'trainer':
+			$name = "";
+			$page = "0";
+			$where = "";
+			$order = "";
+			$team = 0;
+			$ranking = 0;
 
-        $result = $mysqli->query(req_trainers($_GET));
-		$trainers = array();
-		while ($data = $result->fetch_object()) {
-			$data->last_seen = date("Y-m-d", strtotime($data->last_seen));
-			$trainers[$data->name] = $data;
-		}
-		foreach ($trainers as $trainer) {
-            $resultRanking = $mysqli->query(req_trainer_ranking($trainer));
-			while ($data = $resultRanking->fetch_object()) {
-				$trainer->rank = $data->rank;
+        	$result = $mysqli->query(req_trainers($_GET));
+			$trainers = array();
+			while ($data = $result->fetch_object()) {
+				$data->last_seen = date("Y-m-d", strtotime($data->last_seen));
+				$trainers[$data->name] = $data;
 			}
+			foreach ($trainers as $trainer) {
+            	$resultRanking = $mysqli->query(req_trainer_ranking($trainer));
+				while ($data = $resultRanking->fetch_object()) {
+					$trainer->rank = $data->rank;
+				}
 
-            $resultPkms = $mysqli->query(req_trainer_active_pokemon($trainer->name));
-			$trainer->pokemons = array();
-			$active_gyms = 0;
-			$pkmCount = 0;
-			while ($resultPkms && $dataPkm = $resultPkms->fetch_object()) {
-				$active_gyms++;
-				$trainer->pokemons[$pkmCount++] = $dataPkm;
-			}
-			$trainer->gyms = $active_gyms;
+            	$resultPkms = $mysqli->query(req_trainer_active_pokemon($trainer->name));
+				$trainer->pokemons = array();
+				$active_gyms = 0;
+				$pkmCount = 0;
+				while ($resultPkms && $dataPkm = $resultPkms->fetch_object()) {
+					$active_gyms++;
+					$trainer->pokemons[$pkmCount++] = $dataPkm;
+				}
+				$trainer->gyms = $active_gyms;
 
-            $resultPkms = $mysqli->query(req_trainer_inactive_pokemon($trainer->name));
-			while ($resultPkms && $dataPkm = $resultPkms->fetch_object()) {
-				$trainer->pokemons[$pkmCount++] = $dataPkm;
+            	$resultPkms = $mysqli->query(req_trainer_inactive_pokemon($trainer->name));
+				while ($resultPkms && $dataPkm = $resultPkms->fetch_object()) {
+					$trainer->pokemons[$pkmCount++] = $dataPkm;
+				}
 			}
-		}
-		$json = array();
-		$json['trainers'] = $trainers;
-		$locale = array();
-		$locale["today"] = $locales->TODAY;
-		$locale["day"] = $locales->DAY;
-		$locale["days"] = $locales->DAYS;
-		$locale["ivAttack"] = $locales->IV_ATTACK;
-		$locale["ivDefense"] = $locales->IV_DEFENSE;
-		$locale["ivStamina"] = $locales->IV_STAMINA;
-		$json['locale'] = $locale;
-
-		header('Content-Type: application/json');
-		echo json_encode($json);
+			$json = array();
+			$json['trainers'] = $trainers;
+			$locale = array();
+			$locale["today"] = $locales->TODAY;
+			$locale["day"] = $locales->DAY;
+			$locale["days"] = $locales->DAYS;
+			$locale["ivAttack"] = $locales->IV_ATTACK;
+			$locale["ivDefense"] = $locales->IV_DEFENSE;
+			$locale["ivStamina"] = $locales->IV_STAMINA;
+			$json['locale'] = $locale;
 
-		break;
+			header('Content-Type: application/json');
+			echo json_encode($json);
 
+			break;
 
-	case 'raids':
-		$page = "0";
-		if (isset($_GET['page'])) {
-			$page = mysqli_real_escape_string($mysqli, $_GET['page']);
-		}
 
-        $result = $mysqli->query(req_raids_data($page));
-		$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 = "?";
+		case 'raids':
+			$page = "0";
+			if (isset($_GET['page'])) {
+				$page = mysqli_real_escape_string($mysqli, $_GET['page']);
 			}
-			if (isset($data->move_2)) {
-				$move2 = $data->move_2;
-				$data->charge_move = $move->$move2->name;
-			} else {
-				$data->charge_move = "?";
+
+        	$result = $mysqli->query(req_raids_data($page));
+			$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 'pokemon_slider_init':
-        $result = $mysqli->query(req_pokemon_slider_init());
-		$bounds		= $result->fetch_object();
+		case 'pokemon_slider_init':
+        	$result = $mysqli->query(req_pokemon_slider_init());
+			$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']);
-            $result = $mysqli->query(req_pokemon_headmap_points($pokemon_id, $start, $end));
-			$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']);
+            	$result = $mysqli->query(req_pokemon_headmap_points($pokemon_id, $start, $end));
+				$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 = "";
+        	$result = $mysqli->query(req_maps_localization_coordinates());
+			$coordinates = $result->fetch_object();
 
-	case 'maps_localization_coordinates':
-		$json = "";
-        $result = $mysqli->query(req_maps_localization_coordinates());
-		$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']);
+            	$result = $mysqli->query(req_pokemon_graph_data($pokemon_id));
+				$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);
 
-	case 'pokemon_graph_data':
-		$json = "";
-		if (isset($_GET['pokemon_id'])) {
-			$pokemon_id = mysqli_real_escape_string($mysqli, $_GET['pokemon_id']);
-            $result = $mysqli->query(req_pokemon_graph_data($pokemon_id));
-			$array = array_fill(0, 24, 0);
-			while ($result && $data = $result->fetch_object()) {
-				$array[$data->disappear_hour] = $data->total;
+				$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 != "") {

Spacing +1 added lines, -1 removed lines

@@ -600,7 +600,7 @@
 
 	case 'pokemon_slider_init':
         $result = $mysqli->query(req_pokemon_slider_init());
-		$bounds		= $result->fetch_object();
+		$bounds = $result->fetch_object();
 
 		header('Content-Type: application/json');
 		echo json_encode($bounds);

core/process/quarrys.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$variables = realpath(dirname(__FILE__)) . '/../json/variables.json';
+$variables = realpath(dirname(__FILE__)).'/../json/variables.json';
 $config = json_decode(file_get_contents($variables));
 
-include_once('quarrys/' . ($config->system->db_type ?: 'rocketmap') . '.php');
\ No newline at end of file
+include_once('quarrys/'.($config->system->db_type ?: 'rocketmap').'.php');
\ No newline at end of file

core/process/data.loader.php

Indentation +19 added lines, -19 removed lines

@@ -127,7 +127,7 @@ 
 
 			// Total gym protected
 
-            $result = $mysqli->query(req_pokemon_total_gym_protected($pokemon_id));
+			$result = $mysqli->query(req_pokemon_total_gym_protected($pokemon_id));
 			$data = $result->fetch_object();
 
 			$pokemon->protected_gyms = $data->total;
@@ -143,7 +143,7 @@ 
 			// Last seen
 
 
-            $result = $mysqli->query(req_pokemon_last_seen($pokemon_id));
+			$result = $mysqli->query(req_pokemon_last_seen($pokemon_id));
 			$data = $result->fetch_object();
 
 			if (isset($data)) {
@@ -187,7 +187,7 @@ 
 				$top_direction = isset($_GET['direction']) ? 'ASC' : 'DESC';
 				$top_direction = !isset($_GET['order']) && !isset($_GET['direction']) ? 'DESC' : $top_direction;
 
-                $result = $mysqli->query(req_pokemon_get_top_50($pokemon_id, $top_order_by, $top_direction));
+				$result = $mysqli->query(req_pokemon_get_top_50($pokemon_id, $top_order_by, $top_direction));
 				$top = array();
 				while ($data = $result->fetch_object()) {
 					$top[] = $data;
@@ -203,7 +203,7 @@ 
 			$best_direction = isset($_GET['direction']) ? 'ASC' : 'DESC';
 			$best_direction = !isset($_GET['order']) && !isset($_GET['direction']) ? 'DESC' : $best_direction;
 
-            $result = $mysqli->query(req_pokemon_get_top_trainers($pokemon_id, $best_order_by, $best_direction));
+			$result = $mysqli->query(req_pokemon_get_top_trainers($pokemon_id, $best_order_by, $best_direction));
 			$toptrainer = array();
 			while ($data = $result->fetch_object()) {
 				$toptrainer[] = $data;
@@ -241,12 +241,12 @@ 
 		case 'pokestops':
 			$pokestop = new stdClass();
 
-            $result = $mysqli->query(req_pokestop_count());
+			$result = $mysqli->query(req_pokestop_count());
 			$data = $result->fetch_object();
 
 			$pokestop->total = $data->total;
 
-            $result = $mysqli->query(req_pokestop_lure_count());
+			$result = $mysqli->query(req_pokestop_lure_count());
 			$data = $result->fetch_object();
 
 			$pokestop->lured = $data->total;
@@ -287,7 +287,7 @@ 
 			foreach ($teams as $team_key => $team_values) {
 				// Team Guardians
 
-                $result = $mysqli->query(req_gym_guards_for_team($team_values->id));
+				$result = $mysqli->query(req_gym_guards_for_team($team_values->id));
 
 				$i = 0;
 
@@ -300,7 +300,7 @@ 
 
 				// Gym owned and average points
 
-                $result = $mysqli->query(req_gym_count_cp_for_team($team_values->id));
+				$result = $mysqli->query(req_gym_count_cp_for_team($team_values->id));
 				$data	= $result->fetch_object();
 
 				$teams->$team_key->gym_owned = $data->total;
@@ -361,7 +361,7 @@ 
 	// Right now
 	// ---------
 
-    $result = $mysqli->query(req_pokemon_count());
+	$result = $mysqli->query(req_pokemon_count());
 	$data = $result->fetch_object();
 
 
@@ -371,7 +371,7 @@ 
 	// Lured stops
 	// -----------
 
-    $result = $mysqli->query(req_pokestop_lure_count());
+	$result = $mysqli->query(req_pokestop_lure_count());
 	$data = $result->fetch_object();
 
 	$home->pokestop_lured = $data->total;
@@ -380,7 +380,7 @@ 
 	// Gyms
 	// ----
 
-    $result = $mysqli->query(req_gym_count());
+	$result = $mysqli->query(req_gym_count());
 	$data = $result->fetch_object();
 
 	$home->gyms = $data->total;
@@ -398,12 +398,12 @@ 
 			}
 		}
 		// get all mythic pokemon
-        $req_poke = req_mystic_pokemon($mythic_pokemons);
+		$req_poke = req_mystic_pokemon($mythic_pokemons);
 	} else {
 		// get all pokemon
-        $req_poke = req_all_pokemon();
-    }
-    $result = $mysqli->query($req_poke);
+		$req_poke = req_all_pokemon();
+	}
+	$result = $mysqli->query($req_poke);
 	$recents	= array();
 
 	if ($result->num_rows > 0) {
@@ -446,25 +446,25 @@ 
 	// 2 = rouge
 	// 3 = jaune
 
-    $result = $mysqli->query(req_gym_count_for_team(1));
+	$result = $mysqli->query(req_gym_count_for_team(1));
 	$data = $result->fetch_object();
 
 	$home->teams->mystic = $data->total;
 
 
-    $result = $mysqli->query(req_gym_count_for_team(2));
+	$result = $mysqli->query(req_gym_count_for_team(2));
 	$data = $result->fetch_object();
 
 	$home->teams->valor = $data->total;
 
 
-    $result = $mysqli->query(req_gym_count_for_team(3));
+	$result = $mysqli->query(req_gym_count_for_team(3));
 	$data = $result->fetch_object();
 
 	$home->teams->instinct = $data->total;
 
 
-    $result = $mysqli->query(req_gym_count_for_team(0));
+	$result = $mysqli->query(req_gym_count_for_team(0));
 	$data = $result->fetch_object();
 
 	$home->teams->rocket = $data->total;

Spacing +2 added lines, -2 removed lines

@@ -301,7 +301,7 @@ 
 				// Gym owned and average points
 
                 $result = $mysqli->query(req_gym_count_cp_for_team($team_values->id));
-				$data	= $result->fetch_object();
+				$data = $result->fetch_object();
 
 				$teams->$team_key->gym_owned = $data->total;
 				$teams->$team_key->average = $data->average_points;
@@ -404,7 +404,7 @@ 
         $req_poke = req_all_pokemon();
     }
     $result = $mysqli->query($req_poke);
-	$recents	= array();
+	$recents = array();
 
 	if ($result->num_rows > 0) {
 		while ($data = $result->fetch_object()) {