brusselopole / Worldopole

core/cron/crontabs.include.php

Spacing +7 added lines, -7 removed lines

@@ -3,8 +3,8 @@ 
 // This file only include other files to have only 1 entry in your crontabs. 
 // ------------------------------------------------------------------------	
 
-$filePath	= dirname(__FILE__);
-$config_file	= $filePath.'/../../config.php';
+$filePath = dirname(__FILE__);
+$config_file = $filePath.'/../../config.php';
 
 include_once($config_file);
 
@@ -15,7 +15,7 @@ 
 
 
 # MySQL 
-$mysqli		= new mysqli(SYS_DB_HOST, SYS_DB_USER, SYS_DB_PSWD, SYS_DB_NAME, SYS_DB_PORT);
+$mysqli = new mysqli(SYS_DB_HOST, SYS_DB_USER, SYS_DB_PSWD, SYS_DB_NAME, SYS_DB_PORT);
 
 if ($mysqli->connect_error != '') {
 	die('MySQL connect error');
@@ -23,9 +23,9 @@ 
 
 
 
-$gym_file	= SYS_PATH.'/core/json/gym.stats.json';
-$pokestop_file	= SYS_PATH.'/core/json/pokestop.stats.json';
-$pokemonstats_file	= SYS_PATH.'/core/json/pokemon.stats.json';
+$gym_file = SYS_PATH.'/core/json/gym.stats.json';
+$pokestop_file = SYS_PATH.'/core/json/pokestop.stats.json';
+$pokemonstats_file = SYS_PATH.'/core/json/pokemon.stats.json';
 
 
 if (is_file($gym_file)) {
@@ -38,7 +38,7 @@ 
 	$pokedatas	= json_decode(file_get_contents($pokemonstats_file), true);
 }
 
-$timestamp	= time();
+$timestamp = time();
 
 include_once(SYS_PATH.'/core/cron/gym.cron.php');
 include_once(SYS_PATH.'/core/cron/pokemon.cron.php');

install/tester.php

Spacing +7 added lines, -7 removed lines

@@ -22,11 +22,11 @@ 
 {
 	$lock_msg = '';
 
-	$mysqli 	= new mysqli(SYS_DB_HOST, SYS_DB_USER, SYS_DB_PSWD, SYS_DB_NAME, SYS_DB_PORT);
+	$mysqli = new mysqli(SYS_DB_HOST, SYS_DB_USER, SYS_DB_PSWD, SYS_DB_NAME, SYS_DB_PORT);
 
 	// Pokemon Test
-	$req 		= "SELECT COUNT(*) as total FROM pokemon";
-	$result 	= $mysqli->query($req);
+	$req = "SELECT COUNT(*) as total FROM pokemon";
+	$result = $mysqli->query($req);
 
 	if (!is_object($result)) {
 		$lock_msg .= "Error: No Pokémon database found<br>";
@@ -40,8 +40,8 @@ 
 	}
 
 	// Gym Test
-	$req 		= "SELECT COUNT(*) as total FROM gym";
-	$result 	= $mysqli->query($req);
+	$req = "SELECT COUNT(*) as total FROM gym";
+	$result = $mysqli->query($req);
 
 	if (!is_object($result)) {
 		$lock_msg .= "Error: No Gym database found<br>";
@@ -56,8 +56,8 @@ 
 
 
 	// Pokéstop Test
-	$req 		= "SELECT COUNT(*) as total FROM pokestop";
-	$result 	= $mysqli->query($req);
+	$req = "SELECT COUNT(*) as total FROM pokestop";
+	$result = $mysqli->query($req);
 
 	if (!is_object($result)) {
 		$lock_msg .= "Error: No Pokestop database found<br>";

pages/trainer.page.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
 <script type="text/javascript">
 <?=
 $trainerName = "";
-if (isset($_GET['name']) && $_GET['name']!="") {
+if (isset($_GET['name']) && $_GET['name'] != "") {
 	$trainerName = htmlentities($_GET['name']);
 }
 

core/js/dashboard.graph.js.php

Spacing +26 added lines, -26 removed lines

@@ -10,8 +10,8 @@ 
 // Include & load the variables
 // ############################
 
-$variables	= SYS_PATH.'/core/json/variables.json';
-$config		= json_decode(file_get_contents($variables));
+$variables = SYS_PATH.'/core/json/variables.json';
+$config = json_decode(file_get_contents($variables));
 
 
 // Include & load locales (because it's REALLY REALLY REALLY IMPORTANT TO HAVE A FULLY TRANSLATE DASHBOARD )
@@ -24,15 +24,15 @@ 
 // Check if there's a pokemon stat file
 // ####################################
 
-$stats_file	= SYS_PATH.'/core/json/pokemon.stats.json';
-$stats		= json_decode(file_get_contents($stats_file));
+$stats_file = SYS_PATH.'/core/json/pokemon.stats.json';
+$stats = json_decode(file_get_contents($stats_file));
 
 
-$now		= time();
-$yesterday	= $now-86400;
-$lastweek	= $now-604800;
+$now = time();
+$yesterday = $now - 86400;
+$lastweek = $now - 604800;
 
-$i=0;
+$i = 0;
 $labels_global = array();
 $total = array();
 $labels = array();
@@ -59,12 +59,12 @@ 
 
 foreach ($stats as $data) {
 	if ($data->timestamp > $lastweek) {
-		$labels_global[]	= '"'.date('D H:i', $data->timestamp).'"';
-		$total[]		= $data->pokemon_now;
+		$labels_global[] = '"'.date('D H:i', $data->timestamp).'"';
+		$total[] = $data->pokemon_now;
 	}
 
 	if ($data->timestamp > $yesterday) {
-		$labels[] = '"'.date('H:i', $data->timestamp ).'"';
+		$labels[] = '"'.date('H:i', $data->timestamp).'"';
 
 		if (isset($data->rarity_spawn->{'Very common'})) {
 			$veco[]		= $data->rarity_spawn->{'Very common'};
@@ -93,47 +93,47 @@ 
 }
 
 
-$stats_file	= SYS_PATH.'/core/json/gym.stats.json';
-$stats		= json_decode(file_get_contents($stats_file));
+$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).'"';
+		$labels_gym[] = '"'.date('D H:i', $data->timestamp).'"';
 
-		$mystic_average[]		= $data->team->mystic->average;
+		$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_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));
+$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;
+		$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));
+	$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;
+			$labels_captcha[] = '"'.date('D H:i', $data->timestamp).'"';
+			$captcha_accs[] = $data->captcha_accs;
 		}
 	}
 }

