brusselopole / Worldopole

pages/pokemon.page.php

Braces +1 added lines, -2 removed lines

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

core/process/queries/QueryManagerPostgresql.php

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

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

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/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 {

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;
 		}

functions.php

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/process/locales.loader.php

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

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;