brusselopole / Worldopole

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;

core/cron/pokedex_raids.cron.php

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

Indentation +29 added lines, -29 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,29 +25,29 @@ 
                 " . $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;
-        $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;
+		$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

pages/pokemon.page.php

Braces +1 added lines, -2 removed lines

@@ -304,8 +304,7 @@
 									} elseif (!is_null($obj->info)) {
                                         $infoName = 'INFO_' . $obj->info;
                                         echo '<br>(' . $locales->$infoName . ')';
-                                    }
-									else {
+                                    } else {
 										echo '<br> </br>';
 									}
 									?>

Spacing +8 added lines, -8 removed lines

@@ -285,7 +285,7 @@ 
 		<?php
         $skip = false;
 		for ($i = 0; $i < $depth; $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);
 			?>
 
@@ -296,9 +296,9 @@ 
                     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>
@@ -313,13 +313,13 @@ 
 								<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;
 									} elseif (!is_null($obj->info)) {
-                                        $infoName = 'INFO_' . $obj->info;
-                                        echo '<br>(' . $locales->$infoName . ')';
+                                        $infoName = 'INFO_'.$obj->info;
+                                        echo '<br>('.$locales->$infoName.')';
                                     }
 									else {
 										echo '<br> </br>';

Indentation +28 added lines, -28 removed lines

@@ -100,8 +100,8 @@ 
 				<td class="col-md-4 col-xs-4">
 
 				<?php
-                if (isset($pokemon->last_position)) {
-                    ?>
+				if (isset($pokemon->last_position)) {
+					?>
 
 					<a href="https://maps.google.com/?q=<?= $pokemon->last_position->latitude ?>,<?= $pokemon->last_position->longitude ?>&ll=<?= $pokemon->last_position->latitude ?>,<?= $pokemon->last_position->longitude ?>&z=16" target="_blank"><?= time_ago($pokemon->last_seen, $locales) ?></a>
 
@@ -124,15 +124,15 @@ 
 			<tr>
 				<td class="col-md-8 col-xs-8">
                     <?php
-                    if (isset($pokemon->protected_gyms)) {
-					    echo "<strong>".$locales->POKEMON_GYM.$pokemon->name."</strong> :";
-				    } ?>
+					if (isset($pokemon->protected_gyms)) {
+						echo "<strong>".$locales->POKEMON_GYM.$pokemon->name."</strong> :";
+					} ?>
                 </td>
 				<td class="col-md-4 col-xs-4">
                     <?php
-                    if (isset($pokemon->protected_gyms)) {
-					    echo $pokemon->protected_gyms;
-				    }?>
+					if (isset($pokemon->protected_gyms)) {
+						echo $pokemon->protected_gyms;
+					}?>
                 </td>
 			</tr>
 		</table>
@@ -145,16 +145,16 @@ 
 				<td class="col-md-4 col-xs-4">
 
                     <?php
-                    if (isset($pokemon->last_raid_position)) {
-                        ?>
+					if (isset($pokemon->last_raid_position)) {
+						?>
 
 					    <a href="https://maps.google.com/?q=<?= $pokemon->last_raid_position->latitude ?>,<?= $pokemon->last_raid_position->longitude ?>&ll=<?= $pokemon->last_raid_position->latitude ?>,<?= $pokemon->last_raid_position->longitude ?>&z=16" target="_blank"><?= time_ago($pokemon->last_raid_seen, $locales) ?></a>
 
 					    <?php
-                    } else {
-                        echo $locales->NEVER;
-                    }
-                    ?>
+					} else {
+						echo $locales->NEVER;
+					}
+					?>
 
 				</td>
 			</tr>
@@ -277,14 +277,14 @@ 
 	
 	<?php
 	$tree = array($pokemon->tree);
-    $depth = get_depth($tree);
-    ?>
+	$depth = get_depth($tree);
+	?>
 
 	<h3 class="col-md-12 text-center sub-title"><strong><?= $locales->POKEMON_EVOLUTIONS ?></strong></h3>
 	<div class="col-md-12 flex-container-tree results">
 
 		<?php
-        $skip = false;
+		$skip = false;
 		for ($i = 0; $i < $depth; $i++) {
 			$i_id = intval(($i+1)/2);
 			$data = get_tree_at_depth($tree, $i_id, $config->system->max_pokemon);
@@ -294,7 +294,7 @@ 
 			if (!is_null($data) && sizeof($data) != 0 && !$skip) { ?>
 				<div class="col-md-12 flex-item-tree">
 					<?php
-                    foreach ($data as $obj) {
+					foreach ($data as $obj) {
 						$obj_id = $obj->id;
 						$tree_pokemon = $pokemons->pokemon->$obj_id;
 						$link = "/pokemon/" . $obj_id;
@@ -308,7 +308,7 @@ 
 
 						<?php
 						} else {
-						    ?>
+							?>
 
 							<div>
 								<img src="core/img/arrow<?=$obj->array_sufix?>.png" alt="Arrow" class="img">
@@ -319,9 +319,9 @@ 
 										$itemName = 'ITEM_' . $obj->item;
 										echo '<br>+ ' . $locales->$itemName;
 									} elseif (!is_null($obj->info)) {
-                                        $infoName = 'INFO_' . $obj->info;
-                                        echo '<br>(' . $locales->$infoName . ')';
-                                    }
+										$infoName = 'INFO_' . $obj->info;
+										echo '<br>(' . $locales->$infoName . ')';
+									}
 									else {
 										echo '<br> </br>';
 									}
@@ -329,16 +329,16 @@ 
 								</p>
 							</div>
                             <?php
-                        }
+						}
 					}
 					?>
                 </div>
             <?php
-            } elseif ($skip) {
-                $skip = false;
-            } else {
-                $skip = true;
-            }
+			} elseif ($skip) {
+				$skip = false;
+			} else {
+				$skip = true;
+			}
 		}
 		?>
 	</div>

