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/process/timezone.loader.php

Indentation +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
 
 // Include and load variables if not set
 if (!isset($config)) {
-    $variables = realpath(dirname(__FILE__)).'/../json/variables.json';
-    $config = json_decode(file_get_contents($variables));
+	$variables = realpath(dirname(__FILE__)).'/../json/variables.json';
+	$config = json_decode(file_get_contents($variables));
 }
 
 // Set default timezone

core/process/locales.loader.php

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
  *
  * @return array Sorted list of "accept" options
  */
-$sortAccept = function ($header) {
+$sortAccept = function($header) {
     $matches = array();
     foreach (explode(',', $header) as $option) {
         $option = array_map('trim', explode(';', $option));
@@ -59,7 +59,7 @@ 
  *
  * @return string|null a matched option, or NULL if no match
  */
-$matchAccept = function ($header, $supported) use ($sortAccept) {
+$matchAccept = function($header, $supported) use ($sortAccept) {
     $matches = $sortAccept($header);
     foreach ($matches as $key => $q) {
         if (isset($supported[$key])) {
@@ -91,7 +91,7 @@ 
  *
  * @return string the negotiated language result or the supplied default
  */
-$negotiateLanguage = function ($supported, $default = 'en-US') use ($matchAccept) {
+$negotiateLanguage = function($supported, $default = 'en-US') use ($matchAccept) {
     $supp = array();
     foreach ($supported as $lang => $isSupported) {
         if ($isSupported) {

Braces +6 added lines, -3 removed lines

@@ -25,7 +25,8 @@ 
  *
  * @return array Sorted list of "accept" options
  */
-$sortAccept = function ($header) {
+$sortAccept = function ($header)
+{
     $matches = array();
     foreach (explode(',', $header) as $option) {
         $option = array_map('trim', explode(';', $option));
@@ -59,7 +60,8 @@ 
  *
  * @return string|null a matched option, or NULL if no match
  */
-$matchAccept = function ($header, $supported) use ($sortAccept) {
+$matchAccept = function ($header, $supported) use ($sortAccept)
+{
     $matches = $sortAccept($header);
     foreach ($matches as $key => $q) {
         if (isset($supported[$key])) {
@@ -91,7 +93,8 @@ 
  *
  * @return string the negotiated language result or the supplied default
  */
-$negotiateLanguage = function ($supported, $default = 'en-US') use ($matchAccept) {
+$negotiateLanguage = function ($supported, $default = 'en-US') use ($matchAccept)
+{
     $supp = array();
     foreach ($supported as $lang => $isSupported) {
         if ($isSupported) {

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;

core/inc/meta.inc.php

Indentation +31 added lines, -31 removed lines

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

Switch Indentation +27 added lines, -27 removed lines

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

core/cron/nests.cron.php

Indentation +160 added lines, -160 removed lines

@@ -18,19 +18,19 @@ 
 $allNestParks = array();
 
 for ($iLat = 0; $iLat < $countLat;) {
-    for ($iLng = 0; $iLng < $countLng;) {
-        $minLatitude = $totalMinLat + $iLat * 0.5;
-        $maxLatitude = min($minLatitude + 0.5, $totalMaxLat);
-        $minLongitude = $totalMinLon + $iLng * 0.5;
-        $maxLongitude = min($minLongitude + 0.5, $totalMaxLon);
-
-        if (0 == $manager->getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude)->total) { //Skip empty areas
-            ++$iLng;
-            continue;
-        }
-
-        // Get Parks from overpass
-        $req = '[timeout:600][out:json][date:"2017-01-22T00:00:00Z"][bbox:'.$minLatitude.','.$minLongitude.','.$maxLatitude.','.$maxLongitude.'];
+	for ($iLng = 0; $iLng < $countLng;) {
+		$minLatitude = $totalMinLat + $iLat * 0.5;
+		$maxLatitude = min($minLatitude + 0.5, $totalMaxLat);
+		$minLongitude = $totalMinLon + $iLng * 0.5;
+		$maxLongitude = min($minLongitude + 0.5, $totalMaxLon);
+
+		if (0 == $manager->getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude)->total) { //Skip empty areas
+			++$iLng;
+			continue;
+		}
+
+		// Get Parks from overpass
+		$req = '[timeout:600][out:json][date:"2017-01-22T00:00:00Z"][bbox:'.$minLatitude.','.$minLongitude.','.$maxLatitude.','.$maxLongitude.'];
 				(
 					way["leisure"="park"];
 					way["leisure"="garden"];
@@ -83,157 +83,157 @@ 
 				out meta geom;
 				>;
 				out skel qt;';
-        $endpoint = 'https://overpass-api.de/api/interpreter';
-
-        $curl = curl_init($endpoint);
-
-        curl_setopt($curl, CURLOPT_POST, 1);
-        curl_setopt($curl, CURLOPT_POSTFIELDS, 'data='.urlencode($req));
-        curl_setopt($curl, CURLOPT_USERAGENT, 'Worldopole/NestUpdater '.$config->infos->site_name);
-        curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 60);
-        curl_setopt($curl, CURLOPT_TIMEOUT, 660);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-
-        $response = curl_exec($curl);
-        $status = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-        curl_close($curl);
-
-        if (200 == $status) {
-            $json = json_decode($response, true);
-
-            $parks = array();
-            foreach ($json['elements'] as $key => &$element) {
-                $tempGeos = array();
-                if (isset($element['type']) && 'way' == $element['type'] && isset($element['geometry'])) {
-                    $tempGeos = array($element['geometry']);
-                } elseif (isset($element['type']) && 'relation' == $element['type'] && isset($element['members'])) {
-                    $outers = array();
-                    $members = $element['members'];
-                    foreach ($members as $member) {
-                        if (isset($member['role']) && 'outer' == $member['role'] && isset($member['geometry'])) {
-                            $outers[] = $member['geometry'];
-                        }
-                    }
-                    $tempGeos = combineOuter($outers);
-                }
-                foreach ($tempGeos as $key => $tempGeo) {
-                    if (!is_null($tempGeo) && 0 != count($tempGeo)) {
-                        $data = array();
-                        $geo = array();
-                        foreach ($tempGeo as $ele) {
-                            $geo[] = array('lat' => $ele['lat'], 'lng' => $ele['lon']);
-                        }
-
-                        // Finish poly where we started
-                        $firstEle = $geo[0];
-                        $lastEle = $geo[count($geo) - 1];
-                        if ($firstEle != $lastEle) {
-                            $geo[] = $firstEle;
-                        }
-
-                        $data['geo'] = $geo;
-                        if (isset($element['tags']) && isset($element['tags']['name'])) {
-                            $data['name'] = $element['tags']['name'];
-                        } else {
-                            $data['name'] = null;
-                        }
-                        $data['id'] = $element['id'].'#'.$key;
-                        $data['bounds'] = $element['bounds'];
-                        $parks[] = $data;
-                    }
-                }
-                unset($json[$key]);
-            }
-
-            // Get frequent spawn points
-            $datas = $manager->getNestData($nestTime, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude);
-            $nestsdatas = array();
-            foreach ($datas as $key => &$data) {
-                $nests['pid'] = $data->pokemon_id;
-                $nests['c'] = $data->total_pokemon;
-                $nests['lat'] = $data->latitude;
-                $nests['lng'] = $data->longitude;
-                // $starttime = $data->latest_seen - $data->duration;
-
-                $nests['st'] = '00'; // date('i', $starttime);
-                $nests['et'] = '00'; // date('i', $data->latest_seen);
-
-                // Add the data to array
-                $nestsdatas[] = $nests;
-                $allNestSpawns[] = $nests;
-                unset($datas[$key]);
-            }
-
-            // Checking Parks for Spawnpoints.
-            foreach ($parks as $key => &$park) {
-                $spawns = array();
-
-                foreach ($nestsdatas as $spawnpoint) {
-                    $lat = $spawnpoint['lat'];
-                    $lng = $spawnpoint['lng'];
-                    $pid = $spawnpoint['pid'];
-
-                    if (pointIsInsidePolygon($lat, $lng, $park['geo'], $park['bounds'])) {
-                        if (!isset($spawns[$pid])) {
-                            $spawns[$pid] = 0;
-                        }
-                        ++$spawns[$pid];
-                    }
-                }
-
-                $mostPid = 0;
-                $mostPidCount = 0;
-                foreach ($spawns as $pid => $count) {
-                    if ($count > $mostPidCount) {
-                        $mostPidCount = $count;
-                        $mostPid = $pid;
-                    }
-                }
-                if (0 != $mostPidCount && (!isset($config->system->nest_min_count) || $mostPidCount >= $config->system->nest_min_count)) {
-                    $park['pid'] = $mostPid;
-                    $park['count'] = $mostPidCount;
-
-                    $parkId = $park['id'];
-                    if (!array_key_exists($parkId, $allNestParks)) {
-                        $allNestParks[$parkId] = $park;
-                        unset($park['id']);
-                    } else {
-                        $savedPark = $allNestParks[$parkId];
-                        if ($park['pid'] == $savedPark['pid']) {
-                            $savedPark['count'] += $park['count'];
-                        } elseif ($park['count'] > $savedPark['count']) {
-                            $savedPark['count'] = $park['count'];
-                            $savedPark['pid'] = $park['pid'];
-                        }
-                        $allNestParks[$parkId] = $savedPark;
-                    }
-                }
-                unset($parks[$key]);
-            }
-            ++$iLng;
-        } elseif (429 == $status) {
-            echo "Got Error 429: Trying again in 5 Minutes...\n";
-            sleep(300);
-        } else {
-            echo 'Error '.$status." while getting nests from overpass-turbo. Aborting Nest Update.\n";
-            touch($nests_parks_file, $prevNestTime);
-            exit();
-        }
-    }
-    ++$iLat;
+		$endpoint = 'https://overpass-api.de/api/interpreter';
+
+		$curl = curl_init($endpoint);
+
+		curl_setopt($curl, CURLOPT_POST, 1);
+		curl_setopt($curl, CURLOPT_POSTFIELDS, 'data='.urlencode($req));
+		curl_setopt($curl, CURLOPT_USERAGENT, 'Worldopole/NestUpdater '.$config->infos->site_name);
+		curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 60);
+		curl_setopt($curl, CURLOPT_TIMEOUT, 660);
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+
+		$response = curl_exec($curl);
+		$status = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+		curl_close($curl);
+
+		if (200 == $status) {
+			$json = json_decode($response, true);
+
+			$parks = array();
+			foreach ($json['elements'] as $key => &$element) {
+				$tempGeos = array();
+				if (isset($element['type']) && 'way' == $element['type'] && isset($element['geometry'])) {
+					$tempGeos = array($element['geometry']);
+				} elseif (isset($element['type']) && 'relation' == $element['type'] && isset($element['members'])) {
+					$outers = array();
+					$members = $element['members'];
+					foreach ($members as $member) {
+						if (isset($member['role']) && 'outer' == $member['role'] && isset($member['geometry'])) {
+							$outers[] = $member['geometry'];
+						}
+					}
+					$tempGeos = combineOuter($outers);
+				}
+				foreach ($tempGeos as $key => $tempGeo) {
+					if (!is_null($tempGeo) && 0 != count($tempGeo)) {
+						$data = array();
+						$geo = array();
+						foreach ($tempGeo as $ele) {
+							$geo[] = array('lat' => $ele['lat'], 'lng' => $ele['lon']);
+						}
+
+						// Finish poly where we started
+						$firstEle = $geo[0];
+						$lastEle = $geo[count($geo) - 1];
+						if ($firstEle != $lastEle) {
+							$geo[] = $firstEle;
+						}
+
+						$data['geo'] = $geo;
+						if (isset($element['tags']) && isset($element['tags']['name'])) {
+							$data['name'] = $element['tags']['name'];
+						} else {
+							$data['name'] = null;
+						}
+						$data['id'] = $element['id'].'#'.$key;
+						$data['bounds'] = $element['bounds'];
+						$parks[] = $data;
+					}
+				}
+				unset($json[$key]);
+			}
+
+			// Get frequent spawn points
+			$datas = $manager->getNestData($nestTime, $minLatitude, $maxLatitude, $minLongitude, $maxLongitude);
+			$nestsdatas = array();
+			foreach ($datas as $key => &$data) {
+				$nests['pid'] = $data->pokemon_id;
+				$nests['c'] = $data->total_pokemon;
+				$nests['lat'] = $data->latitude;
+				$nests['lng'] = $data->longitude;
+				// $starttime = $data->latest_seen - $data->duration;
+
+				$nests['st'] = '00'; // date('i', $starttime);
+				$nests['et'] = '00'; // date('i', $data->latest_seen);
+
+				// Add the data to array
+				$nestsdatas[] = $nests;
+				$allNestSpawns[] = $nests;
+				unset($datas[$key]);
+			}
+
+			// Checking Parks for Spawnpoints.
+			foreach ($parks as $key => &$park) {
+				$spawns = array();
+
+				foreach ($nestsdatas as $spawnpoint) {
+					$lat = $spawnpoint['lat'];
+					$lng = $spawnpoint['lng'];
+					$pid = $spawnpoint['pid'];
+
+					if (pointIsInsidePolygon($lat, $lng, $park['geo'], $park['bounds'])) {
+						if (!isset($spawns[$pid])) {
+							$spawns[$pid] = 0;
+						}
+						++$spawns[$pid];
+					}
+				}
+
+				$mostPid = 0;
+				$mostPidCount = 0;
+				foreach ($spawns as $pid => $count) {
+					if ($count > $mostPidCount) {
+						$mostPidCount = $count;
+						$mostPid = $pid;
+					}
+				}
+				if (0 != $mostPidCount && (!isset($config->system->nest_min_count) || $mostPidCount >= $config->system->nest_min_count)) {
+					$park['pid'] = $mostPid;
+					$park['count'] = $mostPidCount;
+
+					$parkId = $park['id'];
+					if (!array_key_exists($parkId, $allNestParks)) {
+						$allNestParks[$parkId] = $park;
+						unset($park['id']);
+					} else {
+						$savedPark = $allNestParks[$parkId];
+						if ($park['pid'] == $savedPark['pid']) {
+							$savedPark['count'] += $park['count'];
+						} elseif ($park['count'] > $savedPark['count']) {
+							$savedPark['count'] = $park['count'];
+							$savedPark['pid'] = $park['pid'];
+						}
+						$allNestParks[$parkId] = $savedPark;
+					}
+				}
+				unset($parks[$key]);
+			}
+			++$iLng;
+		} elseif (429 == $status) {
+			echo "Got Error 429: Trying again in 5 Minutes...\n";
+			sleep(300);
+		} else {
+			echo 'Error '.$status." while getting nests from overpass-turbo. Aborting Nest Update.\n";
+			touch($nests_parks_file, $prevNestTime);
+			exit();
+		}
+	}
+	++$iLat;
 }
 
 // Check for nests in nests of same pokemon
 foreach ($allNestParks as $keyA => $parkA) {
-    foreach ($allNestParks as $keyB => $parkB) {
-        if ($keyA != $keyB && $parkA['pid'] == $parkB['pid']) {
-            if (polyIsInsidePolygon($parkA['geo'], $parkA['bounds'], $parkB['geo'], $parkB['bounds'])) {
-                unset($allNestParks[$keyA]);
-            } elseif (polyIsInsidePolygon($parkB['geo'], $parkB['bounds'], $parkA['geo'], $parkA['bounds'])) {
-                unset($allNestParks[$keyB]);
-            }
-        }
-    }
+	foreach ($allNestParks as $keyB => $parkB) {
+		if ($keyA != $keyB && $parkA['pid'] == $parkB['pid']) {
+			if (polyIsInsidePolygon($parkA['geo'], $parkA['bounds'], $parkB['geo'], $parkB['bounds'])) {
+				unset($allNestParks[$keyA]);
+			} elseif (polyIsInsidePolygon($parkB['geo'], $parkB['bounds'], $parkA['geo'], $parkA['bounds'])) {
+				unset($allNestParks[$keyB]);
+			}
+		}
+	}
 }
 
 // Write files

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
         $minLongitude = $totalMinLon + $iLng * 0.5;
         $maxLongitude = min($minLongitude + 0.5, $totalMaxLon);
 
-        if (0 == $manager->getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude)->total) { //Skip empty areas
+        if (0 == $manager->getSpawnpointCount($minLatitude, $maxLatitude, $minLongitude, $maxLongitude)->total) {
+//Skip empty areas
             ++$iLng;
             continue;
         }

core/cron/pokedex_rarity.cron.php

Indentation +33 added lines, -33 removed lines

@@ -6,30 +6,30 @@ 
 $total_pokemon_last_day = 0;
 $pokelist = array();
 foreach ($data as $pokemon_id => $total) {
-    $total_pokemon_last_day += $total;
-    $pokelist[$pokemon_id]['spawns_last_day'] = $total;
+	$total_pokemon_last_day += $total;
+	$pokelist[$pokemon_id]['spawns_last_day'] = $total;
 }
 
 // calc rarity for last 24h
 foreach ($pokelist as &$pokemon) {
-    $percent = $pokemon['spawns_last_day'] * 100 / $total_pokemon_last_day;
-    $pokemon['rate'] = round($percent, 4);
+	$percent = $pokemon['spawns_last_day'] * 100 / $total_pokemon_last_day;
+	$pokemon['rate'] = round($percent, 4);
 }
 
 // set values for all available pokemon
 $maxpid = $config->system->max_pokemon;
 $pokedex_rarity = new stdClass();
 for ($pid = 1; $pid <= $maxpid; ++$pid) {
-    $pokedex_rarity->$pid = new stdClass();
-    if (isset($pokelist[$pid])) {
-        // seen
-        $pokedex_rarity->$pid->rate = $pokelist[$pid]['rate'];
-        $pokedex_rarity->$pid->per_day = (int) $pokelist[$pid]['spawns_last_day'];
-    } else {
-        // unseen
-        $pokedex_rarity->$pid->rate = 0.0;
-        $pokedex_rarity->$pid->per_day = 0;
-    }
+	$pokedex_rarity->$pid = new stdClass();
+	if (isset($pokelist[$pid])) {
+		// seen
+		$pokedex_rarity->$pid->rate = $pokelist[$pid]['rate'];
+		$pokedex_rarity->$pid->per_day = (int) $pokelist[$pid]['spawns_last_day'];
+	} else {
+		// unseen
+		$pokedex_rarity->$pid->rate = 0.0;
+		$pokedex_rarity->$pid->per_day = 0;
+	}
 }
 
 // Write to file
@@ -37,23 +37,23 @@ 
 
 $rm_pokemon_file = $config->system->rm_pokemon_file;
 if (!is_null($rm_pokemon_file)) {
-    $string = file_get_contents($rm_pokemon_file);
-    $json = json_decode($string, true);
-    foreach ($pokedex_rarity as $pid => $rarity) {
-        $rate = $rarity->rate;
-        if ($rate >= 1) {
-            $rarity_string = 'Common';
-        } elseif ($rate >= 0.20) {
-            $rarity_string = 'Uncommon';
-        } elseif ($rate >= 0.01) {
-            $rarity_string = 'Rare';
-        } elseif ($rate >= 0.0025) {
-            $rarity_string = 'Very Rare';
-        } else {
-            $rarity_string = 'Ultra Rare';
-        }
-        unset($json[$pid]['rarity']);
-        $json[$pid]['rarity'] = $rarity_string;
-    }
-    file_put_contents($rm_pokemon_file, json_encode($json));
+	$string = file_get_contents($rm_pokemon_file);
+	$json = json_decode($string, true);
+	foreach ($pokedex_rarity as $pid => $rarity) {
+		$rate = $rarity->rate;
+		if ($rate >= 1) {
+			$rarity_string = 'Common';
+		} elseif ($rate >= 0.20) {
+			$rarity_string = 'Uncommon';
+		} elseif ($rate >= 0.01) {
+			$rarity_string = 'Rare';
+		} elseif ($rate >= 0.0025) {
+			$rarity_string = 'Very Rare';
+		} else {
+			$rarity_string = 'Ultra Rare';
+		}
+		unset($json[$pid]['rarity']);
+		$json[$pid]['rarity'] = $rarity_string;
+	}
+	file_put_contents($rm_pokemon_file, json_encode($json));
 }

core/cron/captcha.cron.php

Indentation +57 added lines, -57 removed lines

@@ -8,73 +8,73 @@
 
 $captcha_file = SYS_PATH.'/core/json/captcha.stats.json';
 if (is_file($captcha_file)) {
-    $capdatas = json_decode(file_get_contents($captcha_file), true);
-    // Trim json stats files to last 7 days of data
-    $capdatas = trim_stats_json($capdatas, $timestamp_lastweek);
+	$capdatas = json_decode(file_get_contents($captcha_file), true);
+	// Trim json stats files to last 7 days of data
+	$capdatas = trim_stats_json($capdatas, $timestamp_lastweek);
 }
 
 $variables_secret = SYS_PATH.'/core/json/variables.secret.json';
 $config_secret = json_decode(file_get_contents($variables_secret));
 
 if ('' == $config_secret->captcha_key) {
-    $captcha['timestamp'] = $timestamp;
-    // get amount of accounts requiring a captcha
-    $data = $manager->getCaptchaCount();
-    $captcha['captcha_accs'] = $data->total;
-    // Add the datas in file
-    $capdatas[] = $captcha;
+	$captcha['timestamp'] = $timestamp;
+	// get amount of accounts requiring a captcha
+	$data = $manager->getCaptchaCount();
+	$captcha['captcha_accs'] = $data->total;
+	// Add the datas in file
+	$capdatas[] = $captcha;
 } else {
-    if (!empty($capdatas)) {
-        $lastCaptcha = array_pop($capdatas);
-    } else {
-        $lastCaptcha['timestamp'] = strtotime('-7 days', strtotime(date('Y-m-d')));
-    }
-    $lastCaptchaDate = date('Y-m-d', $lastCaptcha['timestamp']);
-    $startTime = strtotime($lastCaptchaDate);
-    $endTime = strtotime(date('Y-m-d')) + date('Z');
-    $timeDiff = abs($endTime - $startTime);
-    $numberDays = intval($timeDiff / 86400); // 86400 seconds in one day
-    if ($numberDays > 7) {
-        $numberDays = 7;
-    }
-    while ($numberDays >= 0) {
-        $day = $endTime - ($numberDays * 86400);
-        $captchaUrl =
-                'http://2captcha.com/res.php?key='.
-                $config_secret->captcha_key.'&action=getstats&date='.date('Y-m-d', $day);
+	if (!empty($capdatas)) {
+		$lastCaptcha = array_pop($capdatas);
+	} else {
+		$lastCaptcha['timestamp'] = strtotime('-7 days', strtotime(date('Y-m-d')));
+	}
+	$lastCaptchaDate = date('Y-m-d', $lastCaptcha['timestamp']);
+	$startTime = strtotime($lastCaptchaDate);
+	$endTime = strtotime(date('Y-m-d')) + date('Z');
+	$timeDiff = abs($endTime - $startTime);
+	$numberDays = intval($timeDiff / 86400); // 86400 seconds in one day
+	if ($numberDays > 7) {
+		$numberDays = 7;
+	}
+	while ($numberDays >= 0) {
+		$day = $endTime - ($numberDays * 86400);
+		$captchaUrl =
+				'http://2captcha.com/res.php?key='.
+				$config_secret->captcha_key.'&action=getstats&date='.date('Y-m-d', $day);
 
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $captchaUrl);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        $fileContents = curl_exec($ch);
-        if (curl_errno($ch)) {
-            echo curl_error($ch);
-            echo "\n<br />";
-            $fileContents = '';
-        } else {
-            curl_close($ch);
-        }
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_URL, $captchaUrl);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		$fileContents = curl_exec($ch);
+		if (curl_errno($ch)) {
+			echo curl_error($ch);
+			echo "\n<br />";
+			$fileContents = '';
+		} else {
+			curl_close($ch);
+		}
 
-        if (!is_string($fileContents) || !strlen($fileContents)) {
-            echo 'Failed to get contents.';
-            $fileContents = '';
-        }
-        $capXml = simplexml_load_string($fileContents);
+		if (!is_string($fileContents) || !strlen($fileContents)) {
+			echo 'Failed to get contents.';
+			$fileContents = '';
+		}
+		$capXml = simplexml_load_string($fileContents);
 
-        foreach ($capXml as $key => $value) {
-            if ((0 == $numberDays
-                && ((int) $value->Attributes()->hour >= (int) date('H', $lastCaptcha['timestamp'])
-                && ((int) $value->Attributes()->hour <= (int) date('H')))
-                ) || $numberDays > 0) {
-                $captcha['timestamp'] =
-                        strtotime(date('Y-m-d', $day).' '.$value->Attributes()->hour.':00') + date('Z');
-                $captcha['captcha_accs'] = (string) $value->volume;
-                $capdatas[] = $captcha;
-            }
-        }
-        --$numberDays;
-    }
+		foreach ($capXml as $key => $value) {
+			if ((0 == $numberDays
+				&& ((int) $value->Attributes()->hour >= (int) date('H', $lastCaptcha['timestamp'])
+				&& ((int) $value->Attributes()->hour <= (int) date('H')))
+				) || $numberDays > 0) {
+				$captcha['timestamp'] =
+						strtotime(date('Y-m-d', $day).' '.$value->Attributes()->hour.':00') + date('Z');
+				$captcha['captcha_accs'] = (string) $value->volume;
+				$capdatas[] = $captcha;
+			}
+		}
+		--$numberDays;
+	}
 }
 
 // Write to file

core/cron/crontabs.include.php

Braces +2 added lines, -1 removed lines

@@ -90,7 +90,8 @@
     touch($pokedex_rarity_file);
     // update pokedex rarity
     include_once SYS_PATH.'/core/cron/pokedex_rarity.cron.php';
-} elseif ((file_update_ago($nests_parks_file) >= 43200) && (time() - $migration >= 43200) && (time() - $migration < 86400)) { // extra update 12h after migration
+} elseif ((file_update_ago($nests_parks_file) >= 43200) && (time() - $migration >= 43200) && (time() - $migration < 86400)) {
+// extra update 12h after migration
     if (is_file($nests_parks_file)) {
         $prevNestTime = filemtime($nests_parks_file);
     } else {

Indentation +38 added lines, -38 removed lines

@@ -37,13 +37,13 @@ 
 $pokemonstats_file = SYS_PATH.'/core/json/pokemon.stats.json';
 
 if (is_file($gym_file)) {
-    $gymsdatas = json_decode(file_get_contents($gym_file), true);
+	$gymsdatas = json_decode(file_get_contents($gym_file), true);
 }
 if (is_file($pokestop_file)) {
-    $stopdatas = json_decode(file_get_contents($pokestop_file), true);
+	$stopdatas = json_decode(file_get_contents($pokestop_file), true);
 }
 if (is_file($pokemonstats_file)) {
-    $pokedatas = json_decode(file_get_contents($pokemonstats_file), true);
+	$pokedatas = json_decode(file_get_contents($pokemonstats_file), true);
 }
 
 $timestamp = time();
@@ -59,7 +59,7 @@ 
 include_once SYS_PATH.'/core/cron/pokemon.cron.php';
 include_once SYS_PATH.'/core/cron/pokestop.cron.php';
 if ($config->system->captcha_support) {
-    include_once SYS_PATH.'/core/cron/captcha.cron.php';
+	include_once SYS_PATH.'/core/cron/captcha.cron.php';
 }
 
 // The following files are updated every 24h only because the queries are quite expensive
@@ -72,48 +72,48 @@ 
 $migration->setTimezone(new DateTimeZone('UTC'));
 $migration->setTimestamp(1493856000);
 do {
-    $migrationPrev = clone $migration;
-    $migration->modify('+14 days');
+	$migrationPrev = clone $migration;
+	$migration->modify('+14 days');
 } while ($migration < new DateTime());
 $migration = $migrationPrev->getTimestamp();
 
 if (!is_file($nests_parks_file) || filemtime($nests_parks_file) - $migration <= 0) {
-    file_put_contents($nests_file, json_encode(array()));
-    file_put_contents($nests_parks_file, json_encode(array()));
-    touch($nests_parks_file, 1);
+	file_put_contents($nests_file, json_encode(array()));
+	file_put_contents($nests_parks_file, json_encode(array()));
+	touch($nests_parks_file, 1);
 }
 
 // Do not update both files at the same time to lower cpu load
 if (file_update_ago($pokedex_rarity_file) > 86400) {
-    // set file mtime to now before executing long running queries
-    // so we don't try to update the file twice
-    touch($pokedex_rarity_file);
-    // update pokedex rarity
-    include_once SYS_PATH.'/core/cron/pokedex_rarity.cron.php';
+	// set file mtime to now before executing long running queries
+	// so we don't try to update the file twice
+	touch($pokedex_rarity_file);
+	// update pokedex rarity
+	include_once SYS_PATH.'/core/cron/pokedex_rarity.cron.php';
 } elseif ((file_update_ago($nests_parks_file) >= 43200) && (time() - $migration >= 43200) && (time() - $migration < 86400)) { // extra update 12h after migration
-    if (is_file($nests_parks_file)) {
-        $prevNestTime = filemtime($nests_parks_file);
-    } else {
-        $prevNestTime = 1;
-    }
-
-    // set file mtime to now before executing long running queries
-    // so we don't try to update the file twice
-    touch($nests_parks_file);
-    // update nests
-    $nestTime = 12;
-    include_once SYS_PATH.'/core/cron/nests.cron.php';
+	if (is_file($nests_parks_file)) {
+		$prevNestTime = filemtime($nests_parks_file);
+	} else {
+		$prevNestTime = 1;
+	}
+
+	// set file mtime to now before executing long running queries
+	// so we don't try to update the file twice
+	touch($nests_parks_file);
+	// update nests
+	$nestTime = 12;
+	include_once SYS_PATH.'/core/cron/nests.cron.php';
 } elseif ((file_update_ago($nests_parks_file) >= 86400) && (time() - $migration >= 86400)) {
-    if (is_file($nests_parks_file)) {
-        $prevNestTime = filemtime($nests_parks_file);
-    } else {
-        $prevNestTime = 1;
-    }
-
-    // set file mtime to now before executing long running queries
-    // so we don't try to update the file twice
-    touch($nests_parks_file);
-    // update nests
-    $nestTime = 24;
-    include_once SYS_PATH.'/core/cron/nests.cron.php';
+	if (is_file($nests_parks_file)) {
+		$prevNestTime = filemtime($nests_parks_file);
+	} else {
+		$prevNestTime = 1;
+	}
+
+	// set file mtime to now before executing long running queries
+	// so we don't try to update the file twice
+	touch($nests_parks_file);
+	// update nests
+	$nestTime = 24;
+	include_once SYS_PATH.'/core/cron/nests.cron.php';
 }

core/js/trainer.graph.js.php

Indentation +5 added lines, -5 removed lines

@@ -27,8 +27,8 @@ 
 $trainer_lvl = [];
 // For all 3 teams
 for ($teamid = 1; $teamid <= 3; ++$teamid) {
-    $data = $manager->getTrainerLevelCount($teamid);
-    $trainer_lvl[$teamid] = $data;
+	$data = $manager->getTrainerLevelCount($teamid);
+	$trainer_lvl[$teamid] = $data;
 }
 
 ?>
@@ -68,7 +68,7 @@ 
 			borderColor: 'rgba(59,129,255,1)',
 			borderWidth: 1,
 			data: [<?php if (isset($trainer_lvl[1])) {
-    echo implode(',', $trainer_lvl[1]);
+	echo implode(',', $trainer_lvl[1]);
 } ?>],
 		},
 		{
@@ -77,7 +77,7 @@ 
 			borderColor: 'rgba(247,10,20,1)',
 			borderWidth: 1,
 			data: [<?php if (isset($trainer_lvl[2])) {
-    echo implode(',', $trainer_lvl[2]);
+	echo implode(',', $trainer_lvl[2]);
 } ?>],
 		},
 		{
@@ -86,7 +86,7 @@ 
 			borderColor: 'rgba(248,153,0,1)',
 			borderWidth: 1,
 			data: [<?php if (isset($trainer_lvl[3])) {
-    echo implode(',', $trainer_lvl[3]);
+	echo implode(',', $trainer_lvl[3]);
 } ?>],
 		}
 	]