brusselopole / Worldopole

core/cron/pokemon.cron.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 $rarityarray = array();
 foreach ($counts as $poke_id => $total) {
 	$rarity = $pokemons->pokemon->$poke_id->rarity;
-	isset($rarityarray[$rarity]) ? $rarityarray[$rarity]+=$total : $rarityarray[$rarity]=$total;
+	isset($rarityarray[$rarity]) ? $rarityarray[$rarity] += $total : $rarityarray[$rarity] = $total;
 }
 
 // Set amount of Pokemon for each rarity to 0 if there weren't any at that time

core/cron/crontabs.include.php

Spacing +3 added lines, -3 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();
 
 
@@ -51,10 +51,10 @@ 
 	$pokedatas	= json_decode(file_get_contents($pokemonstats_file), true);
 }
 if (is_file($pokedex_counts_file)) {
-	$pokecountdatas	= json_decode(file_get_contents($pokedex_counts_file), true);
+	$pokecountdatas = json_decode(file_get_contents($pokedex_counts_file), true);
 }
 if (is_file($pokedex_raids_file)) {
-	$raiddatas	= json_decode(file_get_contents($pokedex_raids_file), true);
+	$raiddatas = json_decode(file_get_contents($pokedex_raids_file), true);
 }
 
 

core/js/trainer.graph.js.php

Indentation +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 $trainer_lvl = [];
 # For all 3 teams
 for ($teamid = 1; $teamid <= 3; $teamid++) {
-    $data = $manager->getTrainerLevelCount($teamid);
+	$data = $manager->getTrainerLevelCount($teamid);
 	$trainer_lvl[$teamid] = $data;
 }
 

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 // Load Query Manager
 // ###################
 
-include_once __DIR__ . '/../process/queries/QueryManager.php';
+include_once __DIR__.'/../process/queries/QueryManager.php';
 $manager = QueryManager::current();
 
 # Chart Graph datas	 

core/process/data.loader.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 // Load Query Manager
 // ###################
 
-include_once __DIR__ . '/queries/QueryManager.php';
+include_once __DIR__.'/queries/QueryManager.php';
 $manager = QueryManager::current();
 
 
@@ -268,7 +268,7 @@ 
 
 
 				// Gym owned and average points
-				$data	= $manager->getOwnedAndPoints($team_values->id);
+				$data = $manager->getOwnedAndPoints($team_values->id);
 
 				$teams->$team_key->gym_owned = $data->total;
 				$teams->$team_key->average = $data->average_points;

install/tester.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 // Load Query Manager
 // ###################
 
-include_once __DIR__ . '/../core/process/queries/QueryManager.php';
+include_once __DIR__.'/../core/process/queries/QueryManager.php';
 
 
 ########################################################################

core/process/queries/QueryManagerPostgresql.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/QueryManagerPostgresqlMonocleAlternate.php';
+include_once __DIR__.'/QueryManagerPostgresqlMonocleAlternate.php';
 
 
 abstract class QueryManagerPostgresql extends QueryManager {
@@ -12,7 +12,7 @@ 
 		$this->db = pg_connect("host=".SYS_DB_HOST." port=".SYS_DB_PORT." dbname=".SYS_DB_NAME." user=".SYS_DB_USER." password=".SYS_DB_PSWD);
 
 		if ($this->db === false) {
-			header('Location:' . HOST_URL . 'offline.html');
+			header('Location:'.HOST_URL.'offline.html');
 			exit();
 		}
 	}

Braces +8 added lines, -4 removed lines

@@ -3,11 +3,13 @@ 
 include_once __DIR__ . '/QueryManagerPostgresqlMonocleAlternate.php';
 
 
