brusselopole / Worldopole

core/inc/meta.inc.php

Switch Indentation +27 added lines, -27 removed lines

@@ -47,8 +47,8 @@ 
 <?php
 } else {
         switch ($_GET['page']) {
-        case 'pokemon':
-        ?>
+        	case 'pokemon':
+        	?>
 
 		<title><?= $config->infos->site_name; ?> | <?= $locales->FIND; ?> <?= $pokemon->name; ?> <?= sprintf($locales->INCITY, $config->infos->city); ?></title>
 
@@ -71,10 +71,10 @@ 
 
 
 		<?php
-            break;
+            	break;
 
-        case 'pokestops':
-        ?>
+        	case 'pokestops':
+        	?>
 
 
 		<title><?= $config->infos->site_name; ?> | <?= sprintf($locales->POKESTOPS_METATITLE, $config->infos->city); ?></title>
@@ -97,10 +97,10 @@ 
 
 
 		<?php
-            break;
+            	break;
 
-        case 'gym':
-        ?>
+        	case 'gym':
+        	?>
 
 		<title><?= $config->infos->site_name; ?> | <?= $locales->GYMS_METATITLE; ?></title>
 
@@ -122,10 +122,10 @@ 
 		<meta name="twitter:image" content="<?= HOST_URL; ?>core/img/logo.jpg" />
 
 		<?php
-            break;
+            	break;
 
-        case 'trainer':
-        ?>
+        	case 'trainer':
+        	?>
 
 		<title><?= $config->infos->site_name; ?> | <?= $locales->TRAINERS_METATITLE; ?></title>
 
@@ -146,10 +146,10 @@ 
 		<meta name="twitter:image" content="<?= HOST_URL; ?>core/img/logo.jpg" />
 
 		<?php
-            break;
+            	break;
 
-        case 'dashboard':
-        ?>
+        	case 'dashboard':
+        	?>
 
 		<title><?= $config->infos->site_name; ?> | <?= $locales->NAV_DASHBOARD; ?></title>
 
@@ -171,10 +171,10 @@ 
 
 
 		<?php
-            break;
+            	break;
 
-        case 'pokedex':
-        ?>
+        	case 'pokedex':
+        	?>
 
 		<title><?= $config->infos->site_name; ?> | <?= $locales->POKEDEX_METATITLE; ?></title>
 
@@ -195,10 +195,10 @@ 
 		<meta name="twitter:image" content="<?= HOST_URL; ?>core/img/logo.jpg" />
 
 		<?php
-            break;
+            	break;
 
-        case 'nests':
-        ?>
+        	case 'nests':
+        	?>
 
 		<title><?= $config->infos->site_name; ?> | <?= $locales->NAV_NESTS; ?></title>
 
@@ -219,10 +219,10 @@ 
 		<meta name="twitter:image" content="<?= HOST_URL; ?>core/img/logo.jpg" />
 
 		<?php
-            break;
+            	break;
 
-        case 'raids':
-        ?>
+        	case 'raids':
+        	?>
 
 		<title><?= $config->infos->site_name; ?> | <?= $locales->NAV_RAIDS; ?></title>
 
@@ -243,10 +243,10 @@ 
 		<meta name="twitter:image" content="<?= HOST_URL; ?>core/img/logo.jpg" />
 
 		<?php
-            break;
+            	break;
 
-        case 'gymhistory':
-        ?>
+        	case 'gymhistory':
+        	?>
 
 		<title><?= $config->infos->site_name; ?> | Gym History</title>
 
@@ -267,7 +267,7 @@ 
 		<meta name="twitter:image" content="<?= HOST_URL; ?>core/img/logo.jpg" />
 
 		<?php
-            break;
+            	break;
     }
     }
 

core/process/aru.php

Switch Indentation +492 added lines, -492 removed lines

@@ -56,116 +56,116 @@ 
     //
     //###########################
 
