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;

core/process/queries/QueryManagerMysql.php

Spacing +2 added lines, -2 removed lines

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

Braces +8 added lines, -4 removed lines

@@ -4,11 +4,13 @@ 
 include_once __DIR__ . '/QueryManagerMonocleHydro.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/QueryManagerMonocleHydro.php

Spacing +12 added lines, -12 removed lines

@@ -157,7 +157,7 @@ 
                 cp, atk_iv+0 as individual_attack, def_iv+0 as individual_defense, sta_iv+0 as individual_stamina,
                 ROUND(100*(atk_iv+def_iv+sta_iv)/45,1) AS IV, move_1+0 as move_1, move_2, form
                 FROM sightings
-	            WHERE pokemon_id+0 = '" . $pokemon_id . "' AND move_1+0 IS NOT NULL AND move_1+0 <> '0'
+	            WHERE pokemon_id+0 = '" . $pokemon_id."' AND move_1+0 IS NOT NULL AND move_1+0 <> '0'
 	            GROUP BY encounter_id+0
 	            ORDER BY $top_order_by $top_direction, expire_timestamp+0 DESC
 	            LIMIT 0,50";
@@ -173,13 +173,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(SUM(100*((atk_iv+0)+(def_iv+0)+(sta_iv+0))/45),1) AS IV, move_1, move_2, cp+0 as cp,
                 FROM_UNIXTIME(last_modified+0) AS lasttime, last_modified+0 as last_seen
                 FROM gym_defenders
-				WHERE pokemon_id+0 = '" . $pokemon_id . "'" . $trainer_blacklist . "
+				WHERE pokemon_id+0 = '" . $pokemon_id."'".$trainer_blacklist."
 				GROUP BY external_id
 				ORDER BY $best_order_by $best_direction, owner_name+'' ASC
 				LIMIT 0,50";
