brusselopole / Worldopole

core/js/dashboard.graph.js.php

Indentation +59 added lines, -59 removed lines

@@ -59,83 +59,83 @@ 
 $captcha_accs = array();
 
 foreach ($stats as $data) {
-    if ($data->timestamp > $lastweek) {
-        $labels_global[] = '"'.date('D H:i', $data->timestamp).'"';
-        $total[] = $data->pokemon_now;
-        if (isset($data->pokemon_now_iv)) {
-            $total_iv[] = $data->pokemon_now_iv;
-        } else {
-            $total_iv[] = null;
-        }
-    }
+	if ($data->timestamp > $lastweek) {
+		$labels_global[] = '"'.date('D H:i', $data->timestamp).'"';
+		$total[] = $data->pokemon_now;
+		if (isset($data->pokemon_now_iv)) {
+			$total_iv[] = $data->pokemon_now_iv;
+		} else {
+			$total_iv[] = null;
+		}
+	}
 
-    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 > $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;
+		}
+	}
 }
 
 ?>
@@ -594,7 +594,7 @@ 
 // -------------
 
 <?php if ($config->system->captcha_support) {
-    ?>
+	?>
 var ctx_captcha_accs = $('#captcha');
 
 var data_captcha_accs = {

pages/pokemon.page.php

Indentation +102 added lines, -102 removed lines

@@ -18,7 +18,7 @@ 
 		<div class="col-sm-1 hidden-xs">
 
 				<?php if ($pokemon->id - 1 > 0) {
-    ?>
+	?>
 
 				<p class="nav-links"><a href="pokemon/<?= $pokemon->id - 1; ?>"><i class="fa fa-chevron-left"></i></a></p>
 
@@ -44,19 +44,19 @@ 
 		<div class="col-sm-1 hidden-xs">
 
 			<?php if ($pokemon->id + 1 < $config->system->max_pokemon) {
-        ?>
+		?>
 
 			<p class="nav-links"><a href="pokemon/<?= $pokemon->id + 1; ?>"><i class="fa fa-chevron-right"></i></a></p>
 
 			<?php
-    } ?>
+	} ?>
 		</div>
 
 	</div>
 <?php
-    $form_array = array('Unset', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'W', 'X', 'Y', 'Z');
-    $form_array = array_values($form_array);
-    ?>
+	$form_array = array('Unset', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'W', 'X', 'Y', 'Z');
+	$form_array = array_values($form_array);
+	?>
 
 </header>
 <!-- /Header -->
@@ -78,10 +78,10 @@ 
 
 				<p>
 				<?php foreach ($pokemon->types as $type) {
-        ?>
+		?>
 					<span class="label label-default" style="background-color:<?= $pokemons->typecolors->$type; ?>"><?= $type; ?></span>
 				<?php
-    }?>
+	}?>
 				</p>
 
 			</div>
@@ -110,28 +110,28 @@ 
 				<td class="col-md-4 col-xs-4">
 
 				<?php
-                if (isset($pokemon->last_seen) || isset($pokemon->last_seen_day)) {
+				if (isset($pokemon->last_seen) || isset($pokemon->last_seen_day)) {
 
-                    if (isset($pokemon->last_seen)) {
-                        $time_ago = time_ago($pokemon->last_seen, $locales);
-                    } else {
-                        $time_ago = time_ago_day($pokemon->last_seen_day, $locales);
-                    }
+					if (isset($pokemon->last_seen)) {
+						$time_ago = time_ago($pokemon->last_seen, $locales);
+					} else {
+						$time_ago = time_ago_day($pokemon->last_seen_day, $locales);
+					}
 
-                    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 ?></a>
                         <?php
-                    } else {
-                        echo $time_ago;
-                    }
-                    ?>
+					} else {
+						echo $time_ago;
+					}
+					?>
 
 				    <?php
-                } else {
-                    echo $locales->NEVER;
-                }
-                ?>
+				} else {
+					echo $locales->NEVER;
+				}
+				?>
 
 				</td>
 			</tr>
@@ -146,15 +146,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>
@@ -169,16 +169,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>
@@ -301,25 +301,25 @@ 
 	<div class="col-md-12 flex-container-tree results">
 
 		<?php
-        $tree = array($pokemon->tree);
-        $depth = get_depth($tree);
-        $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); ?>
+		$tree = array($pokemon->tree);
+		$depth = get_depth($tree);
+		$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); ?>
 
 			<?php
