brusselopole / Worldopole

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

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

core/cron/pokemon.cron.php

Spacing +10 added lines, -10 removed lines

@@ -18,19 +18,19 @@ 
 $pokemon_stats['timestamp'] = $timestamp;
 
 
-$req 		= "SELECT COUNT(*) as total FROM pokemon WHERE disappear_time >= UTC_TIMESTAMP()";
-$result 	= $mysqli->query($req);
-$data 		= $result->fetch_object();
+$req = "SELECT COUNT(*) as total FROM pokemon WHERE disappear_time >= UTC_TIMESTAMP()";
+$result = $mysqli->query($req);
+$data = $result->fetch_object();
 
-$pokemon_stats['pokemon_now'] 	= $data->total;
+$pokemon_stats['pokemon_now'] = $data->total;
 
-$req 		= "SELECT pokemon_id FROM pokemon WHERE disappear_time >= UTC_TIMESTAMP()";
-$result 	= $mysqli->query($req);
+$req = "SELECT pokemon_id FROM pokemon WHERE disappear_time >= UTC_TIMESTAMP()";
+$result = $mysqli->query($req);
 
 $rarityarray = array();
 while ($data = $result->fetch_object()) {
-	$poke_id 	= $data->pokemon_id;
-	$rarity 	= $pokemons->pokemon->$poke_id->rarity;
+	$poke_id = $data->pokemon_id;
+	$rarity = $pokemons->pokemon->$poke_id->rarity;
 	
 	isset($rarityarray[$rarity]) ? $rarityarray[$rarity]++ : $rarityarray[$rarity] = 1;
 }
@@ -39,7 +39,7 @@ 
 
 // Add the datas in file
 
-$pokedatas[] 	= $pokemon_stats;
-$json 		= json_encode($pokedatas);
+$pokedatas[] = $pokemon_stats;
+$json = json_encode($pokedatas);
 
 file_put_contents($pokemonstats_file, $json);

core/cron/pokestop.cron.php

Spacing +8 added lines, -8 removed lines

@@ -9,15 +9,15 @@ 
 
 $pokestop['timestamp'] = $timestamp;
 
-$req 		= "SELECT COUNT(*) as total FROM pokestop";
-$result 	= $mysqli->query($req);
-$data 		= $result->fetch_object();
+$req = "SELECT COUNT(*) as total FROM pokestop";
+$result = $mysqli->query($req);
+$data = $result->fetch_object();
 
 $pokestop['total'] = $data->total;
 
-$req 		= "SELECT COUNT(*) as total FROM pokestop WHERE lure_expiration >= UTC_TIMESTAMP()";
-$result 	= $mysqli->query($req);
-$data 		= $result->fetch_object();
+$req = "SELECT COUNT(*) as total FROM pokestop WHERE lure_expiration >= UTC_TIMESTAMP()";
+$result = $mysqli->query($req);
+$data = $result->fetch_object();
 
 $pokestop['lured'] = $data->total;
 
@@ -25,7 +25,7 @@ 
 
 // Add the datas in file
 
-$stopdatas[] 	= $pokestop;
-$json 		= json_encode($stopdatas);
+$stopdatas[] = $pokestop;
+$json = json_encode($stopdatas);
 
 file_put_contents($pokestop_file, $json);

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));
 
 
 # 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/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>";

core/cron/captcha.cron.php

Spacing +23 added lines, -23 removed lines

@@ -5,45 +5,45 @@ 
 // Total lured
 // -----------------------------------------------------------------------------------------------------------
 
-$captcha_file	= SYS_PATH.'/core/json/captcha.stats.json';
+$captcha_file = SYS_PATH.'/core/json/captcha.stats.json';
 if (is_file($captcha_file)) {
-	$capdatas	= json_decode(file_get_contents($captcha_file), true);
+	$capdatas = json_decode(file_get_contents($captcha_file), true);
 }
 
 
 $variables_secret = SYS_PATH.'/core/json/variables.secret.json';
 $config_secret = json_decode(file_get_contents($variables_secret));
 
-if ($config_secret->captcha_key=="") {
+if ($config_secret->captcha_key == "") {
 	$captcha['timestamp'] = $timestamp;
 	// get amount of accounts requiring a captcha
 	$req = "SELECT COUNT(*) as total "
 			. "FROM workerstatus WHERE `captcha` > '0' "
 			. "AND last_modified >= UTC_TIMESTAMP() - INTERVAL 60 SECOND";
-	$result 	= $mysqli->query($req);
-	$data 		= $result->fetch_object();
+	$result = $mysqli->query($req);
+	$data = $result->fetch_object();
 	$captcha['captcha_accs'] = $data->total;
 	// Add the datas in file
-	$capdatas[] 	= $captcha;
+	$capdatas[] = $captcha;
 } else {
 	if (!empty($capdatas)) {
 		$lastCaptcha = array_pop($capdatas);
 	} else {
-		$lastCaptcha["timestamp"]=strtotime("-7 days", strtotime(date("Y-m-d")));
+		$lastCaptcha["timestamp"] = strtotime("-7 days", strtotime(date("Y-m-d")));
 	}
 	$lastCaptchaDate = date("Y-m-d", $lastCaptcha["timestamp"]);
 	$startTime = strtotime($lastCaptchaDate);
-	$endTime = strtotime(date("Y-m-d"))+date("Z");
+	$endTime = strtotime(date("Y-m-d")) + date("Z");
 	$timeDiff = abs($endTime - $startTime);
-	$numberDays = intval($timeDiff/86400) ;  // 86400 seconds in one day
-	if ($numberDays>7) {
-		$numberDays=7;
+	$numberDays = intval($timeDiff / 86400); // 86400 seconds in one day
+	if ($numberDays > 7) {
+		$numberDays = 7;
 	}
-	while ($numberDays>=0) {
-		$day = $endTime-($numberDays*86400);
+	while ($numberDays >= 0) {
+		$day = $endTime - ($numberDays * 86400);
 		$captchaUrl =
-				"http://2captcha.com/res.php?key=" .
-				$config_secret->captcha_key . "&action=getstats&date=" . date("Y-m-d", $day);
+				"http://2captcha.com/res.php?key=".
+				$config_secret->captcha_key."&action=getstats&date=".date("Y-m-d", $day);
 
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_URL, $captchaUrl);
@@ -65,18 +65,18 @@ 
 		$capXml = simplexml_load_string($fileContents);
 
 		foreach ($capXml as $key => $value) {
-			if (	($numberDays==0
-				&& ((int)$value->Attributes()->hour >= (int)date("H", $lastCaptcha["timestamp"])
-				&& ((int)$value->Attributes()->hour <= (int)date("H")))
-				) || $numberDays>0) {
+			if (($numberDays == 0
+				&& ((int) $value->Attributes()->hour >= (int) date("H", $lastCaptcha["timestamp"])
+				&& ((int) $value->Attributes()->hour <= (int) date("H")))
+				) || $numberDays > 0) {
 				$captcha['timestamp'] =
-						strtotime(date("Y-m-d", $day) . " " . $value->Attributes()->hour . ":00")+date("Z");
-				$captcha['captcha_accs'] = (string)$value->volume;
-				$capdatas[] 	= $captcha;
+						strtotime(date("Y-m-d", $day)." ".$value->Attributes()->hour.":00") + date("Z");
+				$captcha['captcha_accs'] = (string) $value->volume;
+				$capdatas[] = $captcha;
 			}
 		}
 		--$numberDays;
 	}
 }
-$json 		= json_encode($capdatas);
+$json = json_encode($capdatas);
 file_put_contents($captcha_file, $json);