brusselopole / Worldopole

functions.php

Braces +20 added lines, -10 removed lines

@@ -177,7 +177,8 @@ 
 //
 // Retruns max depth of array
 ########################################################################
-function get_depth($arr) {
+function get_depth($arr)
+{
 	$it = new RecursiveIteratorIterator(new RecursiveArrayIterator($arr));
 	$depth = 0;
 	foreach ($it as $v) {
@@ -195,12 +196,16 @@ 
 //
 // Return all pokemon with data at a certain tree 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 tree_remove_bellow($trees, $max_pokemon);
-	} 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;
 			$results = tree_remove_bellow(get_tree_at_depth($tree, $depth, $max_pokemon, $currentDepth + 1), $max_pokemon);
 			$arr = tree_check_array($results, $arr, $depth - $currentDepth == 1);
@@ -212,12 +217,16 @@ 
 ########################################################################
 // used in get_tree_at_depth
 ########################################################################
-function tree_check_array($array_check, $array_add, $correct_arrow) {
+function tree_check_array($array_check, $array_add, $correct_arrow)
+{
 	$count = count($array_check);
 	$i = 0;
-	if (!is_null($array_check)) { // check if exists
-		foreach ($array_check as $res) { // Check if above, equal or bellow center
-			if ($count != 1 && $correct_arrow) { // only add arrow once
+	if (!is_null($array_check)) {
+// check if exists
+		foreach ($array_check as $res) {
+// Check if above, equal or bellow center
+			if ($count != 1 && $correct_arrow) {
+// only add arrow once
 				$num = $i / ($count - 1);
 				if ($num < 0.5) {
 					$res->array_sufix = "_up";
@@ -241,7 +250,8 @@ 
 		return null;
 	}
 	$arr = array();
-	foreach ($tree as $item) { // Check if above, equal or bellow center
+	foreach ($tree as $item) {
+// Check if above, equal or bellow center
 		if ($item->id <= $max_pokemon) {
 			$arr[] = $item;
 		}

pages/pokemon.page.php

Braces +1 added lines, -2 removed lines

@@ -323,8 +323,7 @@
 									} elseif (isset($obj->info)) {
 										$infoName = 'INFO_' . $obj->info;
 										echo '<br>(' . $locales->$infoName . ')';
-									}
-									else {
+									} else {
 										echo '<br> </br>';
 									}
 									?>

Indentation +5 added lines, -5 removed lines

@@ -316,11 +316,11 @@
 								<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->candies)) {
+										echo $obj->candies . ' ' . $locales->POKEMON_CANDIES;
+									} else {
+										echo '? ' . $locales->POKEMON_CANDIES;
+									}
 
 									if (isset($obj->item)) {
 										$itemName = 'ITEM_' . $obj->item;

Spacing +6 added lines, -6 removed lines

@@ -317,17 +317,17 @@
 								<p class="pkmn-name">
 									<?php
                                     if (isset($obj->candies)) {
-                                        echo $obj->candies . ' ' . $locales->POKEMON_CANDIES;
+                                        echo $obj->candies.' '.$locales->POKEMON_CANDIES;
                                     } else {
-                                        echo '? ' . $locales->POKEMON_CANDIES;
+                                        echo '? '.$locales->POKEMON_CANDIES;
                                     }
 
 									if (isset($obj->item)) {
-										$itemName = 'ITEM_' . $obj->item;
-										echo '<br>+ ' . $locales->$itemName;
+										$itemName = 'ITEM_'.$obj->item;
+										echo '<br>+ '.$locales->$itemName;
 									} elseif (isset($obj->info)) {
-										$infoName = 'INFO_' . $obj->info;
-										echo '<br>(' . $locales->$infoName . ')';
+										$infoName = 'INFO_'.$obj->info;
+										echo '<br>('.$locales->$infoName.')';
 									}
 									else {
 										echo '<br> </br>';

core/cron/pokemon.cron.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 $rarityarray = array();
 foreach ($counts as $poke_id => $total) {
 	$rarity = $pokemons->pokemon->$poke_id->rarity;
-	isset($rarityarray[$rarity]) ? $rarityarray[$rarity]+=$total : $rarityarray[$rarity]=$total;
+	isset($rarityarray[$rarity]) ? $rarityarray[$rarity] += $total : $rarityarray[$rarity] = $total;
 }
 
 // Set amount of Pokemon for each rarity to 0 if there weren't any at that time

core/js/trainer.graph.js.php

Indentation +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 $trainer_lvl = [];
 # For all 3 teams
 for ($teamid = 1; $teamid <= 3; $teamid++) {
-    $data = $manager->getTrainerLevelCount($teamid);
+	$data = $manager->getTrainerLevelCount($teamid);
 	$trainer_lvl[$teamid] = $data;
 }
 

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 // Load Query Manager
 // ###################
 
-include_once __DIR__ . '/../process/queries/QueryManager.php';
+include_once __DIR__.'/../process/queries/QueryManager.php';
 $manager = QueryManager::current();
 
 # Chart Graph datas	 

core/process/data.loader.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 // Load Query Manager
 // ###################
 
-include_once __DIR__ . '/queries/QueryManager.php';
+include_once __DIR__.'/queries/QueryManager.php';
 $manager = QueryManager::current();
 
 
@@ -268,7 +268,7 @@ 
 
 
 				// Gym owned and average points
-				$data	= $manager->getOwnedAndPoints($team_values->id);
+				$data = $manager->getOwnedAndPoints($team_values->id);
 
 				$teams->$team_key->gym_owned = $data->total;
 				$teams->$team_key->average = $data->average_points;

install/tester.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 // Load Query Manager
 // ###################
 
-include_once __DIR__ . '/../core/process/queries/QueryManager.php';
+include_once __DIR__.'/../core/process/queries/QueryManager.php';
 
 
 ########################################################################

core/process/queries/QueryManagerPostgresql.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/QueryManagerPostgresqlMonocleAlternate.php';
+include_once __DIR__.'/QueryManagerPostgresqlMonocleAlternate.php';
 
 
 abstract class QueryManagerPostgresql extends QueryManager {
@@ -12,7 +12,7 @@ 
 		$this->db = pg_connect("host=".SYS_DB_HOST." port=".SYS_DB_PORT." dbname=".SYS_DB_NAME." user=".SYS_DB_USER." password=".SYS_DB_PSWD);
 
 		if ($this->db === false) {
-			header('Location:' . HOST_URL . 'offline.html');
+			header('Location:'.HOST_URL.'offline.html');
 			exit();
 		}
 	}

Braces +8 added lines, -4 removed lines

@@ -3,11 +3,13 @@ 
 include_once __DIR__ . '/QueryManagerPostgresqlMonocleAlternate.php';
 
 
-abstract class QueryManagerPostgresql extends QueryManager {
+abstract class QueryManagerPostgresql extends QueryManager
+{
 
 	protected $db;
 
-	protected function __construct() {
+	protected function __construct()
+	{
 
 		$this->db = pg_connect("host=".SYS_DB_HOST." port=".SYS_DB_PORT." dbname=".SYS_DB_NAME." user=".SYS_DB_USER." password=".SYS_DB_PSWD);
 
@@ -17,7 +19,8 @@ 
 		}
 	}
 
-	public function __destruct() {
+	public function __destruct()
+	{
 		pg_close($this->db);
 	}
 
@@ -25,7 +28,8 @@ 
 	// Misc
 	/////////
 
-	public function getEcapedString($string) {
+	public function getEcapedString($string)
+	{
 		return pg_escape_string($this->db, $string);
 	}
 

core/process/queries/QueryManagerMysql.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 
-include_once __DIR__ . '/QueryManagerMysqlRocketmap.php';
-include_once __DIR__ . '/QueryManagerMysqlMonocleAlternate.php';
+include_once __DIR__.'/QueryManagerMysqlRocketmap.php';
+include_once __DIR__.'/QueryManagerMysqlMonocleAlternate.php';
 
 
 abstract class QueryManagerMysql extends QueryManager {

Braces +8 added lines, -4 removed lines

@@ -4,11 +4,13 @@ 
 include_once __DIR__ . '/QueryManagerMysqlMonocleAlternate.php';
 
 
-abstract class QueryManagerMysql extends QueryManager {
+abstract class QueryManagerMysql extends QueryManager
+{
 
 	protected $mysqli;
 
-	protected function __construct() {
+	protected function __construct()
+	{
 		$this->mysqli = new mysqli(SYS_DB_HOST, SYS_DB_USER, SYS_DB_PSWD, SYS_DB_NAME, SYS_DB_PORT);
 		if ($this->mysqli->connect_error != '') {
 			header('Location:'.HOST_URL.'offline.html');
@@ -22,7 +24,8 @@ 
 		}
 	}
 
-	public function __destruct() {
+	public function __destruct()
+	{
 		$this->mysqli->close();
 	}
 
@@ -30,7 +33,8 @@ 
 	// Misc
 	/////////
 
-	public function getEcapedString($string) {
+	public function getEcapedString($string)
+	{
 		return mysqli_real_escape_string($this->mysqli, $string);
 	}
 

core/process/queries/QueryManager.php

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-include_once __DIR__ . '/../../../config.php';
-include_once __DIR__ . '/QueryManagerMysql.php';
-include_once __DIR__ . '/QueryManagerPostgresql.php';
+include_once __DIR__.'/../../../config.php';
+include_once __DIR__.'/QueryManagerMysql.php';
+include_once __DIR__.'/QueryManagerPostgresql.php';
 
 abstract class QueryManager {
 
@@ -15,7 +15,7 @@ 
 
 		if (self::$current == null) {
 
-			$variables = realpath(dirname(__FILE__)) . '/../../json/variables.json';
+			$variables = realpath(dirname(__FILE__)).'/../../json/variables.json';
 			self::$config = json_decode(file_get_contents($variables));
 
 			include_once(SYS_PATH.'/core/process/timezone.loader.php');
@@ -37,7 +37,7 @@ 
 		}
 		return self::$current;
 	}
-	private function __construct(){}
+	private function __construct() {}
 
 	// Misc
 	abstract public function getEcapedString($string);

Braces +7 added lines, -3 removed lines

@@ -4,13 +4,15 @@ 
 include_once __DIR__ . '/QueryManagerMysql.php';
 include_once __DIR__ . '/QueryManagerPostgresql.php';
 
-abstract class QueryManager {
+abstract class QueryManager
+{
 
 	protected static $time_offset;
 	protected static $config;
 
 	private static $current;
-	public static function current() {
+	public static function current()
+	{
 		global $time_offset;
 
 		if (self::$current == null) {
@@ -37,7 +39,9 @@ 
 		}
 		return self::$current;
 	}
-	private function __construct(){}
+	private function __construct()
+	{
+}
 
 	// Misc
 	abstract public function getEcapedString($string);