brusselopole / Worldopole

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/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;
+	}
+	}
 
 ?>

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

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/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]);
 } ?>],
 		}
 	]

core/js/nests.maps.js.php

Indentation +12 added lines, -12 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-    // Send Javascript header
-    header('Content-type: text/javascript');
-
-    // Load variables and locales
-    include_once '../../config.php';
-    $variables = SYS_PATH.'/core/json/variables.json';
-    $config = json_decode(file_get_contents($variables));
-    include_once '../process/locales.loader.php';
-    include_once '../../functions.php';
+	// Send Javascript header
+	header('Content-type: text/javascript');
+
+	// Load variables and locales
+	include_once '../../config.php';
+	$variables = SYS_PATH.'/core/json/variables.json';
+	$config = json_decode(file_get_contents($variables));
+	include_once '../process/locales.loader.php';
+	include_once '../../functions.php';
 ?>
 
 /** global: google */
@@ -15,9 +15,9 @@ 
 
 var pokemon = {
 <?php
-    foreach ($pokemons->pokemon as $pokeid => $pokemon) {
-        echo $pokeid.':"'.$pokemon->name.'",';
-    }
+	foreach ($pokemons->pokemon as $pokeid => $pokemon) {
+		echo $pokeid.':"'.$pokemon->name.'",';
+	}
 ?>
 }
 var map;

core/js/pokemon.graph.js.php

Indentation +3 added lines, -3 removed lines

@@ -3,9 +3,9 @@
 // Test to check if the file is called properly
 
 if (!isset($_GET['id'])) {
-    http_response_code(400);
-    echo 'Bad Request';
-    exit();
+	http_response_code(400);
+	echo 'Bad Request';
+	exit();
 }
 
 // Send Javascript header

index.php

Indentation +63 added lines, -63 removed lines

@@ -21,7 +21,7 @@ 
 		<link href="core/css/font-awesome.min.css" rel="stylesheet">
 		<link href="<?php auto_ver('core/css/style.css'); ?>" rel="stylesheet">
 		<?php if ('pokemon' == $page) {
-    ?>
+	?>
 			<link href="<?php auto_ver('core/css/jQRangeSlider-bootstrap.min.css'); ?>" rel="stylesheet">
 		<?php
 } ?>
@@ -29,11 +29,11 @@ 
 	<body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top">
 
 		<?php
-        // Google Analytics
-        if (is_file('analyticstracking.php')) {
-            include_once 'analyticstracking.php';
-        }
-        ?>
+		// Google Analytics
+		if (is_file('analyticstracking.php')) {
+			include_once 'analyticstracking.php';
+		}
+		?>
 
 		<nav class="navbar navbar-default navbar-fixed-top">
 			<div class="container">
@@ -53,15 +53,15 @@ 
 					<ul class="nav navbar-nav navbar-right">
 
 						<?php
-                        if (!isset($config->menu)) {
-                            echo 'Please update variables.json file with menu values';
-                            exit();
-                        }
+						if (!isset($config->menu)) {
+							echo 'Please update variables.json file with menu values';
+							exit();
+						}
 
-                        foreach ($config->menu as $menu) {
-                            printMenuitems($menu, 1, $locales);
-                        }
-                        ?>
+						foreach ($config->menu as $menu) {
+							printMenuitems($menu, 1, $locales);
+						}
+						?>
 
 					</ul>
 				</div> <!-- /.navbar-collapse -->
@@ -70,21 +70,21 @@ 
 
 		<div class="container">
 			<?php
-            // Include the pages
-            if (!empty($_GET['page'])) {
-                $file = SYS_PATH.'/pages/'.$page.'.page.php';
-
-                if (is_file($file)) {
-                    echo '<!-- Page :: '.$page.' -->';
-                    include $file;
-                } else {
-                    include 'pages/home.page.php';
-                }
-            } else {
-                include 'pages/home.page.php';
-            }
-
-            ?>
+			// Include the pages
+			if (!empty($_GET['page'])) {
+				$file = SYS_PATH.'/pages/'.$page.'.page.php';
+
+				if (is_file($file)) {
+					echo '<!-- Page :: '.$page.' -->';
+					include $file;
+				} else {
+					include 'pages/home.page.php';
+				}
+			} else {
+				include 'pages/home.page.php';
+			}
+
+			?>
 		</div>
 
 		<footer>
