brusselopole / Worldopole

core/js/dashboard.graph.js.php

Indentation +59 added lines, -59 removed lines

@@ -59,83 +59,83 @@ 
 $captcha_accs = array();
 
 foreach ($stats as $data) {
-    if ($data->timestamp > $lastweek) {
-        $labels_global[] = '"'.date('D H:i', $data->timestamp).'"';
-        $total[] = $data->pokemon_now;
-        if (isset($data->pokemon_now_iv)) {
-            $total_iv[] = $data->pokemon_now_iv;
-        } else {
-            $total_iv[] = null;
-        }
-    }
+	if ($data->timestamp > $lastweek) {
+		$labels_global[] = '"'.date('D H:i', $data->timestamp).'"';
+		$total[] = $data->pokemon_now;
+		if (isset($data->pokemon_now_iv)) {
+			$total_iv[] = $data->pokemon_now_iv;
+		} else {
+			$total_iv[] = null;
+		}
+	}
 
-    if ($data->timestamp > $yesterday) {
-        $labels[] = '"'.date('H:i', $data->timestamp).'"';
-
-        if (isset($data->rarity_spawn->{'Very common'})) {
-            $veco[] = $data->rarity_spawn->{'Very common'};
-        } else {
-            $veco[] = 0;
-        }
-
-        if (isset($data->rarity_spawn->Common)) {
-            $commo[] = $data->rarity_spawn->Common;
-        } else {
-            $commo[] = 0;
-        }
-
-        if (isset($data->rarity_spawn->Rare)) {
-            $rare[] = $data->rarity_spawn->Rare;
-        } else {
-            $rare[] = 0;
-        }
-
-        if (isset($data->rarity_spawn->Mythic)) {
-            $myth[] = $data->rarity_spawn->Mythic;
-        } else {
-            $myth[] = 0;
-        }
-    }
+	if ($data->timestamp > $yesterday) {
+		$labels[] = '"'.date('H:i', $data->timestamp).'"';
+
+		if (isset($data->rarity_spawn->{'Very common'})) {
+			$veco[] = $data->rarity_spawn->{'Very common'};
+		} else {
+			$veco[] = 0;
+		}
+
+		if (isset($data->rarity_spawn->Common)) {
+			$commo[] = $data->rarity_spawn->Common;
+		} else {
+			$commo[] = 0;
+		}
+
+		if (isset($data->rarity_spawn->Rare)) {
+			$rare[] = $data->rarity_spawn->Rare;
+		} else {
+			$rare[] = 0;
+		}
+
+		if (isset($data->rarity_spawn->Mythic)) {
+			$myth[] = $data->rarity_spawn->Mythic;
+		} else {
+			$myth[] = 0;
+		}
+	}
 }
 
 $stats_file = SYS_PATH.'/core/json/gym.stats.json';
 $stats = json_decode(file_get_contents($stats_file));
 
 foreach ($stats as $data) {
-    if ($data->timestamp > $lastweek) {
-        $labels_gym[] = '"'.date('D H:i', $data->timestamp).'"';
+	if ($data->timestamp > $lastweek) {
+		$labels_gym[] = '"'.date('D H:i', $data->timestamp).'"';
 
-        $mystic_average[] = $data->team->mystic->average;
-        $mystic_owned[] = $data->team->mystic->gym_owned;
+		$mystic_average[] = $data->team->mystic->average;
+		$mystic_owned[] = $data->team->mystic->gym_owned;
 
-        $valor_average[] = $data->team->valor->average;
-        $valor_owned[] = $data->team->valor->gym_owned;
+		$valor_average[] = $data->team->valor->average;
+		$valor_owned[] = $data->team->valor->gym_owned;
 
-        $instinct_average[] = $data->team->instinct->average;
-        $instinct_owned[] = $data->team->instinct->gym_owned;
-    }
+		$instinct_average[] = $data->team->instinct->average;
+		$instinct_owned[] = $data->team->instinct->gym_owned;
+	}
 }
 
 $stats_file = SYS_PATH.'/core/json/pokestop.stats.json';
 $stats = json_decode(file_get_contents($stats_file));
 
 foreach ($stats as $data) {
-    if ($data->timestamp > $lastweek) {
-        $labels_stops[] = '"'.date('D H:i', $data->timestamp).'"';
-        $lure[] = $data->lured;
-    }
+	if ($data->timestamp > $lastweek) {
+		$labels_stops[] = '"'.date('D H:i', $data->timestamp).'"';
+		$lure[] = $data->lured;
+	}
 }
 
 if ($config->system->captcha_support) {
-    $stats_file = SYS_PATH.'/core/json/captcha.stats.json';
-    $stats = json_decode(file_get_contents($stats_file));
-
-    foreach ($stats as $data) {
-        if ($data->timestamp > $lastweek) {
-            $labels_captcha[] = '"'.date('D H:i', $data->timestamp).'"';
-            $captcha_accs[] = $data->captcha_accs;
-        }
-    }
+	$stats_file = SYS_PATH.'/core/json/captcha.stats.json';
+	$stats = json_decode(file_get_contents($stats_file));
+
+	foreach ($stats as $data) {
+		if ($data->timestamp > $lastweek) {
+			$labels_captcha[] = '"'.date('D H:i', $data->timestamp).'"';
+			$captcha_accs[] = $data->captcha_accs;
+		}
+	}
 }
 
 ?>
