brusselopole / Worldopole

functions.php

Indentation +2 added lines, -2 removed lines

@@ -189,7 +189,7 @@ 
 			$tree = $temp->evolutions;
 			$resultsTemp = get_tree_at_depth($tree, $depth, $max_pokemon, $currentDepth + 1);
 			if (is_null($resultsTemp)) { // Woops
-                return null;
+				return null;
 			}
 			$results = $arr = array();
 			foreach ($resultsTemp as $res) { // Remove all above max_pokemon
@@ -198,7 +198,7 @@ 
 				}
 			}
 			if (is_null($results)) { // Not in current gen
-                return null;
+				return null;
 			}
 			$count = count($results);
 			$i = 0;

Spacing +1 added lines, -1 removed lines

@@ -204,7 +204,7 @@
 			$i = 0;
 			foreach ($results as $res) { // Check if above, equal or bellow center
 				if ($count != 1) {
-					$num = $i / ($count-1);
+					$num = $i / ($count - 1);
 					if ($num < 0.5) {
 						$res->array_sufix = "_up";
 					} elseif ($num > 0.5) {

Braces +18 added lines, -9 removed lines

@@ -171,7 +171,8 @@ 
 	return $gym_level;
 }
 
-function get_depth($arr) {
+function get_depth($arr)
+{
 	$it = new RecursiveIteratorIterator(new RecursiveArrayIterator($arr));
 	$depth = 0;
 	foreach ($it as $v) {
@@ -180,29 +181,37 @@ 
 	return $depth;
 }
     
-function get_tree_at_depth($trees, $depth, $max_pokemon, $currentDepth = 0) {
-	if ($depth == $currentDepth) { // Found depth
+function get_tree_at_depth($trees, $depth, $max_pokemon, $currentDepth = 0)
+{
+	if ($depth == $currentDepth) {
+// Found depth
 		return $trees;
-	} 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;
 			$resultsTemp = get_tree_at_depth($tree, $depth, $max_pokemon, $currentDepth + 1);
-			if (is_null($resultsTemp)) { // Woops
+			if (is_null($resultsTemp)) {
+// Woops
                 return null;
 			}
 			$results = $arr = array();
-			foreach ($resultsTemp as $res) { // Remove all above max_pokemon
+			foreach ($resultsTemp as $res) {
+// Remove all above max_pokemon
 				if ($res->id <= $max_pokemon) {
 					$results[] = $res;
 				}
 			}
-			if (is_null($results)) { // Not in current gen
+			if (is_null($results)) {
+// Not in current gen
                 return null;
 			}
 			$count = count($results);
 			$i = 0;
-			foreach ($results as $res) { // Check if above, equal or bellow center
+			foreach ($results as $res) {
+// Check if above, equal or bellow center
 				if ($count != 1) {
 					$num = $i / ($count-1);
 					if ($num < 0.5) {

core/cron/crontabs.include.php

Indentation +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	$pokedatas	= json_decode(file_get_contents($pokemonstats_file), true);
 }
 if (is_file($pokedex_raids_file)) {
-    $raiddatas	= json_decode(file_get_contents($pokedex_raids_file), true);
+	$raiddatas	= json_decode(file_get_contents($pokedex_raids_file), true);
 }
 
 

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 include_once(SYS_PATH.'/functions.php');
 
 // Load timezone
-include_once(SYS_PATH. '/core/process/timezone.loader.php');
+include_once(SYS_PATH.'/core/process/timezone.loader.php');
 
 
 // Load variables.json
@@ -53,7 +53,7 @@ 
 	$pokedatas	= json_decode(file_get_contents($pokemonstats_file), true);
 }
 if (is_file($pokedex_raids_file)) {
-    $raiddatas	= json_decode(file_get_contents($pokedex_raids_file), true);
+    $raiddatas = json_decode(file_get_contents($pokedex_raids_file), true);
 }
 
 

core/process/locales.loader.php

Indentation +8 added lines, -8 removed lines

@@ -211,14 +211,14 @@
 	$pokemon->spawn_count = $pokemon_counts->$pokeid;
 
 	// Add raid data to array
-    $raid_data = $raid_counts->$pokeid;
-    if (isset($raid_data->end_time)) {
-        $pokemon->last_raid_seen = strtotime($raid_data->end_time);
-        $pokemon->last_raid_position = new stdClass();
-        $pokemon->last_raid_position->latitude = $raid_data->latitude;
-        $pokemon->last_raid_position->longitude = $raid_data->longitude;
-    }
-    $pokemon->raid_count = $raid_data->count;
+	$raid_data = $raid_counts->$pokeid;
+	if (isset($raid_data->end_time)) {
+		$pokemon->last_raid_seen = strtotime($raid_data->end_time);
+		$pokemon->last_raid_position = new stdClass();
+		$pokemon->last_raid_position->latitude = $raid_data->latitude;
+		$pokemon->last_raid_position->longitude = $raid_data->longitude;
+	}
+	$pokemon->raid_count = $raid_data->count;
 
 	// Calculate and add rarities to array
 	$spawn_rate = $pokemons_rarity->$pokeid->rate;

pages/pokemon.page.php

Spacing +7 added lines, -7 removed lines

@@ -263,7 +263,7 @@ 
 	
 	<?php
 	$tree = array($pokemon->tree);
-	$depth = (get_depth($tree)+1)/2;
+	$depth = (get_depth($tree) + 1) / 2;
 	?>
 
 	<h3 class="col-md-12 text-center sub-title"><strong><?= $locales->POKEMON_EVOLUTIONS ?></strong></h3>
@@ -271,7 +271,7 @@ 
 
 		<?php
 		for ($i = 0; $i < $depth * 2 - 1; $i++) {
-			$i_id = intval(($i+1)/2);
+			$i_id = intval(($i + 1) / 2);
 			$data = get_tree_at_depth($tree, $i_id, $config->system->max_pokemon);
 			?>
 
@@ -281,9 +281,9 @@ 
 					<?php foreach ($data as $obj) {
 						$obj_id = $obj->id;
 						$tree_pokemon = $pokemons->pokemon->$obj_id;
-						$link = "/pokemon/" . $obj_id;
+						$link = "/pokemon/".$obj_id;
 
-						if ($i%2 == 0) { ?>
+						if ($i % 2 == 0) { ?>
 
 							<div>
 								<a href="<?= $link ?>"><img src="<?= $tree_pokemon->img ?>" alt="<?= $tree_pokemon->name ?>" class="img"></a>
@@ -296,10 +296,10 @@ 
 								<img src="core/img/arrow<?=$obj->array_sufix?>.png" alt="Arrow" class="img">
 								<p class="pkmn-name">
 									<?php
-									echo $obj->candies . ' ' . $locales->POKEMON_CANDIES;
+									echo $obj->candies.' '.$locales->POKEMON_CANDIES;
 									if (!is_null($obj->item)) {
-										$itemName = 'ITEM_' . $obj->item;
-										echo '<br>+ ' . $locales->$itemName;
+										$itemName = 'ITEM_'.$obj->item;
+										echo '<br>+ '.$locales->$itemName;
 									} else {
 										echo '<br> </br>';
 									}

core/cron/pokedex_raids.cron.php

Indentation +30 added lines, -30 removed lines

@@ -6,15 +6,15 @@ 
 $newraiddatas = $raiddatas;
 
 for ($pid = 1; $pid <= $maxpid; $pid++) {
-    // Get count since update
-    if (isset($raiddatas[$pid]['last_update'])) {
-        $last_update = $raiddatas[$pid]['last_update'];
-    } else {
-        $last_update = 0;
-    }
+	// Get count since update
+	if (isset($raiddatas[$pid]['last_update'])) {
+		$last_update = $raiddatas[$pid]['last_update'];
+	} else {
+		$last_update = 0;
+	}
 
-    $where = "WHERE pokemon_id = '".$pid."' && UNIX_TIMESTAMP(start) > '".$last_update."'";
-    $req = "SELECT UNIX_TIMESTAMP(start) as start_timestamp, end, (CONVERT_TZ(end, '+00:00', '".$time_offset."')) AS end_time_real, latitude, longitude, count
+	$where = "WHERE pokemon_id = '".$pid."' && UNIX_TIMESTAMP(start) > '".$last_update."'";
+	$req = "SELECT UNIX_TIMESTAMP(start) as start_timestamp, end, (CONVERT_TZ(end, '+00:00', '".$time_offset."')) AS end_time_real, latitude, longitude, count
                 FROM raid r
                 JOIN gym g
                 JOIN (SELECT count(*) as count
@@ -25,30 +25,30 @@ 
                 " . $where . "
                 ORDER BY start DESC
                 LIMIT 0,1";
-    $result = $mysqli->query($req);
-    $data = $result->fetch_object();
+	$result = $mysqli->query($req);
+	$data = $result->fetch_object();
 
-    if (isset($data)) {
-        $count = $data->count;
-    } else {
-        $count = 0;
-    }
+	if (isset($data)) {
+		$count = $data->count;
+	} else {
+		$count = 0;
+	}
 
-    if ($count != 0) {
-        echo $count;
-        $gym_id = $data->gym_id;
-        $newraiddatas[$pid]['count'] += $count;
-        $newraiddatas[$pid]['last_update'] = $data->start_timestamp;
-        $newraiddatas[$pid]['end_time'] = $data->end_time_real;
-        $newraiddatas[$pid]['latitude'] = $data->latitude;
-        $newraiddatas[$pid]['longitude'] = $data->longitude;
-    } elseif (is_null($newraiddatas[$pid]['count'])) {
-        $newraiddatas[$pid]['count'] = 0;
-        $newraiddatas[$pid]['last_update'] = 0;
-        $newraiddatas[$pid]['end_time'] = null;
-        $newraiddatas[$pid]['latitude'] = null;
-        $newraiddatas[$pid]['longitude'] = null;
-    }
+	if ($count != 0) {
+		echo $count;
+		$gym_id = $data->gym_id;
+		$newraiddatas[$pid]['count'] += $count;
+		$newraiddatas[$pid]['last_update'] = $data->start_timestamp;
+		$newraiddatas[$pid]['end_time'] = $data->end_time_real;
+		$newraiddatas[$pid]['latitude'] = $data->latitude;
+		$newraiddatas[$pid]['longitude'] = $data->longitude;
+	} elseif (is_null($newraiddatas[$pid]['count'])) {
+		$newraiddatas[$pid]['count'] = 0;
+		$newraiddatas[$pid]['last_update'] = 0;
+		$newraiddatas[$pid]['end_time'] = null;
+		$newraiddatas[$pid]['latitude'] = null;
+		$newraiddatas[$pid]['longitude'] = null;
+	}
 }
 
 // Write to file

Spacing +2 added lines, -2 removed lines

@@ -19,10 +19,10 @@
                 JOIN gym g
                 JOIN (SELECT count(*) as count
                     FROM raid
-                    " . $where . "
+                    " . $where."
                 ) x
                 ON r.gym_id = g.gym_id
-                " . $where . "
+                " . $where."
                 ORDER BY start DESC
                 LIMIT 0,1";
     $result = $mysqli->query($req);