-    case 'home_update':
-        $values = [];
-        // Right now
-        // ---------
-        $data = $manager->getTotalPokemon();
-        $values[] = $data->total;
-
-        // Lured stops
-        // -----------
-        $data = $manager->getTotalLures();
-        $values[] = $data->total;
-
-        // Active Raids
-        // -----------
-        $data = $manager->getTotalRaids();
-        $values[] = $data->total;
-
-        // Team battle
-        // -----------
-        $data = $manager->getTotalGyms();
-        $values[] = $data->total;
-
-        // Red
-        $data = $manager->getTotalGymsForTeam(2);
-        $values[] = $data->total;
-
-        // Blue
-        $data = $manager->getTotalGymsForTeam(1);
-        $values[] = $data->total;
-
-        // Yellow
-        $data = $manager->getTotalGymsForTeam(3);
-        $values[] = $data->total;
-
-        // Neutral
-        $data = $manager->getTotalGymsForTeam(0);
-        $values[] = $data->total;
-
-        header('Content-Type: application/json');
-        echo json_encode($values);
-
-        break;
-
-    //###################################
-    //
-    // 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;
-                }
-            }
-
-            // 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;
-                        }
-                    }
-
-                    $html = '
+    	case 'home_update':
+        	$values = [];
+        	// Right now
+        	// ---------
+        	$data = $manager->getTotalPokemon();
+        	$values[] = $data->total;
+
+        	// Lured stops
+        	// -----------
+        	$data = $manager->getTotalLures();
+        	$values[] = $data->total;
+
+        	// Active Raids
+        	// -----------
+        	$data = $manager->getTotalRaids();
+        	$values[] = $data->total;
+
+        	// Team battle
+        	// -----------
+        	$data = $manager->getTotalGyms();
+        	$values[] = $data->total;
+
+        	// Red
+        	$data = $manager->getTotalGymsForTeam(2);
+        	$values[] = $data->total;
+
+        	// Blue
+        	$data = $manager->getTotalGymsForTeam(1);
+        	$values[] = $data->total;
+
+        	// Yellow
+        	$data = $manager->getTotalGymsForTeam(3);
+        	$values[] = $data->total;
+
+        	// Neutral
+        	$data = $manager->getTotalGymsForTeam(0);
+        	$values[] = $data->total;
+
+        	header('Content-Type: application/json');
+        	echo json_encode($values);
+
+        	break;
+
+    	//###################################
+    	//
+    	// 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;
+                	}
+            	}
+
+            	// 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;
+                        	}
+                    	}
+
+                    	$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.'
@@ -177,8 +177,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>
@@ -190,11 +190,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>?
@@ -206,111 +206,111 @@ 
                                         <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 .= '
