brusselopole / Worldopole

core/cron/pokemon.cron.php

Indentation +2 added lines, -2 removed lines

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

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

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

core/js/dashboard.graph.js.php

Indentation +55 added lines, -55 removed lines

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

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>

functions.php

Braces +20 added lines, -10 removed lines

@@ -199,11 +199,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);
@@ -220,9 +223,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';
@@ -251,7 +257,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;
         }
@@ -295,15 +302,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) {

Indentation +272 added lines, -272 removed lines

@@ -10,54 +10,54 @@ 
 
 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);
+	}
 }
 
 //#######################################################################
@@ -70,12 +70,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;
 }
 
 //#######################################################################
@@ -87,13 +87,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;
+	}
 }
 
 //#######################################################################
@@ -105,15 +105,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;
 }
 
 //#######################################################################
@@ -126,13 +126,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;
 }
 
 //#######################################################################
@@ -144,31 +144,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;
 }
 
 //#######################################################################
@@ -179,13 +179,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;
 }
 
 //#######################################################################
@@ -199,18 +199,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;
+	}
 }
 
 //#######################################################################
@@ -218,28 +218,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;
 }
 
 //#######################################################################
@@ -247,17 +247,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;
 }
 
 //#######################################################################
@@ -265,22 +265,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'];
+	}
 }
 
 //#######################################################################
@@ -288,34 +288,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
+	}
 }
 
 //#######################################################################
@@ -323,18 +323,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
+	}
 }
 
 //#######################################################################
@@ -342,45 +342,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;
 }
 
 //#######################################################################
@@ -388,63 +388,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;
+	}
 }
 
 ?>