-            if (!is_null($data) && 0 != sizeof($data) && !$skip) {
-                ?>
+			if (!is_null($data) && 0 != sizeof($data) && !$skip) {
+				?>
 				<div class="col-md-12 flex-item-tree">
 					<?php
-                    foreach ($data as $obj) {
-                        $obj_id = $obj->id;
-                        $tree_pokemon = $pokemons->pokemon->$obj_id;
-                        $link = 'pokemon/'.$obj_id;
+					foreach ($data as $obj) {
+						$obj_id = $obj->id;
+						$tree_pokemon = $pokemons->pokemon->$obj_id;
+						$link = 'pokemon/'.$obj_id;
 
-                        if (0 == $i % 2) {
-                            ?>
+						if (0 == $i % 2) {
+							?>
 
 							<div>
 								<a href="<?= $link; ?>"><img src="<?= $tree_pokemon->img; ?>" alt="<?= $tree_pokemon->name; ?>" class="img"></a>
@@ -327,42 +327,42 @@ 
 							</div>
 
 						<?php
-                        } else {
-                            ?>
+						} else {
+							?>
 
 							<div>
 								<img src="core/img/arrow<?=$obj->array_sufix; ?>.png" alt="Arrow" class="img">
 								<p class="pkmn-name">
 									<?php
-                                    if (isset($obj->candies)) {
-                                        echo $obj->candies.' '.$locales->POKEMON_CANDIES;
-                                    } else {
-                                        echo '? '.$locales->POKEMON_CANDIES;
-                                    }
-
-                            if (isset($obj->item)) {
-                                $itemName = 'ITEM_'.$obj->item;
-                                echo '<br>+ '.$locales->$itemName;
-                            } elseif (isset($obj->info)) {
-                                $infoName = 'INFO_'.$obj->info;
-                                echo '<br>('.$locales->$infoName.')';
-                            } else {
-                                echo '<br> </br>';
-                            } ?>
+									if (isset($obj->candies)) {
+										echo $obj->candies.' '.$locales->POKEMON_CANDIES;
+									} else {
+										echo '? '.$locales->POKEMON_CANDIES;
+									}
+
+							if (isset($obj->item)) {
+								$itemName = 'ITEM_'.$obj->item;
+								echo '<br>+ '.$locales->$itemName;
+							} elseif (isset($obj->info)) {
+								$infoName = 'INFO_'.$obj->info;
+								echo '<br>('.$locales->$infoName.')';
+							} else {
+								echo '<br> </br>';
+							} ?>
 								</p>
 							</div>
                             <?php
-                        }
-                    } ?>
+						}
+					} ?>
                 </div>
             <?php
-            } elseif ($skip) {
-                $skip = false;
-            } else {
-                $skip = true;
-            }
-        }
-        ?>
+			} elseif ($skip) {
+				$skip = false;
+			} else {
+				$skip = true;
+			}
+		}
+		?>
 	</div>
 </div>
 
@@ -377,8 +377,8 @@ 
 
 		<?php
 
-        foreach ($related as $related_mon) {
-            ?>
+		foreach ($related as $related_mon) {
+			?>
 
 			<div class="col-md-1 col-sm-2 col-xs-3 pokemon-single">
 
@@ -390,9 +390,9 @@ 
 
 
 			<?php
-        }
+		}
 
-        ?>
+		?>
 
 		</div>
 
@@ -402,7 +402,7 @@ 
 
 
 <?php if (!empty($top)) {
-            ?>
+			?>
 	<div class="row area" id="top50">
 		<div class="col-md-12">
 			<h2 class="text-center sub-title">Top 50 <strong><?= $pokemon->name; ?></strong></h2>
@@ -420,20 +420,20 @@ 
 							<th><a href="pokemon/<?= $pokemon->id; ?>?order=move_2<?php echo 'move_2' == $top_order && !isset($_GET['direction']) ? '&direction=desc' : ''; ?>#top50">2. <?= $locales->MOVE; ?> <i class="fa fa-sort" aria-hidden="true"></i></a></th>
 							<th><a href="pokemon/<?= $pokemon->id; ?>?order=disappear_time<?php echo 'disappear_time' == $top_order && !isset($_GET['direction']) ? '&direction=desc' : ''; ?>#top50"><?= $locales->DATE; ?> <i class="fa fa-sort" aria-hidden="true"></i></a></th>
 							<?php if (201 == $pokemon->id) {
-                ?>
+				?>
 								<th>Form</th>
 							<?php
-            } ?>
+			} ?>
 						</tr>
 					</thead>
 				
 					<tbody>
 						<?php
-                        $i = 0;
-            foreach ($top as $top50) {
-                ++$i;
-                $move1 = $top50->move_1;
-                $move2 = $top50->move_2; ?>
+						$i = 0;
+			foreach ($top as $top50) {
+				++$i;
+				$move1 = $top50->move_1;
+				$move2 = $top50->move_2; ?>
 
 							<tr>
 								<td><?= $i; ?></td>
@@ -447,17 +447,17 @@ 
 								<td><a href="https://maps.google.com/?q=<?= $top50->latitude; ?>,<?= $top50->longitude; ?>&ll=<?= $top50->latitude; ?>,<?= $top50->longitude; ?>&z=16"
 									target="_blank"><?=$top50->distime; ?></a></td>
 								<?php if (201 == $pokemon->id && $top50->form) {
-                    ?>
+					?>
 									<td><?php echo $form_array[$top50->form]; ?></td>
 								<?php
-                } else {
-                    ?>
+				} else {
+					?>
 									<td></td>
 								<?php
-                } ?>
+				} ?>
 							</tr>
 							<?php
-            } ?>
+			} ?>
 				</tbody>
 			</table>
 		</div>
@@ -465,8 +465,8 @@ 
 </div>
 
 <?php
-        } if ($toptrainer) {
-            ?>
+		} if ($toptrainer) {
+			?>
 	<div class="row" id="trainer">
 		<div class="col-md-12">
 			<h2 class="text-center sub-title"><?= $locales->POKEMON_TOPTRAINER; ?> <strong><?= $pokemon->name; ?></strong></h2>
@@ -485,11 +485,11 @@ 
 					</thead>
 					<tbody>
 						<?php
-                        $i = 0;
-            foreach ($toptrainer as $besttrainer) {
-                ++$i;
-                $move1 = $besttrainer->move_1;
-                $move2 = $besttrainer->move_2; ?>
+						$i = 0;
+			foreach ($toptrainer as $besttrainer) {
+				++$i;
+				$move1 = $besttrainer->move_1;
+				$move2 = $besttrainer->move_2; ?>
 
 							<tr>
 								<td><?= $i; ?></td>
@@ -501,11 +501,11 @@ 
 								<td><?=$besttrainer->lasttime; ?></td>
 							</tr>
 							<?php
-            } ?>
+			} ?>
 				</tbody>
 			</table>
 		</div>
 	</div>
 </div>
 <?php
-        } ?>
+		} ?>