@@ -317,17 +317,17 @@ |
||
| 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>'; |
@@ -22,7 +22,7 @@ |
||
| 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 |
@@ -20,7 +20,7 @@ |
||
| 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 |
@@ -69,7 +69,7 @@ discard block |
||
| 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 |
||
| 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; |
@@ -3,7 +3,7 @@ |
||
| 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 | ######################################################################## |
@@ -1,6 +1,6 @@ discard block |
||
| 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 |
||
| 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 | } |
@@ -1,7 +1,7 @@ |
||
| 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 { |
@@ -1,8 +1,8 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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); |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | // Load Query Manager |
| 41 | 41 | // ################### |
| 42 | 42 | |
| 43 | -include_once __DIR__ . '/queries/QueryManager.php'; |
|
| 43 | +include_once __DIR__.'/queries/QueryManager.php'; |
|
| 44 | 44 | $manager = QueryManager::current(); |
| 45 | 45 | |
| 46 | 46 | $request = ""; |
@@ -161,10 +161,10 @@ discard block |
||
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | $html = ' |
| 164 | - <div class="col-md-1 col-xs-4 pokemon-single" data-pokeid="' . $pokeid . '" data-pokeuid="' . $pokeuid . '" style="display: none;"> |
|
| 165 | - <a href="pokemon/' . $pokeid . '"><img src="' . $pokemons->pokemon->$pokeid->img . '" alt="' . $pokemons->pokemon->$pokeid->name . '" class="img-responsive"></a> |
|
| 166 | - <a href="pokemon/' . $pokeid . '"><p class="pkmn-name">' . $pokemons->pokemon->$pokeid->name . '</p></a> |
|
| 167 | - <a href="' . $location_link . '" target="_blank"> |
|
| 164 | + <div class="col-md-1 col-xs-4 pokemon-single" data-pokeid="' . $pokeid.'" data-pokeuid="'.$pokeuid.'" style="display: none;"> |
|
| 165 | + <a href="pokemon/' . $pokeid.'"><img src="'.$pokemons->pokemon->$pokeid->img.'" alt="'.$pokemons->pokemon->$pokeid->name.'" class="img-responsive"></a> |
|
| 166 | + <a href="pokemon/' . $pokeid.'"><p class="pkmn-name">'.$pokemons->pokemon->$pokeid->name.'</p></a> |
|
| 167 | + <a href="' . $location_link.'" target="_blank"> |
|
| 168 | 168 | <small class="pokemon-timer">00:00:00</small> |
| 169 | 169 | </a>'; |
| 170 | 170 | if ($config->system->recents_encounter_details) { |
@@ -172,50 +172,50 @@ discard block |
||
| 172 | 172 | if ($config->system->iv_numbers) { |
| 173 | 173 | $html .= ' |
| 174 | 174 | <div class="progress" style="height: 15px; margin-bottom: 0"> |
| 175 | - <div title="' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $encdetails->attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px"> |
|
| 176 | - <span class="sr-only">' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '</span>' . $encdetails->attack . ' |
|
| 175 | + <div title="' . $locales->IV_ATTACK.': '.$encdetails->attack.'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$encdetails->attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px"> |
|
| 176 | + <span class="sr-only">' . $locales->IV_ATTACK.': '.$encdetails->attack.'</span>'.$encdetails->attack.' |
|
| 177 | 177 | </div> |
| 178 | - <div title="' . $locales->IV_DEFENSE . ': ' . $encdetails->defense . '" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="' . $encdetails->defense . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px"> |
|
| 179 | - <span class="sr-only">' . $locales->IV_DEFENSE . ': ' . $encdetails->defense . '</span>' . $encdetails->defense . ' |
|
| 178 | + <div title="' . $locales->IV_DEFENSE.': '.$encdetails->defense.'" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$encdetails->defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px"> |
|
| 179 | + <span class="sr-only">' . $locales->IV_DEFENSE.': '.$encdetails->defense.'</span>'.$encdetails->defense.' |
|
| 180 | 180 | </div> |
| 181 | - <div title="' . $locales->IV_STAMINA . ': ' . $encdetails->stamina . '" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="' . $encdetails->stamina . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px"> |
|
| 182 | - <span class="sr-only">' . $locales->IV_STAMINA . ': ' . $encdetails->stamina . '</span>' . $encdetails->stamina . ' |
|
| 181 | + <div title="' . $locales->IV_STAMINA.': '.$encdetails->stamina.'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$encdetails->stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px"> |
|
| 182 | + <span class="sr-only">' . $locales->IV_STAMINA.': '.$encdetails->stamina.'</span>'.$encdetails->stamina.' |
|
| 183 | 183 | </div> |
| 184 | 184 | </div>'; |
| 185 | 185 | } else { |
| 186 | 186 | $html .= ' |
| 187 | 187 | <div class="progress" style="height: 6px; width: 80%; margin: 5px auto 0 auto"> |
| 188 | - <div title="' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $encdetails->attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $encdetails->attack) / 3) . '%"> |
|
| 189 | - <span class="sr-only">' . $locales->IV_ATTACK . ': ' . $encdetails->attack . '</span> |
|
| 188 | + <div title="' . $locales->IV_ATTACK.': '.$encdetails->attack.'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$encdetails->attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $encdetails->attack) / 3).'%"> |
|
| 189 | + <span class="sr-only">' . $locales->IV_ATTACK.': '.$encdetails->attack.'</span> |
|
| 190 | 190 | </div> |
| 191 | - <div title="' . $locales->IV_DEFENSE . ': ' . $encdetails->defense . '" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="' . $encdetails->defense . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $encdetails->defense) / 3) . '%"> |
|
| 192 | - <span class="sr-only">' . $locales->IV_DEFENSE . ': ' . $encdetails->defense . '</span> |
|
| 191 | + <div title="' . $locales->IV_DEFENSE.': '.$encdetails->defense.'" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$encdetails->defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $encdetails->defense) / 3).'%"> |
|
| 192 | + <span class="sr-only">' . $locales->IV_DEFENSE.': '.$encdetails->defense.'</span> |
|
| 193 | 193 | </div> |
| 194 | - <div title="' . $locales->IV_STAMINA . ': ' . $encdetails->stamina . '" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="' . $encdetails->stamina . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $encdetails->stamina) / 3) . '%"> |
|
| 195 | - <span class="sr-only">' . $locales->IV_STAMINA . ': ' . $encdetails->stamina . '</span> |
|
| 194 | + <div title="' . $locales->IV_STAMINA.': '.$encdetails->stamina.'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$encdetails->stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $encdetails->stamina) / 3).'%"> |
|
| 195 | + <span class="sr-only">' . $locales->IV_STAMINA.': '.$encdetails->stamina.'</span> |
|
| 196 | 196 | </div> |
| 197 | 197 | </div>'; |
| 198 | 198 | } |
| 199 | - $html .= '<small>' . $encdetails->cp . '</small>'; |
|
| 199 | + $html .= '<small>'.$encdetails->cp.'</small>'; |
|
| 200 | 200 | } else { |
| 201 | 201 | if ($config->system->iv_numbers) { |
| 202 | 202 | $html .= ' |
| 203 | 203 | <div class="progress" style="height: 15px; margin-bottom: 0"> |
| 204 | - <div title="' . $locales->IV_ATTACK . ': not available" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $encdetails->attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px"> |
|
| 205 | - <span class="sr-only">' . $locales->IV_ATTACK . ': ' . $locales->NOT_AVAILABLE . '</span>? |
|
| 204 | + <div title="' . $locales->IV_ATTACK.': not available" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$encdetails->attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px"> |
|
| 205 | + <span class="sr-only">' . $locales->IV_ATTACK.': '.$locales->NOT_AVAILABLE.'</span>? |
|
| 206 | 206 | </div> |
| 207 | - <div title="' . $locales->IV_DEFENSE . ': not available" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="' . $encdetails->defense . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px"> |
|
| 208 | - <span class="sr-only">' . $locales->IV_DEFENSE . ': ' . $locales->NOT_AVAILABLE . '</span>? |
|
| 207 | + <div title="' . $locales->IV_DEFENSE.': not available" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$encdetails->defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px"> |
|
| 208 | + <span class="sr-only">' . $locales->IV_DEFENSE.': '.$locales->NOT_AVAILABLE.'</span>? |
|
| 209 | 209 | </div> |
| 210 | - <div title="' . $locales->IV_STAMINA . ': not available" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="' . $encdetails->stamina . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 16px"> |
|
| 211 | - <span class="sr-only">' . $locales->IV_STAMINA . ': ' . $locales->NOT_AVAILABLE . '</span>? |
|
| 210 | + <div title="' . $locales->IV_STAMINA.': not available" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$encdetails->stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px"> |
|
| 211 | + <span class="sr-only">' . $locales->IV_STAMINA.': '.$locales->NOT_AVAILABLE.'</span>? |
|
| 212 | 212 | </div> |
| 213 | 213 | </div>'; |
| 214 | 214 | } else { |
| 215 | 215 | $html .= ' |
| 216 | 216 | <div class="progress" style="height: 6px; width: 80%; margin: 5px auto 0 auto"> |
| 217 | 217 | <div title="IV not available" class="progress-bar" role="progressbar" style="width: 100%; background-color: rgb(210,210,210)" aria-valuenow="1" aria-valuemin="0" aria-valuemax="1"> |
| 218 | - <span class="sr-only">IV ' . $locales->NOT_AVAILABLE . '</span> |
|
| 218 | + <span class="sr-only">IV ' . $locales->NOT_AVAILABLE.'</span> |
|
| 219 | 219 | </div> |
| 220 | 220 | </div>'; |
| 221 | 221 | } |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | |
| 292 | 292 | foreach ($teams as $team_name => $team_id) { |
| 293 | 293 | |
| 294 | - $data = $manager->getOwnedAndPoints($team_id); |
|
| 294 | + $data = $manager->getOwnedAndPoints($team_id); |
|
| 295 | 295 | |
| 296 | 296 | $return[] = $data->total; |
| 297 | 297 | $return[] = $data->average_points; |
@@ -414,38 +414,38 @@ discard block |
||
| 414 | 414 | if ($config->system->iv_numbers) { |
| 415 | 415 | $gymData['infoWindow'] .= ' |
| 416 | 416 | <div style="text-align: center; width: 50px; display: inline-block; margin-right: 3px"> |
| 417 | - <a href="pokemon/' . $data->pokemon_id . '"> |
|
| 418 | - <img src="' . $pokemons->pokemon->$pokemon_id->img . '" height="50" style="display:inline-block" > |
|
| 417 | + <a href="pokemon/' . $data->pokemon_id.'"> |
|
| 418 | + <img src="' . $pokemons->pokemon->$pokemon_id->img.'" height="50" style="display:inline-block" > |
|
| 419 | 419 | </a> |
| 420 | - <p class="pkmn-name">' . $data->cp . '</p> |
|
| 420 | + <p class="pkmn-name">' . $data->cp.'</p> |
|
| 421 | 421 | <div class="progress" style="height: 12px; margin-bottom: 0"> |
| 422 | - <div title="' . $locales->IV_ATTACK . ': ' . $data->iv_attack . '" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $data->iv_attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 13px; font-size: 11px"> |
|
| 423 | - <span class="sr-only">' . $locales->IV_ATTACK . ' : ' . $data->iv_attack . '</span>' . $data->iv_attack . ' |
|
| 422 | + <div title="' . $locales->IV_ATTACK.': '.$data->iv_attack.'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$data->iv_attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 13px; font-size: 11px"> |
|
| 423 | + <span class="sr-only">' . $locales->IV_ATTACK.' : '.$data->iv_attack.'</span>'.$data->iv_attack.' |
|
| 424 | 424 | </div> |
| 425 | - <div title="' . $locales->IV_DEFENSE . ': ' . $data->iv_defense . '" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="' . $data->iv_defense . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 13px; font-size: 11px"> |
|
| 426 | - <span class="sr-only">' . $locales->IV_DEFENSE . ' : ' . $data->iv_defense . '</span>' . $data->iv_defense . ' |
|
| 425 | + <div title="' . $locales->IV_DEFENSE.': '.$data->iv_defense.'" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$data->iv_defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 13px; font-size: 11px"> |
|
| 426 | + <span class="sr-only">' . $locales->IV_DEFENSE.' : '.$data->iv_defense.'</span>'.$data->iv_defense.' |
|
| 427 | 427 | </div> |
| 428 | - <div title="' . $locales->IV_STAMINA . ': ' . $data->iv_stamina . '" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="' . $data->iv_stamina . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (100 / 3) . '%; line-height: 13px; font-size: 11px"> |
|
| 429 | - <span class="sr-only">' . $locales->IV_STAMINA . ' : ' . $data->iv_stamina . '</span>' . $data->iv_stamina . ' |
|
| 428 | + <div title="' . $locales->IV_STAMINA.': '.$data->iv_stamina.'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$data->iv_stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 13px; font-size: 11px"> |
|
| 429 | + <span class="sr-only">' . $locales->IV_STAMINA.' : '.$data->iv_stamina.'</span>'.$data->iv_stamina.' |
|
| 430 | 430 | </div> |
| 431 | 431 | </div> |
| 432 | 432 | </div>'; |
| 433 | 433 | } else { |
| 434 | 434 | $gymData['infoWindow'] .= ' |
| 435 | 435 | <div style="text-align: center; width: 50px; display: inline-block; margin-right: 3px"> |
| 436 | - <a href="pokemon/' . $data->pokemon_id . '"> |
|
| 437 | - <img src="' . $pokemons->pokemon->$pokemon_id->img . '" height="50" style="display:inline-block" > |
|
| 436 | + <a href="pokemon/' . $data->pokemon_id.'"> |
|
| 437 | + <img src="' . $pokemons->pokemon->$pokemon_id->img.'" height="50" style="display:inline-block" > |
|
| 438 | 438 | </a> |
| 439 | - <p class="pkmn-name">' . $data->cp . '</p> |
|
| 439 | + <p class="pkmn-name">' . $data->cp.'</p> |
|
| 440 | 440 | <div class="progress" style="height: 4px; width: 40px; margin-bottom: 10px; margin-top: 2px; margin-left: auto; margin-right: auto"> |
| 441 | - <div title="' . $locales->IV_ATTACK . ': ' . $data->iv_attack . '" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="' . $data->iv_attack . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $data->iv_attack) / 3) . '%"> |
|
| 442 | - <span class="sr-only">' . $locales->IV_ATTACK . ': ' . $data->iv_attack . '</span> |
|
| 441 | + <div title="' . $locales->IV_ATTACK.': '.$data->iv_attack.'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$data->iv_attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $data->iv_attack) / 3).'%"> |
|
| 442 | + <span class="sr-only">' . $locales->IV_ATTACK.': '.$data->iv_attack.'</span> |
|
| 443 | 443 | </div> |
| 444 | - <div title="' . $locales->IV_DEFENSE . ': ' . $data->iv_defense . '" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="' . $data->iv_defense . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $data->iv_defense) / 3) . '%"> |
|
| 445 | - <span class="sr-only">' . $locales->IV_DEFENSE . ': ' . $data->iv_defense . '</span> |
|
| 444 | + <div title="' . $locales->IV_DEFENSE.': '.$data->iv_defense.'" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$data->iv_defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $data->iv_defense) / 3).'%"> |
|
| 445 | + <span class="sr-only">' . $locales->IV_DEFENSE.': '.$data->iv_defense.'</span> |
|
| 446 | 446 | </div> |
| 447 | - <div title="' . $locales->IV_STAMINA . ': ' . $data->iv_stamina . '" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="' . $data->iv_stamina . '" aria-valuemin="0" aria-valuemax="45" style="width: ' . (((100 / 15) * $data->iv_stamina) / 3) . '%"> |
|
| 448 | - <span class="sr-only">' . $locales->IV_STAMINA . ': ' . $data->iv_stamina . '</span> |
|
| 447 | + <div title="' . $locales->IV_STAMINA.': '.$data->iv_stamina.'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$data->iv_stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $data->iv_stamina) / 3).'%"> |
|
| 448 | + <span class="sr-only">' . $locales->IV_STAMINA.': '.$data->iv_stamina.'</span> |
|
| 449 | 449 | </div> |
| 450 | 450 | </div> |
| 451 | 451 | </div>'; |
@@ -523,7 +523,7 @@ discard block |
||
| 523 | 523 | } else { |
| 524 | 524 | $data->charge_move = "?"; |
| 525 | 525 | } |
| 526 | - $raids[10*$page + $i] = $data; |
|
| 526 | + $raids[10 * $page + $i] = $data; |
|
| 527 | 527 | $i++; |
| 528 | 528 | } |
| 529 | 529 | $json = array(); |
@@ -611,7 +611,7 @@ discard block |
||
| 611 | 611 | $entry->total_cp_diff = 0; |
| 612 | 612 | $entry->only_cp_changed = true; |
| 613 | 613 | if ($idx < count($entries) - 1) { |
| 614 | - $next_entry = $entries[$idx+1]; |
|
| 614 | + $next_entry = $entries[$idx + 1]; |
|
| 615 | 615 | $entry->total_cp_diff = $entry->total_cp - $next_entry->total_cp; |
| 616 | 616 | $entry->class = $entry->total_cp_diff > 0 ? 'gain' : ($entry->total_cp_diff < 0 ? 'loss' : ''); |
| 617 | 617 | $entry_pokemon = preg_split('/,/', $entry->pokemon_uids, null, PREG_SPLIT_NO_EMPTY); |
@@ -624,7 +624,7 @@ discard block |
||
| 624 | 624 | foreach ($old_pokemon as $pkm) { |
| 625 | 625 | $next_entry->pokemon[$pkm]->class = 'old'; |
| 626 | 626 | } |
| 627 | - if ($entry->team_id != $next_entry->team_id|| $entry->pokemon_uids != $next_entry->pokemon_uids) { |
|
| 627 | + if ($entry->team_id != $next_entry->team_id || $entry->pokemon_uids != $next_entry->pokemon_uids) { |
|
| 628 | 628 | $entry->only_cp_changed = false; |
| 629 | 629 | } |
| 630 | 630 | } |
@@ -646,7 +646,7 @@ discard block |
||
| 646 | 646 | |
| 647 | 647 | |
| 648 | 648 | case 'pokemon_slider_init': |
| 649 | - $bounds = $manager->getPokemonSliderMinMax(); |
|
| 649 | + $bounds = $manager->getPokemonSliderMinMax(); |
|
| 650 | 650 | |
| 651 | 651 | header('Content-Type: application/json'); |
| 652 | 652 | echo json_encode($bounds); |