brusselopole / Worldopole

functions.php

Doc Comments +3 added lines

@@ -216,6 +216,9 @@
 //#######################################################################
 // used in get_tree_at_depth
 //#######################################################################
+/**
+ * @param boolean $correct_arrow
+ */
 function tree_check_array($array_check, $array_add, $correct_arrow)
 {
     $count = count($array_check);

Indentation +285 added lines, -285 removed lines

@@ -10,70 +10,70 @@ 
 
 function time_ago($timestamp, $locales)
 {
-    // Set up our variables.
-    $minute_in_seconds = 60;
-    $hour_in_seconds = $minute_in_seconds * 60;
-    $day_in_seconds = $hour_in_seconds * 24;
-    $week_in_seconds = $day_in_seconds * 7;
-    $month_in_seconds = $day_in_seconds * 30;
-    $year_in_seconds = $day_in_seconds * 365;
-
-    // current time
-    $now = time();
-
-    // Calculate the time difference between the current time reference point and the timestamp we're comparing.
-    // The difference is defined negative, when in the future.
-    $time_difference = $now - $timestamp;
-
-    // Calculate the time ago using the smallest applicable unit.
-    if ($time_difference < $hour_in_seconds) {
-        $difference_value = abs(round($time_difference / $minute_in_seconds));
-        $difference_label = 'MINUTE';
-    } elseif ($time_difference < $day_in_seconds) {
-        $difference_value = abs(round($time_difference / $hour_in_seconds));
-        $difference_label = 'HOUR';
-    } elseif ($time_difference < $week_in_seconds) {
-        $difference_value = abs(round($time_difference / $day_in_seconds));
-        $difference_label = 'DAY';
-    } elseif ($time_difference < $month_in_seconds) {
-        $difference_value = abs(round($time_difference / $week_in_seconds));
-        $difference_label = 'WEEK';
-    } elseif ($time_difference < $year_in_seconds) {
-        $difference_value = abs(round($time_difference / $month_in_seconds));
-        $difference_label = 'MONTH';
-    } else {
-        $difference_value = abs(round($time_difference / $year_in_seconds));
-        $difference_label = 'YEAR';
-    }
-
-    // plural
-    if (1 != $difference_value) {
-        $difference_label = $difference_label.'S';
-    }
-
-    if ($time_difference <= 0) {
-        // Present
-        return sprintf($locales->TIME_LEFT, $difference_value.' '.$locales->$difference_label);
-    } else {
-        // Past
-        return sprintf($locales->TIME_AGO, $difference_value.' '.$locales->$difference_label);
-    }
+	// Set up our variables.
+	$minute_in_seconds = 60;
+	$hour_in_seconds = $minute_in_seconds * 60;
+	$day_in_seconds = $hour_in_seconds * 24;
+	$week_in_seconds = $day_in_seconds * 7;
+	$month_in_seconds = $day_in_seconds * 30;
+	$year_in_seconds = $day_in_seconds * 365;
+
+	// current time
+	$now = time();
+
+	// Calculate the time difference between the current time reference point and the timestamp we're comparing.
+	// The difference is defined negative, when in the future.
+	$time_difference = $now - $timestamp;
+
+	// Calculate the time ago using the smallest applicable unit.
+	if ($time_difference < $hour_in_seconds) {
+		$difference_value = abs(round($time_difference / $minute_in_seconds));
+		$difference_label = 'MINUTE';
+	} elseif ($time_difference < $day_in_seconds) {
+		$difference_value = abs(round($time_difference / $hour_in_seconds));
+		$difference_label = 'HOUR';
+	} elseif ($time_difference < $week_in_seconds) {
+		$difference_value = abs(round($time_difference / $day_in_seconds));
+		$difference_label = 'DAY';
+	} elseif ($time_difference < $month_in_seconds) {
+		$difference_value = abs(round($time_difference / $week_in_seconds));
+		$difference_label = 'WEEK';
+	} elseif ($time_difference < $year_in_seconds) {
+		$difference_value = abs(round($time_difference / $month_in_seconds));
+		$difference_label = 'MONTH';
+	} else {
+		$difference_value = abs(round($time_difference / $year_in_seconds));
+		$difference_label = 'YEAR';
+	}
+
+	// plural
+	if (1 != $difference_value) {
+		$difference_label = $difference_label.'S';
+	}
+
+	if ($time_difference <= 0) {
+		// Present
+		return sprintf($locales->TIME_LEFT, $difference_value.' '.$locales->$difference_label);
+	} else {
+		// Past
+		return sprintf($locales->TIME_AGO, $difference_value.' '.$locales->$difference_label);
+	}
 }
 
 function time_ago_day($timestamp, $locales) {
-    $spawn = new DateTime($timestamp);
-    $now = new DateTime();
-
-    $days = $now->diff($spawn)->format("%a");
-    if ($days == 0) {
-        return $locales->TODAY;
-    } elseif ($days == 1) {
-        return $locales->YESTERDAY;
-    } else {
-        return sprintf($locales->TIME_AGO, $days.' '.$locales->DAYS);
-    }
-
-    return $days;
+	$spawn = new DateTime($timestamp);
+	$now = new DateTime();
+
+	$days = $now->diff($spawn)->format("%a");
+	if ($days == 0) {
+		return $locales->TODAY;
+	} elseif ($days == 1) {
+		return $locales->YESTERDAY;
+	} else {
+		return sprintf($locales->TIME_AGO, $days.' '.$locales->DAYS);
+	}
+
+	return $days;
 }
 
 //#######################################################################
@@ -86,12 +86,12 @@ 
 
 function percent($val, $val_total)
 {
-    $count1 = $val_total / $val;
-    $count2 = $count1 * 100;
+	$count1 = $val_total / $val;
+	$count2 = $count1 * 100;
 
-    $count = number_format($count2, 0);
+	$count = number_format($count2, 0);
 
-    return $count;
+	return $count;
 }
 
 //#######################################################################
@@ -103,13 +103,13 @@ 
 
 function auto_ver($url)
 {
-    if (is_file(SYS_PATH.'/'.$url)) {
-        $path = pathinfo($url);
-        $ver = '.'.filemtime(SYS_PATH.'/'.$url).'.';
-        echo $path['dirname'].'/'.preg_replace('/\.(css|js|json)$/', $ver.'$1', $path['basename']);
-    } else {
-        echo $url;
-    }
+	if (is_file(SYS_PATH.'/'.$url)) {
+		$path = pathinfo($url);
+		$ver = '.'.filemtime(SYS_PATH.'/'.$url).'.';
+		echo $path['dirname'].'/'.preg_replace('/\.(css|js|json)$/', $ver.'$1', $path['basename']);
+	} else {
+		echo $url;
+	}
 }
 
 //#######################################################################
@@ -121,15 +121,15 @@ 
 
 function file_update_ago($filepath)
 {
-    if (is_file($filepath)) {
-        $filemtime = filemtime($filepath);
-        $now = time();
-        $diff = $now - $filemtime;
-
-        return $diff;
-    }
-    // file doesn't exist yet!
-    return PHP_INT_MAX;
+	if (is_file($filepath)) {
+		$filemtime = filemtime($filepath);
+		$now = time();
+		$diff = $now - $filemtime;
+
+		return $diff;
+	}
+	// file doesn't exist yet!
+	return PHP_INT_MAX;
 }
 
 //#######################################################################
@@ -142,13 +142,13 @@ 
 
 function trim_stats_json($array, $timestamp)
 {
-    foreach ($array as $key => $value) {
-        if ($value['timestamp'] < $timestamp) {
-            unset($array[$key]);
-        }
-    }
+	foreach ($array as $key => $value) {
+		if ($value['timestamp'] < $timestamp) {
+			unset($array[$key]);
+		}
+	}
 
-    return $array;
+	return $array;
 }
 
 //#######################################################################
@@ -160,31 +160,31 @@ 
 
 function gym_level($prestige)
 {
-    if (0 == $prestige) {
-        $gym_level = 0;
-    } elseif ($prestige < 2000) {
-        $gym_level = 1;
-    } elseif ($prestige < 4000) {
-        $gym_level = 2;
-    } elseif ($prestige < 8000) {
-        $gym_level = 3;
-    } elseif ($prestige < 12000) {
-        $gym_level = 4;
-    } elseif ($prestige < 16000) {
-        $gym_level = 5;
-    } elseif ($prestige < 20000) {
-        $gym_level = 6;
-    } elseif ($prestige < 30000) {
-        $gym_level = 7;
-    } elseif ($prestige < 40000) {
-        $gym_level = 8;
-    } elseif ($prestige < 50000) {
-        $gym_level = 9;
-    } else {
-        $gym_level = 10;
-    }
-
-    return $gym_level;
+	if (0 == $prestige) {
+		$gym_level = 0;
+	} elseif ($prestige < 2000) {
+		$gym_level = 1;
+	} elseif ($prestige < 4000) {
+		$gym_level = 2;
+	} elseif ($prestige < 8000) {
+		$gym_level = 3;
+	} elseif ($prestige < 12000) {
+		$gym_level = 4;
+	} elseif ($prestige < 16000) {
+		$gym_level = 5;
+	} elseif ($prestige < 20000) {
+		$gym_level = 6;
+	} elseif ($prestige < 30000) {
+		$gym_level = 7;
+	} elseif ($prestige < 40000) {
+		$gym_level = 8;
+	} elseif ($prestige < 50000) {
+		$gym_level = 9;
+	} else {
+		$gym_level = 10;
+	}
+
+	return $gym_level;
 }
 
 //#######################################################################
@@ -195,13 +195,13 @@ 
 //#######################################################################
 function get_depth($arr)
 {
-    $it = new RecursiveIteratorIterator(new RecursiveArrayIterator($arr));
-    $depth = 0;
-    foreach ($it as $v) {
-        $it->getDepth() > $depth && $depth = $it->getDepth();
-    }
+	$it = new RecursiveIteratorIterator(new RecursiveArrayIterator($arr));
+	$depth = 0;
+	foreach ($it as $v) {
+		$it->getDepth() > $depth && $depth = $it->getDepth();
+	}
 
-    return $depth;
+	return $depth;
 }
 
 //#######################################################################
@@ -215,18 +215,18 @@ 
 //#######################################################################
 function get_tree_at_depth($trees, $depth, $max_pokemon, $currentDepth = 0)
 {
-    if ($depth == $currentDepth) { // Found depth
-        return tree_remove_bellow($trees, $max_pokemon);
-    } else { // Go deeper
-        $arr = array();
-        foreach ($trees as $temp) { // Go into all trees
-            $tree = $temp->evolutions;
-            $results = tree_remove_bellow(get_tree_at_depth($tree, $depth, $max_pokemon, $currentDepth + 1), $max_pokemon);
-            $arr = tree_check_array($results, $arr, 1 == $depth - $currentDepth);
-        }
-
-        return $arr;
-    }
+	if ($depth == $currentDepth) { // Found depth
+		return tree_remove_bellow($trees, $max_pokemon);
+	} else { // Go deeper
+		$arr = array();
+		foreach ($trees as $temp) { // Go into all trees
+			$tree = $temp->evolutions;
+			$results = tree_remove_bellow(get_tree_at_depth($tree, $depth, $max_pokemon, $currentDepth + 1), $max_pokemon);
+			$arr = tree_check_array($results, $arr, 1 == $depth - $currentDepth);
+		}
+
+		return $arr;
+	}
 }
 
 //#######################################################################
@@ -234,28 +234,28 @@ 
 //#######################################################################
 function tree_check_array($array_check, $array_add, $correct_arrow)
 {
-    $count = count($array_check);
-    $i = 0;
-    if (!is_null($array_check)) { // check if exists
-        foreach ($array_check as $res) { // Check if above, equal or bellow center
-            if (1 != $count && $correct_arrow) { // only add arrow once
-                $num = $i / ($count - 1);
-                if ($num < 0.5) {
-                    $res->array_sufix = '_up';
-                } elseif ($num > 0.5) {
-                    $res->array_sufix = '_down';
-                } else {
-                    $res->array_sufix = '';
-                }
-            } elseif (!isset($res->array_sufix)) {
-                $res->array_sufix = '';
-            }
-            $array_add[] = $res;
-            ++$i;
-        }
-    }
-
-    return $array_add;
+	$count = count($array_check);
+	$i = 0;
+	if (!is_null($array_check)) { // check if exists
+		foreach ($array_check as $res) { // Check if above, equal or bellow center
+			if (1 != $count && $correct_arrow) { // only add arrow once
+				$num = $i / ($count - 1);
+				if ($num < 0.5) {
+					$res->array_sufix = '_up';
+				} elseif ($num > 0.5) {
+					$res->array_sufix = '_down';
+				} else {
+					$res->array_sufix = '';
+				}
+			} elseif (!isset($res->array_sufix)) {
+				$res->array_sufix = '';
+			}
+			$array_add[] = $res;
+			++$i;
+		}
+	}
+
+	return $array_add;
 }
 
 //#######################################################################
@@ -263,17 +263,17 @@ 
 //#######################################################################
 function tree_remove_bellow($tree, $max_pokemon)
 {
-    if (is_null($tree)) {
-        return null;
-    }
-    $arr = array();
-    foreach ($tree as $item) { // Check if above, equal or bellow center
-        if ($item->id <= $max_pokemon) {
-            $arr[] = $item;
-        }
-    }
-
-    return $arr;
+	if (is_null($tree)) {
+		return null;
+	}
+	$arr = array();
+	foreach ($tree as $item) { // Check if above, equal or bellow center
+		if ($item->id <= $max_pokemon) {
+			$arr[] = $item;
+		}
+	}
+
+	return $arr;
 }
 
 //#######################################################################
@@ -281,22 +281,22 @@ 
 //#######################################################################
 function generation($id)
 {
-    switch ($id) {
-        case $id >= 1 && $id <= 151:
-            return [1, 'Kanto'];
-        case $id >= 152 && $id <= 251:
-            return [2, 'Johto'];
-        case $id >= 252 && $id <= 386:
-            return [3, 'Hoenn'];
-        case $id >= 387 && $id <= 493:
-            return [4, 'Sinnoh'];
-        case $id >= 494 && $id <= 649:
-            return [5, 'Teselia'];
-        case $id >= 650 && $id <= 721:
-            return [6, 'Kalos'];
-        case $id >= 722 && $id <= 802:
-            return [7, 'Alola'];
-    }
+	switch ($id) {
+		case $id >= 1 && $id <= 151:
+			return [1, 'Kanto'];
+		case $id >= 152 && $id <= 251:
+			return [2, 'Johto'];
+		case $id >= 252 && $id <= 386:
+			return [3, 'Hoenn'];
+		case $id >= 387 && $id <= 493:
+			return [4, 'Sinnoh'];
+		case $id >= 494 && $id <= 649:
+			return [5, 'Teselia'];
+		case $id >= 650 && $id <= 721:
+			return [6, 'Kalos'];
+		case $id >= 722 && $id <= 802:
+			return [7, 'Alola'];
+	}
 }
 
 //#######################################################################
@@ -304,34 +304,34 @@ 
 //#######################################################################
 function pointIsInsidePolygon($lat, $lng, $geos, $bounds)
 {
-    if ($lat >= $bounds['minlat'] && $lat <= $bounds['maxlat'] && $lng >= $bounds['minlon'] && $lng <= $bounds['maxlon']) {
-        $intersections = 0;
-        $geos_count = count($geos);
-
-        for ($i = 1; $i < $geos_count; ++$i) {
-            $geo1 = $geos[$i - 1];
-            $geo2 = $geos[$i];
-            if ($geo1['lng'] == $lng && $geo1['lat'] == $lat) { // On one of the coords
-                return true;
-            }
-            if ($geo1['lng'] == $geo2['lng'] and $geo1['lng'] == $lng and $lat > min($geo1['lat'], $geo2['lat']) and $lat < max($geo1['lat'], $geo2['lat'])) { // Check if point is on an horizontal polygon boundary
-                return true;
-            }
-            if ($lng > min($geo1['lng'], $geo2['lng']) and $lng <= max($geo1['lng'], $geo2['lng']) and $lat <= max($geo1['lat'], $geo2['lat']) and $geo1['lng'] != $geo2['lng']) {
-                $xinters = ($lng - $geo1['lng']) * ($geo2['lat'] - $geo1['lat']) / ($geo2['lng'] - $geo1['lng']) + $geo1['lat'];
-                if ($xinters == $lat) { // Check if point is on the polygon boundary (other than horizontal)
-                    return true;
-                }
-                if ($geo1['lat'] == $geo2['lat'] || $lat <= $xinters) {
-                    ++$intersections;
-                }
-            }
-        }
-        // If the number of edges we passed through is odd, then it's in the polygon.
-        return 0 != $intersections % 2;
-    } else {
-        return false; // outside bounds
-    }
+	if ($lat >= $bounds['minlat'] && $lat <= $bounds['maxlat'] && $lng >= $bounds['minlon'] && $lng <= $bounds['maxlon']) {
+		$intersections = 0;
+		$geos_count = count($geos);
+
+		for ($i = 1; $i < $geos_count; ++$i) {
+			$geo1 = $geos[$i - 1];
+			$geo2 = $geos[$i];
+			if ($geo1['lng'] == $lng && $geo1['lat'] == $lat) { // On one of the coords
+				return true;
+			}
+			if ($geo1['lng'] == $geo2['lng'] and $geo1['lng'] == $lng and $lat > min($geo1['lat'], $geo2['lat']) and $lat < max($geo1['lat'], $geo2['lat'])) { // Check if point is on an horizontal polygon boundary
+				return true;
+			}
+			if ($lng > min($geo1['lng'], $geo2['lng']) and $lng <= max($geo1['lng'], $geo2['lng']) and $lat <= max($geo1['lat'], $geo2['lat']) and $geo1['lng'] != $geo2['lng']) {
+				$xinters = ($lng - $geo1['lng']) * ($geo2['lat'] - $geo1['lat']) / ($geo2['lng'] - $geo1['lng']) + $geo1['lat'];
+				if ($xinters == $lat) { // Check if point is on the polygon boundary (other than horizontal)
+					return true;
+				}
+				if ($geo1['lat'] == $geo2['lat'] || $lat <= $xinters) {
+					++$intersections;
+				}
+			}
+		}
+		// If the number of edges we passed through is odd, then it's in the polygon.
+		return 0 != $intersections % 2;
+	} else {
+		return false; // outside bounds
+	}
 }
 
 //#######################################################################
@@ -339,18 +339,18 @@ 
 //#######################################################################
 function polyIsInsidePolygon($geoIn, $boundsIn, $geoOut, $boundsOut)
 {
-    if ($boundsIn['minlat'] >= $boundsOut['minlat'] && $boundsIn['maxlat'] <= $boundsOut['maxlat'] && $boundsIn['minlon'] >= $boundsOut['minlon'] && $boundsIn['maxlon'] <= $boundsOut['maxlon']) {
-        $insideCount = 0;
-        foreach ($geoIn as $coord) {
-            if (pointIsInsidePolygon($coord['lat'], $coord['lng'], $geoOut, $boundsOut)) {
-                ++$insideCount;
-            }
-        }
-
-        return $insideCount / count($geoIn) >= 0.95;
-    } else {
-        return false; // bounds outside
-    }
+	if ($boundsIn['minlat'] >= $boundsOut['minlat'] && $boundsIn['maxlat'] <= $boundsOut['maxlat'] && $boundsIn['minlon'] >= $boundsOut['minlon'] && $boundsIn['maxlon'] <= $boundsOut['maxlon']) {
+		$insideCount = 0;
+		foreach ($geoIn as $coord) {
+			if (pointIsInsidePolygon($coord['lat'], $coord['lng'], $geoOut, $boundsOut)) {
+				++$insideCount;
+			}
+		}
+
+		return $insideCount / count($geoIn) >= 0.95;
+	} else {
+		return false; // bounds outside
+	}
 }
 
 //#######################################################################
@@ -358,45 +358,45 @@ 
 //#######################################################################
 function combineOuter($outers)
 {
-    $polygons = array();
-    $index = 0;
-    $count = 0;
-    $maxCount = count($outers);
-    while (0 != count($outers) && $count <= $maxCount) {
-        ++$count;
-        foreach ($outers as $key => $outer) {
-            if (!isset($polygons[$index])) {
-                $polygons[$index] = $outer;
-                unset($outers[$key]);
-            } else {
-                $firstEle = $outer[0];
-                $lastEle = $outer[count($outer) - 1];
-                $firstElePoly = $polygons[$index][0];
-                $lastElePoly = $polygons[$index][count($polygons[$index]) - 1];
-                if ($firstEle == $lastElePoly) {
-                    $polygons[$index] = array_merge($polygons[$index], $outer);
-                    unset($outers[$key]);
-                } elseif ($lastEle == $lastElePoly) {
-                    $polygons[$index] = array_merge($polygons[$index], array_reverse($outer));
-                    unset($outers[$key]);
-                } elseif ($firstEle == $firstElePoly) {
-                    $polygons[$index] = array_merge(array_reverse($outer), $polygons[$index]);
-                    unset($outers[$key]);
-                } elseif ($lastEle == $firstElePoly) {
-                    $polygons[$index] = array_merge($outer, $polygons[$index]);
-                    unset($outers[$key]);
-                }
-            }
-
-            $firstElePoly = $polygons[$index][0];
-            $lastElePoly = $polygons[$index][count($polygons[$index]) - 1];
-            if ($firstElePoly == $lastElePoly) {
-                ++$index;
-            }
-        }
-    }
-
-    return $polygons;
+	$polygons = array();
+	$index = 0;
+	$count = 0;
+	$maxCount = count($outers);
+	while (0 != count($outers) && $count <= $maxCount) {
+		++$count;
+		foreach ($outers as $key => $outer) {
+			if (!isset($polygons[$index])) {
+				$polygons[$index] = $outer;
+				unset($outers[$key]);
+			} else {
+				$firstEle = $outer[0];
+				$lastEle = $outer[count($outer) - 1];
+				$firstElePoly = $polygons[$index][0];
+				$lastElePoly = $polygons[$index][count($polygons[$index]) - 1];
+				if ($firstEle == $lastElePoly) {
+					$polygons[$index] = array_merge($polygons[$index], $outer);
+					unset($outers[$key]);
+				} elseif ($lastEle == $lastElePoly) {
+					$polygons[$index] = array_merge($polygons[$index], array_reverse($outer));
+					unset($outers[$key]);
+				} elseif ($firstEle == $firstElePoly) {
+					$polygons[$index] = array_merge(array_reverse($outer), $polygons[$index]);
+					unset($outers[$key]);
+				} elseif ($lastEle == $firstElePoly) {
+					$polygons[$index] = array_merge($outer, $polygons[$index]);
+					unset($outers[$key]);
+				}
+			}
+
+			$firstElePoly = $polygons[$index][0];
+			$lastElePoly = $polygons[$index][count($polygons[$index]) - 1];
+			if ($firstElePoly == $lastElePoly) {
+				++$index;
+			}
+		}
+	}
+
+	return $polygons;
 }
 
 //#######################################################################
@@ -404,63 +404,63 @@ 
 //#######################################################################
 function printMenuitems($menu, $level, $locales)
 {
-    if (isset($menu->locale)) {
-        $locale = $menu->locale;
-        $text = $locales->$locale;
-    } elseif (isset($menu->text)) {
-        $text = $menu->text;
-    } else {
-        $text = '';
-    }
-
-    switch ($menu->type) {
-        case 'group':
-            ?>
+	if (isset($menu->locale)) {
+		$locale = $menu->locale;
+		$text = $locales->$locale;
+	} elseif (isset($menu->text)) {
+		$text = $menu->text;
+	} else {
+		$text = '';
+	}
+
+	switch ($menu->type) {
+		case 'group':
+			?>
 			
 			<li>
 			<a class="menu-label"><i class="fa <?= $menu->icon; ?>" aria-hidden="true"></i> <?= $text; ?></a>
 			<ul class="dropdown">
 			
 			<?php
-            foreach ($menu->members as $childmenu) {
-                printMenuitems($childmenu, $level + 1, $locales);
-            }
-            ?>
+			foreach ($menu->members as $childmenu) {
+				printMenuitems($childmenu, $level + 1, $locales);
+			}
+			?>
 			
 			</ul>
 			</li>
 
 			<?php
-            break;
+			break;
 
-        case 'link':
-            ?>
+		case 'link':
+			?>
 
 			<li>
 				<a href="<?= $menu->href; ?>" class="menu-label"><i class="fa <?= $menu->icon; ?>" aria-hidden="true"></i> <?= $text; ?></a>
 			</li>
 
 			<?php
-            break;
+			break;
 
-        case 'link_external':
-            ?>
+		case 'link_external':
+			?>
 
 			<li>
 				<a href="<?= $menu->href; ?>" target="_blank" class="menu-label"><i class="fa <?= $menu->icon; ?>" aria-hidden="true"></i> <?= $menu->text; ?></a>
 			</li>
 
 			<?php
-            break;
+			break;
 
-        case 'html':
-            ?>
+		case 'html':
+			?>
 
 			<li> <?= $menu->value; ?> </li>
 
 			<?php
-            break;
-    }
+			break;
+	}
 }
 
 ?>

Braces +22 added lines, -11 removed lines

@@ -60,7 +60,8 @@ 
     }
 }
 
