brusselopole / Worldopole

core/process/aru.php

Switch Indentation +340 added lines, -340 removed lines

@@ -58,150 +58,150 @@ 
 	//
 	############################
 
-	case 'home_update':
-		// Right now
-		// ---------
+		case 'home_update':
+			// Right now
+			// ---------
 
-		$req 		= "SELECT COUNT(*) as total FROM pokemon WHERE disappear_time >= UTC_TIMESTAMP()";
-		$result 	= $mysqli->query($req);
-		$data 		= $result->fetch_object();
+			$req 		= "SELECT COUNT(*) as total FROM pokemon WHERE disappear_time >= UTC_TIMESTAMP()";
+			$result 	= $mysqli->query($req);
+			$data 		= $result->fetch_object();
 
-		$values[] 	= $data->total;
+			$values[] 	= $data->total;
 
 
-		// Lured stops
-		// -----------
+			// Lured stops
+			// -----------
 
-		$req 		= "SELECT COUNT(*) as total FROM pokestop WHERE lure_expiration >= UTC_TIMESTAMP()";
-		$result 	= $mysqli->query($req);
-		$data 		= $result->fetch_object();
+			$req 		= "SELECT COUNT(*) as total FROM pokestop WHERE lure_expiration >= UTC_TIMESTAMP()";
+			$result 	= $mysqli->query($req);
+			$data 		= $result->fetch_object();
 
-		$values[] 	= $data->total;
+			$values[] 	= $data->total;
 
 
 
-		// Team battle
-		// -----------
+			// Team battle
+			// -----------
 
-		$req 		= "SELECT count( DISTINCT(gym_id) ) as total FROM gym";
-		$result 	= $mysqli->query($req);
-		$data 		= $result->fetch_object();
+			$req 		= "SELECT count( DISTINCT(gym_id) ) as total FROM gym";
+			$result 	= $mysqli->query($req);
+			$data 		= $result->fetch_object();
 
-		$values[] 	= $data->total;
+			$values[] 	= $data->total;
 
-		// Team
-		// 1 = bleu
-		// 2 = rouge
-		// 3 = jaune
+			// Team
+			// 1 = bleu
+			// 2 = rouge
+			// 3 = jaune
 
-		$req	= "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '2'  ";
-		$result	= $mysqli->query($req);
-		$data	= $result->fetch_object();
+			$req	= "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '2'  ";
+			$result	= $mysqli->query($req);
+			$data	= $result->fetch_object();
 
-		// Red
-		$values[] = $data->total;
+			// Red
+			$values[] = $data->total;
 
 
-		$req	= "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '1'  ";
-		$result	= $mysqli->query($req);
-		$data	= $result->fetch_object();
+			$req	= "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '1'  ";
+			$result	= $mysqli->query($req);
+			$data	= $result->fetch_object();
 
-		// Blue
-		$values[] = $data->total;
+			// Blue
+			$values[] = $data->total;
 
 
-		$req	= "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '3'  ";
-		$result	= $mysqli->query($req);
-		$data	= $result->fetch_object();
+			$req	= "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '3'  ";
+			$result	= $mysqli->query($req);
+			$data	= $result->fetch_object();
 
-		// Yellow
-		$values[] = $data->total;
+			// Yellow
+			$values[] = $data->total;
 
-		$req	= "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '0'  ";
-		$result	= $mysqli->query($req);
-		$data	= $result->fetch_object();
+			$req	= "SELECT count( DISTINCT(gym_id) ) as total FROM gym WHERE team_id = '0'  ";
+			$result	= $mysqli->query($req);
+			$data	= $result->fetch_object();
 
-		// Neutral
-		$values[] = $data->total;
+			// Neutral
+			$values[] = $data->total;
 
 
-		header('Content-Type: application/json');
-		$json = json_encode($values);
+			header('Content-Type: application/json');
+			$json = json_encode($values);
 