@@ -107,8 +107,8 @@ 
 		<script src="core/js/bootstrap.min.js"></script>
 
 		<?php // Load scripts only for page
-        if (empty($page)) {
-            ?>
+		if (empty($page)) {
+			?>
 
 			<script src="<?php auto_ver('core/js/home.script.js'); ?>"></script>
 
@@ -124,10 +124,10 @@ 
 				updateCounter(<?= $home->teams->rocket; ?>,'.total-rocket-js');
 			</script>
 		<?php
-        } else {
-            switch ($page) {
-                case 'pokemon':
-                    ?>
+		} else {
+			switch ($page) {
+				case 'pokemon':
+					?>
 
 					<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.5.0/Chart.min.js"></script>
 					<script src="core/js/pokemon.graph.js.php?id=<?= $pokemon_id; ?>"></script>
@@ -141,19 +141,19 @@ 
 					<script src="https://maps.googleapis.com/maps/api/js?key=<?= $config->system->GMaps_Key; ?>&libraries=visualization&callback=initMap&v=3"></script>
 
 					<?php
-                    break;
+					break;
 
-                case 'pokestops':
-                    ?>
+				case 'pokestops':
+					?>
 
 					<script src="<?php auto_ver('core/js/pokestops.maps.js'); ?>"></script>
 					<script src="https://maps.googleapis.com/maps/api/js?key=<?= $config->system->GMaps_Key; ?>&libraries=visualization&callback=initMap&v=3"></script>
 
 					<?php
-                    break;
+					break;
 
-                case 'gym':
-                    ?>
+				case 'gym':
+					?>
 
 					<script src="<?php auto_ver('core/js/gym.script.js'); ?>"></script>
 					<script>
@@ -171,10 +171,10 @@ 
 					<script src="https://maps.googleapis.com/maps/api/js?key=<?= $config->system->GMaps_Key; ?>&libraries=visualization&callback=initMap&v=3"></script>
 
 					<?php
-                    break;
+					break;
 
-                case 'pokedex':
-                    ?>
+				case 'pokedex':
+					?>
 
 					<script src="core/js/holmes.min.js"></script>
 					<script>
@@ -191,56 +191,56 @@ 
 					</script>
 
 					<?php
-                    break;
+					break;
 
-                case 'dashboard':
-                    ?>
+				case 'dashboard':
+					?>
 
 					<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.5.0/Chart.min.js"></script>
 					<script src="core/js/dashboard.graph.js.php"></script>
 
 					<?php
-                    break;
+					break;
 
-                case 'trainer':
-                    ?>
+				case 'trainer':
+					?>
 
 					<script src="<?php auto_ver('core/js/trainer.content.js'); ?>"></script>
 					<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.5.0/Chart.min.js"></script>
 					<script src="core/js/trainer.graph.js.php"></script>
 
 					<?php
-                    break;
+					break;
 
-                case 'nests':
-                    ?>
+				case 'nests':
+					?>
 
 					<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.countdown/2.2.0/jquery.countdown.min.js"></script>
 					<script src="core/js/nests.maps.js.php"></script>
 					<script src="https://maps.googleapis.com/maps/api/js?key=<?= $config->system->GMaps_Key; ?>&libraries=visualization,geometry&callback=initMap&v=3"></script>
 
 					<?php
-                    break;
+					break;
 
-                case 'raids':
-                    ?>
+				case 'raids':
+					?>
 
 					<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.countdown/2.2.0/jquery.countdown.min.js"></script>
 					<script src="<?php auto_ver('core/js/raids.content.js'); ?>"></script>
 
 					<?php
-                    break;
+					break;
 
-                case 'gymhistory':
-                    ?>
+				case 'gymhistory':
+					?>
 
 					<script src="<?php auto_ver('core/js/gymhistory.content.js'); ?>"></script>
 
 					<?php
-                    break;
-            }
-        }
-        ?>
+					break;
+			}
+		}
+		?>
 
 	</body>
 </html>