+                            	}
+                            	$html .= '<small>???</small>';
+                        	}
+                    	}
+                    	$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;
-                }
-            }
-        }
-
-        header('Content-Type: application/json');
-        echo json_encode($total_spawns);
-
-        break;
-
-    //###################################
-    //
-    // List Pokestop
-    //
-    //###################################
-
-    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[] = [
-                $text,
-                $icon,
-                $data->latitude,
-                $data->longitude,
-                $lured,
-            ];
-        }
-
-        header('Content-Type: application/json');
-        echo json_encode($pokestops);
-
-        break;
-
-    //###################################
-    //
-    // Update data for the gym battle
-    //
-    //###################################
-
-    case 'update_gym':
-        $teams = new stdClass();
-        $teams->mystic = 1;
-        $teams->valor = 2;
-        $teams->instinct = 3;
-
-        foreach ($teams as $team_name => $team_id) {
-            $data = $manager->getOwnedAndPoints($team_id);
-
-            $return[] = $data->total;
-            $return[] = $data->average_points;
-        }
-
-        header('Content-Type: application/json');
-        echo json_encode($return);
-
-        break;
-
-    //###################################
-    //
-    // Get datas for the gym map
-    //
-    //###################################
-
-    case 'gym_map':
-        $datas = $manager->getAllGyms();
-
-        $gyms = [];
-        foreach ($datas as $data) {
-            // Team
-            // 1 = bleu
-            // 2 = rouge
-            // 3 = jaune
-
-            switch ($data->team_id) {
+                    	$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;
+
+    	//###################################
+    	//
+    	// List Pokestop
+    	//
+    	//###################################
+
+    	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[] = [
+                	$text,
+                	$icon,
+                	$data->latitude,
+                	$data->longitude,
+                	$lured,
+            	];
+        	}
+
+        	header('Content-Type: application/json');
+        	echo json_encode($pokestops);
+
+        	break;
+
+    	//###################################
+    	//
+    	// Update data for the gym battle
+    	//
+    	//###################################
+
+    	case 'update_gym':
+        	$teams = new stdClass();
+        	$teams->mystic = 1;
+        	$teams->valor = 2;
+        	$teams->instinct = 3;
+
+        	foreach ($teams as $team_name => $team_id) {
+            	$data = $manager->getOwnedAndPoints($team_id);
+
+            	$return[] = $data->total;
+            	$return[] = $data->average_points;
+        	}
+
+        	header('Content-Type: application/json');
+        	echo json_encode($return);
+
+        	break;
+
+    	//###################################
+    	//
+    	// Get datas for the gym map
+    	//
+    	//###################################
+
+    	case 'gym_map':
+        	$datas = $manager->getAllGyms();
+
+        	$gyms = [];
+        	foreach ($datas as $data) {
+            	// Team
+            	// 1 = bleu
+            	// 2 = rouge
+            	// 3 = jaune
+
+            	switch ($data->team_id) {
                 case 0:
                     $icon = 'map_white.png';
                     $team = 'No Team (yet)';
@@ -334,7 +334,7 @@ 
                     $team = 'Team Instinct';
                     $color = 'rgba(254, 217, 40, .6)';
                     break;
-            }
+            	}
 
             if (0 != $data->team_id) {
                 $icon .= $data->level.'.png';
@@ -359,49 +359,49 @@ 
     //
     //###################################
 
-    case 'gym_defenders':
-        $gym_id = $manager->getEcapedString($_GET['gym_id']);
-
-        $data = $manager->getGymData($gym_id);
-        $gymData['gymDetails']['gymInfos'] = false;
-
-        if (!is_null($data)) {
-            if (null == $data->name) {
-                $gymData['gymDetails']['gymInfos']['name'] = '?';
-            } else {
-                $gymData['gymDetails']['gymInfos']['name'] = $data->name;
-            }
-            $gymData['gymDetails']['gymInfos']['description'] = $data->description;
-            if (null == $data->url) {
-                $gymData['gymDetails']['gymInfos']['url'] = 'https://upload.wikimedia.org/wikipedia/commons/thumb/8/86/Solid_grey.svg/200px-Solid_grey.svg.png';
-            } else {
-                $gymData['gymDetails']['gymInfos']['url'] = $data->url;
-            }
-            if (null == $data->total_cp) {
-                $gymData['gymDetails']['gymInfos']['points'] = '?';
-            } else {
-                $gymData['gymDetails']['gymInfos']['points'] = $data->total_cp;
-            }
-            $gymData['gymDetails']['gymInfos']['level'] = $data->level;
-            if (null == $data->last_scanned) {
-                $gymData['gymDetails']['gymInfos']['last_scanned'] = '?';
-            } else {
-                $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'] = '
+    	case 'gym_defenders':
+        	$gym_id = $manager->getEcapedString($_GET['gym_id']);
+
+        	$data = $manager->getGymData($gym_id);
+        	$gymData['gymDetails']['gymInfos'] = false;
+
+        	if (!is_null($data)) {
+            	if (null == $data->name) {
+                	$gymData['gymDetails']['gymInfos']['name'] = '?';
+            	} else {
+                	$gymData['gymDetails']['gymInfos']['name'] = $data->name;
+            	}
+            	$gymData['gymDetails']['gymInfos']['description'] = $data->description;
+            	if (null == $data->url) {
+                	$gymData['gymDetails']['gymInfos']['url'] = 'https://upload.wikimedia.org/wikipedia/commons/thumb/8/86/Solid_grey.svg/200px-Solid_grey.svg.png';
+            	} else {
+                	$gymData['gymDetails']['gymInfos']['url'] = $data->url;
+            	}
+            	if (null == $data->total_cp) {
+                	$gymData['gymDetails']['gymInfos']['points'] = '?';
+            	} else {
+                	$gymData['gymDetails']['gymInfos']['points'] = $data->total_cp;
+            	}
+            	$gymData['gymDetails']['gymInfos']['level'] = $data->level;
+            	if (null == $data->last_scanned) {
+                	$gymData['gymDetails']['gymInfos']['last_scanned'] = '?';
+            	} else {
+                	$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" >
@@ -419,8 +419,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" >
@@ -438,244 +438,244 @@ 
 							</div>
 						</div>
 					</div>';
-                    }
-                }
-            }
-            $gymData['infoWindow'] = $gymData['infoWindow'].'</div>';
-        }
-
-        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;
-
-        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;
-        $raids = array();
-        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;
-        }
-        $json = array();
-        $json['raids'] = $raids;
-        $locale = array();
-        $locale['noraids'] = $locales->RAIDS_NONE;
-        $json['locale'] = $locale;
-
-        header('Content-Type: application/json');
-        echo json_encode($json);
-
-        break;
-
-    case 'gyms':
-        $page = '0';
-        $ranking = 0;
-        $gym_name = '';
-        $team = '';
-        if (isset($_GET['name']) && '' != $_GET['name']) {
-            $gym_name = $manager->getEcapedString($_GET['name']);
-        }
-        if (isset($_GET['team']) && '' != $_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']);
-        }
-
-        $datas = $manager->getGymHistories($gym_name, $team, $page, $ranking);
-        $gyms = array();
-        foreach ($datas as $data) {
-            $pkm = array();
-            if ($data->total_cp > 0) {
-                $pkm = $manager->getGymHistoriesPokemon($data->gym_id);
-            }
-            $data->pokemon = $pkm;
-            unset($data->pokemon_uids);
-            $data->gym_id = str_replace('.', '_', $data->gym_id);
-            $gyms[] = $data;
-        }
-        $json = array();
-        $json['gyms'] = $gyms;
-        $locale = array();
-        $json['locale'] = $locale;
-
-        header('Content-Type: application/json');
-        echo json_encode($json);
-
-        break;
-
-    case 'gymhistory':
-        $gym_id = '';
-        $page = '0';
-        if (isset($_GET['gym_id'])) {
-            $gym_id = $manager->getEcapedString($_GET['gym_id']);
-            $gym_id = str_replace('_', '.', $gym_id);
-        }
-        if (isset($_GET['page'])) {
-            $page = $manager->getEcapedString($_GET['page']);
-        }
-
-        $entries = array();
-
-        $last_page = true;
-        if ('' != $gym_id) {
-            $datas = $manager->getHistoryForGym($page, $gym_id);
-            foreach ($datas['data'] as $data) {
-                $data->gym_id = str_replace('.', '_', $data->gym_id);
-                $entries[] = $data;
-            }
-            $last_page = $datas['last_page'];
-
-            foreach ($entries as $idx => $entry) {
-                $entry->total_cp_diff = 0;
-                $entry->only_cp_changed = true;
-                if ($idx < count($entries) - 1) {
-                    $next_entry = $entries[$idx + 1];
-                    $entry->total_cp_diff = $entry->total_cp - $next_entry->total_cp;
-                    $entry->class = $entry->total_cp_diff > 0 ? 'gain' : ($entry->total_cp_diff < 0 ? 'loss' : '');
-                    $entry_pokemon = preg_split('/,/', $entry->pokemon_uids, null, PREG_SPLIT_NO_EMPTY);
-                    $next_entry_pokemon = preg_split('/,/', $next_entry->pokemon_uids, null, PREG_SPLIT_NO_EMPTY);
-                    $new_pokemon = array_diff($entry_pokemon, $next_entry_pokemon);
-                    $old_pokemon = array_diff($next_entry_pokemon, $entry_pokemon);
-                    foreach ($new_pokemon as $pkm) {
-                        $entry->pokemon[$pkm]->class = 'new';
-                    }
-                    foreach ($old_pokemon as $pkm) {
-                        $next_entry->pokemon[$pkm]->class = 'old';
-                    }
-                    if ($entry->team_id != $next_entry->team_id || $entry->pokemon_uids != $next_entry->pokemon_uids) {
-                        $entry->only_cp_changed = false;
-                    }
-                }
-                unset($entry->pokemon_uids);
-            }
-
-            if (count($entries) > 10) {
-                array_pop($entries);
-            }
-        }
-
-        $json = array();
-        $json['entries'] = $entries;
-        $locale = array();
-        $json['locale'] = $locale;
-        $json['last_page'] = $last_page;
-
-        header('Content-Type: application/json');
-        echo json_encode($json);
-
-        break;
-
-    case 'pokemon_slider_init':
-        $bounds = $manager->getPokemonSliderMinMax();
-
-        header('Content-Type: application/json');
-        echo json_encode($bounds);
-
-        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);
-
-            $json = json_encode($points);
-        }
-
-        header('Content-Type: application/json');
-        echo $json;
-        break;
-
-    case 'maps_localization_coordinates':
-        $coordinates = $manager->getMapsCoords();
-
-        header('Content-Type: application/json');
-        echo json_encode($coordinates);
-
-        break;
-
-    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);
-        }
-
-        header('Content-Type: application/json');
-        echo $json;
-        break;
-
-    case 'postRequest':
-        break;
-
-    default:
-        echo 'What do you mean?';
-        exit();
-    break;
+                    	}
+                	}
+            	}
+            	$gymData['infoWindow'] = $gymData['infoWindow'].'</div>';
+        	}
+
+        	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;
+
+        	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;
+        	$raids = array();
+        	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;
+        	}
+        	$json = array();
+        	$json['raids'] = $raids;
+        	$locale = array();
+        	$locale['noraids'] = $locales->RAIDS_NONE;
+        	$json['locale'] = $locale;
+
+        	header('Content-Type: application/json');
+        	echo json_encode($json);
+
+        	break;
+
+    	case 'gyms':
+        	$page = '0';
+        	$ranking = 0;
+        	$gym_name = '';
+        	$team = '';
+        	if (isset($_GET['name']) && '' != $_GET['name']) {
+            	$gym_name = $manager->getEcapedString($_GET['name']);
+        	}
+        	if (isset($_GET['team']) && '' != $_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']);
+        	}
+
+        	$datas = $manager->getGymHistories($gym_name, $team, $page, $ranking);
+        	$gyms = array();
+        	foreach ($datas as $data) {
+            	$pkm = array();
+            	if ($data->total_cp > 0) {
+                	$pkm = $manager->getGymHistoriesPokemon($data->gym_id);
+            	}
+            	$data->pokemon = $pkm;
+            	unset($data->pokemon_uids);
+            	$data->gym_id = str_replace('.', '_', $data->gym_id);
+            	$gyms[] = $data;
+        	}
+        	$json = array();
+        	$json['gyms'] = $gyms;
+        	$locale = array();
+        	$json['locale'] = $locale;
+
+        	header('Content-Type: application/json');
+        	echo json_encode($json);
+
+        	break;
+
+    	case 'gymhistory':
+        	$gym_id = '';
+        	$page = '0';
+        	if (isset($_GET['gym_id'])) {
+            	$gym_id = $manager->getEcapedString($_GET['gym_id']);
+            	$gym_id = str_replace('_', '.', $gym_id);
+        	}
+        	if (isset($_GET['page'])) {
+            	$page = $manager->getEcapedString($_GET['page']);
+        	}
+
+        	$entries = array();
+
+        	$last_page = true;
+        	if ('' != $gym_id) {
+            	$datas = $manager->getHistoryForGym($page, $gym_id);
+            	foreach ($datas['data'] as $data) {
+                	$data->gym_id = str_replace('.', '_', $data->gym_id);
+                	$entries[] = $data;
+            	}
+            	$last_page = $datas['last_page'];
+
+            	foreach ($entries as $idx => $entry) {
+                	$entry->total_cp_diff = 0;
+                	$entry->only_cp_changed = true;
+                	if ($idx < count($entries) - 1) {
+                    	$next_entry = $entries[$idx + 1];
+                    	$entry->total_cp_diff = $entry->total_cp - $next_entry->total_cp;
+                    	$entry->class = $entry->total_cp_diff > 0 ? 'gain' : ($entry->total_cp_diff < 0 ? 'loss' : '');
+                    	$entry_pokemon = preg_split('/,/', $entry->pokemon_uids, null, PREG_SPLIT_NO_EMPTY);
+                    	$next_entry_pokemon = preg_split('/,/', $next_entry->pokemon_uids, null, PREG_SPLIT_NO_EMPTY);
+                    	$new_pokemon = array_diff($entry_pokemon, $next_entry_pokemon);
+                    	$old_pokemon = array_diff($next_entry_pokemon, $entry_pokemon);
+                    	foreach ($new_pokemon as $pkm) {
+                        	$entry->pokemon[$pkm]->class = 'new';
+                    	}
+                    	foreach ($old_pokemon as $pkm) {
+                        	$next_entry->pokemon[$pkm]->class = 'old';
+                    	}
+                    	if ($entry->team_id != $next_entry->team_id || $entry->pokemon_uids != $next_entry->pokemon_uids) {
+                        	$entry->only_cp_changed = false;
+                    	}
+                	}
+                	unset($entry->pokemon_uids);
+            	}
+
+            	if (count($entries) > 10) {
+                	array_pop($entries);
+            	}
+        	}
+
+        	$json = array();
+        	$json['entries'] = $entries;
+        	$locale = array();
+        	$json['locale'] = $locale;
+        	$json['last_page'] = $last_page;
+
+        	header('Content-Type: application/json');
+        	echo json_encode($json);
+
+        	break;
+
+    	case 'pokemon_slider_init':
+        	$bounds = $manager->getPokemonSliderMinMax();
+
+        	header('Content-Type: application/json');
+        	echo json_encode($bounds);
+
+        	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);
+
+            	$json = json_encode($points);
+        	}
+
+        	header('Content-Type: application/json');
+        	echo $json;
+        	break;
+
+    	case 'maps_localization_coordinates':
+        	$coordinates = $manager->getMapsCoords();
+
+        	header('Content-Type: application/json');
+        	echo json_encode($coordinates);
+
+        	break;
+
+    	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);
+        	}
+
+        	header('Content-Type: application/json');
+        	echo $json;
+        	break;
+
+    	case 'postRequest':
+        	break;
+
+    	default:
+        	echo 'What do you mean?';
+        	exit();
+    	break;
 }
 
 if ('' != $postRequest) {