@@ -594,7 +594,7 @@ 
 // -------------
 
 <?php if ($config->system->captcha_support) {
-    ?>
+	?>
 var ctx_captcha_accs = $('#captcha');
 
 var data_captcha_accs = {

pages/pokemon.page.php

Indentation +102 added lines, -102 removed lines

@@ -18,7 +18,7 @@ 
 		<div class="col-sm-1 hidden-xs">
 
 				<?php if ($pokemon->id - 1 > 0) {
-    ?>
+	?>
 
 				<p class="nav-links"><a href="pokemon/<?= $pokemon->id - 1; ?>"><i class="fa fa-chevron-left"></i></a></p>
 
@@ -44,19 +44,19 @@ 
 		<div class="col-sm-1 hidden-xs">
 
 			<?php if ($pokemon->id + 1 < $config->system->max_pokemon) {
-        ?>
+		?>
 
 			<p class="nav-links"><a href="pokemon/<?= $pokemon->id + 1; ?>"><i class="fa fa-chevron-right"></i></a></p>
 
 			<?php
-    } ?>
+	} ?>
 		</div>
 
 	</div>
 <?php
-    $form_array = array('Unset', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'W', 'X', 'Y', 'Z');
-    $form_array = array_values($form_array);
-    ?>
+	$form_array = array('Unset', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'W', 'X', 'Y', 'Z');
+	$form_array = array_values($form_array);
+	?>
 
 </header>
 <!-- /Header -->
@@ -78,10 +78,10 @@ 
 
 				<p>
 				<?php foreach ($pokemon->types as $type) {
-        ?>
+		?>
 					<span class="label label-default" style="background-color:<?= $pokemons->typecolors->$type; ?>"><?= $type; ?></span>
 				<?php
-    }?>
+	}?>
 				</p>
 
 			</div>
@@ -110,28 +110,28 @@ 
 				<td class="col-md-4 col-xs-4">
 
 				<?php
-                if (isset($pokemon->last_seen) || isset($pokemon->last_seen_day)) {
+				if (isset($pokemon->last_seen) || isset($pokemon->last_seen_day)) {
 
-                    if (isset($pokemon->last_seen)) {
-                        $time_ago = time_ago($pokemon->last_seen, $locales);
-                    } else {
-                        $time_ago = time_ago_day($pokemon->last_seen_day, $locales);
-                    }
+					if (isset($pokemon->last_seen)) {
+						$time_ago = time_ago($pokemon->last_seen, $locales);
+					} else {
+						$time_ago = time_ago_day($pokemon->last_seen_day, $locales);
+					}
 
-                    if (isset($pokemon->last_position)) {
-                        ?>
+					if (isset($pokemon->last_position)) {
+						?>
                         <a href="https://maps.google.com/?q=<?= $pokemon->last_position->latitude; ?>,<?= $pokemon->last_position->longitude; ?>&ll=<?= $pokemon->last_position->latitude; ?>,<?= $pokemon->last_position->longitude; ?>&z=16" target="_blank"><?= $time_ago ?></a>
                         <?php
-                    } else {
-                        echo $time_ago;
-                    }
-                    ?>
+					} else {
+						echo $time_ago;
+					}
+					?>
 
 				    <?php
-                } else {
-                    echo $locales->NEVER;
-                }
-                ?>
+				} else {
+					echo $locales->NEVER;
+				}
+				?>
 
 				</td>
 			</tr>
@@ -146,15 +146,15 @@ 
 			<tr>
 				<td class="col-md-8 col-xs-8">
                     <?php
-                    if (isset($pokemon->protected_gyms)) {
-                        echo '<strong>'.$locales->POKEMON_GYM.$pokemon->name.'</strong>';
-                    } ?>
+					if (isset($pokemon->protected_gyms)) {
+						echo '<strong>'.$locales->POKEMON_GYM.$pokemon->name.'</strong>';
+					} ?>
                 </td>
 				<td class="col-md-4 col-xs-4">
                     <?php
-                    if (isset($pokemon->protected_gyms)) {
-                        echo $pokemon->protected_gyms;
-                    }?>
+					if (isset($pokemon->protected_gyms)) {
+						echo $pokemon->protected_gyms;
+					}?>
                 </td>
 			</tr>
 		</table>
@@ -169,16 +169,16 @@ 
 				<td class="col-md-4 col-xs-4">
 
                     <?php
-                    if (isset($pokemon->last_raid_position)) {
-                        ?>
+					if (isset($pokemon->last_raid_position)) {
+						?>
 
 					    <a href="https://maps.google.com/?q=<?= $pokemon->last_raid_position->latitude; ?>,<?= $pokemon->last_raid_position->longitude; ?>&ll=<?= $pokemon->last_raid_position->latitude; ?>,<?= $pokemon->last_raid_position->longitude; ?>&z=16" target="_blank"><?= time_ago($pokemon->last_raid_seen, $locales); ?></a>
 
 					    <?php
-                    } else {
-                        echo $locales->NEVER;
-                    }
-                    ?>
+					} else {
+						echo $locales->NEVER;
+					}
+					?>
 
 				</td>
 			</tr>
@@ -301,25 +301,25 @@ 
 	<div class="col-md-12 flex-container-tree results">
 
 		<?php
-        $tree = array($pokemon->tree);
-        $depth = get_depth($tree);
-        $skip = false;
-        for ($i = 0; $i < $depth; ++$i) {
-            $i_id = intval(($i + 1) / 2);
-            $data = get_tree_at_depth($tree, $i_id, $config->system->max_pokemon); ?>
+		$tree = array($pokemon->tree);
+		$depth = get_depth($tree);
+		$skip = false;
+		for ($i = 0; $i < $depth; ++$i) {
+			$i_id = intval(($i + 1) / 2);
+			$data = get_tree_at_depth($tree, $i_id, $config->system->max_pokemon); ?>
 
 			<?php
-            if (!is_null($data) && 0 != sizeof($data) && !$skip) {
-                ?>
+			if (!is_null($data) && 0 != sizeof($data) && !$skip) {
+				?>
 				<div class="col-md-12 flex-item-tree">
 					<?php
-                    foreach ($data as $obj) {
-                        $obj_id = $obj->id;
-                        $tree_pokemon = $pokemons->pokemon->$obj_id;
-                        $link = 'pokemon/'.$obj_id;
+					foreach ($data as $obj) {
+						$obj_id = $obj->id;
+						$tree_pokemon = $pokemons->pokemon->$obj_id;
+						$link = 'pokemon/'.$obj_id;
 
-                        if (0 == $i % 2) {
-                            ?>
+						if (0 == $i % 2) {
+							?>
 
 							<div>
 								<a href="<?= $link; ?>"><img src="<?= $tree_pokemon->img; ?>" alt="<?= $tree_pokemon->name; ?>" class="img"></a>
@@ -327,42 +327,42 @@ 
 							</div>
 
 						<?php
-                        } else {
-                            ?>
+						} else {
+							?>
 
 							<div>
 								<img src="core/img/arrow<?=$obj->array_sufix; ?>.png" alt="Arrow" class="img">
 								<p class="pkmn-name">
 									<?php
-                                    if (isset($obj->candies)) {
-                                        echo $obj->candies.' '.$locales->POKEMON_CANDIES;
-                                    } else {
-                                        echo '? '.$locales->POKEMON_CANDIES;
-                                    }
-
-                            if (isset($obj->item)) {
-                                $itemName = 'ITEM_'.$obj->item;
-                                echo '<br>+ '.$locales->$itemName;
-                            } elseif (isset($obj->info)) {
-                                $infoName = 'INFO_'.$obj->info;
-                                echo '<br>('.$locales->$infoName.')';
-                            } else {
-                                echo '<br> </br>';
-                            } ?>
+									if (isset($obj->candies)) {
+										echo $obj->candies.' '.$locales->POKEMON_CANDIES;
+									} else {
+										echo '? '.$locales->POKEMON_CANDIES;
+									}
+
+							if (isset($obj->item)) {
+								$itemName = 'ITEM_'.$obj->item;
+								echo '<br>+ '.$locales->$itemName;
+							} elseif (isset($obj->info)) {
+								$infoName = 'INFO_'.$obj->info;
+								echo '<br>('.$locales->$infoName.')';
+							} else {
+								echo '<br> </br>';
+							} ?>
 								</p>
 							</div>
                             <?php
-                        }
-                    } ?>
+						}
+					} ?>
                 </div>
             <?php
-            } elseif ($skip) {
-                $skip = false;
-            } else {
-                $skip = true;
-            }
-        }
-        ?>
+			} elseif ($skip) {
+				$skip = false;
+			} else {
+				$skip = true;
+			}
+		}
+		?>
 	</div>
 </div>
 
@@ -377,8 +377,8 @@ 
 
 		<?php
 
-        foreach ($related as $related_mon) {
-            ?>
+		foreach ($related as $related_mon) {
+			?>
 
 			<div class="col-md-1 col-sm-2 col-xs-3 pokemon-single">
 
@@ -390,9 +390,9 @@ 
 
 
 			<?php
-        }
+		}
 
-        ?>
+		?>
 
 		</div>
 
@@ -402,7 +402,7 @@ 
 
 
 <?php if (!empty($top)) {
-            ?>
+			?>
 	<div class="row area" id="top50">
 		<div class="col-md-12">
 			<h2 class="text-center sub-title">Top 50 <strong><?= $pokemon->name; ?></strong></h2>
@@ -420,20 +420,20 @@ 
 							<th><a href="pokemon/<?= $pokemon->id; ?>?order=move_2<?php echo 'move_2' == $top_order && !isset($_GET['direction']) ? '&direction=desc' : ''; ?>#top50">2. <?= $locales->MOVE; ?> <i class="fa fa-sort" aria-hidden="true"></i></a></th>
 							<th><a href="pokemon/<?= $pokemon->id; ?>?order=disappear_time<?php echo 'disappear_time' == $top_order && !isset($_GET['direction']) ? '&direction=desc' : ''; ?>#top50"><?= $locales->DATE; ?> <i class="fa fa-sort" aria-hidden="true"></i></a></th>
 							<?php if (201 == $pokemon->id) {
-                ?>
+				?>
 								<th>Form</th>
 							<?php
-            } ?>
+			} ?>
 						</tr>
 					</thead>
 				
 					<tbody>
 						<?php
-                        $i = 0;
-            foreach ($top as $top50) {
-                ++$i;
-                $move1 = $top50->move_1;
-                $move2 = $top50->move_2; ?>
+						$i = 0;
+			foreach ($top as $top50) {
+				++$i;
+				$move1 = $top50->move_1;
+				$move2 = $top50->move_2; ?>
 
 							<tr>
 								<td><?= $i; ?></td>
@@ -447,17 +447,17 @@ 
 								<td><a href="https://maps.google.com/?q=<?= $top50->latitude; ?>,<?= $top50->longitude; ?>&ll=<?= $top50->latitude; ?>,<?= $top50->longitude; ?>&z=16"
 									target="_blank"><?=$top50->distime; ?></a></td>
 								<?php if (201 == $pokemon->id && $top50->form) {
-                    ?>
+					?>
 									<td><?php echo $form_array[$top50->form]; ?></td>
 								<?php
-                } else {
-                    ?>
+				} else {
+					?>
 									<td></td>
 								<?php
-                } ?>
+				} ?>
 							</tr>
 							<?php
-            } ?>
+			} ?>
 				</tbody>
 			</table>
 		</div>
@@ -465,8 +465,8 @@ 
 </div>
 
 <?php
-        } if ($toptrainer) {
-            ?>
+		} if ($toptrainer) {
+			?>
 	<div class="row" id="trainer">
 		<div class="col-md-12">
 			<h2 class="text-center sub-title"><?= $locales->POKEMON_TOPTRAINER; ?> <strong><?= $pokemon->name; ?></strong></h2>
@@ -485,11 +485,11 @@ 
 					</thead>
 					<tbody>
 						<?php
-                        $i = 0;
-            foreach ($toptrainer as $besttrainer) {
-                ++$i;
-                $move1 = $besttrainer->move_1;
-                $move2 = $besttrainer->move_2; ?>
+						$i = 0;
+			foreach ($toptrainer as $besttrainer) {
+				++$i;
+				$move1 = $besttrainer->move_1;
+				$move2 = $besttrainer->move_2; ?>
 
 							<tr>
 								<td><?= $i; ?></td>
@@ -501,11 +501,11 @@ 
 								<td><?=$besttrainer->lasttime; ?></td>
 							</tr>
 							<?php
-            } ?>
+			} ?>
 				</tbody>
 			</table>
 		</div>
 	</div>
 </div>
 <?php
-        } ?>
+		} ?>

core/process/queries/QueryManager.php

Indentation +93 added lines, -93 removed lines