core/process/locales.loader.php

Spacing +18 added lines, -18 removed lines

@@ -43,14 +43,14 @@ 
 			$moves_file			= json_decode(file_get_contents(SYS_PATH.'/core/json/locales/EN/moves.json'));
 		}
 	} else {
-		$pokemon_file 			= file_get_contents(SYS_PATH.'/core/json/locales/EN/pokes.json');
-		$translation_file 		= file_get_contents(SYS_PATH.'/core/json/locales/EN/translations.json');
+		$pokemon_file = file_get_contents(SYS_PATH.'/core/json/locales/EN/pokes.json');
+		$translation_file = file_get_contents(SYS_PATH.'/core/json/locales/EN/translations.json');
 		$moves_file				= json_decode(file_get_contents(SYS_PATH.'/core/json/locales/EN/moves.json'));
 	}
 } else {
 	$pokemon_file			= file_get_contents(SYS_PATH.'/core/json/locales/EN/pokes.json');
-	$translation_file		= file_get_contents(SYS_PATH.'/core/json/locales/EN/translations.json');
-	$moves_file				= json_decode(file_get_contents(SYS_PATH.'/core/json/locales/EN/moves.json'));
+	$translation_file = file_get_contents(SYS_PATH.'/core/json/locales/EN/translations.json');
+	$moves_file = json_decode(file_get_contents(SYS_PATH.'/core/json/locales/EN/moves.json'));
 }
 
 
@@ -60,23 +60,23 @@ 
 // always overwrite english if available
 ########################################
 
