brusselopole / Worldopole

pages/pokedex.page.php

Spacing +3 added lines, -3 removed lines

@@ -30,10 +30,10 @@
 					echo 'unseen';
 } ?> "></a>
 				<p class="pkmn-name"><a href="<?= $pokemon->permalink ?>"><?= $pokemon->name ?></a></p>
-				<p><?php if ($pokemon->spawn ==0) {
-					echo $locales->UNSEEN ;
+				<p><?php if ($pokemon->spawn == 0) {
+					echo $locales->UNSEEN;
 } else {
-	echo $pokemon->spawn. $locales->SEEN ;
+	echo $pokemon->spawn.$locales->SEEN;
 } ?> </p>
 			
 			</div>

core/cron/gym.cron.php

Spacing +22 added lines, -22 removed lines

@@ -8,48 +8,48 @@
 // -----------------------------------------------------------------------------------------------------------
 
 
-$gym['timestamp']	= $timestamp;
+$gym['timestamp'] = $timestamp;
 
-$req		= "SELECT count( DISTINCT(gym_id) ) as total FROM gym";
-$result		= $mysqli->query($req);
-$data		= $result->fetch_object();
+$req = "SELECT count( DISTINCT(gym_id) ) as total FROM gym";
+$result = $mysqli->query($req);
+$data = $result->fetch_object();
 
-$gym['total'] 	= $data->total;
+$gym['total'] = $data->total;
 
 
 // Mystic
 
-$req		= "SELECT count(DISTINCT(gym_id)) as total, ROUND(AVG(gym_points),0) as average_points FROM gym WHERE team_id = '1'";
-$result		= $mysqli->query($req);
-$data		= $result->fetch_object();
+$req = "SELECT count(DISTINCT(gym_id)) as total, ROUND(AVG(gym_points),0) as average_points FROM gym WHERE team_id = '1'";
+$result = $mysqli->query($req);
+$data = $result->fetch_object();
 
-$gym['team']['mystic']['gym_owned']	= $data->total;
-$gym['team']['mystic']['average']	= $data->average_points;
+$gym['team']['mystic']['gym_owned'] = $data->total;
+$gym['team']['mystic']['average'] = $data->average_points;
 
 
 // Valor
 
-$req		= "SELECT count(DISTINCT(gym_id)) as total, ROUND(AVG(gym_points),0) as average_points FROM gym WHERE team_id = '2'";
-$result		= $mysqli->query($req);
-$data		= $result->fetch_object();
+$req = "SELECT count(DISTINCT(gym_id)) as total, ROUND(AVG(gym_points),0) as average_points FROM gym WHERE team_id = '2'";
+$result = $mysqli->query($req);
+$data = $result->fetch_object();
 
-$gym['team']['valor']['gym_owned']	= $data->total;
-$gym['team']['valor']['average']	= $data->average_points;
+$gym['team']['valor']['gym_owned'] = $data->total;
+$gym['team']['valor']['average'] = $data->average_points;
 
 
 // Instinct
 
-$req		= "SELECT count(DISTINCT(gym_id)) as total, ROUND(AVG(gym_points),0) as average_points FROM gym WHERE team_id = '3'";
-$result		= $mysqli->query($req);
-$data		= $result->fetch_object();
+$req = "SELECT count(DISTINCT(gym_id)) as total, ROUND(AVG(gym_points),0) as average_points FROM gym WHERE team_id = '3'";
+$result = $mysqli->query($req);
+$data = $result->fetch_object();
 
-$gym['team']['instinct']['gym_owned'] 	= $data->total;
-$gym['team']['instinct']['average'] 	= $data->average_points;
+$gym['team']['instinct']['gym_owned'] = $data->total;
+$gym['team']['instinct']['average'] = $data->average_points;
 
 
 // Add the datas in file
 
-$gymsdatas[]		= $gym;
-$json			= json_encode($gymsdatas);
+$gymsdatas[] = $gym;
+$json = json_encode($gymsdatas);
 
 file_put_contents($gym_file, $json);

core/process/locales.loader.php

Spacing +18 added lines, -18 removed lines

@@ -37,12 +37,12 @@ 
 			$translation_file	= file_get_contents(SYS_PATH.'/core/json/locales/EN/translations.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');
 	}
 } 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');
 }
 
 
@@ -52,23 +52,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/pokemon.rarity.php');
@@ -78,14 +78,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) {
@@ -95,8 +95,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);
 	}
 

core/js/trainer.graph.js.php

Spacing +4 added lines, -4 removed lines

@@ -10,8 +10,8 @@ 
 // Include & load the variables 
 // ############################
 
-$variables	= realpath(dirname(__FILE__)).'/../json/variables.json';
-$config		= json_decode(file_get_contents($variables));
+$variables = realpath(dirname(__FILE__)).'/../json/variables.json';
+$config = json_decode(file_get_contents($variables));
 
 
 # Connect MySQL 
@@ -25,7 +25,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 = [];
@@ -38,7 +38,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

core/js/pokemon.maps.js.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 			// As the map is rendering by the client, we do recommand to keep a limit on your request.
 			// 10k is already alotof datas ;)
 			