-abstract class QueryManagerPostgresql extends QueryManager {
+abstract class QueryManagerPostgresql extends QueryManager
+{
 
 	protected $db;
 
-	protected function __construct() {
+	protected function __construct()
+	{
 
 		$this->db = pg_connect("host=".SYS_DB_HOST." port=".SYS_DB_PORT." dbname=".SYS_DB_NAME." user=".SYS_DB_USER." password=".SYS_DB_PSWD);
 
@@ -17,7 +19,8 @@ 
 		}
 	}
 
-	public function __destruct() {
+	public function __destruct()
+	{
 		pg_close($this->db);
 	}
 
@@ -25,7 +28,8 @@ 
 	// Misc
 	/////////
 
-	public function getEcapedString($string) {
+	public function getEcapedString($string)
+	{
 		return pg_escape_string($this->db, $string);
 	}
 

core/process/queries/QueryManagerMysql.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 
-include_once __DIR__ . '/QueryManagerMysqlRocketmap.php';
-include_once __DIR__ . '/QueryManagerMysqlMonocleAlternate.php';
+include_once __DIR__.'/QueryManagerMysqlRocketmap.php';
+include_once __DIR__.'/QueryManagerMysqlMonocleAlternate.php';
 
 
 abstract class QueryManagerMysql extends QueryManager {

Braces +8 added lines, -4 removed lines

@@ -4,11 +4,13 @@ 
 include_once __DIR__ . '/QueryManagerMysqlMonocleAlternate.php';
 
 
-abstract class QueryManagerMysql extends QueryManager {
+abstract class QueryManagerMysql extends QueryManager
+{
 
 	protected $mysqli;
 
-	protected function __construct() {
+	protected function __construct()
+	{
 		$this->mysqli = new mysqli(SYS_DB_HOST, SYS_DB_USER, SYS_DB_PSWD, SYS_DB_NAME, SYS_DB_PORT);
 		if ($this->mysqli->connect_error != '') {
 			header('Location:'.HOST_URL.'offline.html');
@@ -22,7 +24,8 @@ 
 		}
 	}
 
-	public function __destruct() {
+	public function __destruct()
+	{
 		$this->mysqli->close();
 	}
 
@@ -30,7 +33,8 @@ 
 	// Misc
 	/////////
 
-	public function getEcapedString($string) {
+	public function getEcapedString($string)
+	{
 		return mysqli_real_escape_string($this->mysqli, $string);
 	}
 

core/process/queries/QueryManager.php

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-include_once __DIR__ . '/../../../config.php';
-include_once __DIR__ . '/QueryManagerMysql.php';
-include_once __DIR__ . '/QueryManagerPostgresql.php';
+include_once __DIR__.'/../../../config.php';
+include_once __DIR__.'/QueryManagerMysql.php';
+include_once __DIR__.'/QueryManagerPostgresql.php';
 
 abstract class QueryManager {
 
@@ -15,7 +15,7 @@ 
 
 		if (self::$current == null) {
 
-			$variables = realpath(dirname(__FILE__)) . '/../../json/variables.json';
+			$variables = realpath(dirname(__FILE__)).'/../../json/variables.json';
 			self::$config = json_decode(file_get_contents($variables));
 
 			include_once(SYS_PATH.'/core/process/timezone.loader.php');
@@ -37,7 +37,7 @@ 
 		}
 		return self::$current;
 	}
-	private function __construct(){}
+	private function __construct() {}
 
 	// Misc
 	abstract public function getEcapedString($string);

Braces +7 added lines, -3 removed lines

@@ -4,13 +4,15 @@ 
 include_once __DIR__ . '/QueryManagerMysql.php';
 include_once __DIR__ . '/QueryManagerPostgresql.php';
 
-abstract class QueryManager {
+abstract class QueryManager
+{
 
 	protected static $time_offset;
 	protected static $config;
 
 	private static $current;
-	public static function current() {
+	public static function current()
+	{
 		global $time_offset;
 
 		if (self::$current == null) {
@@ -37,7 +39,9 @@ 
 		}
 		return self::$current;
 	}
-	private function __construct(){}
+	private function __construct()
+	{
+}
 
 	// Misc
 	abstract public function getEcapedString($string);

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
@@ -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." ORDER BY disappear_time DESC 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."' ORDER BY disappear_time 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;
 
@@ -258,14 +278,16 @@ 
 		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();
@@ -277,14 +299,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();
@@ -299,7 +323,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();
@@ -309,14 +334,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();
@@ -326,7 +353,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
@@ -337,7 +365,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
@@ -356,7 +385,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
@@ -376,7 +406,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) {
 
@@ -401,7 +432,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)."')";
@@ -422,7 +454,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)) {
@@ -463,7 +496,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)."')";
@@ -473,7 +507,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
@@ -488,7 +523,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
@@ -508,7 +544,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();
@@ -518,7 +555,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
@@ -532,7 +570,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
@@ -550,7 +589,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
@@ -568,14 +608,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).")";