-$locales 		= (object) array_replace(json_decode(file_get_contents(SYS_PATH.'/core/json/locales/EN/translations.json'), true), json_decode($translation_file, true));
+$locales = (object) array_replace(json_decode(file_get_contents(SYS_PATH.'/core/json/locales/EN/translations.json'), true), json_decode($translation_file, true));
 
 // Recursive replace because of multi level array
-$pokemon_trans_array 	= array_replace_recursive(json_decode(file_get_contents(SYS_PATH.'/core/json/locales/EN/pokes.json'), true), json_decode($pokemon_file, true));
+$pokemon_trans_array = array_replace_recursive(json_decode(file_get_contents(SYS_PATH.'/core/json/locales/EN/pokes.json'), true), json_decode($pokemon_file, true));
 
 // convert associative array back to object array (recursive)
-$pokemon_trans 		= json_decode(json_encode($pokemon_trans_array), false);
+$pokemon_trans = json_decode(json_encode($pokemon_trans_array), false);
 unset($pokemon_trans_array);
 
 
 // Merge the pokedex, pokemon translation and rarity file into a new array 
 ##########################################################################
 
-$pokedex_file 			= file_get_contents(SYS_PATH.'/core/json/pokedex.json');
-$pokemons 			= json_decode($pokedex_file);
+$pokedex_file = file_get_contents(SYS_PATH.'/core/json/pokedex.json');
+$pokemons = json_decode($pokedex_file);
 
