brusselopole / Worldopole

core/process/queries/QueryManagerPostgresqlMonocleAlternate.php

Spacing +15 added lines, -15 removed lines

@@ -167,7 +167,7 @@ 
                 cp, atk_iv as individual_attack, def_iv as individual_defense, sta_iv as individual_stamina,
                 ROUND(100*(atk_iv+def_iv+sta_iv)/45,1) AS \"IV\", move_1 as move_1, move_2, form
                 FROM sightings
-	            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'
 	            ORDER BY $top_order_by $top_direction, expire_timestamp DESC
 	            LIMIT 50 OFFSET 0";
 		$result = pg_query($this->db, $req);
@@ -181,13 +181,13 @@ 
 	function getTop50Trainers($pokemon_id, $best_order_by, $best_direction) {
 		$trainer_blacklist = "";
 		if (!empty(self::$config->system->trainer_blacklist)) {
-			$trainer_blacklist = " AND owner_name NOT IN ('" . implode("','", self::$config->system->trainer_blacklist) . "')";
+			$trainer_blacklist = " AND owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
 		}
 
 		$req = "SELECT DISTINCT external_id, owner_name as trainer_name, ROUND((100.0*((atk_iv)+(def_iv)+(sta_iv))/45),1) AS \"IV\", move_1, move_2, cp as cp,
                 TO_TIMESTAMP(last_modified) AS lasttime, last_modified as last_seen
                 FROM gym_defenders
-				WHERE pokemon_id = '" . $pokemon_id . "'" . $trainer_blacklist . "
+				WHERE pokemon_id = '" . $pokemon_id."'".$trainer_blacklist."
 				GROUP BY external_id, owner_name, atk_iv, def_iv, sta_iv, move_1, move_2, cp, last_modified
 				ORDER BY $best_order_by $best_direction, owner_name ASC
 				LIMIT 50 OFFSET 0";
@@ -230,9 +230,9 @@ 
 
 	public function getPokemonLive($pokemon_id, $ivMin, $ivMax, $inmap_pokemons) {
 		$inmap_pkms_filter = "";
-		$where = " WHERE expire_timestamp >= EXTRACT(EPOCH FROM NOW()) AND pokemon_id = " . $pokemon_id;
+		$where = " WHERE expire_timestamp >= EXTRACT(EPOCH FROM NOW()) AND pokemon_id = ".$pokemon_id;
 
-		$reqTestIv = "SELECT MAX(atk_iv) AS iv FROM sightings " . $where;
+		$reqTestIv = "SELECT MAX(atk_iv) AS iv FROM sightings ".$where;
 		$resultTestIv = pg_query($this->db, $reqTestIv);
 		$testIv = pg_fetch_object($resultTestIv);
 		if (!is_null($inmap_pokemons) && ($inmap_pokemons != "")) {
@@ -240,20 +240,20 @@ 
 				$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 && !is_null($ivMin) && ($ivMin != "")) {
-			$where .= " AND ((100/45)*(atk_iv + def_iv + sta_iv)) >= (" . $ivMin . ") ";
+			$where .= " AND ((100/45)*(atk_iv + def_iv + sta_iv)) >= (".$ivMin.") ";
 		}
 		if ($testIv->iv != null && !is_null($ivMax) && ($ivMax != "")) {
-			$where .= " AND ((100/45)*(atk_iv + def_iv + sta_iv)) <= (" . $ivMax . ") ";
+			$where .= " AND ((100/45)*(atk_iv + def_iv + sta_iv)) <= (".$ivMax.") ";
 		}
 		$req = "SELECT pokemon_id, lat AS latitude, lon AS longitude,
     					TO_TIMESTAMP(expire_timestamp) AS disappear_time,
     					TO_TIMESTAMP(expire_timestamp) AS disappear_time_real,
     					atk_iv AS individual_attack, def_iv AS individual_defense, sta_iv AS individual_stamina,
    						move_1, move_2
-					FROM sightings " . $where . "
+					FROM sightings " . $where."
 					ORDER BY disappear_time DESC
 					LIMIT 5000";
 		$result = pg_query($this->db, $req);
@@ -322,7 +322,7 @@ 
 		$req = "SELECT COUNT(DISTINCT(fs.fort_id)) AS total, ROUND((SUM(gd.cp)) / COUNT(DISTINCT(fs.fort_id)),0) AS average_points
         			FROM fort_sightings fs
         			JOIN gym_defenders gd ON fs.fort_id = gd.fort_id
-        			WHERE fs.team = '" . $team_id . "'";
+        			WHERE fs.team = '" . $team_id."'";
 		$result = pg_query($this->db, $req);
 		$data = pg_fetch_object($result);
 		return $data;
@@ -369,7 +369,7 @@ 
 	///////////
 
 	public function getAllRaids($page) {
-		$limit = " LIMIT 10 OFFSET ". ($page * 10);
+		$limit = " LIMIT 10 OFFSET ".($page * 10);
 		$req = "SELECT r.fort_id AS gym_id, r.level AS level, r.pokemon_id AS pokemon_id, r.cp AS cp, r.move_1 AS move_1, r.move_2 AS move_2, TO_TIMESTAMP(r.time_spawn) AS spawn, TO_TIMESTAMP(r.time_battle) AS start, TO_TIMESTAMP(r.time_end) AS end, TO_TIMESTAMP(fs.updated) AS last_scanned, f.name, f.lat AS latitude, f.lon as longitude 
 					FROM raids r 
 					JOIN forts f ON f.id = r.fort_id 
@@ -438,9 +438,9 @@ 
 					FROM sightings
 					JOIN (SELECT COUNT(*) AS count
 						FROM sightings
-                    	" . $where. "
+                    	" . $where."
                     ) count ON 1 = 1
-					" . $where . "
+					" . $where."
 					ORDER BY expire_timestamp DESC
 					LIMIT 1 OFFSET 0";
 		$result = pg_query($this->db, $req);
@@ -475,13 +475,13 @@ 
 	public function getNestData() {
 		$pokemon_exclude_sql = "";
 		if (!empty(self::$config->system->nest_exclude_pokemon)) {
-			$pokemon_exclude_sql = "AND p.pokemon_id NOT IN (" . implode(",", self::$config->system->nest_exclude_pokemon) . ")";
+			$pokemon_exclude_sql = "AND p.pokemon_id NOT IN (".implode(",", self::$config->system->nest_exclude_pokemon).")";
 		}
 		$req = "SELECT p.spawn_id, p.pokemon_id, MAX(p.lat) AS latitude, MAX(p.lon) AS longitude, count(p.pokemon_id) AS total_pokemon, TO_TIMESTAMP(MAX(s.updated)) as latest_seen, coalesce(MAX(duration),30)*60 as duration
 			          FROM sightings p
 			          INNER JOIN spawnpoints s ON (p.spawn_id = s.spawn_id)
 			          WHERE p.expire_timestamp > EXTRACT(EPOCH FROM NOW()) - 86400
-			          " . $pokemon_exclude_sql . "
+			          " . $pokemon_exclude_sql."
 			          GROUP BY p.spawn_id, p.pokemon_id
 			          HAVING COUNT(p.pokemon_id) >= 6
 			          ORDER BY p.pokemon_id";

Braces +76 added lines, -38 removed lines

@@ -6,13 +6,16 @@ 
  * Time: 02:26
  */
 
-class QueryManagerPostgresqlMonocleAlternate extends QueryManagerPostgresql {
+class QueryManagerPostgresqlMonocleAlternate extends QueryManagerPostgresql
+{
 
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 	}
 
-	public function __destruct() {
+	public function __destruct()
+	{
 		parent::__destruct();
 	}
 
@@ -20,7 +23,8 @@ 
 	// Tester
 	///////////
 
-	function testTotalPokemon() {
+	function testTotalPokemon()
+	{
 		$req = "SELECT COUNT(*) as total FROM sightings";
 		$result = pg_query($this->db, $req);
 		if ($result === false) {
@@ -36,7 +40,8 @@ 
 		return 0;
 	}
 
-	function testTotalGyms() {
+	function testTotalGyms()
+	{
 		$req = "SELECT COUNT(*) as total FROM forts";
 		$result = pg_query($this->db, $req);
 		if ($result === false) {
@@ -52,7 +57,8 @@ 
 		return 0;
 	}
 
-	function testTotalPokestops() {
+	function testTotalPokestops()
+	{
 		$req = "SELECT COUNT(*) as total FROM pokestops";
 		$result = pg_query($this->db, $req);
 		if ($result === false) {
@@ -73,26 +79,30 @@ 
 	// Homepage
 	/////////////
 
-	function getTotalPokemon() {
+	function getTotalPokemon()
+	{
 		$req = "SELECT COUNT(*) AS total FROM sightings WHERE expire_timestamp >= EXTRACT(EPOCH FROM NOW())";
 		$result = pg_query($this->db, $req);
 		$data = pg_fetch_object($result);
 		return $data;
 	}
 
-	function getTotalLures() {
+	function getTotalLures()
+	{
 		$data = (object) array("total" => 0);
 		return $data;
 	}
 
-	function getTotalGyms() {
+	function getTotalGyms()
+	{
 		$req = "SELECT COUNT(*) AS total FROM forts";
 		$result = pg_query($this->db, $req);
 		$data = pg_fetch_object($result);
 		return $data;
 	}
 
-	function getTotalRaids() {
+	function getTotalRaids()
+	{
 		$req = "SELECT COUNT(*) AS total FROM raids WHERE time_battle <= EXTRACT(EPOCH FROM NOW()) AND time_end >= EXTRACT(EPOCH FROM NOW())";
 		$result = pg_query($this->db, $req);
 		$data = pg_fetch_object($result);
@@ -100,14 +110,16 @@ 
 	}
 
 
-	function getTotalGymsForTeam($team_id) {
+	function getTotalGymsForTeam($team_id)
+	{
 		$req = "SELECT COUNT(*) AS total FROM fort_sightings WHERE team = '$team_id'";
 		$result = pg_query($this->db, $req);
 		$data = pg_fetch_object($result);
 		return $data;
 	}
 
-	function getRecentAll() {
+	function getRecentAll()
+	{
 		$req = "SELECT DISTINCT pokemon_id, encounter_id, TO_TIMESTAMP(expire_timestamp) AS disappear_time, TO_TIMESTAMP(updated) AS last_modified, TO_TIMESTAMP(expire_timestamp) AS disappear_time_real,
               lat AS latitude, lon AS longitude, cp, atk_iv AS individual_attack, def_iv AS individual_defense, sta_iv AS individual_stamina
               FROM sightings
@@ -123,7 +135,8 @@ 
 		return $data;
 	}
 
-	function getRecentMythic($mythic_pokemon) {
+	function getRecentMythic($mythic_pokemon)
+	{
 		$req = "SELECT DISTINCT pokemon_id as pokemon_id, CONCAT('A', encounter_id) as encounter_id, TO_TIMESTAMP(expire_timestamp) AS disappear_time, TO_TIMESTAMP(updated) AS last_modified, TO_TIMESTAMP(expire_timestamp) AS disappear_time_real,
                 lat AS latitude, lon AS longitude, cp, atk_iv AS individual_attack, def_iv AS individual_defense, sta_iv AS individual_stamina
                 FROM sightings
@@ -144,14 +157,16 @@ 
 	// Single Pokemon
 	///////////////////
 
-	function getGymsProtectedByPokemon($pokemon_id) {
+	function getGymsProtectedByPokemon($pokemon_id)
+	{
 		$req = "SELECT COUNT(DISTINCT(fort_id)) AS total FROM fort_sightings WHERE guard_pokemon_id = '".$pokemon_id."'";
 		$result = pg_query($this->db, $req);
 		$data = pg_fetch_object($result);
 		return $data;
 	}
 
-	function getPokemonLastSeen($pokemon_id) {
+	function getPokemonLastSeen($pokemon_id)
+	{
 		$req = "SELECT TO_TIMESTAMP(expire_timestamp) AS expire_timestamp, TO_TIMESTAMP(expire_timestamp) AS disappear_time_real, lat AS latitude, lon AS longitude
                 FROM sightings
                 WHERE pokemon_id = '".$pokemon_id."'
@@ -162,7 +177,8 @@ 
 		return $data;
 	}
 
-	function getTop50Pokemon($pokemon_id, $top_order_by, $top_direction) {
+	function getTop50Pokemon($pokemon_id, $top_order_by, $top_direction)
+	{
 		$req = "SELECT DISTINCT encounter_id, expire_timestamp, TO_TIMESTAMP(expire_timestamp) AS distime, pokemon_id as pokemon_id, TO_TIMESTAMP(expire_timestamp) as disappear_time, lat as latitude, lon as longitude,
                 cp, atk_iv as individual_attack, def_iv as individual_defense, sta_iv as individual_stamina,
                 ROUND(100*(atk_iv+def_iv+sta_iv)/45,1) AS \"IV\", move_1 as move_1, move_2, form
@@ -178,7 +194,8 @@ 
 		return $top;
 	}
 
-	function getTop50Trainers($pokemon_id, $best_order_by, $best_direction) {
+	function getTop50Trainers($pokemon_id, $best_order_by, $best_direction)
+	{
 		$trainer_blacklist = "";
 		if (!empty(self::$config->system->trainer_blacklist)) {
 			$trainer_blacklist = " AND owner_name NOT IN ('" . implode("','", self::$config->system->trainer_blacklist) . "')";
@@ -200,7 +217,8 @@ 
 		return $toptrainer;
 	}
 
-	public function getPokemonHeatmap($pokemon_id, $start, $end) {
+	public function getPokemonHeatmap($pokemon_id, $start, $end)
+	{
 		$where = " WHERE pokemon_id = ".$pokemon_id." "
 			. "AND TO_TIMESTAMP(expire_timestamp) BETWEEN '".$start."' AND '".$end."'";
 		$req 		= "SELECT lat AS latitude, lon AS longitude FROM sightings".$where." ORDER BY expire_timestamp DESC LIMIT 100000";
@@ -212,7 +230,8 @@ 
 		return $points;
 	}
 
-	public function getPokemonGraph($pokemon_id) {
+	public function getPokemonGraph($pokemon_id)
+	{
 		$req = "SELECT COUNT(*) AS total, EXTRACT(HOUR FROM disappear_time) AS disappear_hour
 					FROM (SELECT TO_TIMESTAMP(expire_timestamp) as disappear_time FROM sightings WHERE pokemon_id = '".$pokemon_id."' ORDER BY disappear_time LIMIT 100000) AS pokemonFiltered
 				GROUP BY disappear_hour
@@ -228,7 +247,8 @@ 
 		return $array;
 	}
 
-	public function getPokemonLive($pokemon_id, $ivMin, $ivMax, $inmap_pokemons) {
+	public function getPokemonLive($pokemon_id, $ivMin, $ivMax, $inmap_pokemons)
+	{
 		$inmap_pkms_filter = "";
 		$where = " WHERE expire_timestamp >= EXTRACT(EPOCH FROM NOW()) AND pokemon_id = " . $pokemon_id;
 
@@ -264,14 +284,16 @@ 
 		return $spawns;
 	}
 
-	public function getPokemonSliederMinMax() {
+	public function getPokemonSliederMinMax()
+	{
 		$req = "SELECT TO_TIMESTAMP(MIN(expire_timestamp)) AS min, TO_TIMESTAMP(MAX(expire_timestamp)) AS max FROM sightings";
 		$result = pg_query($this->db, $req);
 		$data = pg_fetch_object($result);
 		return $data;
 	}
 
-	public function getMapsCoords() {
+	public function getMapsCoords()
+	{
 		$req = "SELECT MAX(lat) AS max_latitude, MIN(lat) AS min_latitude, MAX(lon) AS max_longitude, MIN(lon) as min_longitude FROM spawnpoints";
 		$result = pg_query($this->db, $req);
 		$data = pg_fetch_object($result);
@@ -284,14 +306,16 @@ 
 	//////////////
 
 
-	function getTotalPokestops() {
+	function getTotalPokestops()
+	{
 		$req = "SELECT COUNT(*) as total FROM pokestops";
 		$result = pg_query($this->db, $req);
 		$data = pg_fetch_object($result);
 		return $data;
 	}
 
-	public function getAllPokestops() {
+	public function getAllPokestops()
+	{
 		$req = "SELECT lat as latitude, lon as longitude, null AS lure_expiration, EXTRACT(EPOCH FROM NOW()) AS now, null AS lure_expiration_real FROM pokestops";
 		$result = pg_query($this->db, $req);
 		$pokestops = array();
@@ -306,7 +330,8 @@ 
 	// Gyms
 	/////////
 
-	function getTeamGuardians($team_id) {
+	function getTeamGuardians($team_id)
+	{
 		$req = "SELECT COUNT(*) AS total, guard_pokemon_id FROM fort_sightings WHERE team = '".$team_id."' GROUP BY guard_pokemon_id ORDER BY total DESC LIMIT 3 OFFSET 0";
 		$result = pg_query($this->db, $req);
 
@@ -318,7 +343,8 @@ 
 		return $datas;
 	}
 
-	function getOwnedAndPoints($team_id) {
+	function getOwnedAndPoints($team_id)
+	{
 		$req = "SELECT COUNT(DISTINCT(fs.fort_id)) AS total, ROUND((SUM(gd.cp)) / COUNT(DISTINCT(fs.fort_id)),0) AS average_points
         			FROM fort_sightings fs
         			JOIN gym_defenders gd ON fs.fort_id = gd.fort_id
@@ -328,7 +354,8 @@ 
 		return $data;
 	}
 
-	function getAllGyms() {
+	function getAllGyms()
+	{
 		$req = "SELECT f.id as gym_id, team as team_id, f.lat as latitude, f.lon as longitude, updated as last_scanned, (6 - fs.slots_available) AS level FROM forts f LEFT JOIN fort_sightings fs ON f.id = fs.fort_id;";
 		$result = pg_query($this->db, $req);
 		$gyms = array();
@@ -338,7 +365,8 @@ 
 		return $gyms;
 	}
 
-	public function getGymData($gym_id) {
+	public function getGymData($gym_id)
+	{
 		$req = "SELECT f.name AS name, null AS description, f.url AS url, fs.team AS team, TO_TIMESTAMP(fs.updated) AS last_scanned, fs.guard_pokemon_id AS guard_pokemon_id, (6 - fs.slots_available) AS level, SUM(gd.cp) as total_cp	
 			FROM fort_sightings fs
 			LEFT JOIN forts f ON f.id = fs.fort_id
@@ -350,7 +378,8 @@ 
 		return $data;
 	}
 
-	public function getGymDefenders($gym_id) {
+	public function getGymDefenders($gym_id)
+	{
 		$req = "SELECT DISTINCT external_id as pokemon_uid, pokemon_id, atk_iv as iv_attack, def_iv as iv_defense, sta_iv as iv_stamina, cp, fort_id as gym_id
 			FROM gym_defenders 
 			WHERE fort_id='".$gym_id."'
@@ -368,7 +397,8 @@ 
 	// Raids
 	///////////
 
-	public function getAllRaids($page) {
+	public function getAllRaids($page)
+	{
 		$limit = " LIMIT 10 OFFSET ". ($page * 10);
 		$req = "SELECT r.fort_id AS gym_id, r.level AS level, r.pokemon_id AS pokemon_id, r.cp AS cp, r.move_1 AS move_1, r.move_2 AS move_2, TO_TIMESTAMP(r.time_spawn) AS spawn, TO_TIMESTAMP(r.time_battle) AS start, TO_TIMESTAMP(r.time_end) AS end, TO_TIMESTAMP(fs.updated) AS last_scanned, f.name, f.lat AS latitude, f.lon as longitude 
 					FROM raids r 
@@ -389,11 +419,13 @@ 
 	// Trainers
 	//////////////
 
-	public function getTrainers($trainer_name, $team, $page, $ranking) {
+	public function getTrainers($trainer_name, $team, $page, $ranking)
+	{
 		return array(); // Waiting for Monocle to store level
 	}
 
-	public function getTrainerLevelCount($team_id) {
+	public function getTrainerLevelCount($team_id)
+	{
 		$levelData = array();
 		for ($i = 5; $i <= 40; $i++) {
 			if (!isset($levelData[$i])) {
@@ -408,7 +440,8 @@ 
 	// Cron
 	/////////
 
-	public function getPokemonCountsActive() {
+	public function getPokemonCountsActive()
+	{
 		$req = "SELECT pokemon_id, COUNT(*) as total FROM sightings WHERE expire_timestamp >= EXTRACT(EPOCH FROM NOW()) GROUP BY pokemon_id";
 		$result = pg_query($this->db, $req);
 		$counts = array();
@@ -418,7 +451,8 @@ 
 		return $counts;
 	}
 
-	public function getPoekmonCountsLastDay() {
+	public function getPoekmonCountsLastDay()
+	{
 		$req = "SELECT pokemon_id, COUNT(*) AS spawns_last_day
 					FROM sightings
 					WHERE TO_TIMESTAMP(expire_timestamp) >= (SELECT TO_TIMESTAMP(MAX(expire_timestamp)) FROM sightings) - INTERVAL 1 DAY
@@ -432,7 +466,8 @@ 
 		return $counts;
 	}
 
-	public function getPokemonSinceLastUpdate($pokemon_id, $last_update) {
+	public function getPokemonSinceLastUpdate($pokemon_id, $last_update)
+	{
 		$where = "WHERE pokemon_id = '".$pokemon_id."' AND id > '".$last_update."'";
 		$req = "SELECT count, id AS last_timestamp, (TO_TIMESTAMP(expire_timestamp)) AS disappear_time_real, lat as latitude, lon as longitude
 					FROM sightings
@@ -448,7 +483,8 @@ 
 		return $data;
 	}
 
-	public function getRaidsSinceLastUpdate($pokemon_id, $last_update) {
+	public function getRaidsSinceLastUpdate($pokemon_id, $last_update)
+	{
 		$where = "WHERE pokemon_id = '".$pokemon_id."' AND time_battle > '".$last_update."'";
 		$req = "SELECT time_battle AS start_timestamp, time_end as end, (TO_TIMESTAMP(time_end)) AS end_time_real, lat as latitude, lon as longitude, count
 					FROM raids r
@@ -465,14 +501,16 @@ 
 		return $data;
 	}
 
-	public function getCaptchaCount() {
+	public function getCaptchaCount()
+	{
 		$req = " SELECT COUNT(*) as total FROM accounts WHERE captchaed IS NOT NULL AND reason IS NULL";
 		$result = pg_query($this->db, $req);
 		$data = pg_fetch_object($result);
 		return $data;
 	}
 
-	public function getNestData() {
+	public function getNestData()
+	{
 		$pokemon_exclude_sql = "";
 		if (!empty(self::$config->system->nest_exclude_pokemon)) {
 			$pokemon_exclude_sql = "AND p.pokemon_id NOT IN (" . implode(",", self::$config->system->nest_exclude_pokemon) . ")";

core/process/queries/QueryManagerMysqlRocketmap.php

Spacing +6 added lines, -6 removed lines

@@ -302,7 +302,7 @@ 
 	/////////
 
 	function getTeamGuardians($team_id) {
-		$req = "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";
+		$req = "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";
 		$result = $this->mysqli->query($req);
 		$datas = array();
 		while ($data = $result->fetch_object()) {
@@ -454,7 +454,7 @@ 
 				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;
 
 		$result = $this->mysqli->query($req);
 		$trainers = array();
@@ -475,7 +475,7 @@ 
 		return $data;
 	}
 
-	private function getTrainerActivePokemon($trainer_name){
+	private function getTrainerActivePokemon($trainer_name) {
 		$req = "(SELECT DISTINCT gympokemon.pokemon_id, gympokemon.pokemon_uid, gympokemon.cp, DATEDIFF(UTC_TIMESTAMP(), gympokemon.last_seen) AS last_scanned, gympokemon.trainer_name, gympokemon.iv_defense, gympokemon.iv_stamina, gympokemon.iv_attack, filtered_gymmember.gym_id, CONVERT_TZ(filtered_gymmember.deployment_time, '+00:00', '".self::$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
@@ -490,7 +490,7 @@ 
 		return $pokemons;
 	}
 
-	private function getTrainerInactivePokemon($trainer_name){
+	private function getTrainerInactivePokemon($trainer_name) {
 		$req = "(SELECT DISTINCT gympokemon.pokemon_id, gympokemon.pokemon_uid, gympokemon.cp, DATEDIFF(UTC_TIMESTAMP(), gympokemon.last_seen) AS last_scanned, gympokemon.trainer_name, gympokemon.iv_defense, gympokemon.iv_stamina, gympokemon.iv_attack, null AS gym_id, CONVERT_TZ(filtered_gymmember.deployment_time, '+00:00', '".self::$time_offset."') as deployment_time, '0' AS active
 					FROM gympokemon LEFT JOIN
 					(SELECT * FROM gymmember HAVING gymmember.gym_id <> '') AS filtered_gymmember
@@ -544,7 +544,7 @@ 
                     JOIN spawnpoint s ON p.spawnpoint_id = s.id
                     " . $where."
                 ) x
-				" . $where . "
+				" . $where."
 				ORDER BY last_timestamp DESC
                 LIMIT 0,1";
 		$result = $this->mysqli->query($req);
@@ -586,7 +586,7 @@ 
 			          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";

Braces +84 added lines, -42 removed lines

@@ -1,12 +1,15 @@ 
 <?php
 
-final class QueryManagerMysqlRocketmap extends QueryManagerMysql {
+final class QueryManagerMysqlRocketmap extends QueryManagerMysql
+{
 
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 	}
 
-	public function __destruct() {
+	public function __destruct()
+	{
 		parent::__destruct();
 	}
 
@@ -14,7 +17,8 @@ 
 	// Tester
 	///////////
 	
-	function testTotalPokemon() {
+	function testTotalPokemon()
+	{
 		$req = "SELECT COUNT(*) as total FROM pokemon";
 		$result = $this->mysqli->query($req);
 		if (!is_object($result)) {
@@ -30,7 +34,8 @@ 
 		return 0;
 	}
 	
-	function testTotalGyms() {
+	function testTotalGyms()
+	{
 		$req = "SELECT COUNT(*) as total FROM gym";
 		$result = $this->mysqli->query($req);
 		if (!is_object($result)) {
@@ -46,7 +51,8 @@ 
 		return 0;
 	}
 	
-	function testTotalPokestops() {
+	function testTotalPokestops()
+	{
 		$req = "SELECT COUNT(*) as total FROM pokestop";
 		$result = $this->mysqli->query($req);
 		if (!is_object($result)) {
@@ -67,42 +73,48 @@ 
 	// Homepage
 	/////////////
 	
-	function getTotalPokemon() {
+	function getTotalPokemon()
+	{
 		$req = "SELECT COUNT(*) AS total FROM pokemon WHERE disappear_time >= UTC_TIMESTAMP()";
 		$result = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		return $data;
 	}
 	
-	function getTotalLures() {
+	function getTotalLures()
+	{
 		$req = "SELECT COUNT(*) AS total FROM pokestop WHERE lure_expiration >= UTC_TIMESTAMP()";
 		$result = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		return $data;
 	}
 	
-	function getTotalGyms() {
+	function getTotalGyms()
+	{
 		$req = "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym";
 		$result = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		return $data;
 	}
 	
-	function getTotalRaids() {
+	function getTotalRaids()
+	{
 		$req = "SELECT COUNT(*) AS total FROM raid WHERE start <= UTC_TIMESTAMP AND  end >= UTC_TIMESTAMP()";
 		$result = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		return $data;
 	}
 	
-	function getTotalGymsForTeam($team_id) {
+	function getTotalGymsForTeam($team_id)
+	{
 		$req = "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE team_id = '".$team_id."'";
 		$result = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		return $data;
 	}
 	
-	function getRecentAll() {
+	function getRecentAll()
+	{
 		$req = "SELECT DISTINCT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '".self::$time_offset."')) AS disappear_time_real,
 					latitude, longitude, cp, individual_attack, individual_defense, individual_stamina
 					FROM pokemon
@@ -118,7 +130,8 @@ 
 		return $data;
 	}
 	
-	function getRecentMythic($mythic_pokemons) {
+	function getRecentMythic($mythic_pokemons)
+	{
 		$req = "SELECT DISTINCT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '".self::$time_offset."')) AS disappear_time_real,
 					latitude, longitude, cp, individual_attack, individual_defense, individual_stamina
 					FROM pokemon
@@ -139,14 +152,16 @@ 
 	// Single Pokemon
 	///////////////////
 	
-	function getGymsProtectedByPokemon($pokemon_id) {
+	function getGymsProtectedByPokemon($pokemon_id)
+	{
 		$req = "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE guard_pokemon_id = '".$pokemon_id."'";
 		$result = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		return $data;
 	}
 	
-	function getPokemonLastSeen($pokemon_id) {
+	function getPokemonLastSeen($pokemon_id)
+	{
 		$req = "SELECT disappear_time, (CONVERT_TZ(disappear_time, '+00:00', '".self::$time_offset."')) AS disappear_time_real, latitude, longitude
 							FROM pokemon
 							WHERE pokemon_id = '".$pokemon_id."'
@@ -157,7 +172,8 @@ 
 		return $data;
 	}
 
-	function getTop50Pokemon($pokemon_id, $top_order_by, $top_direction) {
+	function getTop50Pokemon($pokemon_id, $top_order_by, $top_direction)
+	{
 		$req = "SELECT (CONVERT_TZ(disappear_time, '+00:00', '".self::$time_offset."')) AS distime, pokemon_id, disappear_time, latitude, longitude,
 							cp, individual_attack, individual_defense, individual_stamina,
 							ROUND(100*(individual_attack+individual_defense+individual_stamina)/45,1) AS IV, move_1, move_2, form
@@ -175,7 +191,8 @@ 
 		return $top;
 	}
 
-	function getTop50Trainers($pokemon_id, $best_order_by, $best_direction) {
+	function getTop50Trainers($pokemon_id, $best_order_by, $best_direction)
+	{
 		$trainer_blacklist = "";
 		if (!empty(self::$config->system->trainer_blacklist)) {
 			$trainer_blacklist = " AND trainer_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
@@ -197,7 +214,8 @@ 
 		return $toptrainer;
 	}
 
-	public function getPokemonHeatmap($pokemon_id, $start, $end) {
+	public function getPokemonHeatmap($pokemon_id, $start, $end)
+	{
 		$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";
@@ -209,7 +227,8 @@ 
 		return $points;
 	}
 
-	public function getPokemonGraph($pokemon_id) {
+	public function getPokemonGraph($pokemon_id)
+	{
 		$req = "SELECT COUNT(*) AS total,
 					HOUR(CONVERT_TZ(disappear_time, '+00:00', '".self::$time_offset."')) AS disappear_hour
 					FROM (SELECT disappear_time FROM pokemon WHERE pokemon_id = '".$pokemon_id."' ORDER BY disappear_time LIMIT 100000) AS pokemonFiltered
@@ -226,7 +245,8 @@ 
 		return $array;
 	}
 
-	public function getPokemonLive($pokemon_id, $ivMin, $ivMax, $inmap_pokemons) {
+	public function getPokemonLive($pokemon_id, $ivMin, $ivMax, $inmap_pokemons)
+	{
 		$inmap_pkms_filter = "";
 		$where = " WHERE disappear_time >= UTC_TIMESTAMP() AND pokemon_id = ".$pokemon_id;
 
@@ -260,14 +280,16 @@ 
 		return $spawns;
 	}
 
-	public function getPokemonSliederMinMax() {
+	public function getPokemonSliederMinMax()
+	{
 		$req = "SELECT MIN(disappear_time) AS min, MAX(disappear_time) AS max FROM pokemon";
 		$result = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		return $data;
 	}
 
-	public function getMapsCoords() {
+	public function getMapsCoords()
+	{
 		$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 = $this->mysqli->query($req);
 		$data = $result->fetch_object();
@@ -279,14 +301,16 @@ 
 	// Pokestops
 	//////////////
 
-	function getTotalPokestops() {
+	function getTotalPokestops()
+	{
 		$req = "SELECT COUNT(*) as total FROM pokestop";
 		$result = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		return $data;
 	}
 
-	public function getAllPokestops() {
+	public function getAllPokestops()
+	{
 		$req = "SELECT latitude, longitude, lure_expiration, UTC_TIMESTAMP() AS now, (CONVERT_TZ(lure_expiration, '+00:00', '".self::$time_offset."')) AS lure_expiration_real FROM pokestop";
 		$result = $this->mysqli->query($req);
 		$pokestops = array();
@@ -301,7 +325,8 @@ 
 	// Gyms
 	/////////
 
-	function getTeamGuardians($team_id) {
+	function getTeamGuardians($team_id)
+	{
 		$req = "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";
 		$result = $this->mysqli->query($req);
 		$datas = array();
@@ -311,14 +336,16 @@ 
 		return $datas;
 	}
 
-	function getOwnedAndPoints($team_id) {
+	function getOwnedAndPoints($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 = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		return $data;
 	}
 
-	function getAllGyms() {
+	function getAllGyms()
+	{
 		$req = "SELECT gym_id, team_id, latitude, longitude, (CONVERT_TZ(last_scanned, '+00:00', '".self::$time_offset."')) AS last_scanned, (6 - slots_available) AS level FROM gym";
 		$result = $this->mysqli->query($req);
 		$gyms = array();
@@ -328,7 +355,8 @@ 
 		return $gyms;
 	}
 
-	public function getGymData($gym_id) {
+	public function getGymData($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', '".self::$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
@@ -339,7 +367,8 @@ 
 		return $data;
 	}
 
-	public function getGymDefenders($gym_id) {
+	public function getGymDefenders($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
@@ -358,7 +387,8 @@ 
 	// Raids
 	///////////
 
-	public function getAllRaids($page) {
+	public function getAllRaids($page)
+	{
 		$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', '".self::$time_offset."') AS spawn, CONVERT_TZ(raid.start, '+00:00', '".self::$time_offset."') AS start, CONVERT_TZ(raid.end, '+00:00', '".self::$time_offset."') AS end, CONVERT_TZ(raid.last_scanned, '+00:00', '".self::$time_offset."') AS last_scanned, gymdetails.name, gym.latitude, gym.longitude FROM raid
 					JOIN gymdetails ON gymdetails.gym_id = raid.gym_id
@@ -378,7 +408,8 @@ 
 	// Trainers
 	//////////////
 
-	public function getTrainers($trainer_name, $team, $page, $ranking) {
+	public function getTrainers($trainer_name, $team, $page, $ranking)
+	{
 		$trainers = $this->getTrainerData($trainer_name, $team, $page, $ranking);
 		foreach ($trainers as $trainer) {
 
@@ -403,7 +434,8 @@ 
 		return $trainers;
 	}
 
-	public function getTrainerLevelCount($team_id) {
+	public function getTrainerLevelCount($team_id)
+	{
 		$req = "SELECT level, count(level) AS count FROM trainer WHERE team = '".$team_id."'";
 		if (!empty(self::$config->system->trainer_blacklist)) {
 			$req .= " AND name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
@@ -424,7 +456,8 @@ 
 		return $levelData;
 	}
 
-	private function getTrainerData($trainer_name, $team, $page, $ranking) {
+	private function getTrainerData($trainer_name, $team, $page, $ranking)
+	{
 		$where = "";
 
 		if (!empty(self::$config->system->trainer_blacklist)) {
@@ -465,7 +498,8 @@ 
 		return $trainers;
 	}
 
-	private function getTrainerLevelRating($level) {
+	private function getTrainerLevelRating($level)
+	{
 		$req = "SELECT COUNT(1) AS rank FROM trainer WHERE level = ".$level;
 		if (!empty(self::$config->system->trainer_blacklist)) {
 			$req .= " AND name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
@@ -475,7 +509,8 @@ 
 		return $data;
 	}
 
-	private function getTrainerActivePokemon($trainer_name){
+	private function getTrainerActivePokemon($trainer_name)
+	{
 		$req = "(SELECT DISTINCT gympokemon.pokemon_id, gympokemon.pokemon_uid, gympokemon.cp, DATEDIFF(UTC_TIMESTAMP(), gympokemon.last_seen) AS last_scanned, gympokemon.trainer_name, gympokemon.iv_defense, gympokemon.iv_stamina, gympokemon.iv_attack, filtered_gymmember.gym_id, CONVERT_TZ(filtered_gymmember.deployment_time, '+00:00', '".self::$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
@@ -490,7 +525,8 @@ 
 		return $pokemons;
 	}
 
-	private function getTrainerInactivePokemon($trainer_name){
+	private function getTrainerInactivePokemon($trainer_name)
+	{
 		$req = "(SELECT DISTINCT gympokemon.pokemon_id, gympokemon.pokemon_uid, gympokemon.cp, DATEDIFF(UTC_TIMESTAMP(), gympokemon.last_seen) AS last_scanned, gympokemon.trainer_name, gympokemon.iv_defense, gympokemon.iv_stamina, gympokemon.iv_attack, null AS gym_id, CONVERT_TZ(filtered_gymmember.deployment_time, '+00:00', '".self::$time_offset."') as deployment_time, '0' AS active
 					FROM gympokemon LEFT JOIN
 					(SELECT * FROM gymmember HAVING gymmember.gym_id <> '') AS filtered_gymmember
@@ -510,7 +546,8 @@ 
 	// Cron
 	/////////
 
-	public function getPokemonCountsActive() {
+	public function getPokemonCountsActive()
+	{
 		$req = "SELECT pokemon_id, COUNT(*) as total FROM pokemon WHERE disappear_time >= UTC_TIMESTAMP() GROUP BY pokemon_id";
 		$result = $this->mysqli->query($req);
 		$counts = array();
@@ -520,7 +557,8 @@ 
 		return $counts;
 	}
 
-	public function getPoekmonCountsLastDay() {
+	public function getPoekmonCountsLastDay()
+	{
 		$req = "SELECT pokemon_id, COUNT(*) AS spawns_last_day
 					FROM pokemon
 					WHERE disappear_time >= (SELECT MAX(disappear_time) FROM pokemon) - INTERVAL 1 DAY
@@ -534,7 +572,8 @@ 
 		return $counts;
 	}
 
-	public function getPokemonSinceLastUpdate($pokemon_id, $last_update) {
+	public function getPokemonSinceLastUpdate($pokemon_id, $last_update)
+	{
 		$where = "WHERE p.pokemon_id = '".$pokemon_id."' AND (UNIX_TIMESTAMP(p.disappear_time) - (LENGTH(s.kind) - LENGTH( REPLACE ( kind, \"s\", \"\") )) * 900) > '".$last_update."'";
 		$req = "SELECT count, (UNIX_TIMESTAMP(p.disappear_time) - (LENGTH(s.kind) - LENGTH( REPLACE ( kind, \"s\", \"\") )) * 900) as last_timestamp, (CONVERT_TZ(p.disappear_time, '+00:00', '".self::$time_offset."')) AS disappear_time_real, p.latitude, p.longitude 
 				FROM pokemon p
@@ -552,7 +591,8 @@ 
 		return $data;
 	}
 
-	public function getRaidsSinceLastUpdate($pokemon_id, $last_update) {
+	public function getRaidsSinceLastUpdate($pokemon_id, $last_update)
+	{
 		$where = "WHERE pokemon_id = '".$pokemon_id."' AND UNIX_TIMESTAMP(start) > '".$last_update."'";
 		$req = "SELECT UNIX_TIMESTAMP(start) as start_timestamp, end, (CONVERT_TZ(end, '+00:00', '".self::$time_offset."')) AS end_time_real, latitude, longitude, count
                 FROM raid r
@@ -570,14 +610,16 @@ 
 		return $data;
 	}
 
-	public function getCaptchaCount() {
+	public function getCaptchaCount()
+	{
 		$req = "SELECT SUM(accounts_captcha) AS total FROM mainworker";
 		$result = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		return $data;
 	}
 
-	public function getNestData() {
+	public function getNestData()
+	{
 		$pokemon_exclude_sql = "";
 		if (!empty(self::$config->system->nest_exclude_pokemon)) {
 			$pokemon_exclude_sql = "AND p.pokemon_id NOT IN (".implode(",", self::$config->system->nest_exclude_pokemon).")";