@@ -222,9 +222,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 != "")) {
@@ -232,20 +232,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."
 					ORDER BY disappear_time DESC
 					LIMIT 5000";
 		$result = $this->mysqli->query($req);
@@ -314,7 +314,7 @@ 
 		$req = "SELECT COUNT(DISTINCT(fs.fort_id)) AS total, ROUND((SUM(gd.cp)) / COUNT(DISTINCT(fs.fort_id)),0) AS average_points
         			FROM fort_sightings fs
         			JOIN gym_defenders gd ON fs.fort_id = gd.fort_id
-        			WHERE fs.team = '" . $team_id . "'";
+        			WHERE fs.team = '" . $team_id."'";
 		$result = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		return $data;
@@ -461,13 +461,13 @@ 
 	public function getNestData() {
 		$pokemon_exclude_sql = "";
 		if (!empty(self::$config->system->nest_exclude_pokemon)) {
-			$pokemon_exclude_sql = "AND p.pokemon_id NOT IN (" . implode(",", self::$config->system->nest_exclude_pokemon) . ")";
+			$pokemon_exclude_sql = "AND p.pokemon_id NOT IN (".implode(",", self::$config->system->nest_exclude_pokemon).")";
 		}
 		$req = "SELECT p.pokemon_id, p.lat AS latitude, p.lon AS longitude, count(p.pokemon_id) AS total_pokemon, s.updated, coalesce(duration,30)*60 as duration
 			          FROM sightings p
 			          INNER JOIN spawnpoints s ON (p.spawn_id = s.spawn_id)
 			          WHERE p.expire_timestamp > UNIX_TIMESTAMP() - 86400
-			          " . $pokemon_exclude_sql . "
+			          " . $pokemon_exclude_sql."
 			          GROUP BY p.spawn_id, p.pokemon_id
 			          HAVING COUNT(p.pokemon_id) >= 6
 			          ORDER BY p.pokemon_id";

Braces +76 added lines, -38 removed lines

@@ -1,12 +1,15 @@ 
 <?php
 
-class QueryManagerMonocleHydro extends QueryManagerMysql {
+class QueryManagerMonocleHydro extends QueryManagerMysql
+{
 
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 	}
 
-	public function __destruct() {
+	public function __destruct()
+	{
 		parent::__destruct();
 	}
 
@@ -14,7 +17,8 @@ 
 	// TesterF
 	///////////
 
-	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,14 +104,16 @@ 
 	}
 
 
-	function getTotalGymsForTeam($team_id) {
+	function getTotalGymsForTeam($team_id)
+	{
 		$req = "SELECT COUNT(*) AS total FROM fort_sightings WHERE team = '$team_id'";
 		$result = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		return $data;
 	}
 
-	function getRecentAll() {
+	function getRecentAll()
+	{
 		$req = "SELECT DISTINCT pokemon_id, encounter_id, FROM_UNIXTIME(expire_timestamp) AS disappear_time, FROM_UNIXTIME(updated+0) 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
@@ -117,7 +129,8 @@ 
 		return $data;
 	}
 
-	function getRecentMythic($mythic_pokemon) {
+	function getRecentMythic($mythic_pokemon)
+	{
 		$req = "SELECT DISTINCT pokemon_id as pokemon_id, CONCAT('A', encounter_id) as encounter_id, FROM_UNIXTIME(expire_timestamp) AS disappear_time, FROM_UNIXTIME(updated+0) 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
@@ -138,14 +151,16 @@ 
 	// Single Pokemon
 	///////////////////
 
-	function getGymsProtectedByPokemon($pokemon_id) {
+	function getGymsProtectedByPokemon($pokemon_id)
+	{
 		$req = "SELECT COUNT(DISTINCT(fort_id)) AS total FROM fort_sightings WHERE guard_pokemon_id = '".$pokemon_id."'";
 		$result = $this->mysqli->query($req);
 		$data = $result->fetch_object();
 		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."'
@@ -156,7 +171,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+0) AS distime, pokemon_id+0 as pokemon_id, FROM_UNIXTIME(expire_timestamp+0) as disappear_time, lat as latitude, lon as longitude,
                 cp, atk_iv+0 as individual_attack, def_iv+0 as individual_defense, sta_iv+0 as individual_stamina,
                 ROUND(100*(atk_iv+def_iv+sta_iv)/45,1) AS IV, move_1+0 as 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 owner_name NOT IN ('" . implode("','", self::$config->system->trainer_blacklist) . "')";
@@ -196,7 +213,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." ORDER BY expire_timestamp DESC LIMIT 100000";
@@ -208,7 +226,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."' ORDER BY disappear_time LIMIT 100000) AS pokemonFiltered
 				GROUP BY disappear_hour
@@ -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 expire_timestamp >= UNIX_TIMESTAMP() AND pokemon_id = " . $pokemon_id;
 
@@ -260,14 +280,16 @@ 
 		return $spawns;
 	}
 
-	public function getPokemonSliederMinMax() {
+	public function getPokemonSliederMinMax()
+	{
 		$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();
@@ -280,14 +302,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();
@@ -302,7 +326,8 @@ 
 	// Gyms
 	/////////
 
-	function getTeamGuardians($team_id) {
+	function getTeamGuardians($team_id)
+	{
 		$req = "SELECT COUNT(*) AS total, guard_pokemon_id FROM fort_sightings WHERE team = '".$team_id."' GROUP BY guard_pokemon_id ORDER BY total DESC LIMIT 0,3";
 		$result = $this->mysqli->query($req);
 
@@ -314,7 +339,8 @@ 
 		return $datas;
 	}
 
-	function getOwnedAndPoints($team_id) {
+	function getOwnedAndPoints($team_id)
+	{
 		$req = "SELECT COUNT(DISTINCT(fs.fort_id)) AS total, ROUND((SUM(gd.cp)) / COUNT(DISTINCT(fs.fort_id)),0) AS average_points
         			FROM fort_sightings fs
         			JOIN gym_defenders gd ON fs.fort_id = gd.fort_id
@@ -324,7 +350,8 @@ 
 		return $data;
 	}
 
-	function getAllGyms() {
+	function getAllGyms()
+	{
 		$req = "SELECT f.id as gym_id, team as team_id, f.lat as latitude, f.lon as longitude, updated as last_scanned, (6 - fs.slots_available) AS level FROM forts f LEFT JOIN fort_sightings fs ON f.id = fs.fort_id;";
 		$result = $this->mysqli->query($req);
 		$gyms = array();
@@ -334,7 +361,8 @@ 
 		return $gyms;
 	}
 
-	public function getGymData($gym_id) {
+	public function getGymData($gym_id)
+	{
 		$gym_id = $this->mysqli->real_escape_string($_GET['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, SUM(gd.cp) as total_cp	
 			FROM fort_sightings fs
@@ -346,7 +374,8 @@ 
 		return $data;
 	}
 
-	public function getGymDefenders($gym_id) {
+	public function getGymDefenders($gym_id)
+	{
 		$req = "SELECT DISTINCT external_id as pokemon_uid, pokemon_id, atk_iv as iv_attack, def_iv as iv_defense, sta_iv as iv_stamina, cp, fort_id as gym_id
 			FROM gym_defenders 
 			WHERE fort_id='".$gym_id."'
@@ -364,7 +393,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 raids r 
@@ -385,11 +415,13 @@ 
 	// Trainers
 	//////////////
 
-	public function getTrainers($trainer_name, $team, $page, $ranking) {
+	public function getTrainers($trainer_name, $team, $page, $ranking)
+	{
 		return array(); // Waiting for Monocle to store level
 	}
 
-	public function getTrainerLevelCount($team_id) {
+	public function getTrainerLevelCount($team_id)
+	{
 		$levelData = array();
 		for ($i = 5; $i <= 40; $i++) {
 			if (!isset($levelData[$i])) {
@@ -404,7 +436,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();
@@ -414,7 +447,8 @@ 
 		return $counts;
 	}
 
-	public function getPoekmonCountsLastDay() {
+	public function getPoekmonCountsLastDay()
+	{
 		$req = "SELECT pokemon_id, COUNT(*) AS spawns_last_day
 					FROM sightings
 					WHERE FROM_UNIXTIME(expire_timestamp) >= (SELECT FROM_UNIXTIME(MAX(expire_timestamp)) FROM sightings) - INTERVAL 1 DAY
@@ -428,7 +462,8 @@ 
 		return $counts;
 	}
 
-	public function getPokemonSinceLastUpdate($pokemon_id, $last_update) {
+	public function getPokemonSinceLastUpdate($pokemon_id, $last_update)
+	{
 		$req = "SELECT COUNT(*) AS count, MAX(expire_timestamp) AS last_timestamp, (FROM_UNIXTIME(MAX(expire_timestamp))) AS disappear_time_real, lat as latitude, lon as longitude
 					FROM sightings
 					WHERE pokemon_id = '".$pokemon_id."' && expire_timestamp > '".$last_update."'";
@@ -437,7 +472,8 @@ 
 		return $data;
 	}
 
-	public function getRaidsSinceLastUpdate($pokemon_id, $last_update) {
+	public function getRaidsSinceLastUpdate($pokemon_id, $last_update)
+	{
 		$where = "WHERE pokemon_id = '".$pokemon_id."' && time_battle > '".$last_update."'";
 		$req = "SELECT time_battle AS start_timestamp, time_end as end, (FROM_UNIXTIME(time_end)) AS end_time_real, lat as latitude, lon as longitude, count
 					FROM raids r
@@ -455,14 +491,16 @@ 
 		return $data;
 	}
 
-	public function getCaptchaCount() {
+	public function getCaptchaCount()
+	{
 		$req = " SELECT COUNT(*) as total FROM accounts WHERE captchaed IS NOT NULL AND reason IS NULL";
 		$result = $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) . ")";

core/process/aru.php

Switch Indentation +309 added lines, -309 removed lines

@@ -59,118 +59,118 @@ 
 	//
 	############################
 
-	case 'home_update':
-		$values = [];
-		// Right now
-		// ---------
-		$data = $manager->getTotalPokemon();
-		$values[] = $data->total;
+		case 'home_update':
+			$values = [];
+			// Right now
+			// ---------
+			$data = $manager->getTotalPokemon();
+			$values[] = $data->total;
 
-		// Lured stops
-		// -----------
-		$data = $manager->getTotalLures();
-		$values[] = $data->total;
+			// Lured stops
+			// -----------
+			$data = $manager->getTotalLures();
+			$values[] = $data->total;
 
-		// Active Raids
-		// -----------
-		$data = $manager->getTotalRaids();
-		$values[] = $data->total;
+			// Active Raids
+			// -----------
+			$data = $manager->getTotalRaids();
+			$values[] = $data->total;
 
-		// Team battle
-		// -----------
-		$data = $manager->getTotalGyms();
-		$values[] = $data->total;
+			// Team battle
+			// -----------
+			$data = $manager->getTotalGyms();
+			$values[] = $data->total;
 
-		// Red
-		$data = $manager->getTotalGymsForTeam(2);
-		$values[] = $data->total;
+			// Red
+			$data = $manager->getTotalGymsForTeam(2);
+			$values[] = $data->total;
 
-		// Blue
-		$data = $manager->getTotalGymsForTeam(1);
-		$values[] = $data->total;
+			// Blue
+			$data = $manager->getTotalGymsForTeam(1);
+			$values[] = $data->total;
 
-		// Yellow
-		$data = $manager->getTotalGymsForTeam(3);
-		$values[] = $data->total;
+			// Yellow
+			$data = $manager->getTotalGymsForTeam(3);
+			$values[] = $data->total;
 
-		// Neutral
-		$data = $manager->getTotalGymsForTeam(0);
-		$values[] = $data->total;
+			// Neutral
+			$data = $manager->getTotalGymsForTeam(0);
+			$values[] = $data->total;
 
 
-		header('Content-Type: application/json');
-		echo json_encode($values);
+			header('Content-Type: application/json');
+			echo json_encode($values);
 
-		break;
+			break;
 
 
-	####################################
-	//
-	// Update latests spawn on homepage
-	//
-	####################################
+		####################################
+		//
+		// Update latests spawn on homepage
+		//
+		####################################
 
-	case 'spawnlist_update':
-		// Recent spawn
-		// ------------
-		$total_spawns = array();
-		$last_uid_param = "";
-		if (isset($_GET['last_uid'])) {
-			$last_uid_param = $_GET['last_uid'];
-		}
-		if ($config->system->recents_filter) {
-			// get all mythic pokemon ids
-			$mythic_pokemons = array();
-			foreach ($pokemons->pokemon as $id => $pokemon) {
-				if ($pokemon->spawn_rate < $config->system->recents_filter_rarity && $pokemon->rating >= $config->system->recents_filter_rating) {
-					$mythic_pokemons[] = $id;
-				}
+		case 'spawnlist_update':
+			// Recent spawn
+			// ------------
+			$total_spawns = array();
+			$last_uid_param = "";
+			if (isset($_GET['last_uid'])) {
+				$last_uid_param = $_GET['last_uid'];
 			}
+			if ($config->system->recents_filter) {
+				// get all mythic pokemon ids
+				$mythic_pokemons = array();
+				foreach ($pokemons->pokemon as $id => $pokemon) {
+					if ($pokemon->spawn_rate < $config->system->recents_filter_rarity && $pokemon->rating >= $config->system->recents_filter_rating) {
+						$mythic_pokemons[] = $id;
+					}
+				}
 
-			// get last mythic pokemon
-			$result = $manager->getRecentMythic($mythic_pokemons);
-		} else {
-			// get last pokemon
-			$result = $manager->getRecentAll();
-		}
+				// get last mythic pokemon
+				$result = $manager->getRecentMythic($mythic_pokemons);
+			} else {
+				// get last pokemon
+				$result = $manager->getRecentAll();
+			}
 
-		if (count($result) > 0) {
-			foreach ($result as $data) {
-				$new_spawn = array();
-				$pokeid = $data->pokemon_id;
-				$pokeuid = $data->encounter_id;
-
-				if ($last_uid_param != $pokeuid) {
-					$last_seen = strtotime($data->disappear_time_real);
-
-					$location_link = isset($config->system->location_url) ? $config->system->location_url : 'https://maps.google.com/?q={latitude},{longitude}&ll={latitude},{longitude}&z=16';
-					$location_link = str_replace('{latitude}', $data->latitude, $location_link);
-					$location_link = str_replace('{longitude}', $data->longitude, $location_link);
-
-					if ($config->system->recents_encounter_details) {
-						$encdetails = new stdClass();
-						$encdetails->cp = $data->cp;
-						$encdetails->attack = $data->individual_attack;
-						$encdetails->defense = $data->individual_defense;
-						$encdetails->stamina = $data->individual_stamina;
-						if (isset($encdetails->cp) && isset($encdetails->attack) && isset($encdetails->defense) && isset($encdetails->stamina)) {
-							$encdetails->available = true;
-						} else {
-							$encdetails->available = false;
+			if (count($result) > 0) {
+				foreach ($result as $data) {
+					$new_spawn = array();
+					$pokeid = $data->pokemon_id;
+					$pokeuid = $data->encounter_id;
+
+					if ($last_uid_param != $pokeuid) {
+						$last_seen = strtotime($data->disappear_time_real);
+
+						$location_link = isset($config->system->location_url) ? $config->system->location_url : 'https://maps.google.com/?q={latitude},{longitude}&ll={latitude},{longitude}&z=16';
+						$location_link = str_replace('{latitude}', $data->latitude, $location_link);
+						$location_link = str_replace('{longitude}', $data->longitude, $location_link);
+
+						if ($config->system->recents_encounter_details) {
+							$encdetails = new stdClass();
+							$encdetails->cp = $data->cp;
+							$encdetails->attack = $data->individual_attack;
+							$encdetails->defense = $data->individual_defense;
+							$encdetails->stamina = $data->individual_stamina;
+							if (isset($encdetails->cp) && isset($encdetails->attack) && isset($encdetails->defense) && isset($encdetails->stamina)) {
+								$encdetails->available = true;
+							} else {
+								$encdetails->available = false;
+							}
 						}
-					}
 
-					$html = '
+						$html = '
                     <div class="col-md-1 col-xs-4 pokemon-single" data-pokeid="' . $pokeid . '" data-pokeuid="' . $pokeuid . '" style="display: none;">
                     <a href="pokemon/' . $pokeid . '"><img src="' . $pokemons->pokemon->$pokeid->img . '" alt="' . $pokemons->pokemon->$pokeid->name . '" class="img-responsive"></a>
                     <a href="pokemon/' . $pokeid . '"><p class="pkmn-name">' . $pokemons->pokemon->$pokeid->name . '</p></a>
                     <a href="' . $location_link . '" target="_blank">
                         <small class="pokemon-timer">00:00:00</small>
                     </a>';
-					if ($config->system->recents_encounter_details) {
-						if ($encdetails->available) {
-							if ($config->system->iv_numbers) {
-								$html .= '
+						if ($config->system->recents_encounter_details) {
+							if ($encdetails->available) {
+								if ($config->system->iv_numbers) {
+									$html .= '
                                 <div class="progress" style="height: 15px; margin-bottom: 0">
                                     <div title="' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $encdetails->attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px">
                                         <span class="sr-only">' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '</span>' . $encdetails->attack . '
@@ -182,8 +182,8 @@ 
                                         <span class="sr-only">' . $locales->IV_STAMINA . ': ' . $encdetails->stamina . '</span>' . $encdetails->stamina . '
                                     </div>
                                 </div>';
-							} else {
-								$html .= '
+								} else {
+									$html .= '
                                 <div class="progress" style="height: 6px; width: 80%; margin: 5px auto 0 auto">
                                 <div title="' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $encdetails->attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $encdetails->attack) / 3) . '%">
                                         <span class="sr-only">' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '</span>
@@ -195,11 +195,11 @@ 
                                         <span class="sr-only">' . $locales->IV_STAMINA . ': ' . $encdetails->stamina . '</span>
                                 </div>
                                 </div>';
-							}
-							$html .= '<small>' . $encdetails->cp . '</small>';
-						} else {
-							if ($config->system->iv_numbers) {
-								$html .= '
+								}
+								$html .= '<small>' . $encdetails->cp . '</small>';
+							} else {
+								if ($config->system->iv_numbers) {
+									$html .= '
                                 <div class="progress" style="height: 15px; margin-bottom: 0">
                                     <div title="' . $locales->IV_ATTACK . ': not available" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $encdetails->attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px">
                                         <span class="sr-only">' . $locales->IV_ATTACK . ': ' . $locales->NOT_AVAILABLE . '</span>?
@@ -211,116 +211,116 @@ 
                                         <span class="sr-only">' . $locales->IV_STAMINA . ': ' . $locales->NOT_AVAILABLE . '</span>?
                                     </div>
                                 </div>';
-							} else {
-								$html .= '
+								} else {
+									$html .= '
                             <div class="progress" style="height: 6px; width: 80%; margin: 5px auto 0 auto">
                                 <div title="IV not available" class="progress-bar" role="progressbar" style="width: 100%; background-color: rgb(210,210,210)" aria-valuenow="1" aria-valuemin="0" aria-valuemax="1">
                                     <span class="sr-only">IV ' . $locales->NOT_AVAILABLE . '</span>
                                 </div>
                             </div>';
+								}
+								$html .= '<small>???</small>';
 							}
-							$html .= '<small>???</small>';
 						}
-					}
-					$html .= '
+						$html .= '
                     </div>';
-					$new_spawn['html'] = $html;
-					$countdown = $last_seen - time();
-					$new_spawn['countdown'] = $countdown;
-					$new_spawn['pokemon_uid'] = $pokeuid;
-					$total_spawns[] = $new_spawn;
-				} else {
-					break;
+						$new_spawn['html'] = $html;
+						$countdown = $last_seen - time();
+						$new_spawn['countdown'] = $countdown;
+						$new_spawn['pokemon_uid'] = $pokeuid;
+						$total_spawns[] = $new_spawn;
+					} else {
+						break;
+					}
 				}
 			}
-		}
 
-		header('Content-Type: application/json');
-		echo json_encode($total_spawns);
+			header('Content-Type: application/json');
+			echo json_encode($total_spawns);
 
-		break;
+			break;
 
 
-	####################################
-	//
-	// List Pokestop
-	//
-	####################################
+		####################################
+		//
+		// List Pokestop
+		//
+		####################################
 
-	case 'pokestop':
-		$datas = $manager->getAllPokestops();
+		case 'pokestop':
+			$datas = $manager->getAllPokestops();
 
-		$pokestops = [];
-		foreach ($datas as $data) {
-			if ($data->lure_expiration >= $data->now) {
-				$icon = 'pokestap_lured.png';
-				$text = sprintf($locales->POKESTOPS_MAP_LURED, date('H:i:s', strtotime($data->lure_expiration_real)));
-				$lured = true;
-			} else {
-				$icon = 'pokestap.png';
-				$text = $locales->POKESTOPS_MAP_REGULAR;
-				$lured = false;
-			}
+			$pokestops = [];
+			foreach ($datas as $data) {
+				if ($data->lure_expiration >= $data->now) {
+					$icon = 'pokestap_lured.png';
+					$text = sprintf($locales->POKESTOPS_MAP_LURED, date('H:i:s', strtotime($data->lure_expiration_real)));
+					$lured = true;
+				} else {
+					$icon = 'pokestap.png';
+					$text = $locales->POKESTOPS_MAP_REGULAR;
+					$lured = false;
+				}
 
-			$pokestops[] = [
-				$text,
-				$icon,
-				$data->latitude,
-				$data->longitude,
-				$lured
-			];
-		}
+				$pokestops[] = [
+					$text,
+					$icon,
+					$data->latitude,
+					$data->longitude,
+					$lured
+				];
+			}
 
-		header('Content-Type: application/json');
-		echo json_encode($pokestops);
+			header('Content-Type: application/json');
+			echo json_encode($pokestops);
 
-		break;
+			break;
 
 
-	####################################
-	//
-	// Update data for the gym battle
-	//
-	####################################
+		####################################
+		//
+		// Update data for the gym battle
+		//
+		####################################
 
-	case 'update_gym':
-		$teams = new stdClass();
-		$teams->mystic = 1;
-		$teams->valor = 2;
-		$teams->instinct = 3;
+		case 'update_gym':
+			$teams = new stdClass();
+			$teams->mystic = 1;
+			$teams->valor = 2;
+			$teams->instinct = 3;
 
-		foreach ($teams as $team_name => $team_id) {
+			foreach ($teams as $team_name => $team_id) {
 
-			$data	= $manager->getOwnedAndPoints($team_id);
+				$data	= $manager->getOwnedAndPoints($team_id);
 
-			$return[] = $data->total;
-			$return[] = $data->average_points;
-		}
+				$return[] = $data->total;
+				$return[] = $data->average_points;
+			}
 
-		header('Content-Type: application/json');
-		echo json_encode($return);
+			header('Content-Type: application/json');
+			echo json_encode($return);
 
-		break;
+			break;
 
 
-	####################################
-	//
-	// Get datas for the gym map
-	//
-	####################################
+		####################################
+		//
+		// Get datas for the gym map
+		//
+		####################################
 
 
-	case 'gym_map':
-		$datas = $manager->getAllGyms();
+		case 'gym_map':
+			$datas = $manager->getAllGyms();
 
-		$gyms = [];
-		foreach ($datas as $data) {
-			// Team
-			// 1 = bleu
-			// 2 = rouge
-			// 3 = jaune
+			$gyms = [];
+			foreach ($datas as $data) {
+				// Team
+				// 1 = bleu
+				// 2 = rouge
+				// 3 = jaune
 
-			switch ($data->team_id) {
+				switch ($data->team_id) {
 				case 0:
 					$icon	= 'map_white.png';
 					$team	= 'No Team (yet)';
@@ -344,7 +344,7 @@ 
 					$team	= 'Team Instinct';
 					$color = 'rgba(254, 217, 40, .6)';
 					break;
-			}
+				}
 
 			if ($data->team_id != 0) {
 				$icon .= $data->level.".png";
@@ -370,37 +370,37 @@ 
 	//
 	####################################
 
-	case 'gym_defenders':
-		$gym_id = $manager->getEcapedString($_GET['gym_id']);
+		case 'gym_defenders':
+			$gym_id = $manager->getEcapedString($_GET['gym_id']);
 
-		$data = $manager->getGymData($gym_id);
-		$gymData['gymDetails']['gymInfos'] = false;
+			$data = $manager->getGymData($gym_id);
+			$gymData['gymDetails']['gymInfos'] = false;
 
-		if (!is_null($data)) {
-			$gymData['gymDetails']['gymInfos']['name'] = $data->name;
-			$gymData['gymDetails']['gymInfos']['description'] = $data->description;
-			if ($data->url == null) {
-				$gymData['gymDetails']['gymInfos']['url'] = '';
-			} else {
-				$gymData['gymDetails']['gymInfos']['url'] = $data->url;
-			}
-			$gymData['gymDetails']['gymInfos']['points'] = $data->total_cp;
-			$gymData['gymDetails']['gymInfos']['level'] = $data->level;
-			$gymData['gymDetails']['gymInfos']['last_scanned'] = $data->last_scanned;
-			$gymData['gymDetails']['gymInfos']['team'] = $data->team;
-			$gymData['gymDetails']['gymInfos']['guardPokemonId'] = $data->guard_pokemon_id;
-
-			// Skip Query if team is none
-			if ($data->team > 0) {
-				$datas = $manager->getGymDefenders($gym_id);
-				$gymData['infoWindow'] = '
+			if (!is_null($data)) {
+				$gymData['gymDetails']['gymInfos']['name'] = $data->name;
+				$gymData['gymDetails']['gymInfos']['description'] = $data->description;
+				if ($data->url == null) {
+					$gymData['gymDetails']['gymInfos']['url'] = '';
+				} else {
+					$gymData['gymDetails']['gymInfos']['url'] = $data->url;
+				}
+				$gymData['gymDetails']['gymInfos']['points'] = $data->total_cp;
+				$gymData['gymDetails']['gymInfos']['level'] = $data->level;
+				$gymData['gymDetails']['gymInfos']['last_scanned'] = $data->last_scanned;
+				$gymData['gymDetails']['gymInfos']['team'] = $data->team;
+				$gymData['gymDetails']['gymInfos']['guardPokemonId'] = $data->guard_pokemon_id;
+
+				// Skip Query if team is none
+				if ($data->team > 0) {
+					$datas = $manager->getGymDefenders($gym_id);
+					$gymData['infoWindow'] = '
 				<div class="gym_defenders">
 				';
-				foreach ($datas as $data) {
-					$gymData['gymDetails']['pokemons'][] = $data;
-					$pokemon_id = $data->pokemon_id;
-					if ($config->system->iv_numbers) {
-						$gymData['infoWindow'] .= '
+					foreach ($datas as $data) {
+						$gymData['gymDetails']['pokemons'][] = $data;
+						$pokemon_id = $data->pokemon_id;
+						if ($config->system->iv_numbers) {
+							$gymData['infoWindow'] .= '
 					<div style="text-align: center; width: 50px; display: inline-block; margin-right: 3px">
 						<a href="pokemon/' . $data->pokemon_id . '">
 						<img src="' . $pokemons->pokemon->$pokemon_id->img . '" height="50" style="display:inline-block" >
@@ -418,8 +418,8 @@ 
 								</div>
 							</div>
 						</div>';
-					} else {
-						$gymData['infoWindow'] .= '
+						} else {
+							$gymData['infoWindow'] .= '
 					<div style="text-align: center; width: 50px; display: inline-block; margin-right: 3px">
 						<a href="pokemon/' . $data->pokemon_id . '">
 						<img src="' . $pokemons->pokemon->$pokemon_id->img . '" height="50" style="display:inline-block" >
@@ -437,148 +437,148 @@ 
 							</div>
 						</div>
 					</div>';
+						}
 					}
 				}
 			}
-		}
-
-		$gymData['infoWindow'] = $gymData['infoWindow'].'</div>';
 
-		header('Content-Type: application/json');
-		echo json_encode($gymData);
+			$gymData['infoWindow'] = $gymData['infoWindow'].'</div>';
 
-		break;
+			header('Content-Type: application/json');
+			echo json_encode($gymData);
 
+			break;
 
-	case 'trainer':
-		$name = "";
-		$page = "0";
-		$team = 0;
-		$ranking = 0;
-		if (isset($_GET['name'])) {
-			$trainer_name = $manager->getEcapedString($_GET['name']);
-		}
-		if (isset($_GET['team'])) {
-			$team = $manager->getEcapedString($_GET['team']);
-		}
-		if (isset($_GET['page'])) {
-			$page = $manager->getEcapedString($_GET['page']);
-		}
-		if (isset($_GET['ranking'])) {
-			$ranking = $manager->getEcapedString($_GET['ranking']);
-		}
 
-		$trainers = $manager->getTrainers($trainer_name, $team, $page, $ranking);
-		$json = array();
-		$json['trainers'] = $trainers;
-		$locale = array();
-		$locale["today"] = $locales->TODAY;
-		$locale["day"] = $locales->DAY;
-		$locale["days"] = $locales->DAYS;
-		$locale["ivAttack"] = $locales->IV_ATTACK;
-		$locale["ivDefense"] = $locales->IV_DEFENSE;
-		$locale["ivStamina"] = $locales->IV_STAMINA;
-		$json['locale'] = $locale;
+		case 'trainer':
+			$name = "";
+			$page = "0";
+			$team = 0;
+			$ranking = 0;
+			if (isset($_GET['name'])) {
+				$trainer_name = $manager->getEcapedString($_GET['name']);
+			}
+			if (isset($_GET['team'])) {
+				$team = $manager->getEcapedString($_GET['team']);
+			}
+			if (isset($_GET['page'])) {
+				$page = $manager->getEcapedString($_GET['page']);
+			}
+			if (isset($_GET['ranking'])) {
+				$ranking = $manager->getEcapedString($_GET['ranking']);
+			}
 
-		header('Content-Type: application/json');
-		echo json_encode($json);
+			$trainers = $manager->getTrainers($trainer_name, $team, $page, $ranking);
+			$json = array();
+			$json['trainers'] = $trainers;
+			$locale = array();
+			$locale["today"] = $locales->TODAY;
+			$locale["day"] = $locales->DAY;
+			$locale["days"] = $locales->DAYS;
+			$locale["ivAttack"] = $locales->IV_ATTACK;
+			$locale["ivDefense"] = $locales->IV_DEFENSE;
+			$locale["ivStamina"] = $locales->IV_STAMINA;
+			$json['locale'] = $locale;
 
-		break;
+			header('Content-Type: application/json');
+			echo json_encode($json);
 
+			break;
 
-	case 'raids':
-		$page = "0";
-		if (isset($_GET['page'])) {
-			$page = $manager->getEcapedString($_GET['page']);
-		}
 
-		$datas = $manager->getAllRaids($page);
-		$i = 1;
-		foreach ($datas as $data) {
-			$data->starttime = date("H:i", strtotime($data->start));
-			$data->endtime = date("H:i", strtotime($data->end));
-			$data->gym_id = str_replace('.', '_', $data->gym_id);
-			if (isset($data->move_1)) {
-				$move1 = $data->move_1;
-				$data->quick_move = $move->$move1->name;
-			} else {
-				$data->quick_move = "?";
+		case 'raids':
+			$page = "0";
+			if (isset($_GET['page'])) {
+				$page = $manager->getEcapedString($_GET['page']);
 			}
-			if (isset($data->move_2)) {
-				$move2 = $data->move_2;
-				$data->charge_move = $move->$move2->name;
-			} else {
-				$data->charge_move = "?";
+
+			$datas = $manager->getAllRaids($page);
+			$i = 1;
+			foreach ($datas as $data) {
+				$data->starttime = date("H:i", strtotime($data->start));
+				$data->endtime = date("H:i", strtotime($data->end));
+				$data->gym_id = str_replace('.', '_', $data->gym_id);
+				if (isset($data->move_1)) {
+					$move1 = $data->move_1;
+					$data->quick_move = $move->$move1->name;
+				} else {
+					$data->quick_move = "?";
+				}
+				if (isset($data->move_2)) {
+					$move2 = $data->move_2;
+					$data->charge_move = $move->$move2->name;
+				} else {
+					$data->charge_move = "?";
+				}
+				$raids[10*$page + $i] = $data;
+				$i++;
 			}
-			$raids[10*$page + $i] = $data;
-			$i++;
-		}
-		$json = array();
-		$json['raids'] = $raids;
-		$locale = array();
-		$locale['noraids'] = $locales->RAIDS_NONE;
-		$json['locale'] = $locale;
+			$json = array();
+			$json['raids'] = $raids;
+			$locale = array();
+			$locale['noraids'] = $locales->RAIDS_NONE;
+			$json['locale'] = $locale;
 
-		header('Content-Type: application/json');
-		echo json_encode($json);
+			header('Content-Type: application/json');
+			echo json_encode($json);
 
-		break;
+			break;
 
-	case 'pokemon_slider_init':
-		$bounds		= $manager->getPokemonSliederMinMax();
+		case 'pokemon_slider_init':
+			$bounds		= $manager->getPokemonSliederMinMax();
 
-		header('Content-Type: application/json');
-		echo json_encode($bounds);
+			header('Content-Type: application/json');
+			echo json_encode($bounds);
 
-		break;
+			break;
 
 
-	case 'pokemon_heatmap_points':
-		$json = "";
-		if (isset($_GET['start']) && isset($_GET['end']) && isset($_GET['pokemon_id'])) {
-			$start = date("Y-m-d H:i", (int) $_GET['start']);
-			$end = date("Y-m-d H:i", (int) $_GET['end']);
-			$pokemon_id = $manager->getEcapedString($_GET['pokemon_id']);
-			$points = $manager->getPokemonHeatmap($pokemon_id, $start, $end);
+		case 'pokemon_heatmap_points':
+			$json = "";
+			if (isset($_GET['start']) && isset($_GET['end']) && isset($_GET['pokemon_id'])) {
+				$start = date("Y-m-d H:i", (int) $_GET['start']);
+				$end = date("Y-m-d H:i", (int) $_GET['end']);
+				$pokemon_id = $manager->getEcapedString($_GET['pokemon_id']);
+				$points = $manager->getPokemonHeatmap($pokemon_id, $start, $end);
 
-			$json = json_encode($points);
-		}
+				$json = json_encode($points);
+			}
 
-		header('Content-Type: application/json');
-		echo $json;
-		break;
+			header('Content-Type: application/json');
+			echo $json;
+			break;
 
 
-	case 'maps_localization_coordinates':
-		$coordinates = $manager->getMapsCoords();
+		case 'maps_localization_coordinates':
+			$coordinates = $manager->getMapsCoords();
 
-		header('Content-Type: application/json');
-		echo json_encode($coordinates);
+			header('Content-Type: application/json');
+			echo json_encode($coordinates);
 
-		break;
+			break;
 
 
-	case 'pokemon_graph_data':
-		$json = "";
-		if (isset($_GET['pokemon_id'])) {
-			$pokemon_id = $manager->getEcapedString($_GET['pokemon_id']);
-			$array = $manager->getPokemonGraph($pokemon_id);
+		case 'pokemon_graph_data':
+			$json = "";
+			if (isset($_GET['pokemon_id'])) {
+				$pokemon_id = $manager->getEcapedString($_GET['pokemon_id']);
+				$array = $manager->getPokemonGraph($pokemon_id);
 
-			$json = json_encode($array);
-		}
+				$json = json_encode($array);
+			}
 
-		header('Content-Type: application/json');
-		echo $json;
-		break;
+			header('Content-Type: application/json');
+			echo $json;
+			break;
 
 
-	case 'postRequest':
-		break;
+		case 'postRequest':
+			break;
 
-	default:
-		echo "What do you mean?";
-		exit();
-	break;
+		default:
+			echo "What do you mean?";
+			exit();
+		break;
 }
 
 if ($postRequest != "") {

Spacing +46 added lines, -46 removed lines

@@ -40,7 +40,7 @@ 
 // Load Query Manager
 // ###################
 
-include_once __DIR__ . '/queries/QueryManager.php';
+include_once __DIR__.'/queries/QueryManager.php';
 $manager = QueryManager::current();
 
 $request = "";
@@ -161,10 +161,10 @@ 
 					}
 
 					$html = '
-                    <div class="col-md-1 col-xs-4 pokemon-single" data-pokeid="' . $pokeid . '" data-pokeuid="' . $pokeuid . '" style="display: none;">
-                    <a href="pokemon/' . $pokeid . '"><img src="' . $pokemons->pokemon->$pokeid->img . '" alt="' . $pokemons->pokemon->$pokeid->name . '" class="img-responsive"></a>
-                    <a href="pokemon/' . $pokeid . '"><p class="pkmn-name">' . $pokemons->pokemon->$pokeid->name . '</p></a>
-                    <a href="' . $location_link . '" target="_blank">
+                    <div class="col-md-1 col-xs-4 pokemon-single" data-pokeid="' . $pokeid.'" data-pokeuid="'.$pokeuid.'" style="display: none;">
+                    <a href="pokemon/' . $pokeid.'"><img src="'.$pokemons->pokemon->$pokeid->img.'" alt="'.$pokemons->pokemon->$pokeid->name.'" class="img-responsive"></a>
+                    <a href="pokemon/' . $pokeid.'"><p class="pkmn-name">'.$pokemons->pokemon->$pokeid->name.'</p></a>
+                    <a href="' . $location_link.'" target="_blank">
                         <small class="pokemon-timer">00:00:00</small>
                     </a>';
 					if ($config->system->recents_encounter_details) {
@@ -172,50 +172,50 @@ 
 							if ($config->system->iv_numbers) {
 								$html .= '
                                 <div class="progress" style="height: 15px; margin-bottom: 0">
-                                    <div title="' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $encdetails->attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px">
-                                        <span class="sr-only">' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '</span>' . $encdetails->attack . '
+                                    <div title="' . $locales->IV_ATTACK.': '.$encdetails->attack.'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$encdetails->attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px">
+                                        <span class="sr-only">' . $locales->IV_ATTACK.': '.$encdetails->attack.'</span>'.$encdetails->attack.'
                                     </div>
-                                    <div title="' . $locales->IV_DEFENSE . ': ' . $encdetails->defense . '" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="' . $encdetails->defense . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px">
-                                        <span class="sr-only">' . $locales->IV_DEFENSE . ': ' . $encdetails->defense . '</span>' . $encdetails->defense . '
+                                    <div title="' . $locales->IV_DEFENSE.': '.$encdetails->defense.'" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$encdetails->defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px">
+                                        <span class="sr-only">' . $locales->IV_DEFENSE.': '.$encdetails->defense.'</span>'.$encdetails->defense.'
                                     </div>
-                                    <div title="' . $locales->IV_STAMINA . ': ' . $encdetails->stamina . '" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="' . $encdetails->stamina . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px">
-                                        <span class="sr-only">' . $locales->IV_STAMINA . ': ' . $encdetails->stamina . '</span>' . $encdetails->stamina . '
+                                    <div title="' . $locales->IV_STAMINA.': '.$encdetails->stamina.'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$encdetails->stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px">
+                                        <span class="sr-only">' . $locales->IV_STAMINA.': '.$encdetails->stamina.'</span>'.$encdetails->stamina.'
                                     </div>
                                 </div>';
 							} else {
 								$html .= '
                                 <div class="progress" style="height: 6px; width: 80%; margin: 5px auto 0 auto">
-                                <div title="' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $encdetails->attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $encdetails->attack) / 3) . '%">
-                                        <span class="sr-only">' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '</span>
+                                <div title="' . $locales->IV_ATTACK.': '.$encdetails->attack.'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$encdetails->attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $encdetails->attack) / 3).'%">
+                                        <span class="sr-only">' . $locales->IV_ATTACK.': '.$encdetails->attack.'</span>
                                 </div>
-                                <div title="' . $locales->IV_DEFENSE . ': ' . $encdetails->defense . '" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="' . $encdetails->defense . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $encdetails->defense) / 3) . '%">
-                                        <span class="sr-only">' . $locales->IV_DEFENSE . ': ' . $encdetails->defense . '</span>
+                                <div title="' . $locales->IV_DEFENSE.': '.$encdetails->defense.'" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$encdetails->defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $encdetails->defense) / 3).'%">
+                                        <span class="sr-only">' . $locales->IV_DEFENSE.': '.$encdetails->defense.'</span>
                                 </div>
-                                <div title="' . $locales->IV_STAMINA . ': ' . $encdetails->stamina . '" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="' . $encdetails->stamina . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $encdetails->stamina) / 3) . '%">
-                                        <span class="sr-only">' . $locales->IV_STAMINA . ': ' . $encdetails->stamina . '</span>
+                                <div title="' . $locales->IV_STAMINA.': '.$encdetails->stamina.'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$encdetails->stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $encdetails->stamina) / 3).'%">
+                                        <span class="sr-only">' . $locales->IV_STAMINA.': '.$encdetails->stamina.'</span>
                                 </div>
                                 </div>';
 							}
-							$html .= '<small>' . $encdetails->cp . '</small>';
+							$html .= '<small>'.$encdetails->cp.'</small>';
 						} else {
 							if ($config->system->iv_numbers) {
 								$html .= '
                                 <div class="progress" style="height: 15px; margin-bottom: 0">
-                                    <div title="' . $locales->IV_ATTACK . ': not available" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $encdetails->attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px">
-                                        <span class="sr-only">' . $locales->IV_ATTACK . ': ' . $locales->NOT_AVAILABLE . '</span>?
+                                    <div title="' . $locales->IV_ATTACK.': not available" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$encdetails->attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px">
+                                        <span class="sr-only">' . $locales->IV_ATTACK.': '.$locales->NOT_AVAILABLE.'</span>?
                                     </div>
-                                    <div title="' . $locales->IV_DEFENSE . ': not available" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="' . $encdetails->defense . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px">
-                                        <span class="sr-only">' . $locales->IV_DEFENSE . ': ' . $locales->NOT_AVAILABLE . '</span>?
+                                    <div title="' . $locales->IV_DEFENSE.': not available" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$encdetails->defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px">
+                                        <span class="sr-only">' . $locales->IV_DEFENSE.': '.$locales->NOT_AVAILABLE.'</span>?
                                     </div>
-                                    <div title="' . $locales->IV_STAMINA . ': not available" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="' . $encdetails->stamina . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px">
-                                        <span class="sr-only">' . $locales->IV_STAMINA . ': ' . $locales->NOT_AVAILABLE . '</span>?
+                                    <div title="' . $locales->IV_STAMINA.': not available" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$encdetails->stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px">
+                                        <span class="sr-only">' . $locales->IV_STAMINA.': '.$locales->NOT_AVAILABLE.'</span>?
                                     </div>
                                 </div>';
 							} else {
 								$html .= '
                             <div class="progress" style="height: 6px; width: 80%; margin: 5px auto 0 auto">
                                 <div title="IV not available" class="progress-bar" role="progressbar" style="width: 100%; background-color: rgb(210,210,210)" aria-valuenow="1" aria-valuemin="0" aria-valuemax="1">
-                                    <span class="sr-only">IV ' . $locales->NOT_AVAILABLE . '</span>
+                                    <span class="sr-only">IV ' . $locales->NOT_AVAILABLE.'</span>
                                 </div>
                             </div>';
 							}
@@ -291,7 +291,7 @@ 
 
 		foreach ($teams as $team_name => $team_id) {
 
-			$data	= $manager->getOwnedAndPoints($team_id);
+			$data = $manager->getOwnedAndPoints($team_id);
 
 			$return[] = $data->total;
 			$return[] = $data->average_points;
@@ -402,38 +402,38 @@ 
 					if ($config->system->iv_numbers) {
 						$gymData['infoWindow'] .= '
 					<div style="text-align: center; width: 50px; display: inline-block; margin-right: 3px">
-						<a href="pokemon/' . $data->pokemon_id . '">
-						<img src="' . $pokemons->pokemon->$pokemon_id->img . '" height="50" style="display:inline-block" >
+						<a href="pokemon/' . $data->pokemon_id.'">
+						<img src="' . $pokemons->pokemon->$pokemon_id->img.'" height="50" style="display:inline-block" >
 						</a>
-						<p class="pkmn-name">' . $data->cp . '</p>
+						<p class="pkmn-name">' . $data->cp.'</p>
 						<div class="progress" style="height: 12px; margin-bottom: 0">
-							<div title="' . $locales->IV_ATTACK . ': ' . $data->iv_attack . '" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $data->iv_attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 13px; font-size: 11px">
-								<span class="sr-only">' . $locales->IV_ATTACK . ' : ' . $data->iv_attack . '</span>' . $data->iv_attack . '
+							<div title="' . $locales->IV_ATTACK.': '.$data->iv_attack.'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$data->iv_attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 13px; font-size: 11px">
+								<span class="sr-only">' . $locales->IV_ATTACK.' : '.$data->iv_attack.'</span>'.$data->iv_attack.'
 								</div>
-								<div title="' . $locales->IV_DEFENSE . ': ' . $data->iv_defense . '" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="' . $data->iv_defense . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 13px; font-size: 11px">
-									<span class="sr-only">' . $locales->IV_DEFENSE . ' : ' . $data->iv_defense . '</span>' . $data->iv_defense . '
+								<div title="' . $locales->IV_DEFENSE.': '.$data->iv_defense.'" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$data->iv_defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 13px; font-size: 11px">
+									<span class="sr-only">' . $locales->IV_DEFENSE.' : '.$data->iv_defense.'</span>'.$data->iv_defense.'
 								</div>
-								<div title="' . $locales->IV_STAMINA . ': ' . $data->iv_stamina . '" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="' . $data->iv_stamina . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 13px; font-size: 11px">
-									<span class="sr-only">' . $locales->IV_STAMINA . ' : ' . $data->iv_stamina . '</span>' . $data->iv_stamina . '
+								<div title="' . $locales->IV_STAMINA.': '.$data->iv_stamina.'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$data->iv_stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 13px; font-size: 11px">
+									<span class="sr-only">' . $locales->IV_STAMINA.' : '.$data->iv_stamina.'</span>'.$data->iv_stamina.'
 								</div>
 							</div>
 						</div>';
 					} else {
 						$gymData['infoWindow'] .= '
 					<div style="text-align: center; width: 50px; display: inline-block; margin-right: 3px">
-						<a href="pokemon/' . $data->pokemon_id . '">
-						<img src="' . $pokemons->pokemon->$pokemon_id->img . '" height="50" style="display:inline-block" >
+						<a href="pokemon/' . $data->pokemon_id.'">
+						<img src="' . $pokemons->pokemon->$pokemon_id->img.'" height="50" style="display:inline-block" >
 						</a>
-						<p class="pkmn-name">' . $data->cp . '</p>
+						<p class="pkmn-name">' . $data->cp.'</p>
 						<div class="progress" style="height: 4px; width: 40px; margin-bottom: 10px; margin-top: 2px; margin-left: auto; margin-right: auto">
-							<div title="' . $locales->IV_ATTACK . ': ' . $data->iv_attack . '" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $data->iv_attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $data->iv_attack) / 3) . '%">
-								<span class="sr-only">' . $locales->IV_ATTACK . ': ' . $data->iv_attack . '</span>
+							<div title="' . $locales->IV_ATTACK.': '.$data->iv_attack.'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$data->iv_attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $data->iv_attack) / 3).'%">
+								<span class="sr-only">' . $locales->IV_ATTACK.': '.$data->iv_attack.'</span>
 							</div>
-							<div title="' . $locales->IV_DEFENSE . ': ' . $data->iv_defense . '" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="' . $data->iv_defense . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $data->iv_defense) / 3) . '%">
-								<span class="sr-only">' . $locales->IV_DEFENSE . ': ' . $data->iv_defense . '</span>
+							<div title="' . $locales->IV_DEFENSE.': '.$data->iv_defense.'" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$data->iv_defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $data->iv_defense) / 3).'%">
+								<span class="sr-only">' . $locales->IV_DEFENSE.': '.$data->iv_defense.'</span>
 							</div>
-							<div title="' . $locales->IV_STAMINA . ': ' . $data->iv_stamina . '" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="' . $data->iv_stamina . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $data->iv_stamina) / 3) . '%">
-								<span class="sr-only">' . $locales->IV_STAMINA . ': ' . $data->iv_stamina . '</span>
+							<div title="' . $locales->IV_STAMINA.': '.$data->iv_stamina.'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$data->iv_stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $data->iv_stamina) / 3).'%">
+								<span class="sr-only">' . $locales->IV_STAMINA.': '.$data->iv_stamina.'</span>
 							</div>
 						</div>
 					</div>';
@@ -510,7 +510,7 @@ 
 			} else {
 				$data->charge_move = "?";
 			}
-			$raids[10*$page + $i] = $data;
+			$raids[10 * $page + $i] = $data;
 			$i++;
 		}
 		$json = array();
@@ -525,7 +525,7 @@ 
 		break;
 
 	case 'pokemon_slider_init':
-		$bounds		= $manager->getPokemonSliederMinMax();
+		$bounds = $manager->getPokemonSliederMinMax();
 
 		header('Content-Type: application/json');
 		echo json_encode($bounds);

core/process/queries/QueryManager.php

Spacing +4 added lines, -4 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-include_once __DIR__ . '/../../../config.php';
-include_once __DIR__ . '/QueryManagerMysql.php';
+include_once __DIR__.'/../../../config.php';
+include_once __DIR__.'/QueryManagerMysql.php';
 
 abstract class QueryManager {
 
@@ -14,7 +14,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');
@@ -32,7 +32,7 @@ 
 		}
 		return self::$current;
 	}
-	private function __construct(){}
+	private function __construct() {}
 
 	// Misc
 	abstract public function getEcapedString($string);

Braces +7 added lines, -3 removed lines

@@ -3,13 +3,15 @@ 
 include_once __DIR__ . '/../../../config.php';
 include_once __DIR__ . '/QueryManagerMysql.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) {
@@ -32,7 +34,9 @@ 
 		}
 		return self::$current;
 	}
-	private function __construct(){}
+	private function __construct()
+	{
+}
 
 	// Misc
 	abstract public function getEcapedString($string);

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';
 
 
 ########################################################################