-		echo $json;
+			echo $json;
 
 
-		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
-			$req		= "SELECT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) as disappear_time_real, latitude, longitude, individual_attack, individual_defense, individual_stamina FROM pokemon
+				// get last mythic pokemon
+				$req		= "SELECT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) as disappear_time_real, latitude, longitude, individual_attack, individual_defense, individual_stamina FROM pokemon
                         WHERE pokemon_id IN (".implode(",", $mythic_pokemons).")
                         ORDER BY last_modified DESC LIMIT 0,12";
-		} else {
-			// get last pokemon
-			$req		= "SELECT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) as disappear_time_real, latitude, longitude, individual_attack, individual_defense, individual_stamina FROM pokemon ORDER BY last_modified DESC LIMIT 0,12";
-		}
-		$result = $mysqli->query($req);
-		while ($data = $result->fetch_object()) {
-			$new_spawn = array();
-			$pokeid = $data->pokemon_id;
-			$pokeuid = $data->encounter_id;
-
-			if ($last_uid_param != $pokeuid) {
-				$last_seen = strtotime($data->disappear_time_real);
-
-				$last_location = new stdClass();
-				$last_location->latitude = $data->latitude;
-				$last_location->longitude = $data->longitude;
-
-				if ($config->system->recents_show_iv) {
-					$iv = new stdClass();
-					$iv->attack = $data->individual_attack;
-					$iv->defense = $data->individual_defense;
-					$iv->stamina = $data->individual_stamina;
-					if (isset($iv->attack) && isset($iv->defense) && isset($iv->stamina)) {
-						$iv->available = true;
-					} else {
-						$iv->available = false;
+			} else {
+				// get last pokemon
+				$req		= "SELECT pokemon_id, encounter_id, disappear_time, last_modified, (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) as disappear_time_real, latitude, longitude, individual_attack, individual_defense, individual_stamina FROM pokemon ORDER BY last_modified DESC LIMIT 0,12";
+			}
+			$result = $mysqli->query($req);
+			while ($data = $result->fetch_object()) {
+				$new_spawn = array();
+				$pokeid = $data->pokemon_id;
+				$pokeuid = $data->encounter_id;
+
+				if ($last_uid_param != $pokeuid) {
+					$last_seen = strtotime($data->disappear_time_real);
+
+					$last_location = new stdClass();
+					$last_location->latitude = $data->latitude;
+					$last_location->longitude = $data->longitude;
+
+					if ($config->system->recents_show_iv) {
+						$iv = new stdClass();
+						$iv->attack = $data->individual_attack;
+						$iv->defense = $data->individual_defense;
+						$iv->stamina = $data->individual_stamina;
+						if (isset($iv->attack) && isset($iv->defense) && isset($iv->stamina)) {
+							$iv->available = true;
+						} else {
+							$iv->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="core/pokemons/'.$pokeid.$config->system->pokeimg_suffix.'" 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="https://maps.google.com/?q='.$last_location->latitude.','.$last_location->longitude.'&ll='.$last_location->latitude.','.$last_location->longitude.'&z=16" target="_blank">
 				    <small class="pokemon-timer">00:00:00</small>
 				</a>';
-				if ($config->system->recents_show_iv) {
-					if ($iv->available) {
-						if ($config->system->iv_numbers) {
-							$html .= '
+					if ($config->system->recents_show_iv) {
+						if ($iv->available) {
+							if ($config->system->iv_numbers) {
+								$html .= '
 							<div class="progress" style="height: 15px; margin-bottom: 0">
 								<div title="Attack IV: '. $iv->attack .'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'. $iv->attack .'" aria-valuemin="0" aria-valuemax="45" style="width: '. (100/3)  .'%; line-height: 16px";>
 									<span class="sr-only">Attack IV: '. $iv->attack .'</span>'. $iv->attack .'
@@ -213,8 +213,8 @@ 
 									<span class="sr-only">Stamina IV: '. $iv->stamina .'</span>'. $iv->stamina .'
 								</div>
 							</div>';
-						} else {
-							$html .= '
+							} else {
+								$html .= '
 							<div class="progress" style="height: 6px; width: 80%; margin: 5px auto 0 auto;">
 					    		<div title="Attack IV: '. $iv->attack .'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'. $iv->attack .'" aria-valuemin="0" aria-valuemax="45" style="width: '. ((100/15)*$iv->attack)/3 .'%">
 									<span class="sr-only">Attack IV: '. $iv->attack .'</span>
@@ -226,10 +226,10 @@ 
 									<span class="sr-only">Stamina IV: '. $iv->stamina .'</span>
 					    		</div>
 							</div>';
-						}
-					} else {
-						if ($config->system->iv_numbers) {
-							$html .= '
+							}
+						} else {
+							if ($config->system->iv_numbers) {
+								$html .= '
 							<div class="progress" style="height: 15px; margin-bottom: 0">
 								<div title="Attack IV: not available" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'. $iv->attack .'" aria-valuemin="0" aria-valuemax="45" style="width: '. (100/3)  .'%; line-height: 16px";>
 									<span class="sr-only">Attack IV: not available</span>?
@@ -241,125 +241,125 @@ 
 									<span class="sr-only">Stamina IV: not available</span>?
 								</div>
 							</div>';
-						} else {
-						$html .= '
+							} else {
+							$html .= '
 					    <div class="progress" style="height: 6px; width: 80%; margin: 5px auto 15px 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 not available</span>
 						    </div>
 					    </div>';
+							}
 						}
 					}
-				}
-				$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);
-		break;
+			header('Content-Type: application/json');
+			echo json_encode($total_spawns);
+			break;
 
 
 
-	####################################
-	//
-	// List Pokestop
-	//
-	####################################
+		####################################
+		//
+		// List Pokestop
+		//
+		####################################
 
-	case 'pokestop':
-		$req 		= "SELECT latitude, longitude, lure_expiration, UTC_TIMESTAMP() as now, (CONVERT_TZ(lure_expiration, '+00:00', '".$time_offset."')) as lure_expiration_real FROM pokestop";
-		$result 	= $mysqli->query($req);
+		case 'pokestop':
+			$req 		= "SELECT latitude, longitude, lure_expiration, UTC_TIMESTAMP() as now, (CONVERT_TZ(lure_expiration, '+00:00', '".$time_offset."')) as lure_expiration_real FROM pokestop";
+			$result 	= $mysqli->query($req);
 
-		$i=0;
+			$i=0;
 
-		while ($data = $result->fetch_object()) {
-			if ($data->lure_expiration >= $data->now) {
-				$icon = 'pokestap_lured.png';
-				$text = 'Lured expire @ '.date('H:i:s', strtotime($data->lure_expiration_real)) ;
-			} else {
-				$icon = 'pokestap.png';
-				$text = 'Normal stop';
-			}
+			while ($data = $result->fetch_object()) {
+				if ($data->lure_expiration >= $data->now) {
+					$icon = 'pokestap_lured.png';
+					$text = 'Lured expire @ '.date('H:i:s', strtotime($data->lure_expiration_real)) ;
+				} else {
+					$icon = 'pokestap.png';
+					$text = 'Normal stop';
+				}
 
-			$temp[$i][] = $text;
-			$temp[$i][] = $icon;
-			$temp[$i][] = $data->latitude;
-			$temp[$i][] = $data->longitude;
-			$temp[$i][] = $i;
+				$temp[$i][] = $text;
+				$temp[$i][] = $icon;
+				$temp[$i][] = $data->latitude;
+				$temp[$i][] = $data->longitude;
+				$temp[$i][] = $i;
 
-			$temp_json[] = json_encode($temp[$i]);
+				$temp_json[] = json_encode($temp[$i]);
 
 
-			$i++;
-		}
+				$i++;
+			}
 
-		$return = json_encode($temp_json);
+			$return = json_encode($temp_json);
 
-		echo $return;
+			echo $return;
 
-		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) {
-			$req	= "SELECT COUNT(DISTINCT(gym_id)) as total, ROUND(AVG(gym_points),0) as average_points FROM gym WHERE team_id = '".$team_id."'  ";
-			$result	= $mysqli->query($req);
-			$data	= $result->fetch_object();
+			foreach ($teams as $team_name => $team_id) {
+				$req	= "SELECT COUNT(DISTINCT(gym_id)) as total, ROUND(AVG(gym_points),0) as average_points FROM gym WHERE team_id = '".$team_id."'  ";
+				$result	= $mysqli->query($req);
+				$data	= $result->fetch_object();
 
-			$return[] 	= $data->total;
-			$return[]	= $data->average_points;
-		}
+				$return[] 	= $data->total;
+				$return[]	= $data->average_points;
+			}
 
-		$json = json_encode($return);
+			$json = json_encode($return);
 
-		header('Content-Type: application/json');
-		echo $json;
+			header('Content-Type: application/json');
+			echo $json;
 
 
-		break;
+			break;
 
-	####################################
-	//
-	// Get datas for the gym map
-	//
-	####################################
+		####################################
+		//
+		// Get datas for the gym map
+		//
+		####################################
 
 
-	case 'gym_map':
-		$req 		= "SELECT gym_id, team_id, guard_pokemon_id, gym_points, latitude, longitude, (CONVERT_TZ(last_scanned, '+00:00', '".$time_offset."')) as last_scanned FROM gym";
-		$result 	= $mysqli->query($req);
+		case 'gym_map':
+			$req 		= "SELECT gym_id, team_id, guard_pokemon_id, gym_points, latitude, longitude, (CONVERT_TZ(last_scanned, '+00:00', '".$time_offset."')) as last_scanned FROM gym";
+			$result 	= $mysqli->query($req);
 
 
-		$i=0;
+			$i=0;
 
-		while ($data = $result->fetch_object()) {
-			// Team
-			// 1 = bleu
-			// 2 = rouge
-			// 3 = jaune
+			while ($data = $result->fetch_object()) {
+				// 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)';
@@ -383,7 +383,7 @@ 
 					$team	= 'Team Instinct';
 					$color	= 'rgba(254, 217, 40, .6)';
 					break;
-			}
+				}
 
 			// Set gym level
 			$data->gym_level=0;
@@ -455,65 +455,65 @@ 
 	//
 	####################################
 
-	case 'gym_defenders':
-		$gym_id = $mysqli->real_escape_string($_GET['gym_id']);
-		$req 		= "SELECT gymdetails.name as name, gymdetails.description as description, gym.gym_points as points, gymdetails.url as url, gym.team_id as team, (CONVERT_TZ(gym.last_scanned, '+00:00', '".$time_offset."')) as last_scanned, gym.guard_pokemon_id as guard_pokemon_id FROM gymdetails LEFT JOIN gym on gym.gym_id = gymdetails.gym_id WHERE gym.gym_id='".$gym_id."'";
-		$result 	= $mysqli->query($req);
-		$gymData['gymDetails']['gymInfos'] = false;
-		while ($data = $result->fetch_object()) {
-			$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->points;
-			$gymData['gymDetails']['gymInfos']['level'] = 0;
-			$gymData['gymDetails']['gymInfos']['last_scanned'] = $data->last_scanned;
-			$gymData['gymDetails']['gymInfos']['team'] = $data->team;
-			$gymData['gymDetails']['gymInfos']['guardPokemonId'] = $data->guard_pokemon_id;
-			if ($data->points < 2000) {
-				$gymData['gymDetails']['gymInfos']['level']=1;
-			} elseif ($data->points < 4000) {
-				$gymData['gymDetails']['gymInfos']['level']=2;
-			} elseif ($data->points < 8000) {
-				$gymData['gymDetails']['gymInfos']['level']=3;
-			} elseif ($data->points < 12000) {
-				$gymData['gymDetails']['gymInfos']['level']=4;
-			} elseif ($data->points < 16000) {
-				$gymData['gymDetails']['gymInfos']['level']=5;
-			} elseif ($data->points < 20000) {
-				$gymData['gymDetails']['gymInfos']['level']=6;
-			} elseif ($data->points < 30000) {
-				$gymData['gymDetails']['gymInfos']['level']=7;
-			} elseif ($data->points < 40000) {
-				$gymData['gymDetails']['gymInfos']['level']=8;
-			} elseif ($data->points < 50000) {
-				$gymData['gymDetails']['gymInfos']['level']=9;
-			} else {
-				$gymData['gymDetails']['gymInfos']['level']=10;
+		case 'gym_defenders':
+			$gym_id = $mysqli->real_escape_string($_GET['gym_id']);
+			$req 		= "SELECT gymdetails.name as name, gymdetails.description as description, gym.gym_points as points, gymdetails.url as url, gym.team_id as team, (CONVERT_TZ(gym.last_scanned, '+00:00', '".$time_offset."')) as last_scanned, gym.guard_pokemon_id as guard_pokemon_id FROM gymdetails LEFT JOIN gym on gym.gym_id = gymdetails.gym_id WHERE gym.gym_id='".$gym_id."'";
+			$result 	= $mysqli->query($req);
+			$gymData['gymDetails']['gymInfos'] = false;
+			while ($data = $result->fetch_object()) {
+				$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->points;
+				$gymData['gymDetails']['gymInfos']['level'] = 0;
+				$gymData['gymDetails']['gymInfos']['last_scanned'] = $data->last_scanned;
+				$gymData['gymDetails']['gymInfos']['team'] = $data->team;
+				$gymData['gymDetails']['gymInfos']['guardPokemonId'] = $data->guard_pokemon_id;
+				if ($data->points < 2000) {
+					$gymData['gymDetails']['gymInfos']['level']=1;
+				} elseif ($data->points < 4000) {
+					$gymData['gymDetails']['gymInfos']['level']=2;
+				} elseif ($data->points < 8000) {
+					$gymData['gymDetails']['gymInfos']['level']=3;
+				} elseif ($data->points < 12000) {
+					$gymData['gymDetails']['gymInfos']['level']=4;
+				} elseif ($data->points < 16000) {
+					$gymData['gymDetails']['gymInfos']['level']=5;
+				} elseif ($data->points < 20000) {
+					$gymData['gymDetails']['gymInfos']['level']=6;
+				} elseif ($data->points < 30000) {
+					$gymData['gymDetails']['gymInfos']['level']=7;
+				} elseif ($data->points < 40000) {
+					$gymData['gymDetails']['gymInfos']['level']=8;
+				} elseif ($data->points < 50000) {
+					$gymData['gymDetails']['gymInfos']['level']=9;
+				} else {
+					$gymData['gymDetails']['gymInfos']['level']=10;
+				}
 			}
-		}
-		//print_r($gymData);
-		$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"
-				. " HAVING gymmember.gym_id='".$gym_id."' ORDER BY cp DESC";
-		$result 	= $mysqli->query($req);
-		$i=0;
+			//print_r($gymData);
+			$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"
+					. " HAVING gymmember.gym_id='".$gym_id."' ORDER BY cp DESC";
+			$result 	= $mysqli->query($req);
+			$i=0;
 
 
 
-		$gymData['infoWindow'] = '
+			$gymData['infoWindow'] = '
 			<div class="gym_defenders">
 			';
-		while ($data = $result->fetch_object()) {
-			$gymData['gymDetails']['pokemons'][] = $data;
-			if ($data != false) {
-				if ($config->system->iv_numbers) {
-					$gymData['infoWindow'] .= '
+			while ($data = $result->fetch_object()) {
+				$gymData['gymDetails']['pokemons'][] = $data;
+				if ($data != false) {
+					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="core/pokemons/'.$data->pokemon_id.$config->system->pokeimg_suffix.'" height="50" style="display:inline-block" >
@@ -531,9 +531,9 @@ 
 								</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="core/pokemons/'.$data->pokemon_id.$config->system->pokeimg_suffix.'" height="50" style="display:inline-block" >
@@ -551,50 +551,50 @@ 
 							</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/'.$gymData['gymDetails']['gymInfos']['guardPokemonId'].'">
 					<img src="core/pokemons/'.$gymData['gymDetails']['gymInfos']['guardPokemonId'].$config->system->pokeimg_suffix.'" height="50" style="display:inline-block" >
 					</a>
 					<p class="pkmn-name">???</p>
 				</div>'
-				;
+					;
+				}
+				$i++;
 			}
-			$i++;
-		}
-		$gymData['infoWindow'] = $gymData['infoWindow'].'</div>';
-		$return = json_encode($gymData);
+			$gymData['infoWindow'] = $gymData['infoWindow'].'</div>';
+			$return = json_encode($gymData);
 
-		echo $return;
+			echo $return;
 
 
-		break;
+			break;
 
-	case 'trainer':
-		$name = "";
-		$page = "0";
-		$where = "";
-		$order="";
-		$team=0;
-		$ranking=0;
-		if (isset($_GET['name'])) {
-			$trainer_name = mysqli_real_escape_string($mysqli, $_GET['name']);
-			$where = " HAVING name LIKE '%".$trainer_name."%'";
-		}
-		if (isset($_GET['team']) && $_GET['team']!=0) {
-			$team = mysqli_real_escape_string($mysqli, $_GET['team']);
-			$where .= ($where==""?" HAVING":"AND ")." team = ".$team;
-		}
-		if (isset($_GET['page'])) {
-			$page = mysqli_real_escape_string($mysqli, $_GET['page']);
-		}
-		if (isset($_GET['ranking'])) {
-			$ranking = mysqli_real_escape_string($mysqli, $_GET['ranking']);
-		}
+		case 'trainer':
+			$name = "";
+			$page = "0";
+			$where = "";
+			$order="";
+			$team=0;
+			$ranking=0;
+			if (isset($_GET['name'])) {
+				$trainer_name = mysqli_real_escape_string($mysqli, $_GET['name']);
+				$where = " HAVING name LIKE '%".$trainer_name."%'";
+			}
+			if (isset($_GET['team']) && $_GET['team']!=0) {
+				$team = mysqli_real_escape_string($mysqli, $_GET['team']);
+				$where .= ($where==""?" HAVING":"AND ")." team = ".$team;
+			}
+			if (isset($_GET['page'])) {
+				$page = mysqli_real_escape_string($mysqli, $_GET['page']);
+			}
+			if (isset($_GET['ranking'])) {
+				$ranking = mysqli_real_escape_string($mysqli, $_GET['ranking']);
+			}
 
-		switch ($ranking) {
+			switch ($ranking) {
 			case 1:
 				$order=" ORDER BY active DESC ";
 				break;
@@ -603,7 +603,7 @@ 
 				break;
 			default:
 				$order=" ORDER BY level DESC, active DESC ";
-		}
+			}
 
 		$limit = " LIMIT ".($page*10).",10 ";
 
@@ -660,100 +660,100 @@ 
 
 		break;
 
-	case 'pokemon_slider_init':
-		$req 		= "SELECT MIN(pokemon.disappear_time) as min, MAX(pokemon.disappear_time) as max from pokemon";
-		$result 	= $mysqli->query($req);
-		$data 		= $result->fetch_object();
-		$bounds 	= $data;
+		case 'pokemon_slider_init':
+			$req 		= "SELECT MIN(pokemon.disappear_time) as min, MAX(pokemon.disappear_time) as max from pokemon";
+			$result 	= $mysqli->query($req);
+			$data 		= $result->fetch_object();
+			$bounds 	= $data;
 
-		header('Content-Type: application/json');
-		$json = json_encode($bounds);
+			header('Content-Type: application/json');
+			$json = json_encode($bounds);
 
-		echo $json;
-		break;
+			echo $json;
+			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 = mysqli_real_escape_string($mysqli, $_GET['pokemon_id']);
-			$where = " WHERE pokemon.pokemon_id = ".$pokemon_id." "
-					. "AND pokemon.disappear_time BETWEEN '".$start."' AND '".$end."'";
-			$req 		= "SELECT latitude, longitude FROM pokemon".$where." ORDER BY disappear_time DESC LIMIT 10000";
-			$result 	= $mysqli->query($req);
-			$points = array();
-			while ($result && $data = $result->fetch_object()) {
-				$points[] 	= $data;
+		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 = mysqli_real_escape_string($mysqli, $_GET['pokemon_id']);
+				$where = " WHERE pokemon.pokemon_id = ".$pokemon_id." "
+						. "AND pokemon.disappear_time BETWEEN '".$start."' AND '".$end."'";
+				$req 		= "SELECT latitude, longitude FROM pokemon".$where." ORDER BY disappear_time DESC LIMIT 10000";
+				$result 	= $mysqli->query($req);
+				$points = array();
+				while ($result && $data = $result->fetch_object()) {
+					$points[] 	= $data;
+				}
+
+				$json = json_encode($points);
 			}
 
-			$json = json_encode($points);
-		}
+			header('Content-Type: application/json');
 
-		header('Content-Type: application/json');
+			echo $json;
 
-		echo $json;
+			break;
 
-		break;
+		case 'pokedex':
+			$json="";
+			if (isset($_GET['pokemon_id'])) {
+				$pokemon_id = mysqli_real_escape_string($mysqli, $_GET['pokemon_id']);
+				$where = " WHERE pokemon.pokemon_id = ".$pokemon_id;
+				$req 		= "SELECT COUNT(encounter_id) as total FROM pokemon".$where;
+				$result 	= $mysqli->query($req);
+				$total = 0;
+				while ($result && $data = $result->fetch_object()) {
+					$total 	= $data;
+				}
 
-	case 'pokedex':
-		$json="";
-		if (isset($_GET['pokemon_id'])) {
-			$pokemon_id = mysqli_real_escape_string($mysqli, $_GET['pokemon_id']);
-			$where = " WHERE pokemon.pokemon_id = ".$pokemon_id;
-			$req 		= "SELECT COUNT(encounter_id) as total FROM pokemon".$where;
-			$result 	= $mysqli->query($req);
-			$total = 0;
-			while ($result && $data = $result->fetch_object()) {
-				$total 	= $data;
+				$json = json_encode($total);
 			}
 
-			$json = json_encode($total);
-		}
-
-		header('Content-Type: application/json');
+			header('Content-Type: application/json');
 
-		echo $json;
+			echo $json;
 
-		break;
+			break;
 
 		case 'postRequest':
 		break;
 
-	case 'pokemon_graph_data':
-		$json="";
-		if (isset($_GET['pokemon_id'])) {
-			$pokemon_id = mysqli_real_escape_string($mysqli, $_GET['pokemon_id']);
-			$where = " WHERE pokemonFiltered.pokemon_id = ".$pokemon_id;
-			$req 		= "SELECT COUNT(*) as total, "
-					. "HOUR(CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) as disappear_hour
+		case 'pokemon_graph_data':
+			$json="";
+			if (isset($_GET['pokemon_id'])) {
+				$pokemon_id = mysqli_real_escape_string($mysqli, $_GET['pokemon_id']);
+				$where = " WHERE pokemonFiltered.pokemon_id = ".$pokemon_id;
+				$req 		= "SELECT COUNT(*) as total, "
+						. "HOUR(CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) as disappear_hour
 			FROM (SELECT * FROM pokemon WHERE pokemon_id = '".$pokemon_id."' LIMIT 10000) as pokemonFiltered
 			GROUP BY disappear_hour
 			ORDER BY disappear_hour";
-			$result 	= $mysqli->query($req);
-			$array = array();
-			while ($result && $data = $result->fetch_object()) {
-				$array[] = $data->total;
+				$result 	= $mysqli->query($req);
+				$array = array();
+				while ($result && $data = $result->fetch_object()) {
+					$array[] = $data->total;
+				}
+				$array[] = array_shift($array);
+				$json = json_encode($array);
 			}
-			$array[] = array_shift($array);
-			$json = json_encode($array);
-		}
 
-		header('Content-Type: application/json');
+			header('Content-Type: application/json');
 
-		echo $json;
+			echo $json;
 
-		break;
+			break;
 
 		case 'postRequest':
 		break;
 
 
-	default:
-		echo "What do you mean?";
-		exit();
+		default:
+			echo "What do you mean?";
+			exit();
 
-	break;
+		break;
 }
 if ($postRequest!=""){
 	switch ($postRequest) {