-$pokedex_rarity_file 		= SYS_PATH.'/core/json/pokedex.rarity.json';
+$pokedex_rarity_file = SYS_PATH.'/core/json/pokedex.rarity.json';
 // initial create of pokedex.rarity.json if it doesn't exist
 if (!is_file($pokedex_rarity_file)) {
 	include_once(SYS_PATH.'/core/cron/pokedex.rarity.php');
@@ -86,14 +86,14 @@ 
 
 foreach ($pokemons->pokemon as $pokeid => $pokemon) {
 	// Merge name and description from translation files
-	$pokemon->name 				= $pokemon_trans->pokemon->$pokeid->name;
-	$pokemon->description 		= $pokemon_trans->pokemon->$pokeid->description;
+	$pokemon->name = $pokemon_trans->pokemon->$pokeid->name;
+	$pokemon->description = $pokemon_trans->pokemon->$pokeid->description;
 
 	// Replace quick and charge move with translation
-	$quick_move 				= $pokemon->quick_move;
-	$pokemon->quick_move 		= $pokemon_trans->quick_moves->$quick_move;
-	$charge_move 				= $pokemon->charge_move;
-	$pokemon->charge_move 		= $pokemon_trans->charge_moves->$charge_move;
+	$quick_move = $pokemon->quick_move;
+	$pokemon->quick_move = $pokemon_trans->quick_moves->$quick_move;
+	$charge_move = $pokemon->charge_move;
+	$pokemon->charge_move = $pokemon_trans->charge_moves->$charge_move;
 
 	// Replace types with translation
 	foreach ($pokemon->types as &$type) {
@@ -103,8 +103,8 @@ 
 
 	// Resolve candy_id to candy_name
 	if (isset($pokemon->candy_id)) {
-		$candy_id 				= $pokemon->candy_id;
-		$pokemon->candy_name	= $pokemon_trans->pokemon->$candy_id->name;
+		$candy_id = $pokemon->candy_id;
+		$pokemon->candy_name = $pokemon_trans->pokemon->$candy_id->name;
 		unset($pokemon->candy_id);
 	}
 	// Convert move numbers to names

core/js/pokemon.graph.js.php

Spacing +3 added lines, -3 removed lines

@@ -26,8 +26,8 @@ 
 
 # Polar Graph datas
 
-$pokemon_file	= file_get_contents(SYS_PATH.'/core/json/pokedex.json');
-$pokemons	= json_decode($pokemon_file);
+$pokemon_file = file_get_contents(SYS_PATH.'/core/json/pokedex.json');
+$pokemons = json_decode($pokemon_file);
 
 $atk		= $pokemons->pokemon->$pokemon_id->atk;
 $def		= $pokemons->pokemon->$pokemon_id->def;
@@ -36,7 +36,7 @@ 
 
 ?>
 
-var pokemon_id = '<?= (int)$pokemon_id ?>';
+var pokemon_id = '<?= (int) $pokemon_id ?>';
 
 Chart.defaults.global.legend.display = false;
 

pages/home.page.php

Spacing +9 added lines, -9 removed lines

@@ -76,26 +76,26 @@ 
 					if ($pokemon->iv->available) {
 						if ($config->system->iv_numbers) { ?>
 							<div class="progress" style="height: 15px; margin-bottom: 0">
-								<div title="Attack IV: <?= $pokemon->iv->attack ?>" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="<?= $pokemon->iv->attack ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= (100/3)  ?>%; line-height: 16px";>
+								<div title="Attack IV: <?= $pokemon->iv->attack ?>" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="<?= $pokemon->iv->attack ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= (100 / 3)  ?>%; line-height: 16px";>
 									<span class="sr-only"><?= $locales->ATTACK ?> IV: <?= $pokemon->iv->attack ?></span><?= $pokemon->iv->attack ?>
 								</div>
-								<div title="Defense IV: <?= $pokemon->iv->defense ?>" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="<?= $pokemon->iv->defense ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= (100/3)  ?>%; line-height: 16px";>
+								<div title="Defense IV: <?= $pokemon->iv->defense ?>" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="<?= $pokemon->iv->defense ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= (100 / 3)  ?>%; line-height: 16px";>
 									<span class="sr-only"><?= $locales->DEFENSE ?> IV: <?= $pokemon->iv->defense ?></span><?= $pokemon->iv->defense ?>
 								</div>
-								<div title="Stamina IV: <?= $pokemon->iv->stamina ?>" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?= $pokemon->iv->stamina ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= (100/3) ?>%; line-height: 16px";>
+								<div title="Stamina IV: <?= $pokemon->iv->stamina ?>" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?= $pokemon->iv->stamina ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= (100 / 3) ?>%; line-height: 16px";>
 									<span class="sr-only"><?= $locales->STAMINA ?> IV: <?= $pokemon->iv->stamina ?></span><?= $pokemon->iv->stamina ?>
 								</div>
 							</div>
 						<?php 
 						} else { ?>
 							<div class="progress" style="height: 6px; width: 80%; margin: 5px auto 15px auto;">
-								<div title="Attack IV: <?= $pokemon->iv->attack ?>" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="<?= $pokemon->iv->attack ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= ((100/15)*$pokemon->iv->attack)/3 ?>%">
+								<div title="Attack IV: <?= $pokemon->iv->attack ?>" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="<?= $pokemon->iv->attack ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= ((100 / 15) * $pokemon->iv->attack) / 3 ?>%">
 									<span class="sr-only"><?= $locales->ATTACK ?> IV: <?= $pokemon->iv->attack ?></span>
 								</div>
-								<div title="Defense IV: <?= $pokemon->iv->defense ?>" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="<?= $pokemon->iv->defense ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= ((100/15)*$pokemon->iv->defense)/3 ?>%">
+								<div title="Defense IV: <?= $pokemon->iv->defense ?>" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="<?= $pokemon->iv->defense ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= ((100 / 15) * $pokemon->iv->defense) / 3 ?>%">
 									<span class="sr-only"><?= $locales->DEFENSE ?> IV: <?= $pokemon->iv->defense ?></span>
 								</div>
-								<div title="Stamina IV: <?= $pokemon->iv->stamina ?>" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?= $pokemon->iv->stamina ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= ((100/15)*$pokemon->iv->stamina)/3 ?>%">
+								<div title="Stamina IV: <?= $pokemon->iv->stamina ?>" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?= $pokemon->iv->stamina ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= ((100 / 15) * $pokemon->iv->stamina) / 3 ?>%">
 									<span class="sr-only"><?= $locales->STAMINA ?> IV: <?= $pokemon->iv->stamina ?></span>
 								</div>
 							</div>
@@ -104,13 +104,13 @@ 
 					} else {
 						if ($config->system->iv_numbers) { ?>
 							<div class="progress" style="height: 15px; margin-bottom: 0">
-								<div title="Attack IV: not available" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="<?= $pokemon->iv->attack ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= (100/3)  ?>%; line-height: 16px";>
+								<div title="Attack IV: not available" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="<?= $pokemon->iv->attack ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= (100 / 3)  ?>%; line-height: 16px";>
 									<span class="sr-only"><?= $locales->ATTACK ?> IV: <?= $locales->NOT_AVAILABLE ?></span>?
 								</div>
-								<div title="Defense IV: not available" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="<?= $pokemon->iv->defense ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= (100/3)  ?>%; line-height: 16px";>
+								<div title="Defense IV: not available" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="<?= $pokemon->iv->defense ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= (100 / 3)  ?>%; line-height: 16px";>
 									<span class="sr-only"><?= $locales->DEFENSE ?> IV: <?= $locales->NOT_AVAILABLE ?></span>?
 								</div>
-								<div title="Stamina IV: not available" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?= $pokemon->iv->stamina ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= (100/3) ?>%; line-height: 16px";>
+								<div title="Stamina IV: not available" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?= $pokemon->iv->stamina ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= (100 / 3) ?>%; line-height: 16px";>
 									<span class="sr-only"><?= $locales->STAMINA ?> IV: <?= $locales->NOT_AVAILABLE ?></span>?
 								</div>
 							</div>

pages/pokemon.page.php

Spacing +6 added lines, -6 removed lines

@@ -17,9 +17,9 @@ 
 
 		<div class="col-sm-1 hidden-xs">
 
-				<?php if ($pokemon->id-1 > 0) { ?>
+				<?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>
+				<p class="nav-links"><a href="pokemon/<?= $pokemon->id - 1 ?>"><i class="fa fa-chevron-left"></i></a></p>
 
 				<?php }?>
 
@@ -41,9 +41,9 @@ 
 
 		<div class="col-sm-1 hidden-xs">
 
-			<?php if ($pokemon->id+1 < $config->system->max_pokemon) { ?>
+			<?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>
+			<p class="nav-links"><a href="pokemon/<?= $pokemon->id + 1 ?>"><i class="fa fa-chevron-right"></i></a></p>
 
 			<?php } ?>
 		</div>
@@ -116,10 +116,10 @@ 
 			</tr>
 			<tr>
 				<td class="col-md-8 col-xs-8"><?php if (isset($pokemon->protected_gyms)) {
-					echo "<strong>" . $locales->POKEMON_GYM . $pokemon->name . "</strong> :";
+					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 ;
+					echo $pokemon->protected_gyms;
 }?></td>
 			</tr>
 		</table>

core/js/trainer.graph.js.php

Spacing +4 added lines, -4 removed lines

@@ -10,8 +10,8 @@ 
 // Include & load the variables 
 // ############################
 
-$variables	= SYS_PATH.'/core/json/variables.json';
-$config		= json_decode(file_get_contents($variables));
+$variables = SYS_PATH.'/core/json/variables.json';
+$config = json_decode(file_get_contents($variables));
 
 // Load the locale elements
 ############################
@@ -29,7 +29,7 @@ 
 $trainer_lvl = [];
 # For all 3 teams
 for ($teamid = 1; $teamid <= 3; $teamid++) {
-	$req	= "SELECT level, count(level) AS count FROM trainer WHERE team = '".$teamid."' GROUP BY level";
+	$req = "SELECT level, count(level) AS count FROM trainer WHERE team = '".$teamid."' GROUP BY level";
 	if ($result = $mysqli->query($req)) {
 		# build level=>count array
 		$data = [];
@@ -42,7 +42,7 @@ 
 			# fill empty levels counts with 0
 			for ($i = 5; $i <= 40; $i++) {
 				if (!isset($data[$i])) {
-					$data[$i]=0;
+					$data[$i] = 0;
 				}
 			}
 			# sort array again