@@ -8,143 +8,143 @@
 
 abstract class QueryManager
 {
-    protected static $time_offset;
-    protected static $config;
-
-    private static $current;
-
-    public static function current()
-    {
-        global $time_offset;
-
-        if (null == self::$current) {
-            $variables = realpath(dirname(__FILE__)).'/../../json/variables.json';
-            self::$config = json_decode(file_get_contents($variables));
-
-            include_once SYS_PATH.'/core/process/timezone.loader.php';
-            self::$time_offset = $time_offset;
-
-            switch (strtolower(SYS_DB_TYPE)) {
-                case 'rdm':
-                case 'realdevicemap':
-                    self::$current = new QueryManagerMysqlRealDeviceMap();
-                    break;
-                case 'monocle-alt':
-                case 'monocle-alt-mysql':
-                    self::$current = new QueryManagerMysqlMonocleAlternate();
-                    break;
-                case 'monocle-alt-pgsql':
-                    self::$current = new QueryManagerPostgresqlMonocleAlternate();
-                    break;
+	protected static $time_offset;
+	protected static $config;
+
+	private static $current;
+
+	public static function current()
+	{
+		global $time_offset;
+
+		if (null == self::$current) {
+			$variables = realpath(dirname(__FILE__)).'/../../json/variables.json';
+			self::$config = json_decode(file_get_contents($variables));
+
+			include_once SYS_PATH.'/core/process/timezone.loader.php';
+			self::$time_offset = $time_offset;
+
+			switch (strtolower(SYS_DB_TYPE)) {
+				case 'rdm':
+				case 'realdevicemap':
+					self::$current = new QueryManagerMysqlRealDeviceMap();
+					break;
+				case 'monocle-alt':
+				case 'monocle-alt-mysql':
+					self::$current = new QueryManagerMysqlMonocleAlternate();
+					break;
+				case 'monocle-alt-pgsql':
+					self::$current = new QueryManagerPostgresqlMonocleAlternate();
+					break;
 				case 'mad':
-                    self::$current = new QueryManagerMysqlMAD();
-                    break;
-                default: //rocketmap
-                    self::$current = new QueryManagerMysqlRocketmap();
-                    break;
-            }
-        }
+					self::$current = new QueryManagerMysqlMAD();
+					break;
+				default: //rocketmap
+					self::$current = new QueryManagerMysqlRocketmap();
+					break;
+			}
+		}
 
-        return self::$current;
-    }
+		return self::$current;
+	}
 
-    private function __construct()
-    {
-    }
+	private function __construct()
+	{
+	}
 
-    // Misc
-    abstract public function getEcapedString($string);
+	// Misc
+	abstract public function getEcapedString($string);
 
-    // Tester
-    abstract public function testTotalPokemon();
+	// Tester
+	abstract public function testTotalPokemon();
 
-    abstract public function testTotalGyms();
+	abstract public function testTotalGyms();
 
-    abstract public function testTotalPokestops();
+	abstract public function testTotalPokestops();
 
-    // Homepage
-    abstract public function getTotalPokemon();
+	// Homepage
+	abstract public function getTotalPokemon();
 
-    abstract public function getTotalLures();
+	abstract public function getTotalLures();
 
-    abstract public function getTotalGyms();
+	abstract public function getTotalGyms();
 
-    abstract public function getTotalRaids();
+	abstract public function getTotalRaids();
 
-    abstract public function getTotalGymsForTeam($team_id);
+	abstract public function getTotalGymsForTeam($team_id);
 
-    abstract public function getRecentAll();
+	abstract public function getRecentAll();
 
-    abstract public function getRecentMythic($mythic_pokemon);
+	abstract public function getRecentMythic($mythic_pokemon);
 
-    // Single Pokemon
-    abstract public function getGymsProtectedByPokemon($pokemon_id);
+	// Single Pokemon
+	abstract public function getGymsProtectedByPokemon($pokemon_id);
 
-    abstract public function getPokemonLastSeen($pokemon_id);
+	abstract public function getPokemonLastSeen($pokemon_id);
 
-    abstract public function getTop50Pokemon($pokemon_id, $top_order_by, $top_direction);
+	abstract public function getTop50Pokemon($pokemon_id, $top_order_by, $top_direction);
 
-    abstract public function getTop50Trainers($pokemon_id, $best_order_by, $best_direction);
+	abstract public function getTop50Trainers($pokemon_id, $best_order_by, $best_direction);
 
-    abstract public function getPokemonHeatmap($pokemon_id, $start, $end);
+	abstract public function getPokemonHeatmap($pokemon_id, $start, $end);
 
-    abstract public function getPokemonGraph($pokemon_id);
+	abstract public function getPokemonGraph($pokemon_id);
 
-    abstract public function getPokemonLive($pokemon_id, $ivMin, $ivMax, $inmap_pokemons);
+	abstract public function getPokemonLive($pokemon_id, $ivMin, $ivMax, $inmap_pokemons);
 
-    abstract public function getPokemonSliderMinMax();
+	abstract public function getPokemonSliderMinMax();
 
-    abstract public function getMapsCoords();
+	abstract public function getMapsCoords();
 
-    abstract public function getPokemonCount($pokemon_id);
+	abstract public function getPokemonCount($pokemon_id);
 
-    abstract public function getPokemonCountAll();
+	abstract public function getPokemonCountAll();
 
-    abstract public function getRaidCount($pokemon_id);
+	abstract public function getRaidCount($pokemon_id);
 
-    abstract public function getRaidCountAll();
+	abstract public function getRaidCountAll();
 
-    // Pokestops
-    abstract public function getTotalPokestops();
+	// Pokestops
+	abstract public function getTotalPokestops();
 
-    abstract public function getAllPokestops();
+	abstract public function getAllPokestops();
 
-    // Gyms
-    abstract public function getTeamGuardians($team_id);
+	// Gyms
+	abstract public function getTeamGuardians($team_id);
 
-    abstract public function getOwnedAndPoints($team_id);
+	abstract public function getOwnedAndPoints($team_id);
 
-    abstract public function getAllGyms();
+	abstract public function getAllGyms();
 
-    abstract public function getGymData($gym_id);
+	abstract public function getGymData($gym_id);
 
-    abstract public function getGymDefenders($gym_id);
+	abstract public function getGymDefenders($gym_id);
 
-    // Gym History
-    abstract public function getGymHistories($gym_name, $team, $page, $ranking);
+	// Gym History
+	abstract public function getGymHistories($gym_name, $team, $page, $ranking);
 
-    abstract public function getGymHistoriesPokemon($gym_id);
+	abstract public function getGymHistoriesPokemon($gym_id);
 
-    abstract public function getHistoryForGym($page, $gym_id);
+	abstract public function getHistoryForGym($page, $gym_id);
 
-    // Raids
-    abstract public function getAllRaids($page);
+	// Raids
+	abstract public function getAllRaids($page);
 
-    // Trainers
-    abstract public function getTrainers($trainer_name, $team, $page, $ranking);
+	// Trainers
+	abstract public function getTrainers($trainer_name, $team, $page, $ranking);
 
-    abstract public function getTrainerLevelCount($team_id);
+	abstract public function getTrainerLevelCount($team_id);
 
-    // Cron
-    abstract public function getPokemonCountsActive();
+	// Cron
+	abstract public function getPokemonCountsActive();
 
-    abstract public function getTotalPokemonIV();
+	abstract public function getTotalPokemonIV();
 
-    abstract public function getPokemonCountsLastDay();
+	abstract public function getPokemonCountsLastDay();
 
-    abstract public function getCaptchaCount();
+	abstract public function getCaptchaCount();
 
-    abstract public function getNestData($time, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude);
+	abstract public function getNestData($time, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude);
 
-    abstract public function getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude);
+	abstract public function getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude);
 }

core/process/queries/QueryManagerMysqlMAD.php

Indentation +664 added lines, -664 removed lines

