@@ -17,8 +17,8 @@ discard block |
||
| 17 | 17 | // Include & load the variables |
| 18 | 18 | // ############################ |
| 19 | 19 | |
| 20 | -$variables = SYS_PATH.'/core/json/variables.json'; |
|
| 21 | -$config = json_decode(file_get_contents($variables)); |
|
| 20 | +$variables = SYS_PATH.'/core/json/variables.json'; |
|
| 21 | +$config = json_decode(file_get_contents($variables)); |
|
| 22 | 22 | |
| 23 | 23 | // Manage Time Interval |
| 24 | 24 | // ##################### |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | include_once(SYS_PATH.'/functions.php'); |
| 38 | 38 | |
| 39 | 39 | # MySQL |
| 40 | -$mysqli = new mysqli(SYS_DB_HOST, SYS_DB_USER, SYS_DB_PSWD, SYS_DB_NAME, SYS_DB_PORT); |
|
| 40 | +$mysqli = new mysqli(SYS_DB_HOST, SYS_DB_USER, SYS_DB_PSWD, SYS_DB_NAME, SYS_DB_PORT); |
|
| 41 | 41 | if ($mysqli->connect_error != '') { |
| 42 | 42 | exit('Error MySQL Connect'); |
| 43 | 43 | } |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $postRequest = ""; |
| 50 | 50 | if (isset($_POST['type'])) { |
| 51 | 51 | $postRequest = $_POST['type']; |
| 52 | - $request= "postRequest"; |
|
| 52 | + $request = "postRequest"; |
|
| 53 | 53 | } |
| 54 | 54 | switch ($request) { |
| 55 | 55 | ############################ |
@@ -62,64 +62,64 @@ discard block |
||
| 62 | 62 | // Right now |
| 63 | 63 | // --------- |
| 64 | 64 | |
| 65 | - $req = "SELECT COUNT(*) AS total FROM pokemon WHERE disappear_time >= UTC_TIMESTAMP()"; |
|
| 66 | - $result = $mysqli->query($req); |
|
| 67 | - $data = $result->fetch_object(); |
|
| 65 | + $req = "SELECT COUNT(*) AS total FROM pokemon WHERE disappear_time >= UTC_TIMESTAMP()"; |
|
| 66 | + $result = $mysqli->query($req); |
|
| 67 | + $data = $result->fetch_object(); |
|
| 68 | 68 | |
| 69 | - $values[] = $data->total; |
|
| 69 | + $values[] = $data->total; |
|
| 70 | 70 | |
| 71 | 71 | |
| 72 | 72 | // Lured stops |
| 73 | 73 | // ----------- |
| 74 | 74 | |
| 75 | - $req = "SELECT COUNT(*) AS total FROM pokestop WHERE lure_expiration >= UTC_TIMESTAMP()"; |
|
| 76 | - $result = $mysqli->query($req); |
|
| 77 | - $data = $result->fetch_object(); |
|
| 75 | + $req = "SELECT COUNT(*) AS total FROM pokestop WHERE lure_expiration >= UTC_TIMESTAMP()"; |
|
| 76 | + $result = $mysqli->query($req); |
|
| 77 | + $data = $result->fetch_object(); |
|
| 78 | 78 | |
| 79 | - $values[] = $data->total; |
|
| 79 | + $values[] = $data->total; |
|
| 80 | 80 | |
| 81 | 81 | |
| 82 | 82 | |
| 83 | 83 | // Team battle |
| 84 | 84 | // ----------- |
| 85 | 85 | |
| 86 | - $req = "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym"; |
|
| 87 | - $result = $mysqli->query($req); |
|
| 88 | - $data = $result->fetch_object(); |
|
| 86 | + $req = "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym"; |
|
| 87 | + $result = $mysqli->query($req); |
|
| 88 | + $data = $result->fetch_object(); |
|
| 89 | 89 | |
| 90 | - $values[] = $data->total; |
|
| 90 | + $values[] = $data->total; |
|
| 91 | 91 | |
| 92 | 92 | // Team |
| 93 | 93 | // 1 = bleu |
| 94 | 94 | // 2 = rouge |
| 95 | 95 | // 3 = jaune |
| 96 | 96 | |
| 97 | - $req = "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE team_id = '2'"; |
|
| 98 | - $result = $mysqli->query($req); |
|
| 99 | - $data = $result->fetch_object(); |
|
| 97 | + $req = "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE team_id = '2'"; |
|
| 98 | + $result = $mysqli->query($req); |
|
| 99 | + $data = $result->fetch_object(); |
|
| 100 | 100 | |
| 101 | 101 | // Red |
| 102 | 102 | $values[] = $data->total; |
| 103 | 103 | |
| 104 | 104 | |
| 105 | - $req = "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE team_id = '1'"; |
|
| 106 | - $result = $mysqli->query($req); |
|
| 107 | - $data = $result->fetch_object(); |
|
| 105 | + $req = "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE team_id = '1'"; |
|
| 106 | + $result = $mysqli->query($req); |
|
| 107 | + $data = $result->fetch_object(); |
|
| 108 | 108 | |
| 109 | 109 | // Blue |
| 110 | 110 | $values[] = $data->total; |
| 111 | 111 | |
| 112 | 112 | |
| 113 | - $req = "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE team_id = '3'"; |
|
| 114 | - $result = $mysqli->query($req); |
|
| 115 | - $data = $result->fetch_object(); |
|
| 113 | + $req = "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE team_id = '3'"; |
|
| 114 | + $result = $mysqli->query($req); |
|
| 115 | + $data = $result->fetch_object(); |
|
| 116 | 116 | |
| 117 | 117 | // Yellow |
| 118 | 118 | $values[] = $data->total; |
| 119 | 119 | |
| 120 | - $req = "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE team_id = '0'"; |
|
| 121 | - $result = $mysqli->query($req); |
|
| 122 | - $data = $result->fetch_object(); |
|
| 120 | + $req = "SELECT COUNT(DISTINCT(gym_id)) AS total FROM gym WHERE team_id = '0'"; |
|
| 121 | + $result = $mysqli->query($req); |
|
| 122 | + $data = $result->fetch_object(); |
|
| 123 | 123 | |
| 124 | 124 | // Neutral |
| 125 | 125 | $values[] = $data->total; |
@@ -207,13 +207,13 @@ discard block |
||
| 207 | 207 | $html .= ' |
| 208 | 208 | <div class="progress" style="height: 15px; margin-bottom: 0"> |
| 209 | 209 | <div title="'.$locales->IV_ATTACK.': '.$iv->attack.'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$iv->attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px"> |
| 210 | - <span class="sr-only">'.$locales->IV_ATTACK.': '.$iv->attack.'</span>'.$iv->attack .' |
|
| 210 | + <span class="sr-only">'.$locales->IV_ATTACK.': '.$iv->attack.'</span>'.$iv->attack.' |
|
| 211 | 211 | </div> |
| 212 | 212 | <div title="'.$locales->IV_DEFENSE.': '.$iv->defense.'" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$iv->defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px"> |
| 213 | - <span class="sr-only">'.$locales->IV_DEFENSE.': '.$iv->defense.'</span>'.$iv->defense .' |
|
| 213 | + <span class="sr-only">'.$locales->IV_DEFENSE.': '.$iv->defense.'</span>'.$iv->defense.' |
|
| 214 | 214 | </div> |
| 215 | 215 | <div title="'.$locales->IV_STAMINA.': '.$iv->stamina.'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$iv->stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(100 / 3).'%; line-height: 16px"> |
| 216 | - <span class="sr-only">'.$locales->IV_STAMINA.': '.$iv->stamina.'</span>'.$iv->stamina .' |
|
| 216 | + <span class="sr-only">'.$locales->IV_STAMINA.': '.$iv->stamina.'</span>'.$iv->stamina.' |
|
| 217 | 217 | </div> |
| 218 | 218 | </div>'; |
| 219 | 219 | } else { |
@@ -222,10 +222,10 @@ discard block |
||
| 222 | 222 | <div title="'.$locales->IV_ATTACK.': '.$iv->attack.'" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="'.$iv->attack.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $iv->attack) / 3).'%"> |
| 223 | 223 | <span class="sr-only">'.$locales->IV_ATTACK.': '.$iv->attack.'</span> |
| 224 | 224 | </div> |
| 225 | - <div title="'.$locales->IV_DEFENSE.': '.$iv->defense .'" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$iv->defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $iv->defense) / 3).'%"> |
|
| 225 | + <div title="'.$locales->IV_DEFENSE.': '.$iv->defense.'" class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="'.$iv->defense.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $iv->defense) / 3).'%"> |
|
| 226 | 226 | <span class="sr-only">'.$locales->IV_DEFENSE.': '.$iv->defense.'</span> |
| 227 | 227 | </div> |
| 228 | - <div title="'.$locales->IV_STAMINA.': '.$iv->stamina .'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$iv->stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $iv->stamina) / 3).'%"> |
|
| 228 | + <div title="'.$locales->IV_STAMINA.': '.$iv->stamina.'" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="'.$iv->stamina.'" aria-valuemin="0" aria-valuemax="45" style="width: '.(((100 / 15) * $iv->stamina) / 3).'%"> |
|
| 229 | 229 | <span class="sr-only">'.$locales->IV_STAMINA.': '.$iv->stamina.'</span> |
| 230 | 230 | </div> |
| 231 | 231 | </div>'; |
@@ -325,19 +325,19 @@ discard block |
||
| 325 | 325 | #################################### |
| 326 | 326 | |
| 327 | 327 | case 'update_gym': |
| 328 | - $teams = new stdClass(); |
|
| 329 | - $teams->mystic = 1; |
|
| 330 | - $teams->valor = 2; |
|
| 331 | - $teams->instinct = 3; |
|
| 328 | + $teams = new stdClass(); |
|
| 329 | + $teams->mystic = 1; |
|
| 330 | + $teams->valor = 2; |
|
| 331 | + $teams->instinct = 3; |
|
| 332 | 332 | |
| 333 | 333 | |
| 334 | 334 | foreach ($teams as $team_name => $team_id) { |
| 335 | - $req = "SELECT COUNT(DISTINCT(gym_id)) AS total, ROUND(AVG(total_cp),0) AS average_points FROM gym WHERE team_id = '".$team_id."'"; |
|
| 336 | - $result = $mysqli->query($req); |
|
| 337 | - $data = $result->fetch_object(); |
|
| 335 | + $req = "SELECT COUNT(DISTINCT(gym_id)) AS total, ROUND(AVG(total_cp),0) AS average_points FROM gym WHERE team_id = '".$team_id."'"; |
|
| 336 | + $result = $mysqli->query($req); |
|
| 337 | + $data = $result->fetch_object(); |
|
| 338 | 338 | |
| 339 | - $return[] = $data->total; |
|
| 340 | - $return[] = $data->average_points; |
|
| 339 | + $return[] = $data->total; |
|
| 340 | + $return[] = $data->average_points; |
|
| 341 | 341 | } |
| 342 | 342 | |
| 343 | 343 | header('Content-Type: application/json'); |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | |
| 355 | 355 | |
| 356 | 356 | case 'gym_map': |
| 357 | - $req = "SELECT gym_id, team_id, latitude, longitude, (CONVERT_TZ(last_scanned, '+00:00', '".$time_offset."')) AS last_scanned, (6 - slots_available) AS level FROM gym"; |
|
| 357 | + $req = "SELECT gym_id, team_id, latitude, longitude, (CONVERT_TZ(last_scanned, '+00:00', '".$time_offset."')) AS last_scanned, (6 - slots_available) AS level FROM gym"; |
|
| 358 | 358 | $result = $mysqli->query($req); |
| 359 | 359 | |
| 360 | 360 | $gyms = []; |
@@ -369,25 +369,25 @@ discard block |
||
| 369 | 369 | case 0: |
| 370 | 370 | $icon = 'map_white.png'; |
| 371 | 371 | $team = 'No Team (yet)'; |
| 372 | - $color = 'rgba(0, 0, 0, .6)'; |
|
| 372 | + $color = 'rgba(0, 0, 0, .6)'; |
|
| 373 | 373 | break; |
| 374 | 374 | |
| 375 | 375 | case 1: |
| 376 | 376 | $icon = 'map_blue_'; |
| 377 | 377 | $team = 'Team Mystic'; |
| 378 | - $color = 'rgba(74, 138, 202, .6)'; |
|
| 378 | + $color = 'rgba(74, 138, 202, .6)'; |
|
| 379 | 379 | break; |
| 380 | 380 | |
| 381 | 381 | case 2: |
| 382 | 382 | $icon = 'map_red_'; |
| 383 | 383 | $team = 'Team Valor'; |
| 384 | - $color = 'rgba(240, 68, 58, .6)'; |
|
| 384 | + $color = 'rgba(240, 68, 58, .6)'; |
|
| 385 | 385 | break; |
| 386 | 386 | |
| 387 | 387 | case 3: |
| 388 | 388 | $icon = 'map_yellow_'; |
| 389 | 389 | $team = 'Team Instinct'; |
| 390 | - $color = 'rgba(254, 217, 40, .6)'; |
|
| 390 | + $color = 'rgba(254, 217, 40, .6)'; |
|
| 391 | 391 | break; |
| 392 | 392 | } |
| 393 | 393 | |
@@ -417,7 +417,7 @@ discard block |
||
| 417 | 417 | |
| 418 | 418 | case 'gym_defenders': |
| 419 | 419 | $gym_id = $mysqli->real_escape_string($_GET['gym_id']); |
| 420 | - $req = "SELECT gymdetails.name AS name, gymdetails.description AS description, gymdetails.url AS url, gym.team_id AS team, |
|
| 420 | + $req = "SELECT gymdetails.name AS name, gymdetails.description AS description, gymdetails.url AS url, gym.team_id AS team, |
|
| 421 | 421 | (CONVERT_TZ(gym.last_scanned, '+00:00', '".$time_offset."')) AS last_scanned, gym.guard_pokemon_id AS guard_pokemon_id, gym.total_cp AS total_cp, (6 - gym.slots_available) AS level |
| 422 | 422 | FROM gymdetails |
| 423 | 423 | LEFT JOIN gym ON gym.gym_id = gymdetails.gym_id |
@@ -441,7 +441,7 @@ discard block |
||
| 441 | 441 | $gymData['gymDetails']['gymInfos']['guardPokemonId'] = $data->guard_pokemon_id; |
| 442 | 442 | } |
| 443 | 443 | |
| 444 | - $req = "SELECT DISTINCT gympokemon.pokemon_uid, pokemon_id, iv_attack, iv_defense, iv_stamina, MAX(cp) AS cp, gymmember.gym_id |
|
| 444 | + $req = "SELECT DISTINCT gympokemon.pokemon_uid, pokemon_id, iv_attack, iv_defense, iv_stamina, MAX(cp) AS cp, gymmember.gym_id |
|
| 445 | 445 | FROM gympokemon INNER JOIN gymmember ON gympokemon.pokemon_uid=gymmember.pokemon_uid |
| 446 | 446 | GROUP BY gympokemon.pokemon_uid, pokemon_id, iv_attack, iv_defense, iv_stamina, gym_id |
| 447 | 447 | HAVING gymmember.gym_id='".$gym_id."' |
@@ -468,10 +468,10 @@ discard block |
||
| 468 | 468 | <span class="sr-only">'.$locales->IV_ATTACK.' : '.$data->iv_attack.'</span>'.$data->iv_attack.' |
| 469 | 469 | </div> |
| 470 | 470 | <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"> |
| 471 | - <span class="sr-only">'.$locales->IV_DEFENSE.' : '.$data->iv_defense.'</span>'. $data->iv_defense .' |
|
| 471 | + <span class="sr-only">'.$locales->IV_DEFENSE.' : '.$data->iv_defense.'</span>'.$data->iv_defense.' |
|
| 472 | 472 | </div> |
| 473 | 473 | <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"> |
| 474 | - <span class="sr-only">'.$locales->IV_STAMINA.' : '.$data->iv_stamina.'</span>'. $data->iv_stamina .' |
|
| 474 | + <span class="sr-only">'.$locales->IV_STAMINA.' : '.$data->iv_stamina.'</span>'.$data->iv_stamina.' |
|
| 475 | 475 | </div> |
| 476 | 476 | </div> |
| 477 | 477 | </div>'; |
@@ -544,16 +544,16 @@ discard block |
||
| 544 | 544 | $name = ""; |
| 545 | 545 | $page = "0"; |
| 546 | 546 | $where = ""; |
| 547 | - $order=""; |
|
| 548 | - $team=0; |
|
| 549 | - $ranking=0; |
|
| 547 | + $order = ""; |
|
| 548 | + $team = 0; |
|
| 549 | + $ranking = 0; |
|
| 550 | 550 | if (isset($_GET['name'])) { |
| 551 | 551 | $trainer_name = mysqli_real_escape_string($mysqli, $_GET['name']); |
| 552 | 552 | $where = " HAVING name LIKE '%".$trainer_name."%'"; |
| 553 | 553 | } |
| 554 | - if (isset($_GET['team']) && $_GET['team']!=0) { |
|
| 554 | + if (isset($_GET['team']) && $_GET['team'] != 0) { |
|
| 555 | 555 | $team = mysqli_real_escape_string($mysqli, $_GET['team']); |
| 556 | - $where .= ($where==""?" HAVING":"AND ")." team = ".$team; |
|
| 556 | + $where .= ($where == "" ? " HAVING" : "AND ")." team = ".$team; |
|
| 557 | 557 | } |
| 558 | 558 | if (isset($_GET['page'])) { |
| 559 | 559 | $page = mysqli_real_escape_string($mysqli, $_GET['page']); |
@@ -564,16 +564,16 @@ discard block |
||
| 564 | 564 | |
| 565 | 565 | switch ($ranking) { |
| 566 | 566 | case 1: |
| 567 | - $order=" ORDER BY active DESC "; |
|
| 567 | + $order = " ORDER BY active DESC "; |
|
| 568 | 568 | break; |
| 569 | 569 | case 2: |
| 570 | - $order=" ORDER BY maxCp DESC "; |
|
| 570 | + $order = " ORDER BY maxCp DESC "; |
|
| 571 | 571 | break; |
| 572 | 572 | default: |
| 573 | - $order=" ORDER BY level DESC, active DESC "; |
|
| 573 | + $order = " ORDER BY level DESC, active DESC "; |
|
| 574 | 574 | } |
| 575 | 575 | |
| 576 | - $limit = " LIMIT ".($page*10).",10 "; |
|
| 576 | + $limit = " LIMIT ".($page * 10).",10 "; |
|
| 577 | 577 | |
| 578 | 578 | |
| 579 | 579 | $req = "SELECT trainer.*, COUNT(actives_pokemons.trainer_name) AS active, max(actives_pokemons.cp) AS maxCp |
@@ -594,7 +594,7 @@ discard block |
||
| 594 | 594 | $reqRanking = "SELECT COUNT(1) AS rank FROM trainer WHERE trainer.level >= ".$trainer->level; |
| 595 | 595 | $resultRanking = $mysqli->query($reqRanking); |
| 596 | 596 | while ($data = $resultRanking->fetch_object()) { |
| 597 | - $trainer->rank = $data->rank ; |
|
| 597 | + $trainer->rank = $data->rank; |
|
| 598 | 598 | } |
| 599 | 599 | $req = "(SELECT DISTINCT gympokemon.pokemon_id, gympokemon.pokemon_uid, gympokemon.cp, DATEDIFF(UTC_TIMESTAMP(), gympokemon.last_seen) AS last_scanned, gympokemon.trainer_name, gympokemon.iv_defense, gympokemon.iv_stamina, gympokemon.iv_attack, filtered_gymmember.gym_id, filtered_gymmember.deployment_time as deployment_time, '1' AS active |
| 600 | 600 | FROM gympokemon INNER JOIN |
@@ -605,7 +605,7 @@ discard block |
||
| 605 | 605 | |
| 606 | 606 | $resultPkms = $mysqli->query($req); |
| 607 | 607 | $trainer->pokemons = array(); |
| 608 | - $active_gyms=0; |
|
| 608 | + $active_gyms = 0; |
|
| 609 | 609 | $pkmCount = 0; |
| 610 | 610 | while ($resultPkms && $dataPkm = $resultPkms->fetch_object()) { |
| 611 | 611 | $active_gyms++; |
@@ -648,7 +648,7 @@ discard block |
||
| 648 | 648 | $page = mysqli_real_escape_string($mysqli, $_GET['page']); |
| 649 | 649 | } |
| 650 | 650 | |
| 651 | - $limit = " LIMIT ".($page*10).",10"; |
|
| 651 | + $limit = " LIMIT ".($page * 10).",10"; |
|
| 652 | 652 | |
| 653 | 653 | $req = "SELECT raid.gym_id, raid.level, raid.pokemon_id, raid.cp, raid.move_1, raid.move_2, CONVERT_TZ(raid.spawn, '+00:00', '".$time_offset."') AS spawn, CONVERT_TZ(raid.start, '+00:00', '".$time_offset."') AS start, CONVERT_TZ(raid.end, '+00:00', '".$time_offset."') AS end, CONVERT_TZ(raid.last_scanned, '+00:00', '".$time_offset."') AS last_scanned, gymdetails.name, gym.latitude, gym.longitude FROM raid |
| 654 | 654 | JOIN gymdetails ON gymdetails.gym_id = raid.gym_id |
@@ -688,7 +688,7 @@ discard block |
||
| 688 | 688 | break; |
| 689 | 689 | |
| 690 | 690 | case 'pokemon_slider_init': |
| 691 | - $req = "SELECT MIN(disappear_time) AS min, MAX(disappear_time) AS max FROM pokemon"; |
|
| 691 | + $req = "SELECT MIN(disappear_time) AS min, MAX(disappear_time) AS max FROM pokemon"; |
|
| 692 | 692 | $result = $mysqli->query($req); |
| 693 | 693 | $bounds = $result->fetch_object(); |
| 694 | 694 | |
@@ -699,18 +699,18 @@ discard block |
||
| 699 | 699 | |
| 700 | 700 | |
| 701 | 701 | case 'pokemon_heatmap_points': |
| 702 | - $json=""; |
|
| 703 | - if (isset($_GET['start'])&&isset($_GET['end']) && isset($_GET['pokemon_id'])) { |
|
| 704 | - $start = Date("Y-m-d H:i",(int)$_GET['start']); |
|
| 705 | - $end = Date("Y-m-d H:i",(int)$_GET['end']); |
|
| 702 | + $json = ""; |
|
| 703 | + if (isset($_GET['start']) && isset($_GET['end']) && isset($_GET['pokemon_id'])) { |
|
| 704 | + $start = Date("Y-m-d H:i", (int) $_GET['start']); |
|
| 705 | + $end = Date("Y-m-d H:i", (int) $_GET['end']); |
|
| 706 | 706 | $pokemon_id = mysqli_real_escape_string($mysqli, $_GET['pokemon_id']); |
| 707 | 707 | $where = " WHERE pokemon_id = ".$pokemon_id." " |
| 708 | 708 | . "AND disappear_time BETWEEN '".$start."' AND '".$end."'"; |
| 709 | 709 | $req = "SELECT latitude, longitude FROM pokemon".$where." ORDER BY disappear_time DESC LIMIT 10000"; |
| 710 | - $result = $mysqli->query($req); |
|
| 710 | + $result = $mysqli->query($req); |
|
| 711 | 711 | $points = array(); |
| 712 | 712 | while ($result && $data = $result->fetch_object()) { |
| 713 | - $points[] = $data; |
|
| 713 | + $points[] = $data; |
|
| 714 | 714 | } |
| 715 | 715 | |
| 716 | 716 | $json = json_encode($points); |
@@ -722,9 +722,9 @@ discard block |
||
| 722 | 722 | |
| 723 | 723 | |
| 724 | 724 | case 'maps_localization_coordinates': |
| 725 | - $json=""; |
|
| 726 | - $req = "SELECT MAX(latitude) AS max_latitude, MIN(latitude) AS min_latitude, MAX(longitude) AS max_longitude, MIN(longitude) as min_longitude FROM spawnpoint"; |
|
| 727 | - $result = $mysqli->query($req); |
|
| 725 | + $json = ""; |
|
| 726 | + $req = "SELECT MAX(latitude) AS max_latitude, MIN(latitude) AS min_latitude, MAX(longitude) AS max_longitude, MIN(longitude) as min_longitude FROM spawnpoint"; |
|
| 727 | + $result = $mysqli->query($req); |
|
| 728 | 728 | $coordinates = $result->fetch_object(); |
| 729 | 729 | |
| 730 | 730 | header('Content-Type: application/json'); |
@@ -734,7 +734,7 @@ discard block |
||
| 734 | 734 | |
| 735 | 735 | |
| 736 | 736 | case 'pokemon_graph_data': |
| 737 | - $json=""; |
|
| 737 | + $json = ""; |
|
| 738 | 738 | if (isset($_GET['pokemon_id'])) { |
| 739 | 739 | $pokemon_id = mysqli_real_escape_string($mysqli, $_GET['pokemon_id']); |
| 740 | 740 | $req = "SELECT COUNT(*) AS total, |
@@ -742,7 +742,7 @@ discard block |
||
| 742 | 742 | FROM (SELECT disappear_time FROM pokemon WHERE pokemon_id = '".$pokemon_id."' ORDER BY disappear_time LIMIT 10000) AS pokemonFiltered |
| 743 | 743 | GROUP BY disappear_hour |
| 744 | 744 | ORDER BY disappear_hour"; |
| 745 | - $result = $mysqli->query($req); |
|
| 745 | + $result = $mysqli->query($req); |
|
| 746 | 746 | $array = array_fill(0, 24, 0); |
| 747 | 747 | while ($result && $data = $result->fetch_object()) { |
| 748 | 748 | $array[$data->disappear_hour] = $data->total; |
@@ -768,30 +768,30 @@ discard block |
||
| 768 | 768 | break; |
| 769 | 769 | } |
| 770 | 770 | |
| 771 | -if ($postRequest!="") { |
|
| 771 | +if ($postRequest != "") { |
|
| 772 | 772 | switch ($postRequest) { |
| 773 | 773 | case 'pokemon_live': |
| 774 | - $json=""; |
|
| 775 | - if (isset( $_POST['pokemon_id'])) { |
|
| 774 | + $json = ""; |
|
| 775 | + if (isset($_POST['pokemon_id'])) { |
|
| 776 | 776 | $pokemon_id = mysqli_real_escape_string($mysqli, $_POST['pokemon_id']); |
| 777 | - $inmap_pkms_filter=""; |
|
| 777 | + $inmap_pkms_filter = ""; |
|
| 778 | 778 | $where = " WHERE disappear_time >= UTC_TIMESTAMP() AND pokemon_id = ".$pokemon_id; |
| 779 | 779 | |
| 780 | 780 | $reqTestIv = "SELECT MAX(individual_attack) AS iv FROM pokemon ".$where; |
| 781 | - $resultTestIv = $mysqli->query($reqTestIv); |
|
| 781 | + $resultTestIv = $mysqli->query($reqTestIv); |
|
| 782 | 782 | $testIv = $resultTestIv->fetch_object(); |
| 783 | - if (isset( $_POST['inmap_pokemons'])&&( $_POST['inmap_pokemons']!="")) { |
|
| 783 | + if (isset($_POST['inmap_pokemons']) && ($_POST['inmap_pokemons'] != "")) { |
|
| 784 | 784 | foreach ($_POST['inmap_pokemons'] as $inmap) { |
| 785 | 785 | $inmap_pkms_filter .= "'".$inmap."',"; |
| 786 | 786 | } |
| 787 | 787 | $inmap_pkms_filter = rtrim($inmap_pkms_filter, ","); |
| 788 | 788 | $where .= " AND encounter_id NOT IN (".$inmap_pkms_filter.") "; |
| 789 | 789 | } |
| 790 | - if ($testIv->iv!=null && isset( $_POST['ivMin'])&&( $_POST['ivMin']!="")) { |
|
| 790 | + if ($testIv->iv != null && isset($_POST['ivMin']) && ($_POST['ivMin'] != "")) { |
|
| 791 | 791 | $ivMin = mysqli_real_escape_string($mysqli, $_POST['ivMin']); |
| 792 | 792 | $where .= " AND ((100/45)*(individual_attack+individual_defense+individual_stamina)) >= (".$ivMin.") "; |
| 793 | 793 | } |
| 794 | - if ($testIv->iv!=null && isset( $_POST['ivMax'])&&( $_POST['ivMax']!="")) { |
|
| 794 | + if ($testIv->iv != null && isset($_POST['ivMax']) && ($_POST['ivMax'] != "")) { |
|
| 795 | 795 | $ivMax = mysqli_real_escape_string($mysqli, $_POST['ivMax']); |
| 796 | 796 | $where .= " AND ((100/45)*(individual_attack+individual_defense+individual_stamina)) <=(".$ivMax.") "; |
| 797 | 797 | } |
@@ -805,12 +805,12 @@ discard block |
||
| 805 | 805 | $json = array(); |
| 806 | 806 | $json['points'] = array(); |
| 807 | 807 | $locale = array(); |
| 808 | - $locale["ivAttack"] = $locales->IV_ATTACK; |
|
| 808 | + $locale["ivAttack"] = $locales->IV_ATTACK; |
|
| 809 | 809 | $locale["ivDefense"] = $locales->IV_DEFENSE; |
| 810 | - $locale["ivStamina"] = $locales->IV_STAMINA; |
|
| 810 | + $locale["ivStamina"] = $locales->IV_STAMINA; |
|
| 811 | 811 | $json['locale'] = $locale; |
| 812 | 812 | while ($result && $data = $result->fetch_object()) { |
| 813 | - $pokeid=$data->pokemon_id; |
|
| 813 | + $pokeid = $data->pokemon_id; |
|
| 814 | 814 | $data->name = $pokemons->pokemon->$pokeid->name; |
| 815 | 815 | if (isset($data->move_1)) { |
| 816 | 816 | $move1 = $data->move_1; |
@@ -824,7 +824,7 @@ discard block |
||
| 824 | 824 | } else { |
| 825 | 825 | $data->charge_move = "?"; |
| 826 | 826 | } |
| 827 | - $json['points'][] = $data; |
|
| 827 | + $json['points'][] = $data; |
|
| 828 | 828 | } |
| 829 | 829 | |
| 830 | 830 | $json = json_encode($json); |