functions.php

Doc Comments +3 added lines

@@ -213,6 +213,9 @@
 ########################################################################
 // used in get_tree_at_depth
 ########################################################################
+/**
+ * @param integer $currentDepth
+ */
 function tree_check_array($array, $depth, $currentDepth) {
     $i = 0;
     $count = count($array);

Indentation +30 added lines, -30 removed lines

@@ -197,16 +197,16 @@ 
 ########################################################################
 function get_tree_at_depth($trees, $depth, $max_pokemon, $currentDepth = 0) {
 	if ($depth == $currentDepth) { // Found depth
-        return tree_remove_bellow($trees, $max_pokemon);
+		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);
 			array_merge($arr, tree_check_array($results, $depth, $currentDepth));
-            echo "<br>";
+			echo "<br>";
 		}
-        return $arr;
+		return $arr;
 	}
 }
 
@@ -214,23 +214,23 @@ 
 // used in get_tree_at_depth
 ########################################################################
 function tree_check_array($array, $depth, $currentDepth) {
-    $i = 0;
-    $count = count($array);
-    if (!is_null($array)) { // check if exists
-        foreach ($array as $res) { // Check if above, equal or bellow center
-            if ($count != 1 && $depth - $currentDepth == 1) { // only add arrow once
-                $num = $i / ($count - 1);
-                if ($num < 0.5) {
-                    $res->array_sufix = "_up";
-                } elseif ($num > 0.5) {
-                    $res->array_sufix = "_down";
-                }
-            }
-            $arr[] = $res;
-            $i++;
-        }
-    }
-    return $arr;
+	$i = 0;
+	$count = count($array);
+	if (!is_null($array)) { // check if exists
+		foreach ($array as $res) { // Check if above, equal or bellow center
+			if ($count != 1 && $depth - $currentDepth == 1) { // only add arrow once
+				$num = $i / ($count - 1);
+				if ($num < 0.5) {
+					$res->array_sufix = "_up";
+				} elseif ($num > 0.5) {
+					$res->array_sufix = "_down";
+				}
+			}
+			$arr[] = $res;
+			$i++;
+		}
+	}
+	return $arr;
 }
 
 ########################################################################
@@ -238,14 +238,14 @@ 
 ########################################################################
 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;
 }
\ No newline at end of file

Braces +20 added lines, -10 removed lines

@@ -177,7 +177,8 @@ 
 //
 // Retruns max depth of array
 ########################################################################
-function get_depth($arr) {
+function get_depth($arr)
+{
 	$it = new RecursiveIteratorIterator(new RecursiveArrayIterator($arr));
 	$depth = 0;
 	foreach ($it as $v) {
@@ -195,12 +196,16 @@ 
 //
 // Return all pokemon with data at a certain tree 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 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);
 			array_merge($arr, tree_check_array($results, $depth, $currentDepth));
@@ -213,12 +218,16 @@ 
 ########################################################################
 // used in get_tree_at_depth
 ########################################################################
-function tree_check_array($array, $depth, $currentDepth) {
+function tree_check_array($array, $depth, $currentDepth)
+{
     $i = 0;
     $count = count($array);
-    if (!is_null($array)) { // check if exists
-        foreach ($array as $res) { // Check if above, equal or bellow center
-            if ($count != 1 && $depth - $currentDepth == 1) { // only add arrow once
+    if (!is_null($array)) {
+// check if exists
+        foreach ($array as $res) {
+// Check if above, equal or bellow center
+            if ($count != 1 && $depth - $currentDepth == 1) {
+// only add arrow once
                 $num = $i / ($count - 1);
                 if ($num < 0.5) {
                     $res->array_sufix = "_up";
@@ -242,7 +251,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;
         }