-			$req 	= "SELECT latitude, longitude FROM pokemon WHERE pokemon_id = '".$pokemon_id."' ORDER BY disappear_time DESC LIMIT 0,10000";
+			$req = "SELECT latitude, longitude FROM pokemon WHERE pokemon_id = '".$pokemon_id."' ORDER BY disappear_time DESC LIMIT 0,10000";
 			$result = $mysqli->query($req);
 			
 			while ($data = $result->fetch_object()) {

install/tester.php

Spacing +11 added lines, -11 removed lines

@@ -11,7 +11,7 @@ 
 {
 	
 	
-	$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);
 		
 	####################
 	// Database tests
@@ -19,10 +19,10 @@ 
 	
 	// Pokemon Test
 
-	$req 		= "SELECT COUNT(*) as total FROM pokemon";
-	$result 	= $mysqli->query($req);
+	$req = "SELECT COUNT(*) as total FROM pokemon";
+	$result = $mysqli->query($req);
 	
-	$lock_msg 	= '';
+	$lock_msg = '';
 	
 	if (!is_object($result)) {
 		$lock_msg .= "No Pokémon database found \r";
@@ -37,10 +37,10 @@ 
 	
 	// Gym Test
 	
-	$req 		= "SELECT COUNT(*) as total FROM gym";
-	$result 	= $mysqli->query($req);
+	$req = "SELECT COUNT(*) as total FROM gym";
+	$result = $mysqli->query($req);
 	
-	$lock_msg 	= '';
+	$lock_msg = '';
 	
 	if (!is_object($result)) {
 		$lock_msg .= "No Gym database found \r";
@@ -57,10 +57,10 @@ 
 	// 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);
 	
-	$lock_msg 	= '';
+	$lock_msg = '';
 	
 	if (!is_object($result)) {
 		$lock_msg .= "No Pokestop database found \r";
@@ -99,7 +99,7 @@ 
 	} else {
 		// Can we read JSON file?
 		$json_test_file = SYS_PATH.'/core/json/pokelist_EN.json';
-		$lock_msg		= '';
+		$lock_msg = '';
 		
 		if (!is_readable($json_test_file)) {
 			$lock_msg .= "JSon files are not readable. Please fix rights \r";

core/cron/pokemon.rarity.php

Spacing +8 added lines, -8 removed lines

@@ -4,26 +4,26 @@
 // This file is loaded once every 24h by data the loader. 
 // ------------------------------------------------------
 
-$req 		= "SELECT pokemon_id, COUNT(1) as total FROM pokemon GROUP BY pokemon_id ORDER BY pokemon_id ASC";
-$result 	= $mysqli->query($req);
+$req = "SELECT pokemon_id, COUNT(1) as total FROM pokemon GROUP BY pokemon_id ORDER BY pokemon_id ASC";
+$result = $mysqli->query($req);
 
 $total_pokemons = 0;
 
 while ($data = $result->fetch_object()) {
-	$pokemon_id 	= $data->pokemon_id;
+	$pokemon_id = $data->pokemon_id;
 	$total_pokemons = $total_pokemons + $data->total;
 	
-	$pokelist[$pokemon_id]['id'] 		= $pokemon_id;
-	$pokelist[$pokemon_id]['total'] 	= $data->total;
+	$pokelist[$pokemon_id]['id'] = $pokemon_id;
+	$pokelist[$pokemon_id]['total'] = $data->total;
 }
 
 
 foreach ($pokelist as $pokemon) {
 	$key = $pokemon['id'];
 	
-	$pourcent 			= ($pokemon['total']*100) / $total_pokemons;
-	$arrondis			= round($pourcent, 4);
-	$pokelist[$key]['rate'] 	= $arrondis;
+	$pourcent = ($pokemon['total'] * 100) / $total_pokemons;
+	$arrondis = round($pourcent, 4);
+	$pokelist[$key]['rate'] = $arrondis;
 }
 
 // create new array if file doesn't exist

pages/pokemon.page.php

Spacing +7 added lines, -7 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>
@@ -130,7 +130,7 @@ 
 			<tr>
 				<td class="col-md-8 col-xs-8"><strong><?= $locales->POKEMON_EVOLUTION ?> :</strong></td>
 				<td class="col-md-4 col-xs-4"><?php if (isset($pokemon->candies)) {
-					echo $pokemon->candies . " ". $pokemon->candy_name . " " . $locales->POKEMON_CANDIES ;
+					echo $pokemon->candies." ".$pokemon->candy_name." ".$locales->POKEMON_CANDIES;
 } else {
 	echo $locales->POKEMON_FINAL;
 } ?></td>

config.example.php

Spacing +2 added lines, -2 removed lines

@@ -57,8 +57,8 @@
 	if ($root == $filePath) {
 		return ''; // installed in the root
 	} else {
-		$subdir_path	= explode('/', $filePath);
-		$subdir		= end($subdir_path);
+		$subdir_path = explode('/', $filePath);
+		$subdir = end($subdir_path);
 		return $subdir;
 	}
 }