brusselopole / Worldopole

pages/pokemon.page.php

Indentation +22 added lines, -22 removed lines

@@ -139,8 +139,8 @@ 
                     <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;
-                    }?>
+						echo $locales->NEVER;
+					}?>
 
                 </td>
             </tr>
@@ -262,29 +262,29 @@ 
     <!-- Tree -->
 
     <?php
-    $tree = array($pokemon->tree);
-    $depth = (get_depth($tree)+1)/2;
-    ?>
+	$tree = array($pokemon->tree);
+	$depth = (get_depth($tree)+1)/2;
+	?>
 
     <h3 class="col-md-12 text-center sub-title"><strong><?= $locales->POKEMON_EVOLUTIONS ?></strong></h3>
     <div class="col-md-12 flex-container results">
 
         <?php
-        for ($i = 0; $i < $depth * 2 - 1; $i++) {
-            $i_id = intval(($i+1)/2);
-            $data = get_tree_at_depth($tree, $i_id, $config->system->max_pokemon);
-            ?>
+		for ($i = 0; $i < $depth * 2 - 1; $i++) {
+			$i_id = intval(($i+1)/2);
+			$data = get_tree_at_depth($tree, $i_id, $config->system->max_pokemon);
+			?>
 
 
                 <?php
-                if (!is_null($data)) { ?>
+				if (!is_null($data)) { ?>
                     <div class="col-md-12 flex-item">
                     <?php foreach ($data as $obj) {
-                        $obj_id = $obj->id;
-                        $tree_pokemon = $pokemons->pokemon->$obj_id;
-                        $link = "/pokemon/" . $obj_id;
+						$obj_id = $obj->id;
+						$tree_pokemon = $pokemons->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>
@@ -297,17 +297,17 @@ 
                                 <img src="core/img/arrow<?=$obj->array_sufix?>.png" alt="Arrow" class="img">
                                 <p class="pkmn-name">
                                     <?php echo $obj->candies . ' ' . $locales->POKEMON_CANDIES;
-                                        if (!is_null($obj->item)) {
-                                            $itemName = 'ITEM_' . $obj->item;
-                                            echo '<br>+ ' . $locales->$itemName;
-                                        } else {
-                                            echo '<br> </br>';
-                                        } ?>
+										if (!is_null($obj->item)) {
+											$itemName = 'ITEM_' . $obj->item;
+											echo '<br>+ ' . $locales->$itemName;
+										} else {
+											echo '<br> </br>';
+										} ?>
                                 </p>
                             </div>
                         <?php
-                        }
-                    } ?>
+						}
+					} ?>
                     </div>
                <?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);
             ?>
 
@@ -282,9 +282,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 @@ 
                             <div id="tree_cell">
                                 <img src="core/img/arrow<?=$obj->array_sufix?>.png" alt="Arrow" class="img">
                                 <p class="pkmn-name">
-                                    <?php echo $obj->candies . ' ' . $locales->POKEMON_CANDIES;
+                                    <?php 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>';
                                         } ?>

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