Failed Conditions
Pull Request — master (#353)
by Florian
02:56
created
pages/pokemon.page.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -317,17 +317,17 @@
 block discarded – undo
317 317
 								<p class="pkmn-name">
318 318
 									<?php
319 319
                                     if (isset($obj->candies)) {
320
-                                        echo $obj->candies . ' ' . $locales->POKEMON_CANDIES;
320
+                                        echo $obj->candies.' '.$locales->POKEMON_CANDIES;
321 321
                                     } else {
322
-                                        echo '? ' . $locales->POKEMON_CANDIES;
322
+                                        echo '? '.$locales->POKEMON_CANDIES;
323 323
                                     }
324 324
 
325 325
 									if (isset($obj->item)) {
326
-										$itemName = 'ITEM_' . $obj->item;
327
-										echo '<br>+ ' . $locales->$itemName;
326
+										$itemName = 'ITEM_'.$obj->item;
327
+										echo '<br>+ '.$locales->$itemName;
328 328
 									} elseif (isset($obj->info)) {
329
-										$infoName = 'INFO_' . $obj->info;
330
-										echo '<br>(' . $locales->$infoName . ')';
329
+										$infoName = 'INFO_'.$obj->info;
330
+										echo '<br>('.$locales->$infoName.')';
331 331
 									}
332 332
 									else {
333 333
 										echo '<br> </br>';
Please login to merge, or discard this patch.
core/cron/pokemon.cron.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 $rarityarray = array();
23 23
 foreach ($counts as $poke_id => $total) {
24 24
 	$rarity = $pokemons->pokemon->$poke_id->rarity;
25
-	isset($rarityarray[$rarity]) ? $rarityarray[$rarity]+=$total : $rarityarray[$rarity]=$total;
25
+	isset($rarityarray[$rarity]) ? $rarityarray[$rarity] += $total : $rarityarray[$rarity] = $total;
26 26
 }
27 27
 
28 28
 // Set amount of Pokemon for each rarity to 0 if there weren't any at that time
Please login to merge, or discard this patch.
core/js/trainer.graph.js.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 // Load Query Manager
21 21
 // ###################
22 22
 
23
-include_once __DIR__ . '/../process/queries/QueryManager.php';
23
+include_once __DIR__.'/../process/queries/QueryManager.php';
24 24
 $manager = QueryManager::current();
25 25
 
26 26
 # Chart Graph datas	 
Please login to merge, or discard this patch.
core/process/data.loader.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 // Load Query Manager
70 70
 // ###################
71 71
 
72
-include_once __DIR__ . '/queries/QueryManager.php';
72
+include_once __DIR__.'/queries/QueryManager.php';
73 73
 $manager = QueryManager::current();
74 74
 
75 75
 
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 
269 269
 
270 270
 				// Gym owned and average points
271
-				$data	= $manager->getOwnedAndPoints($team_values->id);
271
+				$data = $manager->getOwnedAndPoints($team_values->id);
272 272
 
273 273
 				$teams->$team_key->gym_owned = $data->total;
274 274
 				$teams->$team_key->average = $data->average_points;
Please login to merge, or discard this patch.
install/tester.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 // Load Query Manager
4 4
 // ###################
5 5
 
6
-include_once __DIR__ . '/../core/process/queries/QueryManager.php';
6
+include_once __DIR__.'/../core/process/queries/QueryManager.php';
7 7
 
8 8
 
9 9
 ########################################################################
Please login to merge, or discard this patch.
core/process/queries/QueryManagerPostgresql.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-include_once __DIR__ . '/QueryManagerPostgresqlMonocleAlternate.php';
3
+include_once __DIR__.'/QueryManagerPostgresqlMonocleAlternate.php';
4 4
 
5 5
 
6 6
 abstract class QueryManagerPostgresql extends QueryManager {
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 		$this->db = pg_connect("host=".SYS_DB_HOST." port=".SYS_DB_PORT." dbname=".SYS_DB_NAME." user=".SYS_DB_USER." password=".SYS_DB_PSWD);
13 13
 
14 14
 		if ($this->db === false) {
15
-			header('Location:' . HOST_URL . 'offline.html');
15
+			header('Location:'.HOST_URL.'offline.html');
16 16
 			exit();
17 17
 		}
18 18
 	}
Please login to merge, or discard this patch.
core/process/queries/QueryManagerMysql.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-include_once __DIR__ . '/QueryManagerMysqlRocketmap.php';
4
-include_once __DIR__ . '/QueryManagerMysqlMonocleAlternate.php';
3
+include_once __DIR__.'/QueryManagerMysqlRocketmap.php';
4
+include_once __DIR__.'/QueryManagerMysqlMonocleAlternate.php';
5 5
 
6 6
 
7 7
 abstract class QueryManagerMysql extends QueryManager {
Please login to merge, or discard this patch.
core/process/queries/QueryManager.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-include_once __DIR__ . '/../../../config.php';
4
-include_once __DIR__ . '/QueryManagerMysql.php';
5
-include_once __DIR__ . '/QueryManagerPostgresql.php';
3
+include_once __DIR__.'/../../../config.php';
4
+include_once __DIR__.'/QueryManagerMysql.php';
5
+include_once __DIR__.'/QueryManagerPostgresql.php';
6 6
 
7 7
 abstract class QueryManager {
8 8
 
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 
16 16
 		if (self::$current == null) {
17 17
 
18
-			$variables = realpath(dirname(__FILE__)) . '/../../json/variables.json';
18
+			$variables = realpath(dirname(__FILE__)).'/../../json/variables.json';
19 19
 			self::$config = json_decode(file_get_contents($variables));
20 20
 
21 21
 			include_once(SYS_PATH.'/core/process/timezone.loader.php');
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 		}
38 38
 		return self::$current;
39 39
 	}
40
-	private function __construct(){}
40
+	private function __construct() {}
41 41
 
42 42
 	// Misc
43 43
 	abstract public function getEcapedString($string);
Please login to merge, or discard this patch.
core/cron/nests.cron.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,8 @@
 block discarded – undo
17 17
 	$nests['lng'] = $data->longitude;
18 18
 	$starttime = $data->latest_seen - $data->duration;
19 19
 
20
-	$nests['st'] = date("i",$starttime);
21
-	$nests['et'] = date("i",$data->latest_seen);
20
+	$nests['st'] = date("i", $starttime);
21
+	$nests['et'] = date("i", $data->latest_seen);
22 22
 
23 23
 	// Add the data to array
24 24
 	$nestsdatas[] = $nests;
Please login to merge, or discard this patch.