@@ -4,193 +4,193 @@ 
 
 final class QueryManagerMysqlMAD extends QueryManagerMysql
 {
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    public function __destruct()
-    {
-        parent::__destruct();
-    }
-
-    ///////////
-    // Tester
-    ///////////
-
-    public function testTotalPokemon()
-    {
-        $req = 'SELECT COUNT(*) as total FROM pokemon';
-        $result = $this->mysqli->query($req);
-        if (!is_object($result)) {
-            return 1;
-        } else {
-            $data = $result->fetch_object();
-            $total = $data->total;
-
-            if (0 == $total) {
-                return 2;
-            }
-        }
-
-        return 0;
-    }
-
-    public function testTotalGyms()
-    {
-        $req = 'SELECT COUNT(*) as total FROM gym';
-        $result = $this->mysqli->query($req);
-        if (!is_object($result)) {
-            return 1;
-        } else {
-            $data = $result->fetch_object();
-            $total = $data->total;
-
-            if (0 == $total) {
-                return 2;
-            }
-        }
-
-        return 0;
-    }
-
-    public function testTotalPokestops()
-    {
-        $req = 'SELECT COUNT(*) as total FROM pokestop';
-        $result = $this->mysqli->query($req);
-        if (!is_object($result)) {
-            return 1;
-        } else {
-            $data = $result->fetch_object();
-            $total = $data->total;
-
-            if (0 == $total) {
-                return 2;
-            }
-        }
-
-        return 0;
-    }
-
-    /////////////
-    // Homepage
-    /////////////
-
-    public function getTotalPokemon()
-    {
-        $req = 'SELECT COUNT(*) AS total FROM pokemon WHERE disappear_time >= UTC_TIMESTAMP()';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getTotalLures()
-    {
-        $req = 'SELECT COUNT(*) AS total FROM pokestop WHERE lure_expiration >= UTC_TIMESTAMP()';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getTotalGyms()
-    {
-        $req = 'SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getTotalRaids()
-    {
-        $req = 'SELECT COUNT(*) AS total FROM raid WHERE start <= UTC_TIMESTAMP() AND end >= UTC_TIMESTAMP()';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getTotalGymsForTeam($team_id)
-    {
-        $req = "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE team_id = '".$team_id."'";
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getRecentAll()
-    {
-        $req = "SELECT DISTINCT pokemon_id, encounter_id, disappear_time, last_modified,
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	public function __destruct()
+	{
+		parent::__destruct();
+	}
+
+	///////////
+	// Tester
+	///////////
+
+	public function testTotalPokemon()
+	{
+		$req = 'SELECT COUNT(*) as total FROM pokemon';
+		$result = $this->mysqli->query($req);
+		if (!is_object($result)) {
+			return 1;
+		} else {
+			$data = $result->fetch_object();
+			$total = $data->total;
+
+			if (0 == $total) {
+				return 2;
+			}
+		}
+
+		return 0;
+	}
+
+	public function testTotalGyms()
+	{
+		$req = 'SELECT COUNT(*) as total FROM gym';
+		$result = $this->mysqli->query($req);
+		if (!is_object($result)) {
+			return 1;
+		} else {
+			$data = $result->fetch_object();
+			$total = $data->total;
+
+			if (0 == $total) {
+				return 2;
+			}
+		}
+
+		return 0;
+	}
+
+	public function testTotalPokestops()
+	{
+		$req = 'SELECT COUNT(*) as total FROM pokestop';
+		$result = $this->mysqli->query($req);
+		if (!is_object($result)) {
+			return 1;
+		} else {
+			$data = $result->fetch_object();
+			$total = $data->total;
+
+			if (0 == $total) {
+				return 2;
+			}
+		}
+
+		return 0;
+	}
+
+	/////////////
+	// Homepage
+	/////////////
+
+	public function getTotalPokemon()
+	{
+		$req = 'SELECT COUNT(*) AS total FROM pokemon WHERE disappear_time >= UTC_TIMESTAMP()';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getTotalLures()
+	{
+		$req = 'SELECT COUNT(*) AS total FROM pokestop WHERE lure_expiration >= UTC_TIMESTAMP()';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getTotalGyms()
+	{
+		$req = 'SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getTotalRaids()
+	{
+		$req = 'SELECT COUNT(*) AS total FROM raid WHERE start <= UTC_TIMESTAMP() AND end >= UTC_TIMESTAMP()';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getTotalGymsForTeam($team_id)
+	{
+		$req = "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE team_id = '".$team_id."'";
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getRecentAll()
+	{
+		$req = "SELECT DISTINCT pokemon_id, encounter_id, disappear_time, last_modified,
 				CONVERT_TZ(disappear_time, '+00:00', '".self::$time_offset."') AS disappear_time_real,
 				latitude, longitude, cp, individual_attack, individual_defense, individual_stamina
 				FROM pokemon
 				ORDER BY last_modified DESC
 				LIMIT 0,12";
-        $result = $this->mysqli->query($req);
-        $data = array();
-        if ($result->num_rows > 0) {
-            while ($row = $result->fetch_object()) {
-                $data[] = $row;
-            }
-        }
-
-        return $data;
-    }
-
-    public function getRecentMythic($mythic_pokemons)
-    {
-        $req = "SELECT DISTINCT pokemon_id, encounter_id, disappear_time, last_modified,
+		$result = $this->mysqli->query($req);
+		$data = array();
+		if ($result->num_rows > 0) {
+			while ($row = $result->fetch_object()) {
+				$data[] = $row;
+			}
+		}
+
+		return $data;
+	}
+
+	public function getRecentMythic($mythic_pokemons)
+	{
+		$req = "SELECT DISTINCT pokemon_id, encounter_id, disappear_time, last_modified,
 				CONVERT_TZ(disappear_time, '+00:00', '".self::$time_offset."') AS disappear_time_real,
 				latitude, longitude, cp, individual_attack, individual_defense, individual_stamina
 				FROM pokemon
 				WHERE pokemon_id IN (".implode(',', $mythic_pokemons).')
 				ORDER BY last_modified DESC
 				LIMIT 0,12';
-        $result = $this->mysqli->query($req);
-        $data = array();
-        if ($result->num_rows > 0) {
-            while ($row = $result->fetch_object()) {
-                $data[] = $row;
-            }
-        }
-
-        return $data;
-    }
-
-    ///////////////////
-    // Single Pokemon
-    ///////////////////
-
-    public function getGymsProtectedByPokemon($pokemon_id)
-    {
-        $req = "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE guard_pokemon_id = '".$pokemon_id."'";
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getPokemonLastSeen($pokemon_id)
-    {
-        $req = "SELECT disappear_time,
+		$result = $this->mysqli->query($req);
+		$data = array();
+		if ($result->num_rows > 0) {
+			while ($row = $result->fetch_object()) {
+				$data[] = $row;
+			}
+		}
+
+		return $data;
+	}
+
+	///////////////////
+	// Single Pokemon
+	///////////////////
+
+	public function getGymsProtectedByPokemon($pokemon_id)
+	{
+		$req = "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE guard_pokemon_id = '".$pokemon_id."'";
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getPokemonLastSeen($pokemon_id)
+	{
+		$req = "SELECT disappear_time,
 				CONVERT_TZ(disappear_time, '+00:00', '".self::$time_offset."') AS disappear_time_real,
 				latitude, longitude
 				FROM pokemon
 				WHERE pokemon_id = '".$pokemon_id."'
 				ORDER BY disappear_time DESC
 				LIMIT 0,1";
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
 
-        return $data;
-    }
+		return $data;
+	}
 
-    public function getTop50Pokemon($pokemon_id, $top_order_by, $top_direction)
-    {
-        $req = "SELECT CONVERT_TZ(disappear_time, '+00:00', '".self::$time_offset."') AS distime,
+	public function getTop50Pokemon($pokemon_id, $top_order_by, $top_direction)
+	{
+		$req = "SELECT CONVERT_TZ(disappear_time, '+00:00', '".self::$time_offset."') AS distime,
 				pokemon_id, disappear_time, latitude, longitude,
 				cp, individual_attack, individual_defense, individual_stamina,
 				ROUND(100*(individual_attack+individual_defense+individual_stamina)/45,1) AS IV,
@@ -199,235 +199,235 @@ 
 				WHERE pokemon_id = '".$pokemon_id."' AND move_1 IS NOT NULL AND move_1 <> '0'
 				ORDER BY $top_order_by $top_direction, disappear_time DESC
 				LIMIT 0,50";
-        $result = $this->mysqli->query($req);
-        $top = array();
-        while ($data = $result->fetch_object()) {
-            $top[] = $data;
-        }
-
-        return $top;
-    }
-
-    public function getTop50Trainers($pokemon_id, $best_order_by, $best_direction)
-    {
-         return null;
-    }
-
-    public function getPokemonHeatmap($pokemon_id, $start, $end)
-    {
+		$result = $this->mysqli->query($req);
+		$top = array();
+		while ($data = $result->fetch_object()) {
+			$top[] = $data;
+		}
+
+		return $top;
+	}
+
+	public function getTop50Trainers($pokemon_id, $best_order_by, $best_direction)
+	{
+		 return null;
+	}
+
+	public function getPokemonHeatmap($pokemon_id, $start, $end)
+	{
 		$req = "SELECT latitude, longitude
 				FROM pokemon
 				WHERE pokemon_id = ".$pokemon_id." AND disappear_time BETWEEN '".$start."' AND '".$end."'
 				LIMIT 10000";
-        $result = $this->mysqli->query($req);
-        $points = array();
-        while ($data = $result->fetch_object()) {
-            $points[] = $data;
-        }
-
-        return $points;
-    }
-
-    public function getPokemonGraph($pokemon_id)
-    {
-        $req = "SELECT COUNT(*) AS total,
+		$result = $this->mysqli->query($req);
+		$points = array();
+		while ($data = $result->fetch_object()) {
+			$points[] = $data;
+		}
+
+		return $points;
+	}
+
+	public function getPokemonGraph($pokemon_id)
+	{
+		$req = "SELECT COUNT(*) AS total,
 				HOUR(CONVERT_TZ(disappear_time, '+00:00', '".self::$time_offset."')) AS disappear_hour
 				FROM (SELECT disappear_time FROM pokemon WHERE pokemon_id = '".$pokemon_id."' LIMIT 100000) AS pokemonFiltered
 				GROUP BY disappear_hour
 				ORDER BY disappear_hour";
-        $result = $this->mysqli->query($req);
-        $array = array_fill(0, 24, 0);
-        while ($result && $data = $result->fetch_object()) {
-            $array[$data->disappear_hour] = $data->total;
-        }
-        // shift array because AM/PM starts at 1AM not 0:00
-        $array[] = $array[0];
-        array_shift($array);
-
-        return $array;
-    }
-
-    public function getPokemonLive($pokemon_id, $ivMin, $ivMax, $inmap_pokemons)
-    {
-        $inmap_pkms_filter = '';
-        $where = ' WHERE disappear_time >= UTC_TIMESTAMP() AND pokemon_id = '.$pokemon_id;
-        $reqTestIv = 'SELECT MAX(individual_attack) AS iv FROM pokemon '.$where;
-        $resultTestIv = $this->mysqli->query($reqTestIv);
-        $testIv = $resultTestIv->fetch_object();
-        if (!is_null($inmap_pokemons) && ('' != $inmap_pokemons)) {
-            foreach ($inmap_pokemons as $inmap) {
-                $inmap_pkms_filter .= "'".$inmap."',";
-            }
-            $inmap_pkms_filter = rtrim($inmap_pkms_filter, ',');
-            $where .= ' AND encounter_id NOT IN ('.$inmap_pkms_filter.') ';
-        }
-        if (null != $testIv->iv && !is_null($ivMin) && ('' != $ivMin)) {
-            $where .= ' AND ((100/45)*(individual_attack+individual_defense+individual_stamina)) >= ('.$ivMin.') ';
-        }
-        if (null != $testIv->iv && !is_null($ivMax) && ('' != $ivMax)) {
-            $where .= ' AND ((100/45)*(individual_attack+individual_defense+individual_stamina)) <= ('.$ivMax.') ';
-        }
-        $req = "SELECT pokemon_id, encounter_id, latitude, longitude, disappear_time,
+		$result = $this->mysqli->query($req);
+		$array = array_fill(0, 24, 0);
+		while ($result && $data = $result->fetch_object()) {
+			$array[$data->disappear_hour] = $data->total;
+		}
+		// shift array because AM/PM starts at 1AM not 0:00
+		$array[] = $array[0];
+		array_shift($array);
+
+		return $array;
+	}
+
+	public function getPokemonLive($pokemon_id, $ivMin, $ivMax, $inmap_pokemons)
+	{
+		$inmap_pkms_filter = '';
+		$where = ' WHERE disappear_time >= UTC_TIMESTAMP() AND pokemon_id = '.$pokemon_id;
+		$reqTestIv = 'SELECT MAX(individual_attack) AS iv FROM pokemon '.$where;
+		$resultTestIv = $this->mysqli->query($reqTestIv);
+		$testIv = $resultTestIv->fetch_object();
+		if (!is_null($inmap_pokemons) && ('' != $inmap_pokemons)) {
+			foreach ($inmap_pokemons as $inmap) {
+				$inmap_pkms_filter .= "'".$inmap."',";
+			}
+			$inmap_pkms_filter = rtrim($inmap_pkms_filter, ',');
+			$where .= ' AND encounter_id NOT IN ('.$inmap_pkms_filter.') ';
+		}
+		if (null != $testIv->iv && !is_null($ivMin) && ('' != $ivMin)) {
+			$where .= ' AND ((100/45)*(individual_attack+individual_defense+individual_stamina)) >= ('.$ivMin.') ';
+		}
+		if (null != $testIv->iv && !is_null($ivMax) && ('' != $ivMax)) {
+			$where .= ' AND ((100/45)*(individual_attack+individual_defense+individual_stamina)) <= ('.$ivMax.') ';
+		}
+		$req = "SELECT pokemon_id, encounter_id, latitude, longitude, disappear_time,
 				CONVERT_TZ(disappear_time, '+00:00', '".self::$time_offset."') AS disappear_time_real,
 				individual_attack, individual_defense, individual_stamina, move_1, move_2
 				FROM pokemon ".$where.'
 				LIMIT 5000';
-        $result = $this->mysqli->query($req);
-        $spawns = array();
-        while ($data = $result->fetch_object()) {
-            $spawns[] = $data;
-        }
-
-        return $spawns;
-    }
-
-    public function getPokemonSliderMinMax()
-    {
-        $req = 'SELECT MIN(disappear_time) AS min, MAX(disappear_time) AS max FROM pokemon';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getMapsCoords()
-    {
-        $req = 'SELECT MAX(latitude) AS max_latitude, MIN(latitude) AS min_latitude,
+		$result = $this->mysqli->query($req);
+		$spawns = array();
+		while ($data = $result->fetch_object()) {
+			$spawns[] = $data;
+		}
+
+		return $spawns;
+	}
+
+	public function getPokemonSliderMinMax()
+	{
+		$req = 'SELECT MIN(disappear_time) AS min, MAX(disappear_time) AS max FROM pokemon';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getMapsCoords()
+	{
+		$req = 'SELECT MAX(latitude) AS max_latitude, MIN(latitude) AS min_latitude,
 				MAX(longitude) AS max_longitude, MIN(longitude) as min_longitude
 				FROM trs_spawn';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
 
-        return $data;
-    }
+		return $data;
+	}
 
-    public function getPokemonCount($pokemon_id)
-    {
-        $req = 'SELECT count, last_seen, latitude, longitude
+	public function getPokemonCount($pokemon_id)
+	{
+		$req = 'SELECT count, last_seen, latitude, longitude
 				FROM pokemon_stats
 				WHERE pid = '.$pokemon_id;
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
 
-        return $data;
-    }
+		return $data;
+	}
 
-    public function getPokemonCountAll()
-    {
-        $req = 'SELECT pid as pokemon_id, count, last_seen, latitude, longitude
+	public function getPokemonCountAll()
+	{
+		$req = 'SELECT pid as pokemon_id, count, last_seen, latitude, longitude
 				FROM pokemon_stats
 				GROUP BY pid';
-        $result = $this->mysqli->query($req);
-        $array = array();
-        while ($data = $result->fetch_object()) {
-            $array[] = $data;
-        }
-
-        return $array;
-    }
-
-    public function getRaidCount($pokemon_id)
-    {
-        $req = 'SELECT count, last_seen, latitude, longitude
+		$result = $this->mysqli->query($req);
+		$array = array();
+		while ($data = $result->fetch_object()) {
+			$array[] = $data;
+		}
+
+		return $array;
+	}
+
+	public function getRaidCount($pokemon_id)
+	{
+		$req = 'SELECT count, last_seen, latitude, longitude
 				FROM raid_stats
 				WHERE pid = '.$pokemon_id;
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
 
-        return $data;
-    }
+		return $data;
+	}
 
-    public function getRaidCountAll()
-    {
-        $req = 'SELECT pid as pokemon_id, count, last_seen, latitude, longitude
+	public function getRaidCountAll()
+	{
+		$req = 'SELECT pid as pokemon_id, count, last_seen, latitude, longitude
 				FROM raid_stats
 				GROUP BY pid';
-        $result = $this->mysqli->query($req);
-        $array = array();
-        while ($data = $result->fetch_object()) {
-            $array[] = $data;
-        }
-
-        return $array;
-    }
-
-    ///////////////
-    // Pokestops
-    //////////////
-
-    public function getTotalPokestops()
-    {
-        $req = 'SELECT COUNT(*) as total FROM pokestop';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getAllPokestops()
-    {
-        $req = "SELECT latitude, longitude, lure_expiration, UTC_TIMESTAMP() AS now,
+		$result = $this->mysqli->query($req);
+		$array = array();
+		while ($data = $result->fetch_object()) {
+			$array[] = $data;
+		}
+
+		return $array;
+	}
+
+	///////////////
+	// Pokestops
+	//////////////
+
+	public function getTotalPokestops()
+	{
+		$req = 'SELECT COUNT(*) as total FROM pokestop';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getAllPokestops()
+	{
+		$req = "SELECT latitude, longitude, lure_expiration, UTC_TIMESTAMP() AS now,
 				CONVERT_TZ(lure_expiration, '+00:00', '".self::$time_offset."') AS lure_expiration_real
 				FROM pokestop";
-        $result = $this->mysqli->query($req);
-        $pokestops = array();
-        while ($data = $result->fetch_object()) {
-            $pokestops[] = $data;
-        }
-
-        return $pokestops;
-    }
-
-    /////////
-    // Gyms
-    /////////
-
-    public function getTeamGuardians($team_id)
-    {
-        $req = "SELECT COUNT(*) AS total, guard_pokemon_id
+		$result = $this->mysqli->query($req);
+		$pokestops = array();
+		while ($data = $result->fetch_object()) {
+			$pokestops[] = $data;
+		}
+
+		return $pokestops;
+	}
+
+	/////////
+	// Gyms
+	/////////
+
+	public function getTeamGuardians($team_id)
+	{
+		$req = "SELECT COUNT(*) AS total, guard_pokemon_id
 				FROM gym WHERE team_id = '".$team_id."'
 				GROUP BY guard_pokemon_id
 				ORDER BY total DESC
 				LIMIT 0,3";
-        $result = $this->mysqli->query($req);
-        $datas = array();
-        while ($data = $result->fetch_object()) {
-            $datas[] = $data;
-        }
-
-        return $datas;
-    }
-
-    public function getOwnedAndPoints($team_id)
-    {
-        $req = "SELECT COUNT(DISTINCT(gym_id)) AS total,
+		$result = $this->mysqli->query($req);
+		$datas = array();
+		while ($data = $result->fetch_object()) {
+			$datas[] = $data;
+		}
+
+		return $datas;
+	}
+
+	public function getOwnedAndPoints($team_id)
+	{
+		$req = "SELECT COUNT(DISTINCT(gym_id)) AS total,
 				ROUND(AVG(total_cp),0) AS average_points
 				FROM gym
 				WHERE team_id = '".$team_id."'";
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
 
-        return $data;
-    }
+		return $data;
+	}
 
-    public function getAllGyms()
-    {
-        $req = "SELECT gym_id, team_id, latitude, longitude,
+	public function getAllGyms()
+	{
+		$req = "SELECT gym_id, team_id, latitude, longitude,
 				CONVERT_TZ(last_scanned, '+00:00', '".self::$time_offset."') AS last_scanned,
 				(6 - slots_available) AS level
 				FROM gym";
-        $result = $this->mysqli->query($req);
-        $gyms = array();
-        while ($data = $result->fetch_object()) {
-            $gyms[] = $data;
-        }
-
-        return $gyms;
-    }
-
-    public function getGymData($gym_id)
-    {
-        $req = "SELECT gymdetails.name AS name, gymdetails.description AS description, gymdetails.url AS url, gym.team_id AS team,
+		$result = $this->mysqli->query($req);
+		$gyms = array();
+		while ($data = $result->fetch_object()) {
+			$gyms[] = $data;
+		}
+
+		return $gyms;
+	}
+
+	public function getGymData($gym_id)
+	{
+		$req = "SELECT gymdetails.name AS name, gymdetails.description AS description, gymdetails.url AS url, gym.team_id AS team,
 				CONVERT_TZ(gym.last_scanned, '+00:00', '".self::$time_offset."') AS last_scanned,
 				gym.guard_pokemon_id AS guard_pokemon_id,
 				gym.total_cp AS total_cp,
@@ -435,53 +435,53 @@ 
 				FROM gymdetails
 				LEFT JOIN gym ON gym.gym_id = gymdetails.gym_id
 				WHERE gym.gym_id='".$gym_id."'";
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
 
-        return $data;
-    }
+		return $data;
+	}
 
-    public function getGymDefenders($gym_id)
-    {
-        $req = "SELECT DISTINCT gympokemon.pokemon_uid, pokemon_id, iv_attack, iv_defense, iv_stamina, MAX(cp) AS cp, gymmember.gym_id
+	public function getGymDefenders($gym_id)
+	{
+		$req = "SELECT DISTINCT gympokemon.pokemon_uid, pokemon_id, iv_attack, iv_defense, iv_stamina, MAX(cp) AS cp, gymmember.gym_id
 				FROM gympokemon
 				INNER JOIN gymmember ON gympokemon.pokemon_uid=gymmember.pokemon_uid
 				GROUP BY gympokemon.pokemon_uid, pokemon_id, iv_attack, iv_defense, iv_stamina, gym_id
 				HAVING gymmember.gym_id='".$gym_id."'
 				ORDER BY cp DESC";
-        $result = $this->mysqli->query($req);
-        $defenders = array();
-        while ($data = $result->fetch_object()) {
-            $defenders[] = $data;
-        }
-
-        return $defenders;
-    }
-
-    ////////////////
-    // Gym History
-    ////////////////
-
-    public function getGymHistories($gym_name, $team, $page, $ranking)
-    {
-        $where = '';
-        if (isset($gym_name) && '' != $gym_name) {
-            $where = " WHERE name LIKE '%".$gym_name."%'";
-        }
-        if (isset($team) && '' != $team) {
-            $where .= ('' == $where ? ' WHERE' : ' AND').' team_id = '.$team;
-        }
-        switch ($ranking) {
-            case 1:
-                $order = ' ORDER BY name, last_modified DESC';
-                break;
-            case 2:
-                $order = ' ORDER BY total_cp DESC, last_modified DESC';
-                break;
-            default:
-                $order = ' ORDER BY last_modified DESC, name';
-        }
-        $req = "SELECT gymdetails.gym_id, name, team_id, total_cp,
+		$result = $this->mysqli->query($req);
+		$defenders = array();
+		while ($data = $result->fetch_object()) {
+			$defenders[] = $data;
+		}
+
+		return $defenders;
+	}
+
+	////////////////
+	// Gym History
+	////////////////
+
+	public function getGymHistories($gym_name, $team, $page, $ranking)
+	{
+		$where = '';
+		if (isset($gym_name) && '' != $gym_name) {
+			$where = " WHERE name LIKE '%".$gym_name."%'";
+		}
+		if (isset($team) && '' != $team) {
+			$where .= ('' == $where ? ' WHERE' : ' AND').' team_id = '.$team;
+		}
+		switch ($ranking) {
+			case 1:
+				$order = ' ORDER BY name, last_modified DESC';
+				break;
+			case 2:
+				$order = ' ORDER BY total_cp DESC, last_modified DESC';
+				break;
+			default:
+				$order = ' ORDER BY last_modified DESC, name';
+		}
+		$req = "SELECT gymdetails.gym_id, name, team_id, total_cp,
 				(6 - slots_available) as pokemon_count,
 				CONVERT_TZ(last_modified, '+00:00', '".self::$time_offset."') as last_modified
 				FROM gymdetails
@@ -489,93 +489,93 @@ 
 				ON gymdetails.gym_id = gym.gym_id
 				".$where.$order."
 				LIMIT ".($page * 10).",10";
-        $result = $this->mysqli->query($req);
-        $gym_history = array();
-        while ($data = $result->fetch_object()) {
-            $gym_history[] = $data;
-        }
-
-        return $gym_history;
-    }
-
-    public function getGymHistoriesPokemon($gym_id)
-    {
-        $req = "SELECT DISTINCT gymmember.pokemon_uid, pokemon_id, cp, trainer_name
+		$result = $this->mysqli->query($req);
+		$gym_history = array();
+		while ($data = $result->fetch_object()) {
+			$gym_history[] = $data;
+		}
+
+		return $gym_history;
+	}
+
+	public function getGymHistoriesPokemon($gym_id)
+	{
+		$req = "SELECT DISTINCT gymmember.pokemon_uid, pokemon_id, cp, trainer_name
 				FROM gymmember
 				LEFT JOIN gympokemon
 				ON gymmember.pokemon_uid = gympokemon.pokemon_uid
 				WHERE gymmember.gym_id = '".$gym_id."'
 				ORDER BY deployment_time";
-        $result = $this->mysqli->query($req);
-        $pokemons = array();
-        while ($data = $result->fetch_object()) {
-            $pokemons[] = $data;
-        }
-
-        return $pokemons;
-    }
-
-    public function getHistoryForGym($page, $gym_id)
-    {
-        if (isset(self::$config->system->gymhistory_hide_cp_changes) && true === self::$config->system->gymhistory_hide_cp_changes) {
-            $pageSize = 25;
-        } else {
-            $pageSize = 10;
-        }
-        $req = "SELECT gym_id, team_id, total_cp, pokemon_uids, pokemon_count,
+		$result = $this->mysqli->query($req);
+		$pokemons = array();
+		while ($data = $result->fetch_object()) {
+			$pokemons[] = $data;
+		}
+
+		return $pokemons;
+	}
+
+	public function getHistoryForGym($page, $gym_id)
+	{
+		if (isset(self::$config->system->gymhistory_hide_cp_changes) && true === self::$config->system->gymhistory_hide_cp_changes) {
+			$pageSize = 25;
+		} else {
+			$pageSize = 10;
+		}
+		$req = "SELECT gym_id, team_id, total_cp, pokemon_uids, pokemon_count,
 				CONVERT_TZ(last_modified, '+00:00', '".self::$time_offset."') as last_modified
 				FROM gymhistory
 				WHERE gym_id='".$gym_id."'
 				ORDER BY last_modified DESC
 				LIMIT ".($page * $pageSize).','.($pageSize + 1);
-        $result = $this->mysqli->query($req);
-        $history = array();
-        $count = 0;
-        while ($data = $result->fetch_object()) {
-            ++$count;
-            $pkm = array();
-            if (0 == $data->total_cp) {
-                $data->pokemon_uids = '';
-                $data->pokemon_count = 0;
-            }
-            if ('' != $data->pokemon_uids) {
-                $pkm_uids = explode(',', $data->pokemon_uids);
-                $pkm = $this->getHistoryForGymPokemon($pkm_uids);
-            }
-            $data->pokemon = $pkm;
-            $history[] = $data;
-        }
-        if ($count !== ($pageSize + 1)) {
-            $last_page = true;
-        } else {
-            $last_page = false;
-        }
-
-        return array('last_page' => $last_page, 'data' => $history);
-    }
-
-    private function getHistoryForGymPokemon($pkm_uids)
-    {
-        $req = "SELECT DISTINCT pokemon_uid, pokemon_id, cp, trainer_name
+		$result = $this->mysqli->query($req);
+		$history = array();
+		$count = 0;
+		while ($data = $result->fetch_object()) {
+			++$count;
+			$pkm = array();
+			if (0 == $data->total_cp) {
+				$data->pokemon_uids = '';
+				$data->pokemon_count = 0;
+			}
+			if ('' != $data->pokemon_uids) {
+				$pkm_uids = explode(',', $data->pokemon_uids);
+				$pkm = $this->getHistoryForGymPokemon($pkm_uids);
+			}
+			$data->pokemon = $pkm;
+			$history[] = $data;
+		}
+		if ($count !== ($pageSize + 1)) {
+			$last_page = true;
+		} else {
+			$last_page = false;
+		}
+
+		return array('last_page' => $last_page, 'data' => $history);
+	}
+
+	private function getHistoryForGymPokemon($pkm_uids)
+	{
+		$req = "SELECT DISTINCT pokemon_uid, pokemon_id, cp, trainer_name
 				FROM gympokemon
 				WHERE pokemon_uid IN ('".implode("','", $pkm_uids)."')
 				ORDER BY FIND_IN_SET(pokemon_uid, '".implode(',', $pkm_uids)."')";
-        $result = $this->mysqli->query($req);
-        $pokemons = array();
-        while ($data = $result->fetch_object()) {
-            $pokemons[$data->pokemon_uid] = $data;
-        }
-
-        return $pokemons;
-    }
-
-    ///////////
-    // Raids
-    ///////////
-
-    public function getAllRaids($page)
-    {
-        $req = "SELECT raid.gym_id, raid.level, raid.pokemon_id, raid.cp, raid.move_1, raid.move_2,
+		$result = $this->mysqli->query($req);
+		$pokemons = array();
+		while ($data = $result->fetch_object()) {
+			$pokemons[$data->pokemon_uid] = $data;
+		}
+
+		return $pokemons;
+	}
+
+	///////////
+	// Raids
+	///////////
+
+	public function getAllRaids($page)
+	{
+		$req = "SELECT raid.gym_id, raid.level, raid.pokemon_id, raid.cp, raid.move_1, raid.move_2,
 				CONVERT_TZ(raid.spawn, '+00:00', '".self::$time_offset."') AS spawn,
 				CONVERT_TZ(raid.start, '+00:00', '".self::$time_offset."') AS start,
 				CONVERT_TZ(raid.end, '+00:00', '".self::$time_offset."') AS end,
@@ -587,121 +587,121 @@ 
 				WHERE raid.end > UTC_TIMESTAMP()
 				ORDER BY raid.level DESC, raid.start
 				LIMIT ".($page * 10).",10";
-        $result = $this->mysqli->query($req);
-        $raids = array();
-        while ($data = $result->fetch_object()) {
-            $raids[] = $data;
-        }
-
-        return $raids;
-    }
-
-    //////////////
-    // Trainers
-    //////////////
-
-    public function getTrainers($trainer_name, $team, $page, $ranking)
-    {
-        $trainers = $this->getTrainerData($trainer_name, $team, $page, $ranking);
-        foreach ($trainers as $trainer) {
-            $trainer->rank = $this->getTrainerLevelRating($trainer->level)->rank;
-            $active_gyms = 0;
-            $pkmCount = 0;
-            $trainer->pokemons = array();
-            $active_pokemon = $this->getTrainerActivePokemon($trainer->name);
-            foreach ($active_pokemon as $pokemon) {
-                ++$active_gyms;
-                $trainer->pokemons[$pkmCount++] = $pokemon;
-            }
-            $inactive_pokemon = $this->getTrainerInactivePokemon($trainer->name);
-            foreach ($inactive_pokemon as $pokemon) {
-                $trainer->pokemons[$pkmCount++] = $pokemon;
-            }
-            $trainer->gyms = ''.$active_gyms;
-        }
-
-        return $trainers;
-    }
-
-    public function getTrainerLevelCount($team_id)
-    {
-        $req = "SELECT level, count(level) AS count FROM trainer WHERE team = '".$team_id."'";
-        if (!empty(self::$config->system->trainer_blacklist)) {
-            $req .= " AND name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
-        }
-        $req .= ' GROUP BY level';
-        $result = $this->mysqli->query($req);
-        $levelData = array();
-        while ($data = $result->fetch_object()) {
-            $levelData[$data->level] = $data->count;
-        }
-        for ($i = 5; $i <= 40; ++$i) {
-            if (!isset($levelData[$i])) {
-                $levelData[$i] = 0;
-            }
-        }
-        // sort array again
-        ksort($levelData);
-
-        return $levelData;
-    }
-
-    private function getTrainerData($trainer_name, $team, $page, $ranking)
-    {
-        $where = '';
-        if (!empty(self::$config->system->trainer_blacklist)) {
-            $where .= ('' == $where ? ' HAVING' : ' AND')." name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
-        }
-        if ('' != $trainer_name) {
-            $where = " HAVING name LIKE '%".$trainer_name."%'";
-        }
-        if (0 != $team) {
-            $where .= ('' == $where ? ' HAVING' : ' AND').' team = '.$team;
-        }
-        switch ($ranking) {
-            case 1:
-                $order = ' ORDER BY active DESC, level DESC';
-                break;
-            case 2:
-                $order = ' ORDER BY maxCp DESC, level DESC';
-                break;
-            default:
-                $order = ' ORDER BY level DESC, active DESC';
-        }
-        $order .= ', last_seen DESC, name ';
-        $limit = ' LIMIT '.($page * 10).',10 ';
-        $req = "SELECT trainer.*, COUNT(actives_pokemons.trainer_name) AS active, max(actives_pokemons.cp) AS maxCp
+		$result = $this->mysqli->query($req);
+		$raids = array();
+		while ($data = $result->fetch_object()) {
+			$raids[] = $data;
+		}
+
+		return $raids;
+	}
+
+	//////////////
+	// Trainers
+	//////////////
+
+	public function getTrainers($trainer_name, $team, $page, $ranking)
+	{
+		$trainers = $this->getTrainerData($trainer_name, $team, $page, $ranking);
+		foreach ($trainers as $trainer) {
+			$trainer->rank = $this->getTrainerLevelRating($trainer->level)->rank;
+			$active_gyms = 0;
+			$pkmCount = 0;
+			$trainer->pokemons = array();
+			$active_pokemon = $this->getTrainerActivePokemon($trainer->name);
+			foreach ($active_pokemon as $pokemon) {
+				++$active_gyms;
+				$trainer->pokemons[$pkmCount++] = $pokemon;
+			}
+			$inactive_pokemon = $this->getTrainerInactivePokemon($trainer->name);
+			foreach ($inactive_pokemon as $pokemon) {
+				$trainer->pokemons[$pkmCount++] = $pokemon;
+			}
+			$trainer->gyms = ''.$active_gyms;
+		}
+
+		return $trainers;
+	}
+
+	public function getTrainerLevelCount($team_id)
+	{
+		$req = "SELECT level, count(level) AS count FROM trainer WHERE team = '".$team_id."'";
+		if (!empty(self::$config->system->trainer_blacklist)) {
+			$req .= " AND name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
+		}
+		$req .= ' GROUP BY level';
+		$result = $this->mysqli->query($req);
+		$levelData = array();
+		while ($data = $result->fetch_object()) {
+			$levelData[$data->level] = $data->count;
+		}
+		for ($i = 5; $i <= 40; ++$i) {
+			if (!isset($levelData[$i])) {
+				$levelData[$i] = 0;
+			}
+		}
+		// sort array again
+		ksort($levelData);
+
+		return $levelData;
+	}
+
+	private function getTrainerData($trainer_name, $team, $page, $ranking)
+	{
+		$where = '';
+		if (!empty(self::$config->system->trainer_blacklist)) {
+			$where .= ('' == $where ? ' HAVING' : ' AND')." name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
+		}
+		if ('' != $trainer_name) {
+			$where = " HAVING name LIKE '%".$trainer_name."%'";
+		}
+		if (0 != $team) {
+			$where .= ('' == $where ? ' HAVING' : ' AND').' team = '.$team;
+		}
+		switch ($ranking) {
+			case 1:
+				$order = ' ORDER BY active DESC, level DESC';
+				break;
+			case 2:
+				$order = ' ORDER BY maxCp DESC, level DESC';
+				break;
+			default:
+				$order = ' ORDER BY level DESC, active DESC';
+		}
+		$order .= ', last_seen DESC, name ';
+		$limit = ' LIMIT '.($page * 10).',10 ';
+		$req = "SELECT trainer.*, COUNT(actives_pokemons.trainer_name) AS active, max(actives_pokemons.cp) AS maxCp
 				FROM trainer
 				LEFT JOIN (SELECT DISTINCT gympokemon.pokemon_id, gympokemon.pokemon_uid, gympokemon.trainer_name, gympokemon.cp, DATEDIFF(UTC_TIMESTAMP(), gympokemon.last_seen) AS last_scanned
 				FROM gympokemon
 				INNER JOIN (SELECT gymmember.pokemon_uid, gymmember.gym_id FROM gymmember GROUP BY gymmember.pokemon_uid, gymmember.gym_id HAVING gymmember.gym_id <> '') AS filtered_gymmember
 				ON gympokemon.pokemon_uid = filtered_gymmember.pokemon_uid) AS actives_pokemons ON actives_pokemons.trainer_name = trainer.name
 				GROUP BY trainer.name ".$where.$order.$limit;
-        $result = $this->mysqli->query($req);
-        $trainers = array();
-        while ($data = $result->fetch_object()) {
-            $data->last_seen = date('Y-m-d', strtotime($data->last_seen));
-            $trainers[$data->name] = $data;
-        }
-
-        return $trainers;
-    }
-
-    private function getTrainerLevelRating($level)
-    {
-        $req = 'SELECT COUNT(1) AS rank FROM trainer WHERE level = '.$level;
-        if (!empty(self::$config->system->trainer_blacklist)) {
-            $req .= " AND name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
-        }
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    private function getTrainerActivePokemon($trainer_name)
-    {
-        $req = "SELECT DISTINCT gympokemon.pokemon_id, gympokemon.pokemon_uid, gympokemon.cp,
+		$result = $this->mysqli->query($req);
+		$trainers = array();
+		while ($data = $result->fetch_object()) {
+			$data->last_seen = date('Y-m-d', strtotime($data->last_seen));
+			$trainers[$data->name] = $data;
+		}
+
+		return $trainers;
+	}
+
+	private function getTrainerLevelRating($level)
+	{
+		$req = 'SELECT COUNT(1) AS rank FROM trainer WHERE level = '.$level;
+		if (!empty(self::$config->system->trainer_blacklist)) {
+			$req .= " AND name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
+		}
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	private function getTrainerActivePokemon($trainer_name)
+	{
+		$req = "SELECT DISTINCT gympokemon.pokemon_id, gympokemon.pokemon_uid, gympokemon.cp,
 				DATEDIFF(UTC_TIMESTAMP(), gympokemon.last_seen) AS last_scanned,
 				gympokemon.trainer_name, gympokemon.iv_defense, gympokemon.iv_stamina, gympokemon.iv_attack,
 				filtered_gymmember.gym_id,
@@ -712,18 +712,18 @@ 
 				ON gympokemon.pokemon_uid = filtered_gymmember.pokemon_uid
 				WHERE gympokemon.trainer_name='".$trainer_name."'
 				ORDER BY gympokemon.cp DESC";
-        $result = $this->mysqli->query($req);
-        $pokemons = array();
-        while ($data = $result->fetch_object()) {
-            $pokemons[] = $data;
-        }
-
-        return $pokemons;
-    }
-
-    private function getTrainerInactivePokemon($trainer_name)
-    {
-        $req = "SELECT DISTINCT gympokemon.pokemon_id, gympokemon.pokemon_uid, gympokemon.cp,
+		$result = $this->mysqli->query($req);
+		$pokemons = array();
+		while ($data = $result->fetch_object()) {
+			$pokemons[] = $data;
+		}
+
+		return $pokemons;
+	}
+
+	private function getTrainerInactivePokemon($trainer_name)
+	{
+		$req = "SELECT DISTINCT gympokemon.pokemon_id, gympokemon.pokemon_uid, gympokemon.cp,
 				DATEDIFF(UTC_TIMESTAMP(), gympokemon.last_seen) AS last_scanned,
 				gympokemon.trainer_name, gympokemon.iv_defense, gympokemon.iv_stamina, gympokemon.iv_attack,
 				null AS gym_id,
@@ -734,78 +734,78 @@ 
 				ON gympokemon.pokemon_uid = filtered_gymmember.pokemon_uid
 				WHERE filtered_gymmember.pokemon_uid IS NULL AND gympokemon.trainer_name='".$trainer_name."'
 				ORDER BY gympokemon.cp DESC";
-        $result = $this->mysqli->query($req);
-        $pokemons = array();
-        while ($data = $result->fetch_object()) {
-            $pokemons[] = $data;
-        }
-
-        return $pokemons;
-    }
-
-    /////////
-    // Cron
-    /////////
-
-    public function getPokemonCountsActive()
-    {
-        $req = 'SELECT pokemon_id, COUNT(*) as total
+		$result = $this->mysqli->query($req);
+		$pokemons = array();
+		while ($data = $result->fetch_object()) {
+			$pokemons[] = $data;
+		}
+
+		return $pokemons;
+	}
+
+	/////////
+	// Cron
+	/////////
+
+	public function getPokemonCountsActive()
+	{
+		$req = 'SELECT pokemon_id, COUNT(*) as total
 				FROM pokemon
 				WHERE disappear_time >= UTC_TIMESTAMP()
 				GROUP BY pokemon_id';
-        $result = $this->mysqli->query($req);
-        $counts = array();
-        while ($data = $result->fetch_object()) {
-            $counts[$data->pokemon_id] = $data->total;
-        }
+		$result = $this->mysqli->query($req);
+		$counts = array();
+		while ($data = $result->fetch_object()) {
+			$counts[$data->pokemon_id] = $data->total;
+		}
 
-        return $counts;
-    }
+		return $counts;
+	}
 
 
-    public function getTotalPokemonIV()
-    {
-        $req = 'SELECT COUNT(*) as total
+	public function getTotalPokemonIV()
+	{
+		$req = 'SELECT COUNT(*) as total
 				FROM pokemon
 				WHERE disappear_time >= UTC_TIMESTAMP() AND cp IS NOT NULL';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
 
-        return $data;
-    }
+		return $data;
+	}
 
-    public function getPokemonCountsLastDay()
-    {
-        $req = 'SELECT pokemon_id, COUNT(*) AS spawns_last_day
+	public function getPokemonCountsLastDay()
+	{
+		$req = 'SELECT pokemon_id, COUNT(*) AS spawns_last_day
 				FROM pokemon
 				WHERE disappear_time >= (SELECT MAX(disappear_time) FROM pokemon) - INTERVAL 1 DAY
 				GROUP BY pokemon_id
 				ORDER BY pokemon_id ASC';
-        $result = $this->mysqli->query($req);
-        $counts = array();
-        while ($data = $result->fetch_object()) {
-            $counts[$data->pokemon_id] = $data->spawns_last_day;
-        }
-
-        return $counts;
-    }
-
-    public function getCaptchaCount()
-    {
-        $req = 'SELECT SUM(accounts_captcha) AS total FROM mainworker';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getNestData($time, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
-    {
-        $pokemon_exclude_sql = '';
-        if (!empty(self::$config->system->nest_exclude_pokemon)) {
-            $pokemon_exclude_sql = 'AND pokemon_id NOT IN ('.implode(',', self::$config->system->nest_exclude_pokemon).')';
-        }
-        $req = 'SELECT spawnpoint_id, pokemon_id, MAX(latitude) AS latitude, MAX(longitude) AS longitude, count(pokemon_id) AS total_pokemon,
+		$result = $this->mysqli->query($req);
+		$counts = array();
+		while ($data = $result->fetch_object()) {
+			$counts[$data->pokemon_id] = $data->spawns_last_day;
+		}
+
+		return $counts;
+	}
+
+	public function getCaptchaCount()
+	{
+		$req = 'SELECT SUM(accounts_captcha) AS total FROM mainworker';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getNestData($time, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
+	{
+		$pokemon_exclude_sql = '';
+		if (!empty(self::$config->system->nest_exclude_pokemon)) {
+			$pokemon_exclude_sql = 'AND pokemon_id NOT IN ('.implode(',', self::$config->system->nest_exclude_pokemon).')';
+		}
+		$req = 'SELECT spawnpoint_id, pokemon_id, MAX(latitude) AS latitude, MAX(longitude) AS longitude, count(pokemon_id) AS total_pokemon,
 				MAX(UNIX_TIMESTAMP(disappear_time)) as latest_seen
 				FROM pokemon
 				WHERE disappear_time > (UTC_TIMESTAMP() - INTERVAL '.$time.' HOUR)
@@ -814,23 +814,23 @@ 
 				GROUP BY spawnpoint_id, pokemon_id 
 				HAVING COUNT(pokemon_id) >= '.($time / 4).'
 				ORDER BY pokemon_id';
-        $result = $this->mysqli->query($req);
-        $nests = array();
-        while ($data = $result->fetch_object()) {
-            $nests[] = $data;
-        }
-
-        return $nests;
-    }
-
-    public function getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
-    {
-        $req = 'SELECT COUNT(*) as total 
+		$result = $this->mysqli->query($req);
+		$nests = array();
+		while ($data = $result->fetch_object()) {
+			$nests[] = $data;
+		}
+
+		return $nests;
+	}
+
+	public function getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
+	{
+		$req = 'SELECT COUNT(*) as total 
 				FROM trs_spawn
 				WHERE latitude >= '.$minLatitude.' AND latitude < '.$maxLatitude.' AND longitude >= '.$minLongitude.' AND longitude < '.$maxLongitude;
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
 
-        return $data;
-    }
+		return $data;
+	}
 }