We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | $query = "SELECT table_name FROM information_schema.tables WHERE table_rows > 0 AND TABLE_SCHEMA='smr_live'"; |
| 31 | 31 | $rs = self::$conn->query($query); |
| 32 | 32 | $all = $rs->fetch_all(); |
| 33 | - array_walk_recursive($all, function ($a) { |
|
| 33 | + array_walk_recursive($all, function($a) { |
|
| 34 | 34 | self::$defaultPopulatedTables[] = "'" . $a . "'"; |
| 35 | 35 | }); |
| 36 | 36 | } |
@@ -10,7 +10,7 @@ |
||
| 10 | 10 | $db->query('SELECT game_id, game_name FROM game WHERE join_time < ' . $db->escapeNumber(SmrSession::getTime()) . ' AND end_time > ' . $db->escapeNumber(SmrSession::getTime()) . ' ORDER BY start_time DESC'); |
| 11 | 11 | while ($db->nextRecord()) { |
| 12 | 12 | $activeGames[] = array('game_name' => $db->getField('game_name'), |
| 13 | - 'game_id' => $db->getInt('game_id')); |
|
| 13 | + 'game_id' => $db->getInt('game_id')); |
|
| 14 | 14 | } |
| 15 | 15 | $template->assign('ActiveGames', $activeGames); |
| 16 | 16 | |
@@ -105,13 +105,15 @@ |
||
| 105 | 105 | $numberOfPlanets = Request::getInt('type' . $planetTypeID); |
| 106 | 106 | for ($i = 1; $i <= $numberOfPlanets; $i++) { |
| 107 | 107 | $galSector = $galSectors[array_rand($galSectors)]; |
| 108 | - while ($galSector->hasPlanet()) $galSector = $galSectors[array_rand($galSectors)]; //1 per sector |
|
| 108 | + while ($galSector->hasPlanet()) { |
|
| 109 | + $galSector = $galSectors[array_rand($galSectors)]; |
|
| 110 | + } |
|
| 111 | + //1 per sector |
|
| 109 | 112 | $galSector->createPlanet($planetTypeID); |
| 110 | 113 | } |
| 111 | 114 | } |
| 112 | 115 | $var['message'] = '<span class="green">Success</span> : Succesfully added planets.'; |
| 113 | -} |
|
| 114 | -elseif ($submit == 'Create Ports') { |
|
| 116 | +} elseif ($submit == 'Create Ports') { |
|
| 115 | 117 | $numLevelPorts = []; |
| 116 | 118 | for ($i = 1; $i <= SmrPort::MAX_LEVEL; $i++) { |
| 117 | 119 | $numLevelPorts[$i] = Request::getInt('port' . $i); |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | create_error('Join Date is not valid!'); |
| 20 | 20 | } |
| 21 | 21 | $start = empty(Request::get('game_start')) ? $join : |
| 22 | - DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); |
|
| 22 | + DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); |
|
| 23 | 23 | if ($start === false) { |
| 24 | 24 | create_error('Start Date is not valid!'); |
| 25 | 25 | } |
@@ -1,14 +1,14 @@ discard block |
||
| 1 | 1 | <?php declare(strict_types=1); |
| 2 | 2 | |
| 3 | 3 | //first create the game |
| 4 | -$db->query('SELECT game_id FROM game WHERE game_name='.$db->escapeString(Request::get('game_name')).' LIMIT 1'); |
|
| 4 | +$db->query('SELECT game_id FROM game WHERE game_name=' . $db->escapeString(Request::get('game_name')) . ' LIMIT 1'); |
|
| 5 | 5 | if ($db->nextRecord()) { |
| 6 | 6 | create_error('That game name is already taken.'); |
| 7 | 7 | } |
| 8 | 8 | |
| 9 | 9 | $db->query('SELECT game_id FROM game ORDER BY game_id DESC LIMIT 1'); |
| 10 | 10 | if ($db->nextRecord()) { |
| 11 | - $newID = $db->getInt('game_id')+1; |
|
| 11 | + $newID = $db->getInt('game_id') + 1; |
|
| 12 | 12 | } else { |
| 13 | 13 | $newID = 1; |
| 14 | 14 | } |
@@ -18,8 +18,7 @@ discard block |
||
| 18 | 18 | if ($join === false) { |
| 19 | 19 | create_error('Join Date is not valid!'); |
| 20 | 20 | } |
| 21 | -$start = empty(Request::get('game_start')) ? $join : |
|
| 22 | - DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); |
|
| 21 | +$start = empty(Request::get('game_start')) ? $join : DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); |
|
| 23 | 22 | if ($start === false) { |
| 24 | 23 | create_error('Start Date is not valid!'); |
| 25 | 24 | } |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | |
| 88 | 88 | // Form to make location changes |
| 89 | 89 | $container = create_container('1.6/universe_create_save_processing.php', |
| 90 | - '1.6/universe_create_sectors.php', $var); |
|
| 90 | + '1.6/universe_create_sectors.php', $var); |
|
| 91 | 91 | $template->assign('CreateLocationsFormHREF', SmrSession::getNewHREF($container)); |
| 92 | 92 | |
| 93 | 93 | // HREF to cancel and return to the previous page |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | // Get the dates ("|" sets hr/min/sec to 0) |
| 4 | 4 | $join = DateTime::createFromFormat('d/m/Y|', Request::get('game_join')); |
| 5 | 5 | $start = empty(Request::get('game_start')) ? $join : |
| 6 | - DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); |
|
| 6 | + DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); |
|
| 7 | 7 | $end = DateTime::createFromFormat('d/m/Y|', Request::get('game_end')); |
| 8 | 8 | |
| 9 | 9 | $game = SmrGame::getGame($var['game_id']); |
@@ -2,8 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | // Get the dates ("|" sets hr/min/sec to 0) |
| 4 | 4 | $join = DateTime::createFromFormat('d/m/Y|', Request::get('game_join')); |
| 5 | -$start = empty(Request::get('game_start')) ? $join : |
|
| 6 | - DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); |
|
| 5 | +$start = empty(Request::get('game_start')) ? $join : DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); |
|
| 7 | 6 | $end = DateTime::createFromFormat('d/m/Y|', Request::get('game_end')); |
| 8 | 7 | |
| 9 | 8 | $game = SmrGame::getGame($var['game_id']); |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | |
| 30 | 30 | // Form to make planet changes |
| 31 | 31 | $container = create_container('1.6/universe_create_save_processing.php', |
| 32 | - '1.6/universe_create_sectors.php', $var); |
|
| 32 | + '1.6/universe_create_sectors.php', $var); |
|
| 33 | 33 | $template->assign('CreatePlanetsFormHREF', SmrSession::getNewHREF($container)); |
| 34 | 34 | |
| 35 | 35 | // HREF to cancel and return to the previous page |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | } |
| 21 | 21 | } |
| 22 | 22 | $missingLocs = array_diff(array_keys(SmrLocation::getAllLocations()), |
| 23 | - array_keys($existingLocs)); |
|
| 23 | + array_keys($existingLocs)); |
|
| 24 | 24 | $missingLocNames = []; |
| 25 | 25 | foreach ($missingLocs as $locID) { |
| 26 | 26 | $missingLocNames[] = SmrLocation::getLocation($locID)->getName(); |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | $template->assign('SelectedPortRaceID', $selectedPortRaceID); |
| 26 | 26 | |
| 27 | 27 | $sectorLocationIDs = array_pad(array_keys($editSector->getLocations()), |
| 28 | - UNI_GEN_LOCATION_SLOTS, 0); |
|
| 28 | + UNI_GEN_LOCATION_SLOTS, 0); |
|
| 29 | 29 | $template->assign('SectorLocationIDs', $sectorLocationIDs); |
| 30 | 30 | |
| 31 | 31 | if ($editSector->hasWarp()) { |