-function time_ago_day($timestamp, $locales) {
+function time_ago_day($timestamp, $locales)
+{
     $spawn = new DateTime($timestamp);
     $now = new DateTime();
 
@@ -215,11 +216,14 @@ 
 //#######################################################################
 function get_tree_at_depth($trees, $depth, $max_pokemon, $currentDepth = 0)
 {
-    if ($depth == $currentDepth) { // Found depth
+    if ($depth == $currentDepth) {
+// Found depth
         return tree_remove_bellow($trees, $max_pokemon);
-    } else { // Go deeper
+    } else {
+// Go deeper
         $arr = array();
-        foreach ($trees as $temp) { // Go into all trees
+        foreach ($trees as $temp) {
+// Go into all trees
             $tree = $temp->evolutions;
             $results = tree_remove_bellow(get_tree_at_depth($tree, $depth, $max_pokemon, $currentDepth + 1), $max_pokemon);
             $arr = tree_check_array($results, $arr, 1 == $depth - $currentDepth);
@@ -236,9 +240,12 @@ 
 {
     $count = count($array_check);
     $i = 0;
-    if (!is_null($array_check)) { // check if exists
-        foreach ($array_check as $res) { // Check if above, equal or bellow center
-            if (1 != $count && $correct_arrow) { // only add arrow once
+    if (!is_null($array_check)) {
+// check if exists
+        foreach ($array_check as $res) {
+// Check if above, equal or bellow center
+            if (1 != $count && $correct_arrow) {
+// only add arrow once
                 $num = $i / ($count - 1);
                 if ($num < 0.5) {
                     $res->array_sufix = '_up';
@@ -267,7 +274,8 @@ 
         return null;
     }
     $arr = array();
-    foreach ($tree as $item) { // Check if above, equal or bellow center
+    foreach ($tree as $item) {
+// Check if above, equal or bellow center
         if ($item->id <= $max_pokemon) {
             $arr[] = $item;
         }
@@ -311,15 +319,18 @@ 
         for ($i = 1; $i < $geos_count; ++$i) {
             $geo1 = $geos[$i - 1];
             $geo2 = $geos[$i];
-            if ($geo1['lng'] == $lng && $geo1['lat'] == $lat) { // On one of the coords
+            if ($geo1['lng'] == $lng && $geo1['lat'] == $lat) {
+// On one of the coords
                 return true;
             }
-            if ($geo1['lng'] == $geo2['lng'] and $geo1['lng'] == $lng and $lat > min($geo1['lat'], $geo2['lat']) and $lat < max($geo1['lat'], $geo2['lat'])) { // Check if point is on an horizontal polygon boundary
+            if ($geo1['lng'] == $geo2['lng'] and $geo1['lng'] == $lng and $lat > min($geo1['lat'], $geo2['lat']) and $lat < max($geo1['lat'], $geo2['lat'])) {
+// Check if point is on an horizontal polygon boundary
                 return true;
             }
             if ($lng > min($geo1['lng'], $geo2['lng']) and $lng <= max($geo1['lng'], $geo2['lng']) and $lat <= max($geo1['lat'], $geo2['lat']) and $geo1['lng'] != $geo2['lng']) {
                 $xinters = ($lng - $geo1['lng']) * ($geo2['lat'] - $geo1['lat']) / ($geo2['lng'] - $geo1['lng']) + $geo1['lat'];
-                if ($xinters == $lat) { // Check if point is on the polygon boundary (other than horizontal)
+                if ($xinters == $lat) {
+// Check if point is on the polygon boundary (other than horizontal)
                     return true;
                 }
                 if ($geo1['lat'] == $geo2['lat'] || $lat <= $xinters) {

core/cron/pokemon.cron.php

Indentation +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
 $counts = $manager->getPokemonCountsActive();
 $rarityarray = array();
 foreach ($counts as $poke_id => $total) {
-    $rarity = $pokemons->pokemon->$poke_id->rarity;
-    isset($rarityarray[$rarity]) ? $rarityarray[$rarity] += $total : $rarityarray[$rarity] = $total;
+	$rarity = $pokemons->pokemon->$poke_id->rarity;
+	isset($rarityarray[$rarity]) ? $rarityarray[$rarity] += $total : $rarityarray[$rarity] = $total;
 }
 
 // Set amount of Pokemon for each rarity to 0 if there weren't any at that time

core/process/queries/QueryManagerMysqlRocketmap.php

Indentation +673 added lines, -673 removed lines

@@ -4,193 +4,193 @@ 
 
 final class QueryManagerMysqlRocketmap 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,22 +199,22 @@ 
 				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)
-    {
-        $trainer_blacklist = '';
-        if (!empty(self::$config->system->trainer_blacklist)) {
-            $trainer_blacklist = " AND trainer_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
-        }
-        $req = "SELECT trainer_name,
+		$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)
+	{
+		$trainer_blacklist = '';
+		if (!empty(self::$config->system->trainer_blacklist)) {
+			$trainer_blacklist = " AND trainer_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
+		}
+		$req = "SELECT trainer_name,
 				ROUND((100*(iv_attack+iv_defense+iv_stamina)/45),1) AS IV,
 				move_1, move_2, cp,
 				DATE_FORMAT(last_seen, '%Y-%m-%d') AS lasttime, last_seen
@@ -222,230 +222,230 @@ 
 				WHERE pokemon_id = '".$pokemon_id."'".$trainer_blacklist."
 				ORDER BY $best_order_by $best_direction, trainer_name ASC
 				LIMIT 0,50";
-        $result = $this->mysqli->query($req);
-        $toptrainer = array();
-        while ($data = $result->fetch_object()) {
-            $toptrainer[] = $data;
-        }
+		$result = $this->mysqli->query($req);
+		$toptrainer = array();
+		while ($data = $result->fetch_object()) {
+			$toptrainer[] = $data;
+		}
 
-        return $toptrainer;
-    }
+		return $toptrainer;
+	}
 
-    public function getPokemonHeatmap($pokemon_id, $start, $end)
-    {
+	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 spawnpoint';
-        $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,
@@ -453,53 +453,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
@@ -507,93 +507,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,
@@ -605,121 +605,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,
@@ -730,18 +730,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,
@@ -752,78 +752,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)
@@ -832,23 +832,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 spawnpoint
 				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;
+	}
 }

core/process/queries/QueryManagerMysqlMonocleAlternate.php

Indentation +677 added lines, -677 removed lines

@@ -4,193 +4,193 @@ 
 
 class QueryManagerMysqlMonocleAlternate extends QueryManagerMysql
 {
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    public function __destruct()
-    {
-        parent::__destruct();
-    }
-
-    ///////////
-    // Tester
-    ///////////
-
-    public function testTotalPokemon()
-    {
-        $req = 'SELECT COUNT(*) as total FROM sightings';
-        $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 forts';
-        $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 pokestops';
-        $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 sightings WHERE expire_timestamp >= UNIX_TIMESTAMP()';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getTotalLures()
-    {
-        $data = (object) array('total' => 0);
-
-        return $data;
-    }
-
-    public function getTotalGyms()
-    {
-        $req = 'SELECT COUNT(*) AS total FROM forts';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getTotalRaids()
-    {
-        $req = 'SELECT COUNT(*) AS total FROM raids WHERE time_battle <= UNIX_TIMESTAMP() AND time_end >= UNIX_TIMESTAMP()';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getTotalGymsForTeam($team_id)
-    {
-        $req = "SELECT COUNT(*) AS total
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	public function __destruct()
+	{
+		parent::__destruct();
+	}
+
+	///////////
+	// Tester
+	///////////
+
+	public function testTotalPokemon()
+	{
+		$req = 'SELECT COUNT(*) as total FROM sightings';
+		$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 forts';
+		$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 pokestops';
+		$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 sightings WHERE expire_timestamp >= UNIX_TIMESTAMP()';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getTotalLures()
+	{
+		$data = (object) array('total' => 0);
+
+		return $data;
+	}
+
+	public function getTotalGyms()
+	{
+		$req = 'SELECT COUNT(*) AS total FROM forts';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getTotalRaids()
+	{
+		$req = 'SELECT COUNT(*) AS total FROM raids WHERE time_battle <= UNIX_TIMESTAMP() AND time_end >= UNIX_TIMESTAMP()';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getTotalGymsForTeam($team_id)
+	{
+		$req = "SELECT COUNT(*) AS total
 					FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
 					WHERE team = '$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 getRecentAll()
-    {
-        $req = 'SELECT DISTINCT pokemon_id, encounter_id, FROM_UNIXTIME(expire_timestamp) AS disappear_time, FROM_UNIXTIME(updated) AS last_modified, FROM_UNIXTIME(expire_timestamp) AS disappear_time_real,
+	public function getRecentAll()
+	{
+		$req = 'SELECT DISTINCT pokemon_id, encounter_id, FROM_UNIXTIME(expire_timestamp) AS disappear_time, FROM_UNIXTIME(updated) AS last_modified, FROM_UNIXTIME(expire_timestamp) AS disappear_time_real,
               lat AS latitude, lon AS longitude, cp, atk_iv AS individual_attack, def_iv AS individual_defense, sta_iv AS individual_stamina
               FROM sightings
               ORDER BY updated 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_pokemon)
-    {
-        $req = 'SELECT pokemon_id, encounter_id, FROM_UNIXTIME(expire_timestamp) AS disappear_time, FROM_UNIXTIME(updated) AS last_modified, FROM_UNIXTIME(expire_timestamp) AS disappear_time_real,
+		$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_pokemon)
+	{
+		$req = 'SELECT pokemon_id, encounter_id, FROM_UNIXTIME(expire_timestamp) AS disappear_time, FROM_UNIXTIME(updated) AS last_modified, FROM_UNIXTIME(expire_timestamp) AS disappear_time_real,
                 lat AS latitude, lon AS longitude, cp, atk_iv AS individual_attack, def_iv AS individual_defense, sta_iv AS individual_stamina
                 FROM sightings
                 WHERE pokemon_id IN ('.implode(',', $mythic_pokemon).')
                 ORDER BY updated 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(f.id) AS total
+		$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(f.id) AS total
 					FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
 					WHERE guard_pokemon_id = '".$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 getPokemonLastSeen($pokemon_id)
-    {
-        $req = "SELECT FROM_UNIXTIME(expire_timestamp) AS expire_timestamp, FROM_UNIXTIME(expire_timestamp) AS disappear_time_real, lat AS latitude, lon AS longitude
+	public function getPokemonLastSeen($pokemon_id)
+	{
+		$req = "SELECT FROM_UNIXTIME(expire_timestamp) AS expire_timestamp, FROM_UNIXTIME(expire_timestamp) AS disappear_time_real, lat AS latitude, lon AS longitude
                 FROM sightings
                 WHERE pokemon_id = '".$pokemon_id."'
                 ORDER BY expire_timestamp 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 FROM_UNIXTIME(expire_timestamp) AS distime, pokemon_id as pokemon_id, FROM_UNIXTIME(expire_timestamp) as disappear_time, lat as latitude, lon as longitude,
+	public function getTop50Pokemon($pokemon_id, $top_order_by, $top_direction)
+	{
+		$req = "SELECT FROM_UNIXTIME(expire_timestamp) AS distime, pokemon_id as pokemon_id, FROM_UNIXTIME(expire_timestamp) as disappear_time, lat as latitude, lon as longitude,
                 cp, atk_iv as individual_attack, def_iv as individual_defense, sta_iv as individual_stamina,
                 ROUND(100*(atk_iv+def_iv+sta_iv)/45,1) AS IV, move_1 as move_1, move_2, form
                 FROM sightings
@@ -198,435 +198,435 @@ 
 	            ORDER BY $top_order_by $top_direction, expire_timestamp DESC
 	            LIMIT 0,50";
 
-        $result = $this->mysqli->query($req);
-        $top = array();
-        while ($data = $result->fetch_object()) {
-            $top[] = $data;
-        }
+		$result = $this->mysqli->query($req);
+		$top = array();
+		while ($data = $result->fetch_object()) {
+			$top[] = $data;
+		}
 
-        return $top;
-    }
+		return $top;
+	}
 
-    public function getTop50Trainers($pokemon_id, $best_order_by, $best_direction)
-    {
-        $trainer_blacklist = '';
-        if (!empty(self::$config->system->trainer_blacklist)) {
-            $trainer_blacklist = " AND owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
-        }
+	public function getTop50Trainers($pokemon_id, $best_order_by, $best_direction)
+	{
+		$trainer_blacklist = '';
+		if (!empty(self::$config->system->trainer_blacklist)) {
+			$trainer_blacklist = " AND owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
+		}
 
-        $req = "SELECT owner_name as trainer_name, ROUND((100*((atk_iv)+(def_iv)+(sta_iv))/45),1) AS IV, move_1, move_2, cp as cp,
+		$req = "SELECT owner_name as trainer_name, ROUND((100*((atk_iv)+(def_iv)+(sta_iv))/45),1) AS IV, move_1, move_2, cp as cp,
                 FROM_UNIXTIME(last_modified) AS lasttime, last_modified as last_seen
                 FROM gym_defenders
 				WHERE pokemon_id = '".$pokemon_id."'".$trainer_blacklist."
 				ORDER BY $best_order_by $best_direction, owner_name ASC
 				LIMIT 0,50";
 
-        $result = $this->mysqli->query($req);
-        $toptrainer = array();
-        while ($data = $result->fetch_object()) {
-            $toptrainer[] = $data;
-        }
-
-        return $toptrainer;
-    }
-
-    public function getPokemonHeatmap($pokemon_id, $start, $end)
-    {
-        $where = ' WHERE pokemon_id = '.$pokemon_id.' '
-            ."AND FROM_UNIXTIME(expire_timestamp) BETWEEN '".$start."' AND '".$end."'";
-        $req = 'SELECT lat AS latitude, lon AS longitude FROM sightings'.$where.' LIMIT 100000';
-        $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(disappear_time) AS disappear_hour
+		$result = $this->mysqli->query($req);
+		$toptrainer = array();
+		while ($data = $result->fetch_object()) {
+			$toptrainer[] = $data;
+		}
+
+		return $toptrainer;
+	}
+
+	public function getPokemonHeatmap($pokemon_id, $start, $end)
+	{
+		$where = ' WHERE pokemon_id = '.$pokemon_id.' '
+			."AND FROM_UNIXTIME(expire_timestamp) BETWEEN '".$start."' AND '".$end."'";
+		$req = 'SELECT lat AS latitude, lon AS longitude FROM sightings'.$where.' LIMIT 100000';
+		$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(disappear_time) AS disappear_hour
 					FROM (SELECT FROM_UNIXTIME(expire_timestamp) as disappear_time FROM sightings 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 expire_timestamp >= UNIX_TIMESTAMP() AND pokemon_id = '.$pokemon_id;
-
-        $reqTestIv = 'SELECT MAX(atk_iv) AS iv FROM sightings '.$where;
-        $resultTestIv = $this->mysqli->query($reqTestIv);
-        $testIv = $resultTestIv->fetch_object();
-        if (!is_null($inmap_pokemons) && ('' != $inmap_pokemons)) {
-            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)*(atk_iv + def_iv + sta_iv)) >= ('.$ivMin.') ';
-        }
-        if (null != $testIv->iv && !is_null($ivMax) && ('' != $ivMax)) {
-            $where .= ' AND ((100/45)*(atk_iv + def_iv + sta_iv)) <= ('.$ivMax.') ';
-        }
-        $req = 'SELECT pokemon_id, lat AS latitude, lon AS longitude,
+		$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 expire_timestamp >= UNIX_TIMESTAMP() AND pokemon_id = '.$pokemon_id;
+
+		$reqTestIv = 'SELECT MAX(atk_iv) AS iv FROM sightings '.$where;
+		$resultTestIv = $this->mysqli->query($reqTestIv);
+		$testIv = $resultTestIv->fetch_object();
+		if (!is_null($inmap_pokemons) && ('' != $inmap_pokemons)) {
+			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)*(atk_iv + def_iv + sta_iv)) >= ('.$ivMin.') ';
+		}
+		if (null != $testIv->iv && !is_null($ivMax) && ('' != $ivMax)) {
+			$where .= ' AND ((100/45)*(atk_iv + def_iv + sta_iv)) <= ('.$ivMax.') ';
+		}
+		$req = 'SELECT pokemon_id, lat AS latitude, lon AS longitude,
     					FROM_UNIXTIME(expire_timestamp) AS disappear_time,
     					FROM_UNIXTIME(expire_timestamp) AS disappear_time_real,
     					atk_iv AS individual_attack, def_iv AS individual_defense, sta_iv AS individual_stamina,
    						move_1, move_2
 					FROM sightings '.$where.'
 					LIMIT 5000';
-        $result = $this->mysqli->query($req);
-        $spawns = array();
-        while ($data = $result->fetch_object()) {
-            $spawns[] = $data;
-        }
-
-        return $spawns;
-    }
-
-    public function getPokemonSliderMinMax()
-    {
-        $req = 'SELECT FROM_UNIXTIME(MIN(expire_timestamp)) AS min, FROM_UNIXTIME(MAX(expire_timestamp)) AS max FROM sightings';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getMapsCoords()
-    {
-        $req = 'SELECT MAX(lat) AS max_latitude, MIN(lat) AS min_latitude, MAX(lon) AS max_longitude, MIN(lon) as min_longitude FROM spawnpoints';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getPokemonCount($pokemon_id)
-    {
-        $req = 'SELECT count, last_seen, latitude, longitude
+		$result = $this->mysqli->query($req);
+		$spawns = array();
+		while ($data = $result->fetch_object()) {
+			$spawns[] = $data;
+		}
+
+		return $spawns;
+	}
+
+	public function getPokemonSliderMinMax()
+	{
+		$req = 'SELECT FROM_UNIXTIME(MIN(expire_timestamp)) AS min, FROM_UNIXTIME(MAX(expire_timestamp)) AS max FROM sightings';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getMapsCoords()
+	{
+		$req = 'SELECT MAX(lat) AS max_latitude, MIN(lat) AS min_latitude, MAX(lon) AS max_longitude, MIN(lon) as min_longitude FROM spawnpoints';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	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 pokestops';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getAllPokestops()
-    {
-        $req = 'SELECT lat as latitude, lon as longitude, null AS lure_expiration, UNIX_TIMESTAMP() AS now, null AS lure_expiration_real FROM pokestops';
-        $result = $this->mysqli->query($req);
-        $pokestops = array();
-        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);
+		$array = array();
+		while ($data = $result->fetch_object()) {
+			$array[] = $data;
+		}
+
+		return $array;
+	}
+
+	///////////////
+	// Pokestops
+	//////////////
+
+	public function getTotalPokestops()
+	{
+		$req = 'SELECT COUNT(*) as total FROM pokestops';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getAllPokestops()
+	{
+		$req = 'SELECT lat as latitude, lon as longitude, null AS lure_expiration, UNIX_TIMESTAMP() AS now, null AS lure_expiration_real FROM pokestops';
+		$result = $this->mysqli->query($req);
+		$pokestops = array();
+		while ($data = $result->fetch_object()) {
+			$pokestops[] = $data;
+		}
+
+		return $pokestops;
+	}
+
+	/////////
+	// Gyms
+	/////////
+
+	public function getTeamGuardians($team_id)
+	{
+		$req = "SELECT COUNT(*) AS total, guard_pokemon_id
 					FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
 					WHERE team = '".$team_id."' GROUP BY guard_pokemon_id ORDER BY total DESC LIMIT 0,3";
-        $result = $this->mysqli->query($req);
+		$result = $this->mysqli->query($req);
 
-        $datas = array();
-        while ($data = $result->fetch_object()) {
-            $datas[] = $data;
-        }
+		$datas = array();
+		while ($data = $result->fetch_object()) {
+			$datas[] = $data;
+		}
 
-        return $datas;
-    }
+		return $datas;
+	}
 
-    public function getOwnedAndPoints($team_id)
-    {
-        $req = "SELECT COUNT(f.id) AS total, ROUND(AVG(fs.total_cp)) AS average_points
+	public function getOwnedAndPoints($team_id)
+	{
+		$req = "SELECT COUNT(f.id) AS total, ROUND(AVG(fs.total_cp)) AS average_points
         			FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
         			WHERE fs.team = '".$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 f.id as gym_id, team as team_id, f.lat as latitude, f.lon as longitude, updated as last_scanned, (6 - fs.slots_available) AS level
+	public function getAllGyms()
+	{
+		$req = 'SELECT f.id as gym_id, team as team_id, f.lat as latitude, f.lon as longitude, updated as last_scanned, (6 - fs.slots_available) AS level
 					FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id));';
-        $result = $this->mysqli->query($req);
-        $gyms = array();
-        while ($data = $result->fetch_object()) {
-            $gyms[] = $data;
-        }
-
-        return $gyms;
-    }
-
-    public function getGymData($gym_id)
-    {
-        $req = "SELECT f.name AS name, null AS description, f.url AS url, fs.team AS team, FROM_UNIXTIME(fs.updated) AS last_scanned, fs.guard_pokemon_id AS guard_pokemon_id, (6 - fs.slots_available) AS level, fs.total_cp
+		$result = $this->mysqli->query($req);
+		$gyms = array();
+		while ($data = $result->fetch_object()) {
+			$gyms[] = $data;
+		}
+
+		return $gyms;
+	}
+
+	public function getGymData($gym_id)
+	{
+		$req = "SELECT f.name AS name, null AS description, f.url AS url, fs.team AS team, FROM_UNIXTIME(fs.updated) AS last_scanned, fs.guard_pokemon_id AS guard_pokemon_id, (6 - fs.slots_available) AS level, fs.total_cp
 			FROM forts f
 			LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
 			WHERE f.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 external_id as pokemon_uid, pokemon_id, atk_iv as iv_attack, def_iv as iv_defense, sta_iv as iv_stamina, cp, fort_id as gym_id
+	public function getGymDefenders($gym_id)
+	{
+		$req = "SELECT external_id as pokemon_uid, pokemon_id, atk_iv as iv_attack, def_iv as iv_defense, sta_iv as iv_stamina, cp, fort_id as gym_id
 			FROM gym_defenders
 			WHERE fort_id='".$gym_id."'
 			ORDER BY deployment_time";
-        $result = $this->mysqli->query($req);
-        $defenders = array();
-        while ($data = $result->fetch_object()) {
-            $defenders[] = $data;
-        }
-
-        return $defenders;
-    }
-
-    ///////////
-    // Raids
-    ///////////
-
-    public function getAllRaids($page)
-    {
-        $limit = ' LIMIT '.($page * 10).',10';
-        $req = 'SELECT r.fort_id AS gym_id, r.level AS level, r.pokemon_id AS pokemon_id, r.cp AS cp, r.move_1 AS move_1, r.move_2 AS move_2, FROM_UNIXTIME(r.time_spawn) AS spawn, FROM_UNIXTIME(r.time_battle) AS start, FROM_UNIXTIME(r.time_end) AS end, FROM_UNIXTIME(fs.updated) AS last_scanned, f.name, f.lat AS latitude, f.lon as longitude
+		$result = $this->mysqli->query($req);
+		$defenders = array();
+		while ($data = $result->fetch_object()) {
+			$defenders[] = $data;
+		}
+
+		return $defenders;
+	}
+
+	///////////
+	// Raids
+	///////////
+
+	public function getAllRaids($page)
+	{
+		$limit = ' LIMIT '.($page * 10).',10';
+		$req = 'SELECT r.fort_id AS gym_id, r.level AS level, r.pokemon_id AS pokemon_id, r.cp AS cp, r.move_1 AS move_1, r.move_2 AS move_2, FROM_UNIXTIME(r.time_spawn) AS spawn, FROM_UNIXTIME(r.time_battle) AS start, FROM_UNIXTIME(r.time_end) AS end, FROM_UNIXTIME(fs.updated) AS last_scanned, f.name, f.lat AS latitude, f.lon as longitude
 					FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
 				 	LEFT JOIN raids r ON (r.fort_id = f.id AND r.time_end >= UNIX_TIMESTAMP())
 					WHERE r.time_end > UNIX_TIMESTAMP()
 					ORDER BY r.level DESC, r.time_battle'.$limit;
-        $result = $this->mysqli->query($req);
-        $raids = array();
-        while ($data = $result->fetch_object()) {
-            $raids[] = $data;
-        }
-
-        return $raids;
-    }
-
-    ////////////////
-    // 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').' fs.team = '.$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';
-        }
-
-        $limit = ' LIMIT '.($page * 10).',10';
-
-        $req = 'SELECT f.id as gym_id, fs.total_cp, f.name, fs.team as team_id, (6 - slots_available) as pokemon_count, FROM_UNIXTIME(last_modified) AS last_modified
+		$result = $this->mysqli->query($req);
+		$raids = array();
+		while ($data = $result->fetch_object()) {
+			$raids[] = $data;
+		}
+
+		return $raids;
+	}
+
+	////////////////
+	// 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').' fs.team = '.$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';
+		}
+
+		$limit = ' LIMIT '.($page * 10).',10';
+
+		$req = 'SELECT f.id as gym_id, fs.total_cp, f.name, fs.team as team_id, (6 - slots_available) as pokemon_count, FROM_UNIXTIME(last_modified) AS last_modified
 			FROM forts f
 			LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
 			'.$where.$order.$limit;
-        $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 external_id AS pokemon_uid, pokemon_id, cp_now as cp, owner_name AS 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 external_id AS pokemon_uid, pokemon_id, cp_now as cp, owner_name AS trainer_name
 					FROM gym_defenders
 					WHERE fort_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 f.id as gym_id, fs.team as team_id, total_cp, FROM_UNIXTIME(fs.last_modified) as last_modified, last_modified as last_modified_real
+		$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 f.id as gym_id, fs.team as team_id, total_cp, FROM_UNIXTIME(fs.last_modified) as last_modified, last_modified as last_modified_real
 					FROM fort_sightings fs
 					LEFT JOIN forts f ON f.id = fs.fort_id
 					WHERE f.id = '".$gym_id."'
 					ORDER BY fs.last_modified DESC
 					LIMIT ".($page * $pageSize).','.($pageSize + 1);
-        $result = $this->mysqli->query($req);
-        $history = array();
-        $count = 0;
-        while ($data = $result->fetch_object()) {
-            ++$count;
-            if (0 == $data->total_cp) {
-                $data->pokemon = array();
-                $data->pokemon_count = 0;
-                $data->pokemon_uids = '';
-            } else {
-                $data->pokemon = $this->getHistoryForGymPokemon($gym_id, $data->last_modified_real);
-                $data->pokemon_count = count($data->pokemon);
-                $data->pokemon_uids = implode(',', array_keys($data->pokemon));
-            }
-            if (0 === $data->total_cp || 0 !== $data->pokemon_count) {
-                $history[] = $data;
-            }
-        }
-        if ($count !== ($pageSize + 1)) {
-            $last_page = true;
-        } else {
-            $last_page = false;
-        }
-
-        return array('last_page' => $last_page, 'data' => $history);
-    }
-
-    private function getHistoryForGymPokemon($gym_id, $last_modified)
-    {
-        $req = "SELECT ghd.defender_id, gd.pokemon_id, ghd.cp, gd.owner_name as trainer_name
+		$result = $this->mysqli->query($req);
+		$history = array();
+		$count = 0;
+		while ($data = $result->fetch_object()) {
+			++$count;
+			if (0 == $data->total_cp) {
+				$data->pokemon = array();
+				$data->pokemon_count = 0;
+				$data->pokemon_uids = '';
+			} else {
+				$data->pokemon = $this->getHistoryForGymPokemon($gym_id, $data->last_modified_real);
+				$data->pokemon_count = count($data->pokemon);
+				$data->pokemon_uids = implode(',', array_keys($data->pokemon));
+			}
+			if (0 === $data->total_cp || 0 !== $data->pokemon_count) {
+				$history[] = $data;
+			}
+		}
+		if ($count !== ($pageSize + 1)) {
+			$last_page = true;
+		} else {
+			$last_page = false;
+		}
+
+		return array('last_page' => $last_page, 'data' => $history);
+	}
+
+	private function getHistoryForGymPokemon($gym_id, $last_modified)
+	{
+		$req = "SELECT ghd.defender_id, gd.pokemon_id, ghd.cp, gd.owner_name as trainer_name
 					FROM gym_history_defenders ghd
 					JOIN gym_defenders gd ON ghd.defender_id = gd.external_id
 					WHERE ghd.fort_id = '".$gym_id."' AND date = '".$last_modified."'
 					ORDER BY gd.deployment_time";
-        $result = $this->mysqli->query($req);
-        $pokemons = array();
-        while ($data = $result->fetch_object()) {
-            $pokemons[$data->defender_id] = $data;
-        }
-
-        return $pokemons;
-    }
-
-    //////////////
-    // Trainers
-    //////////////
-
-    public function getTrainers($trainer_name, $team, $page, $rankingNumber)
-    {
-        $ranking = $this->getTrainerLevelRanking();
-        $where = '';
-        if (!empty(self::$config->system->trainer_blacklist)) {
-            $where .= " AND gd.owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
-        }
-        if ('' != $trainer_name) {
-            $where = " AND gd.owner_name LIKE '%".$trainer_name."%'";
-        }
-        if (0 != $team) {
-            $where .= ('' == $where ? ' HAVING' : ' AND').' team = '.$team;
-        }
-        switch ($rankingNumber) {
-            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 gd.owner_name AS name, MAX(owner_level) AS level, MAX(cp) AS maxCp, MAX(active) AS active, MAX(team) AS team, FROM_UNIXTIME(MAX(last_modified)) as last_seen
+		$result = $this->mysqli->query($req);
+		$pokemons = array();
+		while ($data = $result->fetch_object()) {
+			$pokemons[$data->defender_id] = $data;
+		}
+
+		return $pokemons;
+	}
+
+	//////////////
+	// Trainers
+	//////////////
+
+	public function getTrainers($trainer_name, $team, $page, $rankingNumber)
+	{
+		$ranking = $this->getTrainerLevelRanking();
+		$where = '';
+		if (!empty(self::$config->system->trainer_blacklist)) {
+			$where .= " AND gd.owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
+		}
+		if ('' != $trainer_name) {
+			$where = " AND gd.owner_name LIKE '%".$trainer_name."%'";
+		}
+		if (0 != $team) {
+			$where .= ('' == $where ? ' HAVING' : ' AND').' team = '.$team;
+		}
+		switch ($rankingNumber) {
+			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 gd.owner_name AS name, MAX(owner_level) AS level, MAX(cp) AS maxCp, MAX(active) AS active, MAX(team) AS team, FROM_UNIXTIME(MAX(last_modified)) as last_seen
 				  	FROM gym_defenders gd
 				  	LEFT JOIN (
 				  		SELECT owner_name, COUNT(*) as active
@@ -636,157 +636,157 @@ 
 				  	) active ON active.owner_name = gd.owner_name
 				  	WHERE gd.owner_level IS NOT NULL '.$where.'
 				  	GROUP BY gd.owner_name'.$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));
-            if (is_null($data->active)) {
-                $data->active = 0;
-            }
-            $trainers[$data->name] = $data;
-
-            $pokemon = array_merge($this->getActivePokemon($data->name), $this->getInactivePokemon($data->name));
-
-            $trainers[$data->name]->gyms = $data->active;
-            $trainers[$data->name]->pokemons = $pokemon;
-            $trainers[$data->name]->rank = $ranking[$data->level];
-        }
-
-        return $trainers;
-    }
-
-    public function getTrainerLevelRanking()
-    {
-        $exclue = '';
-        if (!empty(self::$config->system->trainer_blacklist)) {
-            $exclue .= " AND owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
-        }
-        $req = 'SELECT COUNT(*) AS count, level FROM (SELECT MAX(owner_level) as level FROM gym_defenders WHERE owner_level IS NOT NULL '.$exclue.' GROUP BY owner_level, owner_name) x 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;
-    }
-
-    public function getActivePokemon($trainer_name)
-    {
-        $req = "SELECT pokemon_id, cp, atk_iv AS iv_attack, sta_iv AS iv_stamina, def_iv AS iv_defense, FROM_UNIXTIME(deployment_time) AS deployment_time, '1' AS active, fort_id as gym_id, FLOOR((UNIX_TIMESTAMP() - created) / 86400) AS last_scanned
+		$result = $this->mysqli->query($req);
+		$trainers = array();
+		while ($data = $result->fetch_object()) {
+			$data->last_seen = date('Y-m-d', strtotime($data->last_seen));
+			if (is_null($data->active)) {
+				$data->active = 0;
+			}
+			$trainers[$data->name] = $data;
+
+			$pokemon = array_merge($this->getActivePokemon($data->name), $this->getInactivePokemon($data->name));
+
+			$trainers[$data->name]->gyms = $data->active;
+			$trainers[$data->name]->pokemons = $pokemon;
+			$trainers[$data->name]->rank = $ranking[$data->level];
+		}
+
+		return $trainers;
+	}
+
+	public function getTrainerLevelRanking()
+	{
+		$exclue = '';
+		if (!empty(self::$config->system->trainer_blacklist)) {
+			$exclue .= " AND owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
+		}
+		$req = 'SELECT COUNT(*) AS count, level FROM (SELECT MAX(owner_level) as level FROM gym_defenders WHERE owner_level IS NOT NULL '.$exclue.' GROUP BY owner_level, owner_name) x 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;
+	}
+
+	public function getActivePokemon($trainer_name)
+	{
+		$req = "SELECT pokemon_id, cp, atk_iv AS iv_attack, sta_iv AS iv_stamina, def_iv AS iv_defense, FROM_UNIXTIME(deployment_time) AS deployment_time, '1' AS active, fort_id as gym_id, FLOOR((UNIX_TIMESTAMP() - created) / 86400) AS last_scanned
 						FROM gym_defenders
 						WHERE owner_name = '".$trainer_name."' AND fort_id IS NOT NULL
 						ORDER BY deployment_time";
-        $result = $this->mysqli->query($req);
-        $pokemon = array();
-        while ($data = $result->fetch_object()) {
-            $pokemon[] = $data;
-        }
-
-        return $pokemon;
-    }
-
-    public function getInactivePokemon($trainer_name)
-    {
-        $req = "SELECT pokemon_id, cp, atk_iv AS iv_attack, sta_iv AS iv_stamina, def_iv AS iv_defense, NULL AS deployment_time, '0' AS active, fort_id as gym_id, FLOOR((UNIX_TIMESTAMP() - created) / 86400) AS last_scanned
+		$result = $this->mysqli->query($req);
+		$pokemon = array();
+		while ($data = $result->fetch_object()) {
+			$pokemon[] = $data;
+		}
+
+		return $pokemon;
+	}
+
+	public function getInactivePokemon($trainer_name)
+	{
+		$req = "SELECT pokemon_id, cp, atk_iv AS iv_attack, sta_iv AS iv_stamina, def_iv AS iv_defense, NULL AS deployment_time, '0' AS active, fort_id as gym_id, FLOOR((UNIX_TIMESTAMP() - created) / 86400) AS last_scanned
 					FROM gym_defenders
 					WHERE owner_name = '".$trainer_name."' AND fort_id IS NULL
 					ORDER BY last_scanned";
-        $result = $this->mysqli->query($req);
-        $pokemon = array();
-        while ($data = $result->fetch_object()) {
-            $pokemon[] = $data;
-        }
-
-        return $pokemon;
-    }
-
-    public function getTrainerLevelCount($team_id)
-    {
-        $exclue = '';
-        if (!empty(self::$config->system->trainer_blacklist)) {
-            $exclue .= " AND owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
-        }
-        $req = "SELECT COUNT(*) AS count, level FROM (SELECT MAX(owner_level) as level FROM gym_defenders WHERE owner_level IS NOT NULL AND team = '".$team_id."' ".$exclue.' GROUP BY owner_level, owner_name) x 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;
-    }
-
-    /////////
-    // Cron
-    /////////
-
-    public function getPokemonCountsActive()
-    {
-        $req = 'SELECT pokemon_id, COUNT(*) as total FROM sightings WHERE expire_timestamp >= UNIX_TIMESTAMP() GROUP BY pokemon_id';
-        $result = $this->mysqli->query($req);
-        $counts = array();
-        while ($data = $result->fetch_object()) {
-            $counts[$data->pokemon_id] = $data->total;
-        }
-
-        return $counts;
-    }
-
-    public function getTotalPokemonIV()
-    {
-        $req = 'SELECT COUNT(*) as total FROM sightings WHERE expire_timestamp >= UNIX_TIMESTAMP() AND cp IS NOT NULL';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-    public function getPokemonCountsLastDay()
-    {
-        $req = 'SELECT pokemon_id, COUNT(*) AS spawns_last_day
+		$result = $this->mysqli->query($req);
+		$pokemon = array();
+		while ($data = $result->fetch_object()) {
+			$pokemon[] = $data;
+		}
+
+		return $pokemon;
+	}
+
+	public function getTrainerLevelCount($team_id)
+	{
+		$exclue = '';
+		if (!empty(self::$config->system->trainer_blacklist)) {
+			$exclue .= " AND owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
+		}
+		$req = "SELECT COUNT(*) AS count, level FROM (SELECT MAX(owner_level) as level FROM gym_defenders WHERE owner_level IS NOT NULL AND team = '".$team_id."' ".$exclue.' GROUP BY owner_level, owner_name) x 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;
+	}
+
+	/////////
+	// Cron
+	/////////
+
+	public function getPokemonCountsActive()
+	{
+		$req = 'SELECT pokemon_id, COUNT(*) as total FROM sightings WHERE expire_timestamp >= UNIX_TIMESTAMP() GROUP BY pokemon_id';
+		$result = $this->mysqli->query($req);
+		$counts = array();
+		while ($data = $result->fetch_object()) {
+			$counts[$data->pokemon_id] = $data->total;
+		}
+
+		return $counts;
+	}
+
+	public function getTotalPokemonIV()
+	{
+		$req = 'SELECT COUNT(*) as total FROM sightings WHERE expire_timestamp >= UNIX_TIMESTAMP() AND cp IS NOT NULL';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+	public function getPokemonCountsLastDay()
+	{
+		$req = 'SELECT pokemon_id, COUNT(*) AS spawns_last_day
 					FROM sightings
 					WHERE expire_timestamp >= (SELECT MAX(expire_timestamp) - 86400 FROM sightings)
 					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 COUNT(*) as total FROM accounts WHERE captchaed IS NOT NULL AND reason IS NULL';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getNestData($time, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
-    {
-        $pokemon_exclude_sql = '';
-        if (!empty(self::$config->system->nest_exclude_pokemon)) {
-            $pokemon_exclude_sql = 'AND p.pokemon_id NOT IN ('.implode(',', self::$config->system->nest_exclude_pokemon).')';
-        }
-        $req = 'SELECT p.pokemon_id, MAX(p.lat) AS latitude, MAX(p.lon) AS longitude, count(p.pokemon_id) AS total_pokemon, MAX(s.updated) as latest_seen, coalesce(CASE WHEN MAX(duration) = 0 THEN NULL ELSE MAX(duration) END ,30)*60 as duration
+		$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 COUNT(*) as total FROM accounts WHERE captchaed IS NOT NULL AND reason IS NULL';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getNestData($time, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
+	{
+		$pokemon_exclude_sql = '';
+		if (!empty(self::$config->system->nest_exclude_pokemon)) {
+			$pokemon_exclude_sql = 'AND p.pokemon_id NOT IN ('.implode(',', self::$config->system->nest_exclude_pokemon).')';
+		}
+		$req = 'SELECT p.pokemon_id, MAX(p.lat) AS latitude, MAX(p.lon) AS longitude, count(p.pokemon_id) AS total_pokemon, MAX(s.updated) as latest_seen, coalesce(CASE WHEN MAX(duration) = 0 THEN NULL ELSE MAX(duration) END ,30)*60 as duration
 			          FROM sightings p
 			          INNER JOIN spawnpoints s ON (p.spawn_id = s.spawn_id)
 			          WHERE p.expire_timestamp > UNIX_TIMESTAMP() - '.($time * 3600).'
@@ -795,23 +795,23 @@ 
 			          GROUP BY p.spawn_id, p.pokemon_id
 			          HAVING COUNT(p.pokemon_id) >= '.($time / 4).'
 			          ORDER BY p.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 spawnpoints 
  					WHERE lat >= '.$minLatitude.' AND lat < '.$maxLatitude.' AND lon >= '.$minLongitude.' AND lon < '.$maxLongitude;
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
 
-        return $data;
-    }
+		return $data;
+	}
 }

core/process/queries/QueryManagerMysqlRealDeviceMap.php

Indentation +489 added lines, -489 removed lines

@@ -4,185 +4,185 @@ 
 
 class QueryManagerMysqlRealDeviceMap 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 expire_timestamp >= UNIX_TIMESTAMP()';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getTotalLures()
-    {
-        $req = 'SELECT COUNT(*) as total FROM pokestop WHERE lure_expire_timestamp >= UNIX_TIMESTAMP()';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getTotalGyms()
-    {
-        $req = 'SELECT COUNT(*) AS total FROM gym';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getTotalRaids()
-    {
-        $req = 'SELECT COUNT(*) AS total FROM gym WHERE raid_battle_timestamp <= UNIX_TIMESTAMP() AND raid_end_timestamp >= UNIX_TIMESTAMP()';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getTotalGymsForTeam($team_id)
-    {
-        $req = 'SELECT COUNT(*) 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 pokemon_id, id, FROM_UNIXTIME(expire_timestamp) AS disappear_time, FROM_UNIXTIME(updated) AS last_modified, FROM_UNIXTIME(expire_timestamp) AS disappear_time_real,
+	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 expire_timestamp >= UNIX_TIMESTAMP()';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getTotalLures()
+	{
+		$req = 'SELECT COUNT(*) as total FROM pokestop WHERE lure_expire_timestamp >= UNIX_TIMESTAMP()';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getTotalGyms()
+	{
+		$req = 'SELECT COUNT(*) AS total FROM gym';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getTotalRaids()
+	{
+		$req = 'SELECT COUNT(*) AS total FROM gym WHERE raid_battle_timestamp <= UNIX_TIMESTAMP() AND raid_end_timestamp >= UNIX_TIMESTAMP()';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getTotalGymsForTeam($team_id)
+	{
+		$req = 'SELECT COUNT(*) 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 pokemon_id, id, FROM_UNIXTIME(expire_timestamp) AS disappear_time, FROM_UNIXTIME(updated) AS last_modified, FROM_UNIXTIME(expire_timestamp) AS disappear_time_real,
               lat AS latitude, lon AS longitude, cp, atk_iv AS individual_attack, def_iv AS individual_defense, sta_iv AS individual_stamina
               FROM pokemon
               ORDER BY changed 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_pokemon)
-    {
-        $req = 'SELECT pokemon_id, id as encounter_id, FROM_UNIXTIME(expire_timestamp) AS disappear_time, FROM_UNIXTIME(updated) AS last_modified, FROM_UNIXTIME(expire_timestamp) AS disappear_time_real,
+		$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_pokemon)
+	{
+		$req = 'SELECT pokemon_id, id as encounter_id, FROM_UNIXTIME(expire_timestamp) AS disappear_time, FROM_UNIXTIME(updated) AS last_modified, FROM_UNIXTIME(expire_timestamp) AS disappear_time_real,
                 lat AS latitude, lon AS longitude, cp, atk_iv AS individual_attack, def_iv AS individual_defense, sta_iv AS individual_stamina
                 FROM pokemon
                 WHERE pokemon_id IN ('.implode(',', $mythic_pokemon).')
                 ORDER BY changed 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)
-    {
-        return array();
-    }
-
-    public function getPokemonLastSeen($pokemon_id)
-    {
-        $req = "SELECT FROM_UNIXTIME(expire_timestamp) AS expire_timestamp, FROM_UNIXTIME(expire_timestamp) AS disappear_time_real, lat AS latitude, lon AS longitude
+		$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)
+	{
+		return array();
+	}
+
+	public function getPokemonLastSeen($pokemon_id)
+	{
+		$req = "SELECT FROM_UNIXTIME(expire_timestamp) AS expire_timestamp, FROM_UNIXTIME(expire_timestamp) AS disappear_time_real, lat AS latitude, lon AS longitude
                 FROM pokemon
                 WHERE pokemon_id = '".$pokemon_id."'
                 ORDER BY expire_timestamp 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 FROM_UNIXTIME(expire_timestamp) AS distime, pokemon_id as pokemon_id, FROM_UNIXTIME(expire_timestamp) as disappear_time, lat as latitude, lon as longitude,
+	public function getTop50Pokemon($pokemon_id, $top_order_by, $top_direction)
+	{
+		$req = "SELECT FROM_UNIXTIME(expire_timestamp) AS distime, pokemon_id as pokemon_id, FROM_UNIXTIME(expire_timestamp) as disappear_time, lat as latitude, lon as longitude,
                 cp, atk_iv as individual_attack, def_iv as individual_defense, sta_iv as individual_stamina,
                 iv AS IV, move_1 as move_1, move_2, form
                 FROM pokemon
@@ -190,354 +190,354 @@ 
 	            ORDER BY $top_order_by $top_direction, expire_timestamp 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 array();
-    }
-
-    public function getPokemonHeatmap($pokemon_id, $start, $end)
-    {
-        $where = ' WHERE pokemon_id = '.$pokemon_id.' '
-            ."AND FROM_UNIXTIME(expire_timestamp) BETWEEN '".$start."' AND '".$end."'";
-        $req = 'SELECT lat AS latitude, lon AS longitude FROM pokemon'.$where.' LIMIT 100000';
-        $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(disappear_time) AS disappear_hour
+		$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 array();
+	}
+
+	public function getPokemonHeatmap($pokemon_id, $start, $end)
+	{
+		$where = ' WHERE pokemon_id = '.$pokemon_id.' '
+			."AND FROM_UNIXTIME(expire_timestamp) BETWEEN '".$start."' AND '".$end."'";
+		$req = 'SELECT lat AS latitude, lon AS longitude FROM pokemon'.$where.' LIMIT 100000';
+		$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(disappear_time) AS disappear_hour
 					FROM (SELECT FROM_UNIXTIME(expire_timestamp) as 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 expire_timestamp >= UNIX_TIMESTAMP() AND pokemon_id = '.$pokemon_id;
-
-        $reqTestIv = 'SELECT MAX(iv) 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) && !($ivMax == 100 && $ivMin == 0)) {
-            $where .= ' AND iv >= ('.$ivMin.') ';
-        }
-        if (null != $testIv->iv && !is_null($ivMax) && ('' != $ivMax) && !($ivMax == 100 && $ivMin == 0)) {
-            $where .= ' AND iv <= ('.$ivMax.') ';
-        }
-        $req = 'SELECT pokemon_id, lat AS latitude, lon AS longitude,
+		$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 expire_timestamp >= UNIX_TIMESTAMP() AND pokemon_id = '.$pokemon_id;
+
+		$reqTestIv = 'SELECT MAX(iv) 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) && !($ivMax == 100 && $ivMin == 0)) {
+			$where .= ' AND iv >= ('.$ivMin.') ';
+		}
+		if (null != $testIv->iv && !is_null($ivMax) && ('' != $ivMax) && !($ivMax == 100 && $ivMin == 0)) {
+			$where .= ' AND iv <= ('.$ivMax.') ';
+		}
+		$req = 'SELECT pokemon_id, lat AS latitude, lon AS longitude,
     					FROM_UNIXTIME(expire_timestamp) AS disappear_time,
     					FROM_UNIXTIME(expire_timestamp) AS disappear_time_real,
     					atk_iv AS individual_attack, def_iv AS individual_defense, sta_iv AS individual_stamina,
    						move_1, move_2
 					FROM 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 FROM_UNIXTIME(MIN(expire_timestamp)) AS min, FROM_UNIXTIME(MAX(expire_timestamp)) AS max FROM pokemon';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getMapsCoords()
-    {
-        $req = 'SELECT MAX(lat) AS max_latitude, MIN(lat) AS min_latitude, MAX(lon) AS max_longitude, MIN(lon) as min_longitude FROM spawnpoint';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getPokemonCount($pokemon_id)
-    {
-        $req = 'SELECT COALESCE(SUM(count),0) as count, MAX(date) as last_seen_day
+		$result = $this->mysqli->query($req);
+		$spawns = array();
+		while ($data = $result->fetch_object()) {
+			$spawns[] = $data;
+		}
+
+		return $spawns;
+	}
+
+	public function getPokemonSliderMinMax()
+	{
+		$req = 'SELECT FROM_UNIXTIME(MIN(expire_timestamp)) AS min, FROM_UNIXTIME(MAX(expire_timestamp)) AS max FROM pokemon';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getMapsCoords()
+	{
+		$req = 'SELECT MAX(lat) AS max_latitude, MIN(lat) AS min_latitude, MAX(lon) AS max_longitude, MIN(lon) as min_longitude FROM spawnpoint';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getPokemonCount($pokemon_id)
+	{
+		$req = 'SELECT COALESCE(SUM(count),0) as count, MAX(date) as last_seen_day
 					FROM pokemon_stats
 					WHERE pokemon_id = '.$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 pokemon_id, SUM(count) as count, MAX(date) as last_seen_day
+	public function getPokemonCountAll()
+	{
+		$req = 'SELECT pokemon_id, SUM(count) as count, MAX(date) as last_seen_day
 					FROM pokemon_stats
 					GROUP BY pokemon_id';
-        $result = $this->mysqli->query($req);
-        $array = array();
-        while ($data = $result->fetch_object()) {
-            $array[] = $data;
-        }
+		$result = $this->mysqli->query($req);
+		$array = array();
+		while ($data = $result->fetch_object()) {
+			$array[] = $data;
+		}
 
-        return $array;
-    }
+		return $array;
+	}
 
 
-    public function getRaidCount($pokemon_id)
-    {
-        $req = 'SELECT COALESCE(SUM(count),0) as count, MAX(date) as last_seen_day
+	public function getRaidCount($pokemon_id)
+	{
+		$req = 'SELECT COALESCE(SUM(count),0) as count, MAX(date) as last_seen_day
 					FROM raid_stats
 					WHERE pokemon_id = '.$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 pokemon_id, SUM(count) as count, MAX(date) as last_seen_day
+	public function getRaidCountAll()
+	{
+		$req = 'SELECT pokemon_id, SUM(count) as count, MAX(date) as last_seen_day
 					FROM raid_stats
 					GROUP BY pokemon_id';
-        $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 lat as latitude, lon as longitude, lure_expire_timestamp AS lure_expiration, UNIX_TIMESTAMP() AS now, FROM_UNIXTIME(lure_expire_timestamp) 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)
-    {
-        return array();
-    }
-
-    public function getOwnedAndPoints($team_id)
-    {
-        $req = "SELECT COUNT(id) AS total, ROUND(AVG(total_cp)) AS average_points
+		$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 lat as latitude, lon as longitude, lure_expire_timestamp AS lure_expiration, UNIX_TIMESTAMP() AS now, FROM_UNIXTIME(lure_expire_timestamp) 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)
+	{
+		return array();
+	}
+
+	public function getOwnedAndPoints($team_id)
+	{
+		$req = "SELECT COUNT(id) AS total, ROUND(AVG(total_cp)) 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 id as gym_id, team_id, lat as latitude, lon as longitude, updated as last_scanned, (6 - availble_slots) AS level
+	public function getAllGyms()
+	{
+		$req = 'SELECT id as gym_id, team_id, lat as latitude, lon as longitude, updated as last_scanned, (6 - availble_slots) 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 name, null AS description, url, team_id AS team, FROM_UNIXTIME(updated) AS last_scanned, guarding_pokemon_id AS guard_pokemon_id, (6 - availble_slots) AS level, total_cp
+		$result = $this->mysqli->query($req);
+		$gyms = array();
+		while ($data = $result->fetch_object()) {
+			$gyms[] = $data;
+		}
+
+		return $gyms;
+	}
+
+	public function getGymData($gym_id)
+	{
+		$req = "SELECT name, null AS description, url, team_id AS team, FROM_UNIXTIME(updated) AS last_scanned, guarding_pokemon_id AS guard_pokemon_id, (6 - availble_slots) AS level, total_cp
                 FROM gym
                 WHERE 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)
-    {
-        return array();
-    }
+	public function getGymDefenders($gym_id)
+	{
+		return array();
+	}
 
-    ///////////
-    // Raids
-    ///////////
+	///////////
+	// Raids
+	///////////
 
-    public function getAllRaids($page)
-    {
-        $limit = ' LIMIT '.($page * 10).',10';
-        $req = 'SELECT id AS gym_id, raid_level AS level, raid_pokemon_id AS pokemon_id, raid_pokemon_cp AS cp, raid_pokemon_move_1 AS move_1, raid_pokemon_move_2 AS move_2, FROM_UNIXTIME(raid_spawn_timestamp) AS spawn, FROM_UNIXTIME(raid_battle_timestamp) AS start, FROM_UNIXTIME(raid_end_timestamp) AS end, FROM_UNIXTIME(updated) AS last_scanned, name, lat AS latitude, lon as longitude
+	public function getAllRaids($page)
+	{
+		$limit = ' LIMIT '.($page * 10).',10';
+		$req = 'SELECT id AS gym_id, raid_level AS level, raid_pokemon_id AS pokemon_id, raid_pokemon_cp AS cp, raid_pokemon_move_1 AS move_1, raid_pokemon_move_2 AS move_2, FROM_UNIXTIME(raid_spawn_timestamp) AS spawn, FROM_UNIXTIME(raid_battle_timestamp) AS start, FROM_UNIXTIME(raid_end_timestamp) AS end, FROM_UNIXTIME(updated) AS last_scanned, name, lat AS latitude, lon as longitude
                 FROM gym
                 WHERE raid_end_timestamp > UNIX_TIMESTAMP()
                 ORDER BY raid_level DESC, raid_battle_timestamp'.$limit;
-        $result = $this->mysqli->query($req);
-        $raids = array();
-        while ($data = $result->fetch_object()) {
-            $raids[] = $data;
-        }
-
-        return $raids;
-    }
-
-    ////////////////
-    // Gym History
-    ////////////////
-
-    public function getGymHistories($gym_name, $team, $page, $ranking)
-    {
-        return array();
-    }
-
-    public function getGymHistoriesPokemon($gym_id)
-    {
-        return array();
-    }
-
-    public function getHistoryForGym($page, $gym_id)
-    {
-        return array();
-    }
-
-    //////////////
-    // Trainers
-    //////////////
-
-    public function getTrainers($trainer_name, $team, $page, $rankingNumber)
-    {
-        return array();
-    }
-
-    public function getTrainerLevelRanking()
-    {
-        return array();
-    }
-
-    public function getActivePokemon($trainer_name)
-    {
-        return array();
-    }
-
-    public function getInactivePokemon($trainer_name)
-    {
-        return array();
-    }
-
-    public function getTrainerLevelCount($team_id)
-    {
-        return array();
-    }
-
-    /////////
-    // Cron
-    /////////
-
-    public function getPokemonCountsActive()
-    {
-        $req = 'SELECT pokemon_id, COUNT(*) as total FROM pokemon WHERE expire_timestamp >= UNIX_TIMESTAMP() GROUP BY pokemon_id';
-        $result = $this->mysqli->query($req);
-        $counts = array();
-        while ($data = $result->fetch_object()) {
-            $counts[$data->pokemon_id] = $data->total;
-        }
-
-        return $counts;
-    }
-
-    public function getTotalPokemonIV()
-    {
-        $req = 'SELECT COUNT(*) as total FROM pokemon WHERE expire_timestamp >= UNIX_TIMESTAMP() AND iv IS NOT NULL';
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
-
-        return $data;
-    }
-
-    public function getPokemonCountsLastDay()
-    {
-        $req = 'SELECT pokemon_id, COUNT(*) AS spawns_last_day
+		$result = $this->mysqli->query($req);
+		$raids = array();
+		while ($data = $result->fetch_object()) {
+			$raids[] = $data;
+		}
+
+		return $raids;
+	}
+
+	////////////////
+	// Gym History
+	////////////////
+
+	public function getGymHistories($gym_name, $team, $page, $ranking)
+	{
+		return array();
+	}
+
+	public function getGymHistoriesPokemon($gym_id)
+	{
+		return array();
+	}
+
+	public function getHistoryForGym($page, $gym_id)
+	{
+		return array();
+	}
+
+	//////////////
+	// Trainers
+	//////////////
+
+	public function getTrainers($trainer_name, $team, $page, $rankingNumber)
+	{
+		return array();
+	}
+
+	public function getTrainerLevelRanking()
+	{
+		return array();
+	}
+
+	public function getActivePokemon($trainer_name)
+	{
+		return array();
+	}
+
+	public function getInactivePokemon($trainer_name)
+	{
+		return array();
+	}
+
+	public function getTrainerLevelCount($team_id)
+	{
+		return array();
+	}
+
+	/////////
+	// Cron
+	/////////
+
+	public function getPokemonCountsActive()
+	{
+		$req = 'SELECT pokemon_id, COUNT(*) as total FROM pokemon WHERE expire_timestamp >= UNIX_TIMESTAMP() GROUP BY pokemon_id';
+		$result = $this->mysqli->query($req);
+		$counts = array();
+		while ($data = $result->fetch_object()) {
+			$counts[$data->pokemon_id] = $data->total;
+		}
+
+		return $counts;
+	}
+
+	public function getTotalPokemonIV()
+	{
+		$req = 'SELECT COUNT(*) as total FROM pokemon WHERE expire_timestamp >= UNIX_TIMESTAMP() AND iv IS NOT NULL';
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
+
+		return $data;
+	}
+
+	public function getPokemonCountsLastDay()
+	{
+		$req = 'SELECT pokemon_id, COUNT(*) AS spawns_last_day
 					FROM pokemon
 					WHERE expire_timestamp >= (SELECT MAX(expire_timestamp) - 86400 FROM pokemon)
 					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()
-    {
-        return ["total"=>0];
-    }
-
-    public function getNestData($time, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
-    {
-        $pokemon_exclude_sql = '';
-        if (!empty(self::$config->system->nest_exclude_pokemon)) {
-            $pokemon_exclude_sql = 'AND p.pokemon_id NOT IN ('.implode(',', self::$config->system->nest_exclude_pokemon).')';
-        }
-
-        $req = 'SELECT p.pokemon_id, MAX(p.lat) AS latitude, MAX(p.lon) AS longitude, count(p.pokemon_id) AS total_pokemon, MAX(p.updated) as latest_seen, 0 as duration
+		$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()
+	{
+		return ["total"=>0];
+	}
+
+	public function getNestData($time, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
+	{
+		$pokemon_exclude_sql = '';
+		if (!empty(self::$config->system->nest_exclude_pokemon)) {
+			$pokemon_exclude_sql = 'AND p.pokemon_id NOT IN ('.implode(',', self::$config->system->nest_exclude_pokemon).')';
+		}
+
+		$req = 'SELECT p.pokemon_id, MAX(p.lat) AS latitude, MAX(p.lon) AS longitude, count(p.pokemon_id) AS total_pokemon, MAX(p.updated) as latest_seen, 0 as duration
 			          FROM pokemon p
 			          WHERE p.expire_timestamp > UNIX_TIMESTAMP() - '.($time * 3600).' AND p.spawn_id IS NOT NULL
 			            AND p.lat >= '.$minLatitude.' AND p.lat < '.$maxLatitude.' AND p.lon >= '.$minLongitude.' AND p.lon < '.$maxLongitude.'
@@ -545,12 +545,12 @@ 
 			          GROUP BY p.spawn_id, p.pokemon_id
 			          HAVING COUNT(p.pokemon_id) >= '.($time / 4).'
 			          ORDER BY p.pokemon_id';
-        $result = $this->mysqli->query($req);
-        $nests = array();
-        while ($data = $result->fetch_object()) {
-            $nests[] = $data;
-        }
-        $req = 'SELECT p.pokemon_id, MAX(p.lat) AS latitude, MAX(p.lon) AS longitude, count(p.pokemon_id) AS total_pokemon, MAX(p.updated) as latest_seen, 0 as duration
+		$result = $this->mysqli->query($req);
+		$nests = array();
+		while ($data = $result->fetch_object()) {
+			$nests[] = $data;
+		}
+		$req = 'SELECT p.pokemon_id, MAX(p.lat) AS latitude, MAX(p.lon) AS longitude, count(p.pokemon_id) AS total_pokemon, MAX(p.updated) as latest_seen, 0 as duration
 			          FROM pokemon p
 			          WHERE p.expire_timestamp > UNIX_TIMESTAMP() - '.($time * 3600).' AND p.pokestop_id IS NOT NULL
 			            AND p.lat >= '.$minLatitude.' AND p.lat < '.$maxLatitude.' AND p.lon >= '.$minLongitude.' AND p.lon < '.$maxLongitude.'
@@ -558,22 +558,22 @@ 
 			          GROUP BY p.pokestop_id, p.pokemon_id
 			          HAVING COUNT(p.pokemon_id) >= '.($time / 4).'
 			          ORDER BY p.pokemon_id';
-        $result = $this->mysqli->query($req);
-        while ($data = $result->fetch_object()) {
-            $nests[] = $data;
-        }
+		$result = $this->mysqli->query($req);
+		while ($data = $result->fetch_object()) {
+			$nests[] = $data;
+		}
 
-        return $nests;
-    }
+		return $nests;
+	}
 
-    public function getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
-    {
-        $req = 'SELECT COUNT(*) as total 
+	public function getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
+	{
+		$req = 'SELECT COUNT(*) as total 
 					FROM spawnpoint
  					WHERE lat >= '.$minLatitude.' AND lat < '.$maxLatitude.' AND lon >= '.$minLongitude.' AND lon < '.$maxLongitude;
-        $result = $this->mysqli->query($req);
-        $data = $result->fetch_object();
+		$result = $this->mysqli->query($req);
+		$data = $result->fetch_object();
 
-        return $data;
-    }
+		return $data;
+	}
 }

core/process/queries/QueryManagerPostgresqlMonocleAlternate.php

Indentation +679 added lines, -679 removed lines

@@ -4,630 +4,630 @@ 
 
 class QueryManagerPostgresqlMonocleAlternate extends QueryManagerPostgresql
 {
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    public function __destruct()
-    {
-        parent::__destruct();
-    }
-
-    ///////////
-    // Tester
-    ///////////
-
-    public function testTotalPokemon()
-    {
-        $req = 'SELECT COUNT(*) as total FROM sightings';
-        $result = pg_query($this->db, $req);
-        if (false === $result) {
-            return 1;
-        } else {
-            $data = pg_fetch_object($result);
-            $total = $data->total;
-
-            if (0 == $total) {
-                return 2;
-            }
-        }
-
-        return 0;
-    }
-
-    public function testTotalGyms()
-    {
-        $req = 'SELECT COUNT(*) as total FROM forts';
-        $result = pg_query($this->db, $req);
-        if (false === $result) {
-            return 1;
-        } else {
-            $data = pg_fetch_object($result);
-            $total = $data->total;
-
-            if (0 == $total) {
-                return 2;
-            }
-        }
-
-        return 0;
-    }
-
-    public function testTotalPokestops()
-    {
-        $req = 'SELECT COUNT(*) as total FROM pokestops';
-        $result = pg_query($this->db, $req);
-        if (false === $result) {
-            return 1;
-        } else {
-            $data = pg_fetch_object($result);
-            $total = $data->total;
-
-            if (0 == $total) {
-                return 2;
-            }
-        }
-
-        return 0;
-    }
-
-    /////////////
-    // Homepage
-    /////////////
-
-    public function getTotalPokemon()
-    {
-        $req = 'SELECT COUNT(*) AS total FROM sightings WHERE expire_timestamp >= EXTRACT(EPOCH FROM NOW())';
-        $result = pg_query($this->db, $req);
-        $data = pg_fetch_object($result);
-
-        return $data;
-    }
-
-    public function getTotalLures()
-    {
-        $data = (object) array('total' => 0);
-
-        return $data;
-    }
-
-    public function getTotalGyms()
-    {
-        $req = 'SELECT COUNT(*) AS total FROM forts';
-        $result = pg_query($this->db, $req);
-        $data = pg_fetch_object($result);
-
-        return $data;
-    }
-
-    public function getTotalRaids()
-    {
-        $req = 'SELECT COUNT(*) AS total FROM raids WHERE time_battle <= EXTRACT(EPOCH FROM NOW()) AND time_end >= EXTRACT(EPOCH FROM NOW())';
-        $result = pg_query($this->db, $req);
-        $data = pg_fetch_object($result);
-
-        return $data;
-    }
-
-    public function getTotalGymsForTeam($team_id)
-    {
-        $req = "SELECT COUNT(*) AS total
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	public function __destruct()
+	{
+		parent::__destruct();
+	}
+
+	///////////
+	// Tester
+	///////////
+
+	public function testTotalPokemon()
+	{
+		$req = 'SELECT COUNT(*) as total FROM sightings';
+		$result = pg_query($this->db, $req);
+		if (false === $result) {
+			return 1;
+		} else {
+			$data = pg_fetch_object($result);
+			$total = $data->total;
+
+			if (0 == $total) {
+				return 2;
+			}
+		}
+
+		return 0;
+	}
+
+	public function testTotalGyms()
+	{
+		$req = 'SELECT COUNT(*) as total FROM forts';
+		$result = pg_query($this->db, $req);
+		if (false === $result) {
+			return 1;
+		} else {
+			$data = pg_fetch_object($result);
+			$total = $data->total;
+
+			if (0 == $total) {
+				return 2;
+			}
+		}
+
+		return 0;
+	}
+
+	public function testTotalPokestops()
+	{
+		$req = 'SELECT COUNT(*) as total FROM pokestops';
+		$result = pg_query($this->db, $req);
+		if (false === $result) {
+			return 1;
+		} else {
+			$data = pg_fetch_object($result);
+			$total = $data->total;
+
+			if (0 == $total) {
+				return 2;
+			}
+		}
+
+		return 0;
+	}
+
+	/////////////
+	// Homepage
+	/////////////
+
+	public function getTotalPokemon()
+	{
+		$req = 'SELECT COUNT(*) AS total FROM sightings WHERE expire_timestamp >= EXTRACT(EPOCH FROM NOW())';
+		$result = pg_query($this->db, $req);
+		$data = pg_fetch_object($result);
+
+		return $data;
+	}
+
+	public function getTotalLures()
+	{
+		$data = (object) array('total' => 0);
+
+		return $data;
+	}
+
+	public function getTotalGyms()
+	{
+		$req = 'SELECT COUNT(*) AS total FROM forts';
+		$result = pg_query($this->db, $req);
+		$data = pg_fetch_object($result);
+
+		return $data;
+	}
+
+	public function getTotalRaids()
+	{
+		$req = 'SELECT COUNT(*) AS total FROM raids WHERE time_battle <= EXTRACT(EPOCH FROM NOW()) AND time_end >= EXTRACT(EPOCH FROM NOW())';
+		$result = pg_query($this->db, $req);
+		$data = pg_fetch_object($result);
+
+		return $data;
+	}
+
+	public function getTotalGymsForTeam($team_id)
+	{
+		$req = "SELECT COUNT(*) AS total
 					FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
 					WHERE team = '$team_id'";
-        $result = pg_query($this->db, $req);
-        $data = pg_fetch_object($result);
+		$result = pg_query($this->db, $req);
+		$data = pg_fetch_object($result);
 
-        return $data;
-    }
+		return $data;
+	}
 
-    public function getRecentAll()
-    {
-        $req = 'SELECT pokemon_id, encounter_id, TO_TIMESTAMP(expire_timestamp) AS disappear_time, TO_TIMESTAMP(updated) AS last_modified, TO_TIMESTAMP(expire_timestamp) AS disappear_time_real,
+	public function getRecentAll()
+	{
+		$req = 'SELECT pokemon_id, encounter_id, TO_TIMESTAMP(expire_timestamp) AS disappear_time, TO_TIMESTAMP(updated) AS last_modified, TO_TIMESTAMP(expire_timestamp) AS disappear_time_real,
               lat AS latitude, lon AS longitude, cp, atk_iv AS individual_attack, def_iv AS individual_defense, sta_iv AS individual_stamina
               FROM sightings
               ORDER BY updated DESC
               LIMIT 12 OFFSET 0';
-        $result = pg_query($this->db, $req);
-        $data = array();
-        if ($result->num_rows > 0) {
-            while ($row = pg_fetch_object($result)) {
-                $data[] = $row;
-            }
-        }
-
-        return $data;
-    }
-
-    public function getRecentMythic($mythic_pokemon)
-    {
-        $req = 'SELECT pokemon_id, encounter_id, TO_TIMESTAMP(expire_timestamp) AS disappear_time, TO_TIMESTAMP(updated) AS last_modified, TO_TIMESTAMP(expire_timestamp) AS disappear_time_real,
+		$result = pg_query($this->db, $req);
+		$data = array();
+		if ($result->num_rows > 0) {
+			while ($row = pg_fetch_object($result)) {
+				$data[] = $row;
+			}
+		}
+
+		return $data;
+	}
+
+	public function getRecentMythic($mythic_pokemon)
+	{
+		$req = 'SELECT pokemon_id, encounter_id, TO_TIMESTAMP(expire_timestamp) AS disappear_time, TO_TIMESTAMP(updated) AS last_modified, TO_TIMESTAMP(expire_timestamp) AS disappear_time_real,
                 lat AS latitude, lon AS longitude, cp, atk_iv AS individual_attack, def_iv AS individual_defense, sta_iv AS individual_stamina
                 FROM sightings
                 WHERE pokemon_id IN ('.implode(',', $mythic_pokemon).')
                 ORDER BY updated DESC
                 LIMIT 12 OFFSET 0';
-        $result = pg_query($this->db, $req);
-        $data = array();
-        if ($result->num_rows > 0) {
-            while ($row = pg_fetch_object($result)) {
-                $data[] = $row;
-            }
-        }
-
-        return $data;
-    }
-
-    ///////////////////
-    // Single Pokemon
-    ///////////////////
-
-    public function getGymsProtectedByPokemon($pokemon_id)
-    {
-        $req = "SELECT COUNT(f.id) AS total
+		$result = pg_query($this->db, $req);
+		$data = array();
+		if ($result->num_rows > 0) {
+			while ($row = pg_fetch_object($result)) {
+				$data[] = $row;
+			}
+		}
+
+		return $data;
+	}
+
+	///////////////////
+	// Single Pokemon
+	///////////////////
+
+	public function getGymsProtectedByPokemon($pokemon_id)
+	{
+		$req = "SELECT COUNT(f.id) AS total
 					FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
 					WHERE guard_pokemon_id = '".$pokemon_id."'";
-        $result = pg_query($this->db, $req);
-        $data = pg_fetch_object($result);
+		$result = pg_query($this->db, $req);
+		$data = pg_fetch_object($result);
 
-        return $data;
-    }
+		return $data;
+	}
 
-    public function getPokemonLastSeen($pokemon_id)
-    {
-        $req = "SELECT TO_TIMESTAMP(expire_timestamp) AS expire_timestamp, TO_TIMESTAMP(expire_timestamp) AS disappear_time_real, lat AS latitude, lon AS longitude
+	public function getPokemonLastSeen($pokemon_id)
+	{
+		$req = "SELECT TO_TIMESTAMP(expire_timestamp) AS expire_timestamp, TO_TIMESTAMP(expire_timestamp) AS disappear_time_real, lat AS latitude, lon AS longitude
                 FROM sightings
                 WHERE pokemon_id = '".$pokemon_id."'
                 ORDER BY expire_timestamp DESC
                 LIMIT 1 OFFSET 0";
-        $result = pg_query($this->db, $req);
-        $data = pg_fetch_object($result);
+		$result = pg_query($this->db, $req);
+		$data = pg_fetch_object($result);
 
-        return $data;
-    }
+		return $data;
+	}
 
-    public function getTop50Pokemon($pokemon_id, $top_order_by, $top_direction)
-    {
-        $req = "SELECT expire_timestamp, TO_TIMESTAMP(expire_timestamp) AS distime, pokemon_id as pokemon_id, TO_TIMESTAMP(expire_timestamp) as disappear_time, lat as latitude, lon as longitude,
+	public function getTop50Pokemon($pokemon_id, $top_order_by, $top_direction)
+	{
+		$req = "SELECT expire_timestamp, TO_TIMESTAMP(expire_timestamp) AS distime, pokemon_id as pokemon_id, TO_TIMESTAMP(expire_timestamp) as disappear_time, lat as latitude, lon as longitude,
                 cp, atk_iv as individual_attack, def_iv as individual_defense, sta_iv as individual_stamina,
                 ROUND(100*(atk_iv+def_iv+sta_iv)/45,1) AS \"IV\", move_1 as move_1, move_2, form
                 FROM sightings
 	            WHERE pokemon_id = '".$pokemon_id."' AND move_1 IS NOT NULL AND move_1 <> '0'
 	            ORDER BY $top_order_by $top_direction, expire_timestamp DESC
 	            LIMIT 50 OFFSET 0";
-        $result = pg_query($this->db, $req);
-        $top = array();
-        while ($data = pg_fetch_object($result)) {
-            $top[] = $data;
-        }
-
-        return $top;
-    }
-
-    public function getTop50Trainers($pokemon_id, $best_order_by, $best_direction)
-    {
-        $trainer_blacklist = '';
-        if (!empty(self::$config->system->trainer_blacklist)) {
-            $trainer_blacklist = " AND owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
-        }
-
-        $req = "SELECT owner_name as trainer_name, ROUND((100.0*((atk_iv)+(def_iv)+(sta_iv))/45),1) AS \"IV\", move_1, move_2, cp as cp,
+		$result = pg_query($this->db, $req);
+		$top = array();
+		while ($data = pg_fetch_object($result)) {
+			$top[] = $data;
+		}
+
+		return $top;
+	}
+
+	public function getTop50Trainers($pokemon_id, $best_order_by, $best_direction)
+	{
+		$trainer_blacklist = '';
+		if (!empty(self::$config->system->trainer_blacklist)) {
+			$trainer_blacklist = " AND owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
+		}
+
+		$req = "SELECT owner_name as trainer_name, ROUND((100.0*((atk_iv)+(def_iv)+(sta_iv))/45),1) AS \"IV\", move_1, move_2, cp as cp,
                 TO_TIMESTAMP(last_modified) AS lasttime, last_modified as last_seen
                 FROM gym_defenders
 				WHERE pokemon_id = '".$pokemon_id."'".$trainer_blacklist."
 				ORDER BY $best_order_by $best_direction, owner_name ASC
 				LIMIT 50 OFFSET 0";
 
-        $result = pg_query($this->db, $req);
-        $toptrainer = array();
-        while ($data = pg_fetch_object($result)) {
-            $toptrainer[] = $data;
-        }
-
-        return $toptrainer;
-    }
-
-    public function getPokemonHeatmap($pokemon_id, $start, $end)
-    {
-        $where = ' WHERE pokemon_id = '.$pokemon_id.' '
-            ."AND TO_TIMESTAMP(expire_timestamp) BETWEEN '".$start."' AND '".$end."'";
-        $req = 'SELECT lat AS latitude, lon AS longitude FROM sightings'.$where.' LIMIT 100000';
-        $result = pg_query($this->db, $req);
-        $points = array();
-        while ($data = pg_fetch_object($result)) {
-            $points[] = $data;
-        }
-
-        return $points;
-    }
-
-    public function getPokemonGraph($pokemon_id)
-    {
-        $req = "SELECT COUNT(*) AS total, EXTRACT(HOUR FROM disappear_time) AS disappear_hour
+		$result = pg_query($this->db, $req);
+		$toptrainer = array();
+		while ($data = pg_fetch_object($result)) {
+			$toptrainer[] = $data;
+		}
+
+		return $toptrainer;
+	}
+
+	public function getPokemonHeatmap($pokemon_id, $start, $end)
+	{
+		$where = ' WHERE pokemon_id = '.$pokemon_id.' '
+			."AND TO_TIMESTAMP(expire_timestamp) BETWEEN '".$start."' AND '".$end."'";
+		$req = 'SELECT lat AS latitude, lon AS longitude FROM sightings'.$where.' LIMIT 100000';
+		$result = pg_query($this->db, $req);
+		$points = array();
+		while ($data = pg_fetch_object($result)) {
+			$points[] = $data;
+		}
+
+		return $points;
+	}
+
+	public function getPokemonGraph($pokemon_id)
+	{
+		$req = "SELECT COUNT(*) AS total, EXTRACT(HOUR FROM disappear_time) AS disappear_hour
 					FROM (SELECT TO_TIMESTAMP(expire_timestamp) as disappear_time FROM sightings WHERE pokemon_id = '".$pokemon_id."' LIMIT 100000) AS pokemonFiltered
 				GROUP BY disappear_hour
 				ORDER BY disappear_hour";
-        $result = pg_query($this->db, $req);
-        $array = array_fill(0, 24, 0);
-        while ($result && $data = pg_fetch_object($result)) {
-            $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 expire_timestamp >= EXTRACT(EPOCH FROM NOW()) AND pokemon_id = '.$pokemon_id;
-
-        $reqTestIv = 'SELECT MAX(atk_iv) AS iv FROM sightings '.$where;
-        $resultTestIv = pg_query($this->db, $reqTestIv);
-        $testIv = pg_fetch_object($resultTestIv);
-        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)*(atk_iv + def_iv + sta_iv)) >= ('.$ivMin.') ';
-        }
-        if (null != $testIv->iv && !is_null($ivMax) && ('' != $ivMax)) {
-            $where .= ' AND ((100/45)*(atk_iv + def_iv + sta_iv)) <= ('.$ivMax.') ';
-        }
-        $req = 'SELECT pokemon_id, lat AS latitude, lon AS longitude,
+		$result = pg_query($this->db, $req);
+		$array = array_fill(0, 24, 0);
+		while ($result && $data = pg_fetch_object($result)) {
+			$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 expire_timestamp >= EXTRACT(EPOCH FROM NOW()) AND pokemon_id = '.$pokemon_id;
+
+		$reqTestIv = 'SELECT MAX(atk_iv) AS iv FROM sightings '.$where;
+		$resultTestIv = pg_query($this->db, $reqTestIv);
+		$testIv = pg_fetch_object($resultTestIv);
+		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)*(atk_iv + def_iv + sta_iv)) >= ('.$ivMin.') ';
+		}
+		if (null != $testIv->iv && !is_null($ivMax) && ('' != $ivMax)) {
+			$where .= ' AND ((100/45)*(atk_iv + def_iv + sta_iv)) <= ('.$ivMax.') ';
+		}
+		$req = 'SELECT pokemon_id, lat AS latitude, lon AS longitude,
     					TO_TIMESTAMP(expire_timestamp) AS disappear_time,
     					TO_TIMESTAMP(expire_timestamp) AS disappear_time_real,
     					atk_iv AS individual_attack, def_iv AS individual_defense, sta_iv AS individual_stamina,
    						move_1, move_2
 					FROM sightings '.$where.'
 					LIMIT 5000';
-        $result = pg_query($this->db, $req);
-        $spawns = array();
-        while ($data = pg_fetch_object($result)) {
-            $spawns[] = $data;
-        }
-
-        return $spawns;
-    }
-
-    public function getPokemonSliderMinMax()
-    {
-        $req = 'SELECT TO_TIMESTAMP(MIN(expire_timestamp)) AS min, TO_TIMESTAMP(MAX(expire_timestamp)) AS max FROM sightings';
-        $result = pg_query($this->db, $req);
-        $data = pg_fetch_object($result);
-
-        return $data;
-    }
-
-    public function getMapsCoords()
-    {
-        $req = 'SELECT MAX(lat) AS max_latitude, MIN(lat) AS min_latitude, MAX(lon) AS max_longitude, MIN(lon) as min_longitude FROM spawnpoints';
-        $result = pg_query($this->db, $req);
-        $data = pg_fetch_object($result);
-
-        return $data;
-    }
-
-    public function getPokemonCount($pokemon_id)
-    {
-        $req = 'SELECT count, last_seen, latitude, longitude
+		$result = pg_query($this->db, $req);
+		$spawns = array();
+		while ($data = pg_fetch_object($result)) {
+			$spawns[] = $data;
+		}
+
+		return $spawns;
+	}
+
+	public function getPokemonSliderMinMax()
+	{
+		$req = 'SELECT TO_TIMESTAMP(MIN(expire_timestamp)) AS min, TO_TIMESTAMP(MAX(expire_timestamp)) AS max FROM sightings';
+		$result = pg_query($this->db, $req);
+		$data = pg_fetch_object($result);
+
+		return $data;
+	}
+
+	public function getMapsCoords()
+	{
+		$req = 'SELECT MAX(lat) AS max_latitude, MIN(lat) AS min_latitude, MAX(lon) AS max_longitude, MIN(lon) as min_longitude FROM spawnpoints';
+		$result = pg_query($this->db, $req);
+		$data = pg_fetch_object($result);
+
+		return $data;
+	}
+
+	public function getPokemonCount($pokemon_id)
+	{
+		$req = 'SELECT count, last_seen, latitude, longitude
 					FROM pokemon_stats
 					WHERE pid = '.$pokemon_id;
-        $result = pg_query($this->db, $req);
-        $data = pg_fetch_object($result);
+		$result = pg_query($this->db, $req);
+		$data = pg_fetch_object($result);
 
-        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 = pg_fetch_object($result)) {
-            $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 = pg_fetch_object($result)) {
+			$array[] = $data;
+		}
+
+		return $array;
+	}
+
+	public function getRaidCount($pokemon_id)
+	{
+		$req = 'SELECT count, last_seen, latitude, longitude
 					FROM raid_stats
 					WHERE pid = '.$pokemon_id;
-        $result = pg_query($this->db, $req);
-        $data = pg_fetch_object($result);
+		$result = pg_query($this->db, $req);
+		$data = pg_fetch_object($result);
 
-        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 = pg_fetch_object($result)) {
-            $array[] = $data;
-        }
-
-        return $array;
-    }
-
-    ///////////////
-    // Pokestops
-    //////////////
-
-    public function getTotalPokestops()
-    {
-        $req = 'SELECT COUNT(*) as total FROM pokestops';
-        $result = pg_query($this->db, $req);
-        $data = pg_fetch_object($result);
-
-        return $data;
-    }
-
-    public function getAllPokestops()
-    {
-        $req = 'SELECT lat as latitude, lon as longitude, null AS lure_expiration, EXTRACT(EPOCH FROM NOW()) AS now, null AS lure_expiration_real FROM pokestops';
-        $result = pg_query($this->db, $req);
-        $pokestops = array();
-        while ($data = pg_fetch_object($result)) {
-            $pokestops[] = $data;
-        }
-
-        return $pokestops;
-    }
-
-    /////////
-    // Gyms
-    /////////
-
-    public function getTeamGuardians($team_id)
-    {
-        $req = "SELECT COUNT(*) AS total, guard_pokemon_id
+		$result = $this->mysqli->query($req);
+		$array = array();
+		while ($data = pg_fetch_object($result)) {
+			$array[] = $data;
+		}
+
+		return $array;
+	}
+
+	///////////////
+	// Pokestops
+	//////////////
+
+	public function getTotalPokestops()
+	{
+		$req = 'SELECT COUNT(*) as total FROM pokestops';
+		$result = pg_query($this->db, $req);
+		$data = pg_fetch_object($result);
+
+		return $data;
+	}
+
+	public function getAllPokestops()
+	{
+		$req = 'SELECT lat as latitude, lon as longitude, null AS lure_expiration, EXTRACT(EPOCH FROM NOW()) AS now, null AS lure_expiration_real FROM pokestops';
+		$result = pg_query($this->db, $req);
+		$pokestops = array();
+		while ($data = pg_fetch_object($result)) {
+			$pokestops[] = $data;
+		}
+
+		return $pokestops;
+	}
+
+	/////////
+	// Gyms
+	/////////
+
+	public function getTeamGuardians($team_id)
+	{
+		$req = "SELECT COUNT(*) AS total, guard_pokemon_id
 					FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
 					WHERE team = '".$team_id."' GROUP BY guard_pokemon_id ORDER BY total DESC LIMIT 3 OFFSET 0";
-        $result = pg_query($this->db, $req);
+		$result = pg_query($this->db, $req);
 
-        $datas = array();
-        while ($data = pg_fetch_object($result)) {
-            $datas[] = $data;
-        }
+		$datas = array();
+		while ($data = pg_fetch_object($result)) {
+			$datas[] = $data;
+		}
 
-        return $datas;
-    }
+		return $datas;
+	}
 
-    public function getOwnedAndPoints($team_id)
-    {
-        $req = "SELECT COUNT(f.id) AS total, ROUND(AVG(fs.total_cp))AS average_points
+	public function getOwnedAndPoints($team_id)
+	{
+		$req = "SELECT COUNT(f.id) AS total, ROUND(AVG(fs.total_cp))AS average_points
         			FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
         			WHERE fs.team = '".$team_id."'";
-        $result = pg_query($this->db, $req);
-        $data = pg_fetch_object($result);
+		$result = pg_query($this->db, $req);
+		$data = pg_fetch_object($result);
 
-        return $data;
-    }
+		return $data;
+	}
 
-    public function getAllGyms()
-    {
-        $req = 'SELECT f.id as gym_id, team as team_id, f.lat as latitude, f.lon as longitude, updated as last_scanned, (6 - fs.slots_available) AS level
+	public function getAllGyms()
+	{
+		$req = 'SELECT f.id as gym_id, team as team_id, f.lat as latitude, f.lon as longitude, updated as last_scanned, (6 - fs.slots_available) AS level
 					FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))';
-        $result = pg_query($this->db, $req);
-        $gyms = array();
-        while ($data = pg_fetch_object($result)) {
-            $gyms[] = $data;
-        }
-
-        return $gyms;
-    }
-
-    public function getGymData($gym_id)
-    {
-        $req = "SELECT f.name AS name, null AS description, f.url AS url, fs.team AS team, TO_TIMESTAMP(fs.updated) AS last_scanned, fs.guard_pokemon_id AS guard_pokemon_id, (6 - fs.slots_available) AS level, fs.total_cp
+		$result = pg_query($this->db, $req);
+		$gyms = array();
+		while ($data = pg_fetch_object($result)) {
+			$gyms[] = $data;
+		}
+
+		return $gyms;
+	}
+
+	public function getGymData($gym_id)
+	{
+		$req = "SELECT f.name AS name, null AS description, f.url AS url, fs.team AS team, TO_TIMESTAMP(fs.updated) AS last_scanned, fs.guard_pokemon_id AS guard_pokemon_id, (6 - fs.slots_available) AS level, fs.total_cp
 			FROM forts f
 			LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
 			WHERE f.id ='".$gym_id."'
 			GROUP BY f.name, f.url, fs.team, fs.updated, fs.guard_pokemon_id, fs.slots_available, gd.cp";
-        $result = pg_query($this->db, $req);
-        $data = pg_fetch_object($result);
+		$result = pg_query($this->db, $req);
+		$data = pg_fetch_object($result);
 
-        return $data;
-    }
+		return $data;
+	}
 
-    public function getGymDefenders($gym_id)
-    {
-        $req = "SELECT external_id as pokemon_uid, pokemon_id, atk_iv as iv_attack, def_iv as iv_defense, sta_iv as iv_stamina, cp, fort_id as gym_id
+	public function getGymDefenders($gym_id)
+	{
+		$req = "SELECT external_id as pokemon_uid, pokemon_id, atk_iv as iv_attack, def_iv as iv_defense, sta_iv as iv_stamina, cp, fort_id as gym_id
 			FROM gym_defenders
 			WHERE fort_id='".$gym_id."'
 			ORDER BY deployment_time";
-        $result = pg_query($this->db, $req);
-        $defenders = array();
-        while ($data = pg_fetch_object($result)) {
-            $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').' fs.team = '.$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';
-        }
-
-        $limit = ' LIMIT 10 OFFSET '.($page * 10);
-
-        $req = 'SELECT f.id as gym_id, fs.total_cp, f.name, fs.team as team_id, (6 - slots_available) as pokemon_count, TO_TIMESTAMP(last_modified) AS last_modified
+		$result = pg_query($this->db, $req);
+		$defenders = array();
+		while ($data = pg_fetch_object($result)) {
+			$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').' fs.team = '.$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';
+		}
+
+		$limit = ' LIMIT 10 OFFSET '.($page * 10);
+
+		$req = 'SELECT f.id as gym_id, fs.total_cp, f.name, fs.team as team_id, (6 - slots_available) as pokemon_count, TO_TIMESTAMP(last_modified) AS last_modified
 			FROM forts f
 			LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
 			'.$where.$order.$limit;
 
-        $result = pg_query($this->db, $req);
-        $gym_history = array();
-        while ($data = pg_fetch_object($result)) {
-            $gym_history[] = $data;
-        }
+		$result = pg_query($this->db, $req);
+		$gym_history = array();
+		while ($data = pg_fetch_object($result)) {
+			$gym_history[] = $data;
+		}
 
-        return $gym_history;
-    }
+		return $gym_history;
+	}
 
-    public function getGymHistoriesPokemon($gym_id)
-    {
-        $req = "SELECT external_id AS pokemon_uid, pokemon_id, cp_now as cp, owner_name AS trainer_name
+	public function getGymHistoriesPokemon($gym_id)
+	{
+		$req = "SELECT external_id AS pokemon_uid, pokemon_id, cp_now as cp, owner_name AS trainer_name
 					FROM gym_defenders
 					WHERE fort_id = '".$gym_id."'
 					ORDER BY deployment_time";
-        $result = pg_query($this->db, $req);
-        $pokemons = array();
-        while ($data = pg_fetch_object($result)) {
-            $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 f.id as gym_id, fs.team as team_id, total_cp, TO_TIMESTAMP(fs.last_modified) as last_modified, last_modified as last_modified_real
+		$result = pg_query($this->db, $req);
+		$pokemons = array();
+		while ($data = pg_fetch_object($result)) {
+			$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 f.id as gym_id, fs.team as team_id, total_cp, TO_TIMESTAMP(fs.last_modified) as last_modified, last_modified as last_modified_real
 					FROM fort_sightings fs
 					LEFT JOIN forts f ON f.id = fs.fort_id
 					WHERE f.id = '".$gym_id."'
 					ORDER BY fs.last_modified DESC
 					LIMIT ".($pageSize + 1).' OFFSET '.($page * $pageSize);
-        $result = pg_query($this->db, $req);
-        $history = array();
-        $count = 0;
-        while ($data = pg_fetch_object($result)) {
-            ++$count;
-            if (0 == $data->total_cp) {
-                $data->pokemon = array();
-                $data->pokemon_count = 0;
-                $data->pokemon_uids = '';
-            } else {
-                $data->pokemon = $this->getHistoryForGymPokemon($gym_id, $data->last_modified_real);
-                $data->pokemon_count = count($data->pokemon);
-                $data->pokemon_uids = implode(',', array_keys($data->pokemon));
-            }
-            if (0 === $data->total_cp || 0 !== $data->pokemon_count) {
-                $history[] = $data;
-            }
-        }
-        if ($count !== ($pageSize + 1)) {
-            $last_page = true;
-        } else {
-            $last_page = false;
-        }
-
-        return array('last_page' => $last_page, 'data' => $history);
-    }
-
-    private function getHistoryForGymPokemon($gym_id, $last_modified)
-    {
-        $req = "SELECT ghd.defender_id, gd.pokemon_id, ghd.cp, gd.owner_name as trainer_name
+		$result = pg_query($this->db, $req);
+		$history = array();
+		$count = 0;
+		while ($data = pg_fetch_object($result)) {
+			++$count;
+			if (0 == $data->total_cp) {
+				$data->pokemon = array();
+				$data->pokemon_count = 0;
+				$data->pokemon_uids = '';
+			} else {
+				$data->pokemon = $this->getHistoryForGymPokemon($gym_id, $data->last_modified_real);
+				$data->pokemon_count = count($data->pokemon);
+				$data->pokemon_uids = implode(',', array_keys($data->pokemon));
+			}
+			if (0 === $data->total_cp || 0 !== $data->pokemon_count) {
+				$history[] = $data;
+			}
+		}
+		if ($count !== ($pageSize + 1)) {
+			$last_page = true;
+		} else {
+			$last_page = false;
+		}
+
+		return array('last_page' => $last_page, 'data' => $history);
+	}
+
+	private function getHistoryForGymPokemon($gym_id, $last_modified)
+	{
+		$req = "SELECT ghd.defender_id, gd.pokemon_id, ghd.cp, gd.owner_name as trainer_name
 					FROM gym_history_defenders ghd
 					JOIN gym_defenders gd ON ghd.defender_id = gd.external_id
 					WHERE ghd.fort_id = '".$gym_id."' AND date = '".$last_modified."'
 					ORDER BY gd.deployment_time";
-        $result = pg_query($this->db, $req);
-        $pokemons = array();
-        while ($data = pg_fetch_object($result)) {
-            $pokemons[$data->defender_id] = $data;
-        }
-
-        return $pokemons;
-    }
-
-    ///////////
-    // Raids
-    ///////////
-
-    public function getAllRaids($page)
-    {
-        $limit = ' LIMIT 10 OFFSET '.($page * 10);
-        $req = 'SELECT r.fort_id AS gym_id, r.level AS level, r.pokemon_id AS pokemon_id, r.cp AS cp, r.move_1 AS move_1, r.move_2 AS move_2, TO_TIMESTAMP(r.time_spawn) AS spawn, TO_TIMESTAMP(r.time_battle) AS start, TO_TIMESTAMP(r.time_end) AS end, TO_TIMESTAMP(fs.updated) AS last_scanned, f.name, f.lat AS latitude, f.lon as longitude
+		$result = pg_query($this->db, $req);
+		$pokemons = array();
+		while ($data = pg_fetch_object($result)) {
+			$pokemons[$data->defender_id] = $data;
+		}
+
+		return $pokemons;
+	}
+
+	///////////
+	// Raids
+	///////////
+
+	public function getAllRaids($page)
+	{
+		$limit = ' LIMIT 10 OFFSET '.($page * 10);
+		$req = 'SELECT r.fort_id AS gym_id, r.level AS level, r.pokemon_id AS pokemon_id, r.cp AS cp, r.move_1 AS move_1, r.move_2 AS move_2, TO_TIMESTAMP(r.time_spawn) AS spawn, TO_TIMESTAMP(r.time_battle) AS start, TO_TIMESTAMP(r.time_end) AS end, TO_TIMESTAMP(fs.updated) AS last_scanned, f.name, f.lat AS latitude, f.lon as longitude
 					FROM forts f
 					LEFT JOIN fort_sightings fs ON (fs.fort_id = f.id AND fs.last_modified = (SELECT MAX(last_modified) FROM fort_sightings fs2 WHERE fs2.fort_id=f.id))
 				 	LEFT JOIN raids r ON (r.fort_id = f.id AND r.time_end >= UNIX_TIMESTAMP())
 					WHERE r.time_end > EXTRACT(EPOCH FROM NOW())
 					ORDER BY r.level DESC, r.time_battle'.$limit;
-        $result = pg_query($this->db, $req);
-        $raids = array();
-        while ($data = pg_fetch_object($result)) {
-            $raids[] = $data;
-        }
-
-        return $raids;
-    }
-
-    //////////////
-    // Trainers
-    //////////////
-
-    public function getTrainers($trainer_name, $team, $page, $rankingNumber)
-    {
-        $ranking = $this->getTrainerLevelRanking();
-        $where = '';
-        if (!empty(self::$config->system->trainer_blacklist)) {
-            $where .= " AND gd.owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
-        }
-        if ('' != $trainer_name) {
-            $where = " AND gd.owner_name LIKE '%".$trainer_name."%'";
-        }
-        if (0 != $team) {
-            $where .= ('' == $where ? ' HAVING' : ' AND').' team = '.$team;
-        }
-        switch ($rankingNumber) {
-            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 10 OFFSET '.($page * 10);
-        $req = 'SELECT gd.owner_name AS name, MAX(owner_level) AS level, MAX(cp) AS maxCp, MAX(active) AS active, MAX(team) AS team, TO_TIMESTAMP(MAX(last_modified)) as last_seen
+		$result = pg_query($this->db, $req);
+		$raids = array();
+		while ($data = pg_fetch_object($result)) {
+			$raids[] = $data;
+		}
+
+		return $raids;
+	}
+
+	//////////////
+	// Trainers
+	//////////////
+
+	public function getTrainers($trainer_name, $team, $page, $rankingNumber)
+	{
+		$ranking = $this->getTrainerLevelRanking();
+		$where = '';
+		if (!empty(self::$config->system->trainer_blacklist)) {
+			$where .= " AND gd.owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
+		}
+		if ('' != $trainer_name) {
+			$where = " AND gd.owner_name LIKE '%".$trainer_name."%'";
+		}
+		if (0 != $team) {
+			$where .= ('' == $where ? ' HAVING' : ' AND').' team = '.$team;
+		}
+		switch ($rankingNumber) {
+			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 10 OFFSET '.($page * 10);
+		$req = 'SELECT gd.owner_name AS name, MAX(owner_level) AS level, MAX(cp) AS maxCp, MAX(active) AS active, MAX(team) AS team, TO_TIMESTAMP(MAX(last_modified)) as last_seen
 				  	FROM gym_defenders gd
 				  	LEFT JOIN (
 				  		SELECT owner_name, COUNT(*) as active
@@ -637,158 +637,158 @@ 
 				  	) active ON active.owner_name = gd.owner_name
 				  	WHERE level IS NOT NULL '.$where.'
 				  	GROUP BY gd.owner_name'.$order.$limit;
-        $result = pg_query($this->db, $req);
-        $trainers = array();
-        while ($data = pg_fetch_object($result)) {
-            $data->last_seen = date('Y-m-d', strtotime($data->last_seen));
-            if (is_null($data->active)) {
-                $data->active = 0;
-            }
-            $trainers[$data->name] = $data;
-
-            $pokemon = array_merge($this->getActivePokemon($data->name), $this->getInactivePokemon($data->name));
-
-            $trainers[$data->name]->gyms = $data->active;
-            $trainers[$data->name]->pokemons = $pokemon;
-            $trainers[$data->name]->rank = $ranking[$data->level];
-        }
-
-        return $trainers;
-    }
-
-    public function getTrainerLevelRanking()
-    {
-        $exclue = '';
-        if (!empty(self::$config->system->trainer_blacklist)) {
-            $exclue .= " AND owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
-        }
-        $req = 'SELECT COUNT(*) AS count, level FROM (SELECT MAX(owner_level) as level FROM gym_defenders WHERE owner_level IS NOT NULL '.$exclue.' GROUP BY owner_level, owner_name) x GROUP BY level';
-        $result = pg_query($this->db, $req);
-        $levelData = array();
-        while ($data = pg_fetch_object($result)) {
-            $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;
-    }
-
-    public function getActivePokemon($trainer_name)
-    {
-        $req = "SELECT pokemon_id, cp, atk_iv AS iv_attack, sta_iv AS iv_stamina, def_iv AS iv_defense, TO_TIMESTAMP(deployment_time) AS deployment_time, '1' AS active, fort_id as gym_id, FLOOR((UNIX_TIMESTAMP() - created) / 86400) AS last_scanned
+		$result = pg_query($this->db, $req);
+		$trainers = array();
+		while ($data = pg_fetch_object($result)) {
+			$data->last_seen = date('Y-m-d', strtotime($data->last_seen));
+			if (is_null($data->active)) {
+				$data->active = 0;
+			}
+			$trainers[$data->name] = $data;
+
+			$pokemon = array_merge($this->getActivePokemon($data->name), $this->getInactivePokemon($data->name));
+
+			$trainers[$data->name]->gyms = $data->active;
+			$trainers[$data->name]->pokemons = $pokemon;
+			$trainers[$data->name]->rank = $ranking[$data->level];
+		}
+
+		return $trainers;
+	}
+
+	public function getTrainerLevelRanking()
+	{
+		$exclue = '';
+		if (!empty(self::$config->system->trainer_blacklist)) {
+			$exclue .= " AND owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
+		}
+		$req = 'SELECT COUNT(*) AS count, level FROM (SELECT MAX(owner_level) as level FROM gym_defenders WHERE owner_level IS NOT NULL '.$exclue.' GROUP BY owner_level, owner_name) x GROUP BY level';
+		$result = pg_query($this->db, $req);
+		$levelData = array();
+		while ($data = pg_fetch_object($result)) {
+			$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;
+	}
+
+	public function getActivePokemon($trainer_name)
+	{
+		$req = "SELECT pokemon_id, cp, atk_iv AS iv_attack, sta_iv AS iv_stamina, def_iv AS iv_defense, TO_TIMESTAMP(deployment_time) AS deployment_time, '1' AS active, fort_id as gym_id, FLOOR((UNIX_TIMESTAMP() - created) / 86400) AS last_scanned
 						FROM gym_defenders
 						WHERE owner_name = '".$trainer_name."' AND fort_id IS NOT NULL
 						ORDER BY deployment_time";
-        $result = pg_query($this->db, $req);
-        $pokemon = array();
-        while ($data = pg_fetch_object($result)) {
-            $pokemon[] = $data;
-        }
-
-        return $pokemon;
-    }
-
-    public function getInactivePokemon($trainer_name)
-    {
-        $req = "SELECT pokemon_id, cp, atk_iv AS iv_attack, sta_iv AS iv_stamina, def_iv AS iv_defense, NULL AS deployment_time, '0' AS active, fort_id as gym_id, FLOOR((UNIX_TIMESTAMP() - created) / 86400) AS last_scanned
+		$result = pg_query($this->db, $req);
+		$pokemon = array();
+		while ($data = pg_fetch_object($result)) {
+			$pokemon[] = $data;
+		}
+
+		return $pokemon;
+	}
+
+	public function getInactivePokemon($trainer_name)
+	{
+		$req = "SELECT pokemon_id, cp, atk_iv AS iv_attack, sta_iv AS iv_stamina, def_iv AS iv_defense, NULL AS deployment_time, '0' AS active, fort_id as gym_id, FLOOR((UNIX_TIMESTAMP() - created) / 86400) AS last_scanned
 					FROM gym_defenders
 					WHERE owner_name = '".$trainer_name."' AND fort_id IS NULL
 					ORDER BY last_scanned";
-        $result = pg_query($this->db, $req);
-        $pokemon = array();
-        while ($data = pg_fetch_object($result)) {
-            $pokemon[] = $data;
-        }
-
-        return $pokemon;
-    }
-
-    public function getTrainerLevelCount($team_id)
-    {
-        $exclue = '';
-        if (!empty(self::$config->system->trainer_blacklist)) {
-            $exclue .= " AND owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
-        }
-        $req = "SELECT COUNT(*) AS count, level FROM (SELECT MAX(owner_level) as level FROM gym_defenders WHERE owner_level IS NOT NULL AND team = '".$team_id."' ".$exclue.' GROUP BY owner_level, owner_name) x GROUP BY level';
-        $result = pg_query($this->db, $req);
-        $levelData = array();
-        while ($data = pg_fetch_object($result)) {
-            $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;
-    }
-
-    /////////
-    // Cron
-    /////////
-
-    public function getPokemonCountsActive()
-    {
-        $req = 'SELECT pokemon_id, COUNT(*) as total FROM sightings WHERE expire_timestamp >= EXTRACT(EPOCH FROM NOW()) GROUP BY pokemon_id';
-        $result = pg_query($this->db, $req);
-        $counts = array();
-        while ($data = pg_fetch_object($result)) {
-            $counts[$data->pokemon_id] = $data->total;
-        }
-
-        return $counts;
-    }
-
-    public function getTotalPokemonIV()
-    {
-        $req = 'SELECT COUNT(*) as total FROM sightings WHERE expire_timestamp >= EXTRACT(EPOCH FROM NOW()) AND cp IS NOT NULL';
-        $result = pg_query($this->db, $req);
-        $data = pg_fetch_object($result);
-
-        return $data;
-    }
-
-    public function getPokemonCountsLastDay()
-    {
-        $req = 'SELECT pokemon_id, COUNT(*) AS spawns_last_day
+		$result = pg_query($this->db, $req);
+		$pokemon = array();
+		while ($data = pg_fetch_object($result)) {
+			$pokemon[] = $data;
+		}
+
+		return $pokemon;
+	}
+
+	public function getTrainerLevelCount($team_id)
+	{
+		$exclue = '';
+		if (!empty(self::$config->system->trainer_blacklist)) {
+			$exclue .= " AND owner_name NOT IN ('".implode("','", self::$config->system->trainer_blacklist)."')";
+		}
+		$req = "SELECT COUNT(*) AS count, level FROM (SELECT MAX(owner_level) as level FROM gym_defenders WHERE owner_level IS NOT NULL AND team = '".$team_id."' ".$exclue.' GROUP BY owner_level, owner_name) x GROUP BY level';
+		$result = pg_query($this->db, $req);
+		$levelData = array();
+		while ($data = pg_fetch_object($result)) {
+			$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;
+	}
+
+	/////////
+	// Cron
+	/////////
+
+	public function getPokemonCountsActive()
+	{
+		$req = 'SELECT pokemon_id, COUNT(*) as total FROM sightings WHERE expire_timestamp >= EXTRACT(EPOCH FROM NOW()) GROUP BY pokemon_id';
+		$result = pg_query($this->db, $req);
+		$counts = array();
+		while ($data = pg_fetch_object($result)) {
+			$counts[$data->pokemon_id] = $data->total;
+		}
+
+		return $counts;
+	}
+
+	public function getTotalPokemonIV()
+	{
+		$req = 'SELECT COUNT(*) as total FROM sightings WHERE expire_timestamp >= EXTRACT(EPOCH FROM NOW()) AND cp IS NOT NULL';
+		$result = pg_query($this->db, $req);
+		$data = pg_fetch_object($result);
+
+		return $data;
+	}
+
+	public function getPokemonCountsLastDay()
+	{
+		$req = 'SELECT pokemon_id, COUNT(*) AS spawns_last_day
 					FROM sightings
 					WHERE expire_timestamp >= (SELECT MAX(expire_timestamp) - 86400 FROM sightings)
 					GROUP BY pokemon_id
 				  	ORDER BY pokemon_id ASC';
-        $result = pg_query($this->db, $req);
-        $counts = array();
-        while ($data = pg_fetch_object($result)) {
-            $counts[$data->pokemon_id] = $data->spawns_last_day;
-        }
-
-        return $counts;
-    }
-
-    public function getCaptchaCount()
-    {
-        $req = ' SELECT COUNT(*) as total FROM accounts WHERE captchaed IS NOT NULL AND reason IS NULL';
-        $result = pg_query($this->db, $req);
-        $data = pg_fetch_object($result);
-
-        return $data;
-    }
-
-    public function getNestData($time, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
-    {
-        $pokemon_exclude_sql = '';
-        if (!empty(self::$config->system->nest_exclude_pokemon)) {
-            $pokemon_exclude_sql = 'AND p.pokemon_id NOT IN ('.implode(',', self::$config->system->nest_exclude_pokemon).')';
-        }
-        $req = 'SELECT p.spawn_id, p.pokemon_id, MAX(p.lat) AS latitude, MAX(p.lon) AS longitude, count(p.pokemon_id) AS total_pokemon, MAX(s.updated) as latest_seen, coalesce(CASE WHEN MAX(duration) = 0 THEN NULL ELSE MAX(duration) END ,30)*60 as duration
+		$result = pg_query($this->db, $req);
+		$counts = array();
+		while ($data = pg_fetch_object($result)) {
+			$counts[$data->pokemon_id] = $data->spawns_last_day;
+		}
+
+		return $counts;
+	}
+
+	public function getCaptchaCount()
+	{
+		$req = ' SELECT COUNT(*) as total FROM accounts WHERE captchaed IS NOT NULL AND reason IS NULL';
+		$result = pg_query($this->db, $req);
+		$data = pg_fetch_object($result);
+
+		return $data;
+	}
+
+	public function getNestData($time, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
+	{
+		$pokemon_exclude_sql = '';
+		if (!empty(self::$config->system->nest_exclude_pokemon)) {
+			$pokemon_exclude_sql = 'AND p.pokemon_id NOT IN ('.implode(',', self::$config->system->nest_exclude_pokemon).')';
+		}
+		$req = 'SELECT p.spawn_id, p.pokemon_id, MAX(p.lat) AS latitude, MAX(p.lon) AS longitude, count(p.pokemon_id) AS total_pokemon, MAX(s.updated) as latest_seen, coalesce(CASE WHEN MAX(duration) = 0 THEN NULL ELSE MAX(duration) END ,30)*60 as duration
 			          FROM sightings p
 			          INNER JOIN spawnpoints s ON (p.spawn_id = s.spawn_id)
 			          WHERE p.expire_timestamp > EXTRACT(EPOCH FROM NOW()) - '.($time * 3600).'
@@ -797,23 +797,23 @@ 
 			          GROUP BY p.spawn_id, p.pokemon_id
 			          HAVING COUNT(p.pokemon_id) >= '.($time / 4).'
 			          ORDER BY p.pokemon_id';
-        $result = pg_query($this->db, $req);
-        $nests = array();
-        while ($data = pg_fetch_object($result)) {
-            $nests[] = $data;
-        }
-
-        return $nests;
-    }
-
-    public function getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
-    {
-        $req = 'SELECT COUNT(*) as total 
+		$result = pg_query($this->db, $req);
+		$nests = array();
+		while ($data = pg_fetch_object($result)) {
+			$nests[] = $data;
+		}
+
+		return $nests;
+	}
+
+	public function getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude)
+	{
+		$req = 'SELECT COUNT(*) as total 
 					FROM spawnpoints 
  					WHERE lat >= '.$minLatitude.' AND lat < '.$maxLatitude.' AND lon >= '.$minLongitude.' AND lon < '.$maxLongitude;
-        $result = pg_query($this->db, $req);
-        $data = pg_fetch_object($result);
+		$result = pg_query($this->db, $req);
+		$data = pg_fetch_object($result);
 
-        return $data;
-    }
+		return $data;
+	}
 }

core/process/queries/QueryManager.php

Indentation +86 added lines, -86 removed lines

@@ -8,140 +8,140 @@
 
 abstract class QueryManager
 {
-    protected static $time_offset;
-    protected static $config;
+	protected static $time_offset;
+	protected static $config;
 
-    private static $current;
+	private static $current;
 
-    public static function current()
-    {
-        global $time_offset;
+	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));
+		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;
+			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;
-                default: //rocketmap
-                    self::$current = new QueryManagerMysqlRocketmap();
-                    break;
-            }
-        }
+			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;
+				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/aru.php

Indentation +604 added lines, -604 removed lines

@@ -8,8 +8,8 @@ 
 $pos = !empty($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], getenv('HTTP_HOST'));
 
 if (false === $pos) {
-    http_response_code(401);
-    die('Restricted access');
+	http_response_code(401);
+	die('Restricted access');
 }
 
 include_once '../../config.php';
@@ -42,130 +42,130 @@ 
 
 $request = '';
 if (isset($_GET['type'])) {
-    $request = $_GET['type'];
+	$request = $_GET['type'];
 }
 $postRequest = '';
 if (isset($_POST['type'])) {
-    $postRequest = $_POST['type'];
-    $request = 'postRequest';
+	$postRequest = $_POST['type'];
+	$request = 'postRequest';
 }
 switch ($request) {
-    //###########################
-    //
-    // Update datas on homepage
-    //
-    //###########################
-
-    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 = '
+	//###########################
+	//
+	// Update datas on homepage
+	//
+	//###########################
+
+	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,202 +206,202 @@ 
                                         <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) {
-                case 0:
-                    $icon = 'map_white.png';
-                    $team = 'No Team (yet)';
-                    $color = 'rgba(0, 0, 0, .6)';
-                    break;
-
-                case 1:
-                    $icon = 'map_blue_';
-                    $team = 'Team Mystic';
-                    $color = 'rgba(74, 138, 202, .6)';
-                    break;
-
-                case 2:
-                    $icon = 'map_red_';
-                    $team = 'Team Valor';
-                    $color = 'rgba(240, 68, 58, .6)';
-                    break;
-
-                case 3:
-                    $icon = 'map_yellow_';
-                    $team = 'Team Instinct';
-                    $color = 'rgba(254, 217, 40, .6)';
-                    break;
-            }
-
-            if (0 != $data->team_id) {
-                $icon .= $data->level.'.png';
-            }
-
-            $gyms[] = [
-                $icon,
-                $data->latitude,
-                $data->longitude,
-                $data->gym_id,
-            ];
-        }
-
-        header('Content-Type: application/json');
-        echo json_encode($gyms);
-
-        break;
-
-    //###################################
-    //
-    // Get datas for gym defenders
-    //
-    //###################################
-
-    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'] = '
+					$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)';
+					$color = 'rgba(0, 0, 0, .6)';
+					break;
+
+				case 1:
+					$icon = 'map_blue_';
+					$team = 'Team Mystic';
+					$color = 'rgba(74, 138, 202, .6)';
+					break;
+
+				case 2:
+					$icon = 'map_red_';
+					$team = 'Team Valor';
+					$color = 'rgba(240, 68, 58, .6)';
+					break;
+
+				case 3:
+					$icon = 'map_yellow_';
+					$team = 'Team Instinct';
+					$color = 'rgba(254, 217, 40, .6)';
+					break;
+			}
+
+			if (0 != $data->team_id) {
+				$icon .= $data->level.'.png';
+			}
+
+			$gyms[] = [
+				$icon,
+				$data->latitude,
+				$data->longitude,
+				$data->gym_id,
+			];
+		}
+
+		header('Content-Type: application/json');
+		echo json_encode($gyms);
+
+		break;
+
+	//###################################
+	//
+	// Get datas for gym defenders
+	//
+	//###################################
+
+	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,299 +438,299 @@ 
 							</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) {
-    switch ($postRequest) {
-        case 'pokemon_live':
-            $json = '';
-            if (isset($_POST['pokemon_id'])) {
-                $pokemon_id = $manager->getEcapedString($_POST['pokemon_id']);
-                $ivMin = $manager->getEcapedString($_POST['ivMin']);
-                $ivMax = $manager->getEcapedString($_POST['ivMax']);
-                if (isset($_POST['inmap_pokemons'])) {
-                    $inmap_pokemons = $manager->getEcapedString($_POST['inmap_pokemons']);
-                } else {
-                    $inmap_pokemons = null;
-                }
-
-                $datas = $manager->getPokemonLive($pokemon_id, $ivMin, $ivMax, $inmap_pokemons);
-
-                $json = array();
-                $json['points'] = array();
-                $locale = array();
-                $locale['ivAttack'] = $locales->IV_ATTACK;
-                $locale['ivDefense'] = $locales->IV_DEFENSE;
-                $locale['ivStamina'] = $locales->IV_STAMINA;
-                $json['locale'] = $locale;
-                foreach ($datas as $data) {
-                    $pokeid = $data->pokemon_id;
-                    $data->name = $pokemons->pokemon->$pokeid->name;
-                    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 = '?';
-                    }
-                    $json['points'][] = $data;
-                }
-
-                $json = json_encode($json);
-            }
-
-            header('Content-Type: application/json');
-
-            echo $json;
-
-        break;
-
-        default:
-            echo 'What do you mean?';
-            exit();
-        break;
-    }
+	switch ($postRequest) {
+		case 'pokemon_live':
+			$json = '';
+			if (isset($_POST['pokemon_id'])) {
+				$pokemon_id = $manager->getEcapedString($_POST['pokemon_id']);
+				$ivMin = $manager->getEcapedString($_POST['ivMin']);
+				$ivMax = $manager->getEcapedString($_POST['ivMax']);
+				if (isset($_POST['inmap_pokemons'])) {
+					$inmap_pokemons = $manager->getEcapedString($_POST['inmap_pokemons']);
+				} else {
+					$inmap_pokemons = null;
+				}
+
+				$datas = $manager->getPokemonLive($pokemon_id, $ivMin, $ivMax, $inmap_pokemons);
+
+				$json = array();
+				$json['points'] = array();
+				$locale = array();
+				$locale['ivAttack'] = $locales->IV_ATTACK;
+				$locale['ivDefense'] = $locales->IV_DEFENSE;
+				$locale['ivStamina'] = $locales->IV_STAMINA;
+				$json['locale'] = $locale;
+				foreach ($datas as $data) {
+					$pokeid = $data->pokemon_id;
+					$data->name = $pokemons->pokemon->$pokeid->name;
+					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 = '?';
+					}
+					$json['points'][] = $data;
+				}
+
+				$json = json_encode($json);
+			}
+
+			header('Content-Type: application/json');
+
+			echo $json;
+
+		break;
+
+		default:
+			echo 'What do you mean?';
+			exit();
+		break;
+	}
 }

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

core/process/locales.loader.php

Indentation +182 added lines, -182 removed lines

@@ -26,28 +26,28 @@ 
  * @return array Sorted list of "accept" options
  */
 $sortAccept = function ($header) {
-    $matches = array();
-    foreach (explode(',', $header) as $option) {
-        $option = array_map('trim', explode(';', $option));
-        $l = strtolower($option[0]);
-        if (isset($option[1])) {
-            $q = (float) str_replace('q=', '', $option[1]);
-        } else {
-            $q = null;
-            // Assign default low weight for generic values
-            if ('*/*' == $l) {
-                $q = 0.01;
-            } elseif ('*' == substr($l, -1)) {
-                $q = 0.02;
-            }
-        }
-        // Unweighted values, get high weight by their position in the
-        // list
-        $matches[$l] = isset($q) ? $q : 1000 - count($matches);
-    }
-    arsort($matches, SORT_NUMERIC);
-
-    return $matches;
+	$matches = array();
+	foreach (explode(',', $header) as $option) {
+		$option = array_map('trim', explode(';', $option));
+		$l = strtolower($option[0]);
+		if (isset($option[1])) {
+			$q = (float) str_replace('q=', '', $option[1]);
+		} else {
+			$q = null;
+			// Assign default low weight for generic values
+			if ('*/*' == $l) {
+				$q = 0.01;
+			} elseif ('*' == substr($l, -1)) {
+				$q = 0.02;
+			}
+		}
+		// Unweighted values, get high weight by their position in the
+		// list
+		$matches[$l] = isset($q) ? $q : 1000 - count($matches);
+	}
+	arsort($matches, SORT_NUMERIC);
+
+	return $matches;
 };
 
 /**
@@ -60,18 +60,18 @@ 
  * @return string|null a matched option, or NULL if no match
  */
 $matchAccept = function ($header, $supported) use ($sortAccept) {
-    $matches = $sortAccept($header);
-    foreach ($matches as $key => $q) {
-        if (isset($supported[$key])) {
-            return $supported[$key];
-        }
-    }
-    // If any (i.e. "*") is acceptable, return the first supported format
-    if (isset($matches['*'])) {
-        return array_shift($supported);
-    }
-
-    return null;
+	$matches = $sortAccept($header);
+	foreach ($matches as $key => $q) {
+		if (isset($supported[$key])) {
+			return $supported[$key];
+		}
+	}
+	// If any (i.e. "*") is acceptable, return the first supported format
+	if (isset($matches['*'])) {
+		return array_shift($supported);
+	}
+
+	return null;
 };
 
 /**
@@ -92,46 +92,46 @@ 
  * @return string the negotiated language result or the supplied default
  */
 $negotiateLanguage = function ($supported, $default = 'en-US') use ($matchAccept) {
-    $supp = array();
-    foreach ($supported as $lang => $isSupported) {
-        if ($isSupported) {
-            $supp[strtolower($lang)] = $lang;
-        }
-    }
-    if (!count($supp)) {
-        return $default;
-    }
-    if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-        $match = $matchAccept(
-            $_SERVER['HTTP_ACCEPT_LANGUAGE'],
-            $supp
-        );
-        if (!is_null($match)) {
-            return $match;
-        }
-    }
-    if (isset($_SERVER['REMOTE_HOST'])) {
-        $domain = explode('.', $_SERVER['REMOTE_HOST']);
-        $lang = strtolower(end($domain));
-        if (isset($supp[$lang])) {
-            return $supp[$lang];
-        }
-    }
-
-    return $default;
+	$supp = array();
+	foreach ($supported as $lang => $isSupported) {
+		if ($isSupported) {
+			$supp[strtolower($lang)] = $lang;
+		}
+	}
+	if (!count($supp)) {
+		return $default;
+	}
+	if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+		$match = $matchAccept(
+			$_SERVER['HTTP_ACCEPT_LANGUAGE'],
+			$supp
+		);
+		if (!is_null($match)) {
+			return $match;
+		}
+	}
+	if (isset($_SERVER['REMOTE_HOST'])) {
+		$domain = explode('.', $_SERVER['REMOTE_HOST']);
+		$lang = strtolower(end($domain));
+		if (isset($supp[$lang])) {
+			return $supp[$lang];
+		}
+	}
+
+	return $default;
 };
 
 // Language setting
 //##################
 if (empty($config->system->forced_lang)) {
-    $directories = glob(SYS_PATH.'/core/json/locales/*', GLOB_ONLYDIR);
-    $directories = array_map('basename', $directories);
-    //print_r($directories);
-    $browser_lang = $negotiateLanguage(array_fill_keys($directories, true), $config->system->default_lang);
+	$directories = glob(SYS_PATH.'/core/json/locales/*', GLOB_ONLYDIR);
+	$directories = array_map('basename', $directories);
+	//print_r($directories);
+	$browser_lang = $negotiateLanguage(array_fill_keys($directories, true), $config->system->default_lang);
 //print_r($browser_lang);
 } else {
-    // Use forced language
-    $browser_lang = $config->system->forced_lang;
+	// Use forced language
+	$browser_lang = $config->system->forced_lang;
 }
 
 // Activate lang
@@ -140,15 +140,15 @@ 
 $translation_file = '{}';
 $pokemon_file = '{}';
 if (is_file($locale_dir.'/pokes.json')) {
-    $pokemon_file = file_get_contents($locale_dir.'/pokes.json');
+	$pokemon_file = file_get_contents($locale_dir.'/pokes.json');
 }
 if (is_file($locale_dir.'/translations.json')) {
-    $translation_file = file_get_contents($locale_dir.'/translations.json');
+	$translation_file = file_get_contents($locale_dir.'/translations.json');
 }
 if (is_file($locale_dir.'/moves.json')) {
-    $moves_file = json_decode(file_get_contents($locale_dir.'/moves.json'));
+	$moves_file = json_decode(file_get_contents($locale_dir.'/moves.json'));
 } else {
-    $moves_file = json_decode(file_get_contents(SYS_PATH.'/core/json/locales/EN/moves.json'));
+	$moves_file = json_decode(file_get_contents(SYS_PATH.'/core/json/locales/EN/moves.json'));
 }
 
 // Merge translation files
@@ -181,125 +181,125 @@ 
 $data = $manager->getPokemonCountAll();
 $pokemon_counts = array();
 foreach ($data as $pokemon) {
-    $pokemon_counts[$pokemon->pokemon_id] = $pokemon;
+	$pokemon_counts[$pokemon->pokemon_id] = $pokemon;
 }
 
 $data = $manager->getRaidCountAll();
 $raid_counts = array();
 foreach ($data as $raid) {
-    $raid_counts[$raid->pokemon_id] = $raid;
+	$raid_counts[$raid->pokemon_id] = $raid;
 }
 
 $totalCountPoke = 0;
 $maxpid = $config->system->max_pokemon;
 for ($pokeid = 1; $pokeid <= $maxpid; ++$pokeid) {
-    if (!isset($pokemons_all->pokemon->$pokeid)) {
-        continue;
-    }
-    // Merge name and description from translation files
-    $pokemon = $pokemons_all->pokemon->$pokeid;
-    $pokemon->id = $pokeid;
-    $pokemon->name = $pokemon_trans->pokemon->$pokeid->name;
-    $pokemon->description = $pokemon_trans->pokemon->$pokeid->description;
-    $pokemon->img = 'core/pokemons/'.$pokeid.$config->system->pokeimg_suffix;
-
-    // Replace quick and charge move with translation
-    $quick_move = $pokemon->quick_move;
-    $pokemon->quick_move = $pokemon_trans->quick_moves->$quick_move;
-    $charge_move = $pokemon->charge_move;
-    $pokemon->charge_move = $pokemon_trans->charge_moves->$charge_move;
-
-    // Replace types with translation
-    foreach ($pokemon->types as &$type) {
-        $type = $pokemon_trans->types->$type;
-    }
-    unset($type);
-
-    // Convert move numbers to names
-    $move = new stdClass();
-    foreach ($moves_file as $move_id => $move_name) {
-        if (isset($move_name)) {
-            $move->$move_id = new stdClass();
-            $move->$move_id->name = $move_name->name;
-        }
-    }
-
-    // Add pokemon counts to array
-    if (array_key_exists($pokeid, $pokemon_counts)) {
-        $data = $pokemon_counts[$pokeid];
-        $pokemon->spawn_count = $data->count;
-        if (isset($data->last_seen)) {
-            $pokemon->last_seen = $data->last_seen;
-        } else {
-            $pokemon->last_seen = null;
-        }
-        if (isset($data->last_seen_day)) {
-            $pokemon->last_seen_day = $data->last_seen_day;
-        } else {
-            $pokemon->last_seen_day = null;
-        }
-        if (isset($data->latitude) && isset($data->longitude)) {
-            $pokemon->last_position = new stdClass();
-            $pokemon->last_position->latitude = $data->latitude;
-            $pokemon->last_position->longitude = $data->longitude;
-        }
-
-        $totalCountPoke += $data->count;
-    } else {
-        $pokemon->spawn_count = 0;
-        $pokemon->last_seen = null;
-        $pokemon->last_position = null;
-    }
-
-    // Add raid counts to array
-    if (array_key_exists($pokeid, $raid_counts)) {
-        $data = $raid_counts[$pokeid];
-        $pokemon->raid_count = $data->count;
-        if (isset($data->last_seen)) {
-            $pokemon->last_raid_seen = $data->last_seen;
-        } else {
-            $pokemon->last_raid_seen = null;
-        }
-        if (isset($data->last_seen_day)) {
-            $pokemon->last_raid_seen_day = $data->last_seen_day;
-        } else {
-            $pokemon->last_raid_seen_day = null;
-        }
-        if (isset($data->latitude) && isset($data->longitude)) {
-            $pokemon->last_raid_position = new stdClass();
-            $pokemon->last_raid_position->latitude = $data->latitude;
-            $pokemon->last_raid_position->longitude = $data->longitude;
-        }
-    } else {
-        $pokemon->raid_count = 0;
-        $pokemon->last_raid_seen = null;
-        $pokemon->last_raid_position = null;
-    }
-
-    // Calculate and add rarities to array
-    $spawn_rate = $pokemons_rarity->$pokeid->rate;
-    $pokemon->spawn_rate = $spawn_rate;
-    $pokemon->per_day = $pokemons_rarity->$pokeid->per_day;
-
-    // >= 1          = Very common
-    // 0.20 - 1      = Common
-    // 0.01 - 0.20   = Rare
-    // > 0  - 0.01   = Mythic
-    // Unseen
-    if ($spawn_rate >= 1) {
-        $pokemon->rarity = $locales->VERYCOMMON;
-    } elseif ($spawn_rate >= 0.20) {
-        $pokemon->rarity = $locales->COMMON;
-    } elseif ($spawn_rate >= 0.01) {
-        $pokemon->rarity = $locales->RARE;
-    } elseif ($spawn_rate > 0 || $pokemon->spawn_count > 0) {
-        // pokemon with at least 1 spawn in the past aren't unseen!
-        $pokemon->rarity = $locales->MYTHIC;
-    } else {
-        $pokemon->rarity = $locales->UNSEEN;
-    }
-
-    $pokemons->pokemon->$pokeid = $pokemon;
+	if (!isset($pokemons_all->pokemon->$pokeid)) {
+		continue;
+	}
+	// Merge name and description from translation files
+	$pokemon = $pokemons_all->pokemon->$pokeid;
+	$pokemon->id = $pokeid;
+	$pokemon->name = $pokemon_trans->pokemon->$pokeid->name;
+	$pokemon->description = $pokemon_trans->pokemon->$pokeid->description;
+	$pokemon->img = 'core/pokemons/'.$pokeid.$config->system->pokeimg_suffix;
+
+	// Replace quick and charge move with translation
+	$quick_move = $pokemon->quick_move;
+	$pokemon->quick_move = $pokemon_trans->quick_moves->$quick_move;
+	$charge_move = $pokemon->charge_move;
+	$pokemon->charge_move = $pokemon_trans->charge_moves->$charge_move;
+
+	// Replace types with translation
+	foreach ($pokemon->types as &$type) {
+		$type = $pokemon_trans->types->$type;
+	}
+	unset($type);
+
+	// Convert move numbers to names
+	$move = new stdClass();
+	foreach ($moves_file as $move_id => $move_name) {
+		if (isset($move_name)) {
+			$move->$move_id = new stdClass();
+			$move->$move_id->name = $move_name->name;
+		}
+	}
+
+	// Add pokemon counts to array
+	if (array_key_exists($pokeid, $pokemon_counts)) {
+		$data = $pokemon_counts[$pokeid];
+		$pokemon->spawn_count = $data->count;
+		if (isset($data->last_seen)) {
+			$pokemon->last_seen = $data->last_seen;
+		} else {
+			$pokemon->last_seen = null;
+		}
+		if (isset($data->last_seen_day)) {
+			$pokemon->last_seen_day = $data->last_seen_day;
+		} else {
+			$pokemon->last_seen_day = null;
+		}
+		if (isset($data->latitude) && isset($data->longitude)) {
+			$pokemon->last_position = new stdClass();
+			$pokemon->last_position->latitude = $data->latitude;
+			$pokemon->last_position->longitude = $data->longitude;
+		}
+
+		$totalCountPoke += $data->count;
+	} else {
+		$pokemon->spawn_count = 0;
+		$pokemon->last_seen = null;
+		$pokemon->last_position = null;
+	}
+
+	// Add raid counts to array
+	if (array_key_exists($pokeid, $raid_counts)) {
+		$data = $raid_counts[$pokeid];
+		$pokemon->raid_count = $data->count;
+		if (isset($data->last_seen)) {
+			$pokemon->last_raid_seen = $data->last_seen;
+		} else {
+			$pokemon->last_raid_seen = null;
+		}
+		if (isset($data->last_seen_day)) {
+			$pokemon->last_raid_seen_day = $data->last_seen_day;
+		} else {
+			$pokemon->last_raid_seen_day = null;
+		}
+		if (isset($data->latitude) && isset($data->longitude)) {
+			$pokemon->last_raid_position = new stdClass();
+			$pokemon->last_raid_position->latitude = $data->latitude;
+			$pokemon->last_raid_position->longitude = $data->longitude;
+		}
+	} else {
+		$pokemon->raid_count = 0;
+		$pokemon->last_raid_seen = null;
+		$pokemon->last_raid_position = null;
+	}
+
+	// Calculate and add rarities to array
+	$spawn_rate = $pokemons_rarity->$pokeid->rate;
+	$pokemon->spawn_rate = $spawn_rate;
+	$pokemon->per_day = $pokemons_rarity->$pokeid->per_day;
+
+	// >= 1          = Very common
+	// 0.20 - 1      = Common
+	// 0.01 - 0.20   = Rare
+	// > 0  - 0.01   = Mythic
+	// Unseen
+	if ($spawn_rate >= 1) {
+		$pokemon->rarity = $locales->VERYCOMMON;
+	} elseif ($spawn_rate >= 0.20) {
+		$pokemon->rarity = $locales->COMMON;
+	} elseif ($spawn_rate >= 0.01) {
+		$pokemon->rarity = $locales->RARE;
+	} elseif ($spawn_rate > 0 || $pokemon->spawn_count > 0) {
+		// pokemon with at least 1 spawn in the past aren't unseen!
+		$pokemon->rarity = $locales->MYTHIC;
+	} else {
+		$pokemon->rarity = $locales->UNSEEN;
+	}
+
+	$pokemons->pokemon->$pokeid = $pokemon;
 }
 
 $pokemons->total = $totalCountPoke;
@@ -307,8 +307,8 @@ 
 // Translate typecolors array keys as well
 $types_temp = new stdClass();
 foreach ($pokemons_all->typecolors as $type => $color) {
-    $type_trans = $pokemon_trans->types->$type;
-    $types_temp->$type_trans = $color;
+	$type_trans = $pokemon_trans->types->$type;
+	$types_temp->$type_trans = $color;
 }
 // Replace typecolors array with translated one
 $pokemons->typecolors = $types_temp;