brusselopole / Worldopole

core/process/queries/QueryManagerMysqlMonocleAlternate.php

Indentation +3 added lines, -3 removed lines

@@ -540,9 +540,9 @@
 		$trainers = array();
 		while ($data = $result->fetch_object()) {
 			$data->last_seen = date("Y-m-d", strtotime($data->last_seen));
-            if (is_null($data->active)) {
-                $data->active = 0;
-            }
+			if (is_null($data->active)) {
+				$data->active = 0;
+			}
 			$trainers[$data->name] = $data;
 
 			$pokemon = array_merge($this->getActivePokemon($data->name),  $this->getInactivePokemon($data->name));

Spacing +19 added lines, -19 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 0,50";
 
@@ -182,13 +182,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 owner_name as trainer_name, ROUND((100*((atk_iv)+(def_iv)+(sta_iv))/45),1) AS IV, move_1, move_2, cp as cp,
                 FROM_UNIXTIME(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."
 				ORDER BY $best_order_by $best_direction, owner_name ASC
 				LIMIT 0,50";
 
@@ -230,9 +230,9 @@ 
 
 	public function getPokemonLive($pokemon_id, $ivMin, $ivMax, $inmap_pokemons) {
 		$inmap_pkms_filter = "";
-		$where = " WHERE expire_timestamp >= UNIX_TIMESTAMP() AND pokemon_id = " . $pokemon_id;
+		$where = " WHERE expire_timestamp >= UNIX_TIMESTAMP() 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 = $this->mysqli->query($reqTestIv);
 		$testIv = $resultTestIv->fetch_object();
 		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,
     					FROM_UNIXTIME(expire_timestamp) AS disappear_time,
     					FROM_UNIXTIME(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."
 					LIMIT 5000";
 		$result = $this->mysqli->query($req);
 		$spawns = array();
@@ -343,7 +343,7 @@ 
 		$req = "SELECT COUNT(f.id) AS total, ROUND(AVG(fs.total_cp)) AS average_points
         			FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
-        			WHERE fs.team = '" . $team_id . "'";
+        			WHERE fs.team = '" . $team_id."'";
 		$result = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		return $data;
@@ -449,7 +449,7 @@ 
 	{
 		$req = "SELECT external_id AS pokemon_uid, pokemon_id, cp_now as cp, owner_name AS trainer_name
 					FROM gym_defenders
-					WHERE fort_id = '". $gym_id ."'
+					WHERE fort_id = '". $gym_id."'
 					ORDER BY deployment_time";
 		$result = $this->mysqli->query($req);
 		$pokemons = array();
@@ -469,9 +469,9 @@ 
 		$req = "SELECT f.id as gym_id, fs.team as team_id, total_cp, FROM_UNIXTIME(fs.last_modified) as last_modified, last_modified as last_modified_real
 					FROM fort_sightings fs
 					LEFT JOIN forts f ON f.id = fs.fort_id
-					WHERE f.id = '". $gym_id ."'
+					WHERE f.id = '". $gym_id."'
 					ORDER BY fs.last_modified DESC
-					LIMIT ".($page * $pageSize).",".($pageSize+1);
+					LIMIT ".($page * $pageSize).",".($pageSize + 1);
 		$result = $this->mysqli->query($req);
 		$history = array();
 		$count = 0;
@@ -503,7 +503,7 @@ 
 		$req = "SELECT ghd.defender_id, gd.pokemon_id, ghd.cp, gd.owner_name as trainer_name
 					FROM gym_history_defenders ghd
 					JOIN gym_defenders gd ON ghd.defender_id = gd.external_id
-					WHERE ghd.fort_id = '". $gym_id ."' AND date = '".$last_modified."'
+					WHERE ghd.fort_id = '". $gym_id."' AND date = '".$last_modified."'
 					ORDER BY gd.deployment_time";
 		$result = $this->mysqli->query($req);
 		$pokemons = array();
@@ -551,8 +551,8 @@ 
 						WHERE fort_id IS NOT NULL
 				  		GROUP BY owner_name
 				  	) active ON active.owner_name = gd.owner_name
-				  	WHERE gd.owner_level IS NOT NULL " . $where . "
-				  	GROUP BY gd.owner_name" . $order  . $limit;
+				  	WHERE gd.owner_level IS NOT NULL " . $where."
+				  	GROUP BY gd.owner_name" . $order.$limit;
 		$result = $this->mysqli->query($req);
 		$trainers = array();
 		while ($data = $result->fetch_object()) {
@@ -562,7 +562,7 @@ 
             }
 			$trainers[$data->name] = $data;
 
-			$pokemon = array_merge($this->getActivePokemon($data->name),  $this->getInactivePokemon($data->name));
+			$pokemon = array_merge($this->getActivePokemon($data->name), $this->getInactivePokemon($data->name));
 
 			$trainers[$data->name]->gyms = $data->active;
 			$trainers[$data->name]->pokemons = $pokemon;
@@ -678,14 +678,14 @@ 
 	public function getNestData($time, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude) {
 		$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.pokemon_id, MAX(p.lat) AS latitude, MAX(p.lon) AS longitude, count(p.pokemon_id) AS total_pokemon, MAX(s.updated) as latest_seen, coalesce(CASE WHEN MAX(duration) = 0 THEN NULL ELSE MAX(duration) END ,30)*60 as duration
 			          FROM sightings p
 			          INNER JOIN spawnpoints s ON (p.spawn_id = s.spawn_id)
 			          WHERE p.expire_timestamp > UNIX_TIMESTAMP() - ".($time * 3600)."
 			            AND p.lat >= ".$minLatitude." AND p.lat < ".$maxLatitude." AND p.lon >= ".$minLongitude." AND p.lon < ".$maxLongitude."
-			          " . $pokemon_exclude_sql . "
+			          " . $pokemon_exclude_sql."
 			          GROUP BY p.spawn_id, p.pokemon_id
 			          HAVING COUNT(p.pokemon_id) >= ".($time / 4)."
 			          ORDER BY p.pokemon_id";

Braces +84 added lines, -42 removed lines

@@ -1,12 +1,15 @@ 
 <?php
 
-class QueryManagerMysqlMonocleAlternate extends QueryManagerMysql {
+class QueryManagerMysqlMonocleAlternate 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 sightings";
 		$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 forts";
 		$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 pokestops";
 		$result = $this->mysqli->query($req);
 		if (!is_object($result)) {
@@ -67,26 +73,30 @@ 
 	// Homepage
 	/////////////
 
-	function getTotalPokemon() {
+	function getTotalPokemon()
+	{
 		$req = "SELECT COUNT(*) AS total FROM sightings WHERE expire_timestamp >= UNIX_TIMESTAMP()";
 		$result = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		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 = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		return $data;
 	}
 
-	function getTotalRaids() {
+	function getTotalRaids()
+	{
 		$req = "SELECT COUNT(*) AS total FROM raids WHERE time_battle <= UNIX_TIMESTAMP() AND time_end >= UNIX_TIMESTAMP()";
 		$result = $this->mysqli->query($req);
 		$data = $result->fetch_object();
@@ -94,7 +104,8 @@ 
 	}
 
 
-	function getTotalGymsForTeam($team_id) {
+	function getTotalGymsForTeam($team_id)
+	{
 		$req = "SELECT COUNT(*) AS total
 					FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
@@ -104,7 +115,8 @@ 
 		return $data;
 	}
 
-	function getRecentAll() {
+	function getRecentAll()
+	{
 		$req = "SELECT DISTINCT pokemon_id, encounter_id, FROM_UNIXTIME(expire_timestamp) AS disappear_time, FROM_UNIXTIME(updated) AS last_modified, FROM_UNIXTIME(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
@@ -120,7 +132,8 @@ 
 		return $data;
 	}
 
-	function getRecentMythic($mythic_pokemon) {
+	function getRecentMythic($mythic_pokemon)
+	{
 		$req = "SELECT pokemon_id, encounter_id, FROM_UNIXTIME(expire_timestamp) AS disappear_time, FROM_UNIXTIME(updated) AS last_modified, FROM_UNIXTIME(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
@@ -141,7 +154,8 @@ 
 	// Single Pokemon
 	///////////////////
 
-	function getGymsProtectedByPokemon($pokemon_id) {
+	function getGymsProtectedByPokemon($pokemon_id)
+	{
 		$req = "SELECT COUNT(f.id) AS total
 					FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
@@ -151,7 +165,8 @@ 
 		return $data;
 	}
 
-	function getPokemonLastSeen($pokemon_id) {
+	function getPokemonLastSeen($pokemon_id)
+	{
 		$req = "SELECT FROM_UNIXTIME(expire_timestamp) AS expire_timestamp, FROM_UNIXTIME(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 FROM_UNIXTIME(expire_timestamp) AS distime, pokemon_id as pokemon_id, FROM_UNIXTIME(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
@@ -179,7 +195,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 FROM_UNIXTIME(expire_timestamp) BETWEEN '".$start."' AND '".$end."'";
 		$req 		= "SELECT lat AS latitude, lon AS longitude FROM sightings".$where." LIMIT 100000";
@@ -212,7 +230,8 @@ 
 		return $points;
 	}
 
-	public function getPokemonGraph($pokemon_id) {
+	public function getPokemonGraph($pokemon_id)
+	{
 		$req = "SELECT COUNT(*) AS total, HOUR(disappear_time) AS disappear_hour
 					FROM (SELECT FROM_UNIXTIME(expire_timestamp) as disappear_time FROM sightings WHERE pokemon_id = '".$pokemon_id."' 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 >= UNIX_TIMESTAMP() AND pokemon_id = " . $pokemon_id;
 
@@ -263,21 +283,24 @@ 
 		return $spawns;
 	}
 
-	public function getPokemonSliderMinMax() {
+	public function getPokemonSliderMinMax()
+	{
 		$req = "SELECT FROM_UNIXTIME(MIN(expire_timestamp)) AS min, FROM_UNIXTIME(MAX(expire_timestamp)) AS max FROM sightings";
 		$result = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		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 = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		return $data;
 	}
 
-	public function getPokemonCount($pokemon_id) {
+	public function getPokemonCount($pokemon_id)
+	{
 		$req = "SELECT count, last_seen, latitude, longitude
 					FROM pokemon_stats
 					WHERE pid = ".$pokemon_id;
@@ -286,7 +309,8 @@ 
 		return $data;
 	}
 
-	public function getRaidCount($pokemon_id) {
+	public function getRaidCount($pokemon_id)
+	{
 		$req = "SELECT count, last_seen, latitude, longitude
 					FROM raid_stats
 					WHERE pid = ".$pokemon_id;
@@ -302,14 +326,16 @@ 
 	//////////////
 
 
-	function getTotalPokestops() {
+	function getTotalPokestops()
+	{
 		$req = "SELECT COUNT(*) as total FROM pokestops";
 		$result = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		return $data;
 	}
 
-	public function getAllPokestops() {
+	public function getAllPokestops()
+	{
 		$req = "SELECT lat as latitude, lon as longitude, null AS lure_expiration, UNIX_TIMESTAMP() AS now, null AS lure_expiration_real FROM pokestops";
 		$result = $this->mysqli->query($req);
 		$pokestops = array();
@@ -324,7 +350,8 @@ 
 	// Gyms
 	/////////
 
-	function getTeamGuardians($team_id) {
+	function getTeamGuardians($team_id)
+	{
 		$req = "SELECT COUNT(*) AS total, guard_pokemon_id
 					FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
@@ -339,7 +366,8 @@ 
 		return $datas;
 	}
 
-	function getOwnedAndPoints($team_id) {
+	function getOwnedAndPoints($team_id)
+	{
 		$req = "SELECT COUNT(f.id) AS total, ROUND(AVG(fs.total_cp)) AS average_points
         			FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
@@ -349,7 +377,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 (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id));";
@@ -361,7 +390,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, FROM_UNIXTIME(fs.updated) AS last_scanned, fs.guard_pokemon_id AS guard_pokemon_id, (6 - fs.slots_available) AS level, fs.total_cp
 			FROM forts f
 			LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
@@ -371,7 +401,8 @@ 
 		return $data;
 	}
 
-	public function getGymDefenders($gym_id) {
+	public function getGymDefenders($gym_id)
+	{
 		$req = "SELECT 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."'
@@ -389,7 +420,8 @@ 
 	// Raids
 	///////////
 
-	public function getAllRaids($page) {
+	public function getAllRaids($page)
+	{
 		$limit = " LIMIT ".($page * 10).",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, FROM_UNIXTIME(r.time_spawn) AS spawn, FROM_UNIXTIME(r.time_battle) AS start, FROM_UNIXTIME(r.time_end) AS end, FROM_UNIXTIME(fs.updated) AS last_scanned, f.name, f.lat AS latitude, f.lon as longitude
 					FROM forts f
@@ -519,7 +551,8 @@ 
 	// Trainers
 	//////////////
 
-	public function getTrainers($trainer_name, $team, $page, $rankingNumber) {
+	public function getTrainers($trainer_name, $team, $page, $rankingNumber)
+	{
 		$ranking = $this->getTrainerLevelRanking();
 		$where = "";
 		if (!empty(self::$config->system->trainer_blacklist)) {
@@ -571,7 +604,8 @@ 
 		return $trainers;
 	}
 
-	public function getTrainerLevelRanking() {
+	public function getTrainerLevelRanking()
+	{
 		$exclue = "";
 		if (!empty(self::$config->system->trainer_blacklist)) {
 			$exclue .= " AND owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
@@ -592,7 +626,8 @@ 
 		return $levelData;
 	}
 
-	public function getActivePokemon($trainer_name) {
+	public function getActivePokemon($trainer_name)
+	{
 		$req = "SELECT pokemon_id, cp, atk_iv AS iv_attack, sta_iv AS iv_stamina, def_iv AS iv_defense, FROM_UNIXTIME(deployment_time) AS deployment_time, '1' AS active, fort_id as gym_id, FLOOR((UNIX_TIMESTAMP() - created) / 86400) AS last_scanned
 						FROM gym_defenders
 						WHERE owner_name = '".$trainer_name."' AND fort_id IS NOT NULL
@@ -605,7 +640,8 @@ 
 		return $pokemon;
 	}
 
-	public function getInactivePokemon($trainer_name) {
+	public function getInactivePokemon($trainer_name)
+	{
 		$req = "SELECT pokemon_id, cp, atk_iv AS iv_attack, sta_iv AS iv_stamina, def_iv AS iv_defense, NULL AS deployment_time, '0' AS active, fort_id as gym_id, FLOOR((UNIX_TIMESTAMP() - created) / 86400) AS last_scanned
 					FROM gym_defenders
 					WHERE owner_name = '".$trainer_name."' AND fort_id IS NULL
@@ -618,7 +654,8 @@ 
 		return $pokemon;
 	}
 
-	public function getTrainerLevelCount($team_id) {
+	public function getTrainerLevelCount($team_id)
+	{
 		$exclue = "";
 		if (!empty(self::$config->system->trainer_blacklist)) {
 			$exclue .= " AND owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
@@ -644,7 +681,8 @@ 
 	// Cron
 	/////////
 
-	public function getPokemonCountsActive() {
+	public function getPokemonCountsActive()
+	{
 		$req = "SELECT pokemon_id, COUNT(*) as total FROM sightings WHERE expire_timestamp >= UNIX_TIMESTAMP() GROUP BY pokemon_id";
 		$result = $this->mysqli->query($req);
 		$counts = array();
@@ -654,7 +692,8 @@ 
 		return $counts;
 	}
 
-	public function getPokemonCountsLastDay() {
+	public function getPokemonCountsLastDay()
+	{
 		$req = "SELECT pokemon_id, COUNT(*) AS spawns_last_day
 					FROM sightings
 					WHERE expire_timestamp >= (SELECT MAX(expire_timestamp) - 86400 FROM sightings)
@@ -668,14 +707,16 @@ 
 		return $counts;
 	}
 
-	public function getCaptchaCount() {
+	public function getCaptchaCount()
+	{
 		$req = " SELECT COUNT(*) as total FROM accounts WHERE captchaed IS NOT NULL AND reason IS NULL";
 		$result = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		return $data;
 	}
 
-	public function getNestData($time, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude) {
+	public function getNestData($time, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
+	{
 		$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) . ")";
@@ -697,7 +738,8 @@ 
 		return $nests;
 	}
 
-	public function getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude) {
+	public function getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
+	{
 		$req = "SELECT COUNT(*) as total 
 					FROM spawnpoints 
  					WHERE lat >= ".$minLatitude." AND lat < ".$maxLatitude." AND lon >= ".$minLongitude." AND lon < ".$maxLongitude;

functions.php

Doc Comments +3 added lines

@@ -216,6 +216,9 @@
 ########################################################################
 // used in get_tree_at_depth
 ########################################################################
+/**
+ * @param boolean $correct_arrow
+ */
 function tree_check_array($array_check, $array_add, $correct_arrow) {
 	$count = count($array_check);
 	$i = 0;

Spacing +1 added lines, -1 removed lines

@@ -372,7 +372,7 @@
 			
 			$firstElePoly = $polygons[$index][0];
 			$lastElePoly = $polygons[$index][count($polygons[$index]) - 1];
-			if ($firstElePoly == $lastElePoly){
+			if ($firstElePoly == $lastElePoly) {
 				$index++;
 			}
 		}

Braces +33 added lines, -17 removed lines

@@ -181,7 +181,8 @@ 
 //
 // Retruns max depth of array
 ########################################################################
-function get_depth($arr) {
+function get_depth($arr)
+{
 	$it = new RecursiveIteratorIterator(new RecursiveArrayIterator($arr));
 	$depth = 0;
 	foreach ($it as $v) {
@@ -199,12 +200,16 @@ 
 //
 // Return all pokemon with data at a certain tree depth
 ########################################################################
-function get_tree_at_depth($trees, $depth, $max_pokemon, $currentDepth = 0) {
-	if ($depth == $currentDepth) { // Found depth
+function get_tree_at_depth($trees, $depth, $max_pokemon, $currentDepth = 0)
+{
+	if ($depth == $currentDepth) {
+// Found depth
 		return tree_remove_bellow($trees, $max_pokemon);
-	} else { // Go deeper
+	} else {
+// Go deeper
 		$arr = array();
-		foreach ($trees as $temp) { // Go into all trees
+		foreach ($trees as $temp) {
+// Go into all trees
 			$tree = $temp->evolutions;
 			$results = tree_remove_bellow(get_tree_at_depth($tree, $depth, $max_pokemon, $currentDepth + 1), $max_pokemon);
 			$arr = tree_check_array($results, $arr, $depth - $currentDepth == 1);
@@ -216,12 +221,16 @@ 
 ########################################################################
 // used in get_tree_at_depth
 ########################################################################
-function tree_check_array($array_check, $array_add, $correct_arrow) {
+function tree_check_array($array_check, $array_add, $correct_arrow)
+{
 	$count = count($array_check);
 	$i = 0;
-	if (!is_null($array_check)) { // check if exists
-		foreach ($array_check as $res) { // Check if above, equal or bellow center
-			if ($count != 1 && $correct_arrow) { // only add arrow once
+	if (!is_null($array_check)) {
+// check if exists
+		foreach ($array_check as $res) {
+// Check if above, equal or bellow center
+			if ($count != 1 && $correct_arrow) {
+// only add arrow once
 				$num = $i / ($count - 1);
 				if ($num < 0.5) {
 					$res->array_sufix = "_up";
@@ -249,7 +258,8 @@ 
 		return null;
 	}
 	$arr = array();
-	foreach ($tree as $item) { // Check if above, equal or bellow center
+	foreach ($tree as $item) {
+// Check if above, equal or bellow center
 		if ($item->id <= $max_pokemon) {
 			$arr[] = $item;
 		}
@@ -283,7 +293,8 @@ 
 ########################################################################
 // check if point is inside porygon
 ########################################################################
-function pointIsInsidePolygon($lat, $lng, $geos, $bounds) {
+function pointIsInsidePolygon($lat, $lng, $geos, $bounds)
+{
 	if ($lat >= $bounds["minlat"] && $lat <= $bounds["maxlat"] && $lng >= $bounds["minlon"] && $lng <= $bounds["maxlon"]) {
 
 		$intersections = 0;
@@ -292,15 +303,18 @@ 
 		for ($i = 1; $i < $geos_count; $i++) {
 			$geo1 = $geos[$i - 1];
 			$geo2 = $geos[$i];
-			if ($geo1['lng'] == $lng && $geo1['lat'] == $lat) { // On one of the coords
+			if ($geo1['lng'] == $lng && $geo1['lat'] == $lat) {
+// On one of the coords
 				return true;
 			}
-			if ($geo1['lng'] == $geo2['lng'] and $geo1['lng'] == $lng and $lat > min($geo1['lat'], $geo2['lat']) and $lat < max($geo1['lat'], $geo2['lat'])) { // Check if point is on an horizontal polygon boundary
+			if ($geo1['lng'] == $geo2['lng'] and $geo1['lng'] == $lng and $lat > min($geo1['lat'], $geo2['lat']) and $lat < max($geo1['lat'], $geo2['lat'])) {
+// Check if point is on an horizontal polygon boundary
 				return true;
 			}
 			if ($lng > min($geo1['lng'], $geo2['lng']) and $lng <= max($geo1['lng'], $geo2['lng']) and $lat <= max($geo1['lat'], $geo2['lat']) and $geo1['lng'] != $geo2['lng']) {
 				$xinters = ($lng - $geo1['lng']) * ($geo2['lat'] - $geo1['lat']) / ($geo2['lng'] - $geo1['lng']) + $geo1['lat'];
-				if ($xinters == $lat) { // Check if point is on the polygon boundary (other than horizontal)
+				if ($xinters == $lat) {
+// Check if point is on the polygon boundary (other than horizontal)
 					return true;
 				}
 				if ($geo1['lat'] == $geo2['lat'] || $lat <= $xinters) {
@@ -322,7 +336,8 @@ 
 ########################################################################
 // check if $boundsIn is inside (or equal to) $boundsOut
 ########################################################################
-function polyIsInsidePolygon($geoIn, $boundsIn, $geoOut, $boundsOut) {
+function polyIsInsidePolygon($geoIn, $boundsIn, $geoOut, $boundsOut)
+{
 	if ($boundsIn["minlat"] >= $boundsOut["minlat"] && $boundsIn["maxlat"] <= $boundsOut["maxlat"] && $boundsIn["minlon"] >= $boundsOut["minlon"] && $boundsIn["maxlon"] <= $boundsOut["maxlon"]) {
 		$insideCount = 0;
 		foreach ($geoIn as $coord) {
@@ -339,7 +354,8 @@ 
 ########################################################################
 // compine outer ways into porygon
 ########################################################################
-function combineOuter($outers) {
+function combineOuter($outers)
+{
 	$polygons = array();
 	$index = 0;
 	$count = 0;
@@ -372,7 +388,7 @@ 
 			
 			$firstElePoly = $polygons[$index][0];
 			$lastElePoly = $polygons[$index][count($polygons[$index]) - 1];
-			if ($firstElePoly == $lastElePoly){
+			if ($firstElePoly == $lastElePoly) {
 				$index++;
 			}
 		}

core/cron/crontabs.include.php

Braces +2 added lines, -1 removed lines

@@ -103,7 +103,8 @@
 	touch($pokedex_rarity_file);
 	// update pokedex rarity
 	include_once(SYS_PATH.'/core/cron/pokedex_rarity.cron.php');
-} elseif ( (file_update_ago($nests_parks_file) >= 43200) && (time() - $migration  >= 43200) && (time() - $migration  < 86400) ) { # extra update 12h after migration
+} elseif ( (file_update_ago($nests_parks_file) >= 43200) && (time() - $migration  >= 43200) && (time() - $migration  < 86400) ) {
+# extra update 12h after migration
 	if (is_file($nests_parks_file)) {
 		$prevNestTime = filemtime($nests_parks_file);
 	} else {

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
 // Load Query Manager
 // ###################
 
-include_once __DIR__ . '/../process/queries/QueryManager.php';
+include_once __DIR__.'/../process/queries/QueryManager.php';
 $manager = QueryManager::current();
 
 
@@ -79,7 +79,7 @@ 
 } while ($migration < new DateTime());
 $migration = $migrationPrev->getTimestamp();
 
-if ( filemtime($nests_parks_file) - $migration <= 0 ) {
+if (filemtime($nests_parks_file) - $migration <= 0) {
 	file_put_contents($nests_file, json_encode(array()));
 	file_put_contents($nests_parks_file, json_encode(array()));
 	touch($nests_parks_file, 1);
@@ -92,7 +92,7 @@ 
 	touch($pokedex_rarity_file);
 	// update pokedex rarity
 	include_once(SYS_PATH.'/core/cron/pokedex_rarity.cron.php');
-} elseif ( (file_update_ago($nests_parks_file) >= 43200) && (time() - $migration  >= 43200) && (time() - $migration  < 86400) ) { # extra update 12h after migration
+} elseif ((file_update_ago($nests_parks_file) >= 43200) && (time() - $migration >= 43200) && (time() - $migration < 86400)) { # extra update 12h after migration
 	if (is_file($nests_parks_file)) {
 		$prevNestTime = filemtime($nests_parks_file);
 	} else {
@@ -104,8 +104,8 @@ 
 	touch($nests_parks_file);
 	// update nests
 	$nestTime = 12;
-	include_once(SYS_PATH . '/core/cron/nests.cron.php');
-} elseif ( (file_update_ago($nests_parks_file) >= 86400) && (time() - $migration  >= 86400) ) {
+	include_once(SYS_PATH.'/core/cron/nests.cron.php');
+} elseif ((file_update_ago($nests_parks_file) >= 86400) && (time() - $migration >= 86400)) {
 	if (is_file($nests_parks_file)) {
 		$prevNestTime = filemtime($nests_parks_file);
 	} else {
@@ -117,5 +117,5 @@ 
 	touch($nests_parks_file);
 	// update nests
 	$nestTime = 24;
-	include_once(SYS_PATH . '/core/cron/nests.cron.php');
+	include_once(SYS_PATH.'/core/cron/nests.cron.php');
 }

core/cron/nests.cron.php

Braces +2 added lines, -1 removed lines

@@ -25,7 +25,8 @@
 		$minLongitude = $totalMinLon + $iLng * 0.5;
 		$maxLongitude = min($minLongitude + 0.5 ,$totalMaxLon);
 
-		if ($manager->getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude)->total == 0) { //Skip empty areas
+		if ($manager->getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude)->total == 0) {
+//Skip empty areas
 			$iLng++;
 			continue;
 		}

Spacing +5 added lines, -5 removed lines

@@ -23,7 +23,7 @@ 
 		$minLatitude = $totalMinLat + $iLat * 0.5;
 		$maxLatitude = min($minLatitude + 0.5, $totalMaxLat);
 		$minLongitude = $totalMinLon + $iLng * 0.5;
-		$maxLongitude = min($minLongitude + 0.5 ,$totalMaxLon);
+		$maxLongitude = min($minLongitude + 0.5, $totalMaxLon);
 
 		if ($manager->getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude)->total == 0) { //Skip empty areas
 			$iLng++;
@@ -31,7 +31,7 @@ 
 		}
 
 		// Get Parks from overpass
-		$req = '[timeout:600][out:json][date:"2017-01-22T00:00:00Z"][bbox:' . $minLatitude . ',' . $minLongitude . ',' . $maxLatitude . ',' . $maxLongitude . '];
+		$req = '[timeout:600][out:json][date:"2017-01-22T00:00:00Z"][bbox:'.$minLatitude.','.$minLongitude.','.$maxLatitude.','.$maxLongitude.'];
 				(
 					way["leisure"="park"];
 					way["leisure"="garden"];
@@ -89,8 +89,8 @@ 
 		$curl = curl_init($endpoint);
 
 		curl_setopt($curl, CURLOPT_POST, 1);
-		curl_setopt($curl, CURLOPT_POSTFIELDS, "data=" . urlencode($req));
-		curl_setopt($curl, CURLOPT_USERAGENT,"Worldopole/NestUpdater ".$config->infos->site_name);
+		curl_setopt($curl, CURLOPT_POSTFIELDS, "data=".urlencode($req));
+		curl_setopt($curl, CURLOPT_USERAGENT, "Worldopole/NestUpdater ".$config->infos->site_name);
 		curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 60);
 		curl_setopt($curl, CURLOPT_TIMEOUT, 660);
 		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
@@ -218,7 +218,7 @@ 
 			echo "Got Error 429: Trying again in 5 Minutes...\n";
 			sleep(300);
 		} else {
-			echo "Error " . $status . " while getting nests from overpass-turbo. Aborting Nest Update.\n";
+			echo "Error ".$status." while getting nests from overpass-turbo. Aborting Nest Update.\n";
 			touch($nests_parks_file, $prevNestTime);
 			exit();
 		}

core/process/locales.loader.php

Spacing +4 added lines, -4 removed lines

@@ -3,7 +3,7 @@ 
 // Load Query Manager
 // ###################
 
-include_once __DIR__ . '/queries/QueryManager.php';
+include_once __DIR__.'/queries/QueryManager.php';
 $manager = QueryManager::current();
 
 /**
@@ -26,7 +26,7 @@ 
  * @return array Sorted list of "accept" options
  */
 
-$sortAccept = function ($header) {
+$sortAccept = function($header) {
 	$matches = array();
 	foreach (explode(',', $header) as $option) {
 		$option = array_map('trim', explode(';', $option));
@@ -59,7 +59,7 @@ 
  *
  * @return string|NULL a matched option, or NULL if no match
  */
-$matchAccept = function ($header, $supported) use ($sortAccept) {
+$matchAccept = function($header, $supported) use ($sortAccept) {
 	$matches = $sortAccept($header);
 	foreach ($matches as $key => $q) {
 		if (isset($supported[$key])) {
@@ -90,7 +90,7 @@ 
  *
  * @return string The negotiated language result or the supplied default.
  */
-$negotiateLanguage = function ($supported, $default = 'en-US') use ($matchAccept) {
+$negotiateLanguage = function($supported, $default = 'en-US') use ($matchAccept) {
 	$supp = array();
 	foreach ($supported as $lang => $isSupported) {
 		if ($isSupported) {

Braces +6 added lines, -3 removed lines

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

core/process/queries/QueryManagerPostgresqlMonocleAlternate.php

Spacing +20 added lines, -20 removed lines

@@ -173,7 +173,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);
@@ -187,13 +187,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 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."
 				ORDER BY $best_order_by $best_direction, owner_name ASC
 				LIMIT 50 OFFSET 0";
 
@@ -235,9 +235,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 != "")) {
@@ -245,20 +245,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."
 					LIMIT 5000";
 		$result = pg_query($this->db, $req);
 		$spawns = array();
@@ -347,7 +347,7 @@ 
 		$req = "SELECT COUNT(f.id) AS total, ROUND(AVG(fs.total_cp))AS average_points
         			FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
-        			WHERE fs.team = '" . $team_id . "'";
+        			WHERE fs.team = '" . $team_id."'";
 		$result = pg_query($this->db, $req);
 		$data = pg_fetch_object($result);
 		return $data;
@@ -434,7 +434,7 @@ 
 	{
 		$req = "SELECT external_id AS pokemon_uid, pokemon_id, cp_now as cp, owner_name AS trainer_name
 					FROM gym_defenders
-					WHERE fort_id = '". $gym_id ."'
+					WHERE fort_id = '". $gym_id."'
 					ORDER BY deployment_time";
 		$result = $this->mysqli->query($req);
 		$pokemons = array();
@@ -454,9 +454,9 @@ 
 		$req = "SELECT f.id as gym_id, fs.team as team_id, total_cp, TO_TIMESTAMP(fs.last_modified) as last_modified, last_modified as last_modified_real
 					FROM fort_sightings fs
 					LEFT JOIN forts f ON f.id = fs.fort_id
-					WHERE f.id = '". $gym_id ."'
+					WHERE f.id = '". $gym_id."'
 					ORDER BY fs.last_modified DESC
-					LIMIT ".($pageSize+1)." OFFSET ".($page * $pageSize);
+					LIMIT ".($pageSize + 1)." OFFSET ".($page * $pageSize);
 		$result = $this->mysqli->query($req);
 		$history = array();
 		$count = 0;
@@ -488,7 +488,7 @@ 
 		$req = "SELECT ghd.defender_id, gd.pokemon_id, ghd.cp, gd.owner_name as trainer_name
 					FROM gym_history_defenders ghd
 					JOIN gym_defenders gd ON ghd.defender_id = gd.external_id
-					WHERE ghd.fort_id = '". $gym_id ."' AND date = '".$last_modified."'
+					WHERE ghd.fort_id = '". $gym_id."' AND date = '".$last_modified."'
 					ORDER BY gd.deployment_time";
 		$result = $this->mysqli->query($req);
 		$pokemons = array();
@@ -503,7 +503,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 forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
@@ -555,8 +555,8 @@ 
 						WHERE fort_id IS NOT NULL
 				  		GROUP BY owner_name
 				  	) active ON active.owner_name = gd.owner_name
-				  	WHERE level IS NOT NULL " . $where . "
-				  	GROUP BY gd.owner_name" . $order  . $limit;
+				  	WHERE level IS NOT NULL " . $where."
+				  	GROUP BY gd.owner_name" . $order.$limit;
 		$result = $this->mysqli->query($req);
 		$trainers = array();
 		while ($data = $result->fetch_object()) {
@@ -566,7 +566,7 @@ 
 			}
 			$trainers[$data->name] = $data;
 
-			$pokemon = array_merge($this->getActivePokemon($data->name),  $this->getInactivePokemon($data->name));
+			$pokemon = array_merge($this->getActivePokemon($data->name), $this->getInactivePokemon($data->name));
 
 			$trainers[$data->name]->gyms = $data->active;
 			$trainers[$data->name]->pokemons = $pokemon;
@@ -683,14 +683,14 @@ 
 	public function getNestData($time, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude) {
 		$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, MAX(s.updated) as latest_seen, coalesce(CASE WHEN MAX(duration) = 0 THEN NULL ELSE MAX(duration) END ,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()) - ".($time * 3600)."
 			            AND p.lat >= ".$minLatitude." AND p.lat < ".$maxLatitude." AND p.lon >= ".$minLongitude." AND p.lon < ".$maxLongitude."
-			          " . $pokemon_exclude_sql . "
+			          " . $pokemon_exclude_sql."
 			          GROUP BY p.spawn_id, p.pokemon_id
 			          HAVING COUNT(p.pokemon_id) >= ".($time / 4)."
 			          ORDER BY p.pokemon_id";

Braces +84 added lines, -42 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,7 +110,8 @@ 
 	}
 
 
-	function getTotalGymsForTeam($team_id) {
+	function getTotalGymsForTeam($team_id)
+	{
 		$req = "SELECT COUNT(*) AS total
 					FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
@@ -110,7 +121,8 @@ 
 		return $data;
 	}
 
-	function getRecentAll() {
+	function getRecentAll()
+	{
 		$req = "SELECT 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
@@ -126,7 +138,8 @@ 
 		return $data;
 	}
 
-	function getRecentMythic($mythic_pokemon) {
+	function getRecentMythic($mythic_pokemon)
+	{
 		$req = "SELECT 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
@@ -147,7 +160,8 @@ 
 	// Single Pokemon
 	///////////////////
 
-	function getGymsProtectedByPokemon($pokemon_id) {
+	function getGymsProtectedByPokemon($pokemon_id)
+	{
 		$req = "SELECT COUNT(f.id) AS total
 					FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
@@ -157,7 +171,8 @@ 
 		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."'
@@ -168,7 +183,8 @@ 
 		return $data;
 	}
 
-	function getTop50Pokemon($pokemon_id, $top_order_by, $top_direction) {
+	function getTop50Pokemon($pokemon_id, $top_order_by, $top_direction)
+	{
 		$req = "SELECT 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
@@ -184,7 +200,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) . "')";
@@ -205,7 +222,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." LIMIT 100000";
@@ -217,7 +235,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."' LIMIT 100000) AS pokemonFiltered
 				GROUP BY disappear_hour
@@ -233,7 +252,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;
 
@@ -268,21 +288,24 @@ 
 		return $spawns;
 	}
 
-	public function getPokemonSliderMinMax() {
+	public function getPokemonSliderMinMax()
+	{
 		$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);
 		return $data;
 	}
 
-	public function getPokemonCount($pokemon_id) {
+	public function getPokemonCount($pokemon_id)
+	{
 		$req = "SELECT count, last_seen, latitude, longitude
 					FROM pokemon_stats
 					WHERE pid = ".$pokemon_id;
@@ -291,7 +314,8 @@ 
 		return $data;
 	}
 
-	public function getRaidCount($pokemon_id) {
+	public function getRaidCount($pokemon_id)
+	{
 		$req = "SELECT count, last_seen, latitude, longitude
 					FROM raid_stats
 					WHERE pid = ".$pokemon_id;
@@ -306,14 +330,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();
@@ -328,7 +354,8 @@ 
 	// Gyms
 	/////////
 
-	function getTeamGuardians($team_id) {
+	function getTeamGuardians($team_id)
+	{
 		$req = "SELECT COUNT(*) AS total, guard_pokemon_id
 					FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
@@ -343,7 +370,8 @@ 
 		return $datas;
 	}
 
-	function getOwnedAndPoints($team_id) {
+	function getOwnedAndPoints($team_id)
+	{
 		$req = "SELECT COUNT(f.id) AS total, ROUND(AVG(fs.total_cp))AS average_points
         			FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
@@ -353,7 +381,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 (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))";
@@ -365,7 +394,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, fs.total_cp
 			FROM forts f
 			LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
@@ -376,7 +406,8 @@ 
 		return $data;
 	}
 
-	public function getGymDefenders($gym_id) {
+	public function getGymDefenders($gym_id)
+	{
 		$req = "SELECT 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."'
@@ -502,7 +533,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 forts f
@@ -523,7 +555,8 @@ 
 	// Trainers
 	//////////////
 
-	public function getTrainers($trainer_name, $team, $page, $rankingNumber) {
+	public function getTrainers($trainer_name, $team, $page, $rankingNumber)
+	{
 		$ranking = $this->getTrainerLevelRanking();
 		$where = "";
 		if (!empty(self::$config->system->trainer_blacklist)) {
@@ -575,7 +608,8 @@ 
 		return $trainers;
 	}
 
-	public function getTrainerLevelRanking() {
+	public function getTrainerLevelRanking()
+	{
 		$exclue = "";
 		if (!empty(self::$config->system->trainer_blacklist)) {
 			$exclue .= " AND owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
@@ -596,7 +630,8 @@ 
 		return $levelData;
 	}
 
-	public function getActivePokemon($trainer_name) {
+	public function getActivePokemon($trainer_name)
+	{
 		$req = "SELECT pokemon_id, cp, atk_iv AS iv_attack, sta_iv AS iv_stamina, def_iv AS iv_defense, TO_TIMESTAMP(deployment_time) AS deployment_time, '1' AS active, fort_id as gym_id, FLOOR((UNIX_TIMESTAMP() - created) / 86400) AS last_scanned
 						FROM gym_defenders
 						WHERE owner_name = '".$trainer_name."' AND fort_id IS NOT NULL
@@ -609,7 +644,8 @@ 
 		return $pokemon;
 	}
 
-	public function getInactivePokemon($trainer_name) {
+	public function getInactivePokemon($trainer_name)
+	{
 		$req = "SELECT pokemon_id, cp, atk_iv AS iv_attack, sta_iv AS iv_stamina, def_iv AS iv_defense, NULL AS deployment_time, '0' AS active, fort_id as gym_id, FLOOR((UNIX_TIMESTAMP() - created) / 86400) AS last_scanned
 					FROM gym_defenders
 					WHERE owner_name = '".$trainer_name."' AND fort_id IS NULL
@@ -622,7 +658,8 @@ 
 		return $pokemon;
 	}
 
-	public function getTrainerLevelCount($team_id) {
+	public function getTrainerLevelCount($team_id)
+	{
 		$exclue = "";
 		if (!empty(self::$config->system->trainer_blacklist)) {
 			$exclue .= " AND owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
@@ -648,7 +685,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();
@@ -658,7 +696,8 @@ 
 		return $counts;
 	}
 
-	public function getPokemonCountsLastDay() {
+	public function getPokemonCountsLastDay()
+	{
 		$req = "SELECT pokemon_id, COUNT(*) AS spawns_last_day
 					FROM sightings
 					WHERE expire_timestamp >= (SELECT MAX(expire_timestamp) - 86400 FROM sightings)
@@ -673,14 +712,16 @@ 
 	}
 
 
-	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($time, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude) {
+	public function getNestData($time, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
+	{
 		$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) . ")";
@@ -702,7 +743,8 @@ 
 		return $nests;
 	}
 
-	public function getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude) {
+	public function getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
+	{
 		$req = "SELECT COUNT(*) as total 
 					FROM spawnpoints 
  					WHERE lat >= ".$minLatitude." AND lat < ".$maxLatitude." AND lon >= ".$minLongitude." AND lon < ".$maxLongitude;

core/process/queries/QueryManagerMysqlRocketmap.php

Spacing +8 added lines, -8 removed lines

@@ -318,7 +318,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()) {
@@ -396,7 +396,7 @@ 
 
 		$limit = " LIMIT ".($page * 10).",10";
 
-		$req = "SELECT gymdetails.gym_id, name, team_id, total_cp, (6 - slots_available) as pokemon_count, (CONVERT_TZ(last_modified, '+00:00', '" . self::$time_offset . "')) as last_modified
+		$req = "SELECT gymdetails.gym_id, name, team_id, total_cp, (6 - slots_available) as pokemon_count, (CONVERT_TZ(last_modified, '+00:00', '".self::$time_offset."')) as last_modified
 				FROM gymdetails
 				LEFT JOIN gym
 				ON gymdetails.gym_id = gym.gym_id
@@ -415,7 +415,7 @@ 
 					FROM gymmember
 					LEFT JOIN gympokemon
 					ON gymmember.pokemon_uid = gympokemon.pokemon_uid
-					WHERE gymmember.gym_id = '". $gym_id ."'
+					WHERE gymmember.gym_id = '". $gym_id."'
 					ORDER BY deployment_time";
 		$result = $this->mysqli->query($req);
 		$pokemons = array();
@@ -435,7 +435,7 @@ 
 					FROM gymhistory
 					WHERE gym_id='".$gym_id."'
 					ORDER BY last_modified DESC
-					LIMIT ".($page * $pageSize).",".($pageSize+1);
+					LIMIT ".($page * $pageSize).",".($pageSize + 1);
 		$result = $this->mysqli->query($req);
 		$history = array();
 		$count = 0;
@@ -575,7 +575,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();
@@ -596,7 +596,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
@@ -611,7 +611,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
@@ -672,7 +672,7 @@ 
 			          INNER JOIN spawnpoint s ON (p.spawnpoint_id = s.id) 
 			          WHERE p.disappear_time > UTC_TIMESTAMP() - INTERVAL ".($time)." HOUR 
 			            AND p.latitude >= ".$minLatitude." AND p.latitude < ".$maxLatitude." AND p.longitude >= ".$minLongitude." AND p.longitude < ".$maxLongitude."
-			          " . $pokemon_exclude_sql . " 
+			          " . $pokemon_exclude_sql." 
 			          GROUP BY p.spawnpoint_id, p.pokemon_id 
 			          HAVING COUNT(p.pokemon_id) >= ".($time / 4)." 
 			          ORDER BY p.pokemon_id";

Braces +94 added lines, -47 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
@@ -174,7 +190,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)."')";
@@ -195,7 +212,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." LIMIT 10000";
@@ -207,7 +225,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."' LIMIT 100000) AS pokemonFiltered
@@ -224,7 +243,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;
 
@@ -257,21 +277,24 @@ 
 		return $spawns;
 	}
 
-	public function getPokemonSliderMinMax() {
+	public function getPokemonSliderMinMax()
+	{
 		$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();
 		return $data;
 	}
 
-	public function getPokemonCount($pokemon_id) {
+	public function getPokemonCount($pokemon_id)
+	{
 		$req = "SELECT count, last_seen, latitude, longitude
 					FROM pokemon_stats
 					WHERE pid = ".$pokemon_id;
@@ -280,7 +303,8 @@ 
 		return $data;
 	}
 
-	public function getRaidCount($pokemon_id) {
+	public function getRaidCount($pokemon_id)
+	{
 		$req = "SELECT count, last_seen, latitude, longitude
 					FROM raid_stats
 					WHERE pid = ".$pokemon_id;
@@ -295,14 +319,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();
@@ -317,7 +343,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();
@@ -327,14 +354,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();
@@ -344,7 +373,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
@@ -355,7 +385,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
@@ -375,7 +406,8 @@ 
 	// Gym History
 	////////////////
 
-	public function getGymHistories($gym_name, $team, $page, $ranking) {
+	public function getGymHistories($gym_name, $team, $page, $ranking)
+	{
 		$where = '';
 		if (isset($gym_name) && $gym_name != '') {
 			$where = " WHERE name LIKE '%".$gym_name."%'";
@@ -410,7 +442,8 @@ 
 		return $gym_history;
 	}
 
-	public function getGymHistoriesPokemon($gym_id) {
+	public function getGymHistoriesPokemon($gym_id)
+	{
 		$req = "SELECT DISTINCT gymmember.pokemon_uid, pokemon_id, cp, trainer_name
 					FROM gymmember
 					LEFT JOIN gympokemon
@@ -425,7 +458,8 @@ 
 		return $pokemons;
 	}
 
-	public function getHistoryForGym($page, $gym_id) {
+	public function getHistoryForGym($page, $gym_id)
+	{
 		if (isset(self::$config->system->gymhistory_hide_cp_changes) && self::$config->system->gymhistory_hide_cp_changes === true) {
 			$pageSize = 25;
 		} else {
@@ -461,7 +495,8 @@ 
 		return array("last_page" => $last_page, "data" => $history);
 	}
 
-	private function getHistoryForGymPokemon($pkm_uids) {
+	private function getHistoryForGymPokemon($pkm_uids)
+	{
 		$req = "SELECT DISTINCT pokemon_uid, pokemon_id, cp, trainer_name
 								FROM gympokemon
 								WHERE pokemon_uid IN ('".implode("','", $pkm_uids)."')
@@ -479,7 +514,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
@@ -499,7 +535,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) {
 
@@ -524,7 +561,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)."')";
@@ -545,7 +583,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)) {
@@ -586,7 +625,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)."')";
@@ -596,7 +636,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
@@ -611,7 +652,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
@@ -631,7 +673,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();
@@ -641,7 +684,8 @@ 
 		return $counts;
 	}
 
-	public function getPokemonCountsLastDay() {
+	public function getPokemonCountsLastDay()
+	{
 		$req = "SELECT pokemon_id, COUNT(*) AS spawns_last_day
 					FROM pokemon
 					WHERE disappear_time >= (SELECT MAX(disappear_time) FROM pokemon) - INTERVAL 1 DAY
@@ -655,14 +699,16 @@ 
 		return $counts;
 	}
 
-	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($time, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude) {
+	public function getNestData($time, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
+	{
 		$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).")";
@@ -684,7 +730,8 @@ 
 		return $nests;
 	}
 
-	public function getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude) {
+	public function getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
+	{
 		$req = "SELECT COUNT(*) as total 
 					FROM spawnpoint
  					WHERE latitude >= ".$minLatitude." AND latitude < ".$maxLatitude." AND longitude >= ".$minLongitude." AND longitude < ".$maxLongitude;