We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -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 |
@@ -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()) { |
@@ -28,7 +28,7 @@ |
||
28 | 28 | // * C o l o r L e g e n d |
29 | 29 | // ********************************* |
30 | 30 | $avail_colors = array('#FFFFFF', '#00FF00', '#FF3377', '#0099FF', |
31 | - '#FF0000', '#0000FF'); |
|
31 | + '#FF0000', '#0000FF'); |
|
32 | 32 | |
33 | 33 | // now assign each account id a color |
34 | 34 | $colors = []; |
@@ -2,8 +2,8 @@ |
||
2 | 2 | trait SmrMySqlSecrets { |
3 | 3 | protected static $databaseName = 'smr_live'; |
4 | 4 | private static $host = 'smr-mysql'; // must match MYSQL_HOST in .env |
5 | - private static $user = 'smr'; // must match MYSQL_USER in .env |
|
6 | - private static $password = 'smr'; // must match MYSQL_PASSWORD in .env |
|
5 | + private static $user = 'smr'; // must match MYSQL_USER in .env |
|
6 | + private static $password = 'smr'; // must match MYSQL_PASSWORD in .env |
|
7 | 7 | |
8 | 8 | // Set to null to use defaults |
9 | 9 | private static $port = null; |
@@ -55,9 +55,9 @@ |
||
55 | 55 | function applyHofVisibilityMask($amount, $vis, $gameID, $accountID) { |
56 | 56 | global $account, $player; |
57 | 57 | if (($vis == HOF_PRIVATE && $account->getAccountID() != $accountID) || |
58 | - ($vis == HOF_ALLIANCE && isset($gameID) && |
|
59 | - !SmrGame::getGame($gameID)->hasEnded() && |
|
60 | - !SmrPlayer::getPlayer($accountID, $gameID)->sameAlliance($player))) |
|
58 | + ($vis == HOF_ALLIANCE && isset($gameID) && |
|
59 | + !SmrGame::getGame($gameID)->hasEnded() && |
|
60 | + !SmrPlayer::getPlayer($accountID, $gameID)->sameAlliance($player))) |
|
61 | 61 | { |
62 | 62 | return '-'; |
63 | 63 | } else { |
@@ -7,7 +7,7 @@ |
||
7 | 7 | $db->query('SELECT game_id, game_name FROM game WHERE join_time < ' . $db->escapeNumber(TIME) . ' AND end_time > ' . $db->escapeNumber(TIME) . ' ORDER BY start_time DESC'); |
8 | 8 | while ($db->nextRecord()) { |
9 | 9 | $activeGames[] = array('game_name' => $db->getField('game_name'), |
10 | - 'game_id' => $db->getInt('game_id')); |
|
10 | + 'game_id' => $db->getInt('game_id')); |
|
11 | 11 | } |
12 | 12 | $template->assign('ActiveGames', $activeGames); |
13 | 13 |
@@ -46,5 +46,5 @@ |
||
46 | 46 | $template->assign('ProcessingHREF', $processingHREF); |
47 | 47 | |
48 | 48 | $template->assign('PermissionCategories', |
49 | - AdminPermissions::getPermissionsByCategory()); |
|
49 | + AdminPermissions::getPermissionsByCategory()); |
|
50 | 50 | } |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | // Send vote announcement to members of the player's council (war votes) |
40 | 40 | // or both races' councils (peace votes). |
41 | 41 | $councilMembers = Council::getRaceCouncil($player->getGameID(), |
42 | - $player->getRaceID()); |
|
42 | + $player->getRaceID()); |
|
43 | 43 | if ($type == 'PEACE') { |
44 | 44 | $otherCouncil = Council::getRaceCouncil($player->getGameID(), $race_id); |
45 | 45 | $councilMembers = array_merge($councilMembers, $otherCouncil); |
@@ -49,16 +49,16 @@ discard block |
||
49 | 49 | $color = ($type == 'PEACE' ? 'dgreen' : 'red'); |
50 | 50 | $type_fancy = "<span class=\"$color\">$type</span>"; |
51 | 51 | $message = $player->getLevelName() . " " . $player->getBBLink() |
52 | - . " has initiated a vote for $type_fancy with the " |
|
53 | - . Globals::getRaceName($race_id) |
|
54 | - . "! You have " . format_time(TIME_FOR_COUNCIL_VOTE) |
|
55 | - . " to cast your vote."; |
|
52 | + . " has initiated a vote for $type_fancy with the " |
|
53 | + . Globals::getRaceName($race_id) |
|
54 | + . "! You have " . format_time(TIME_FOR_COUNCIL_VOTE) |
|
55 | + . " to cast your vote."; |
|
56 | 56 | |
57 | 57 | foreach ($councilMembers as $accountID) { |
58 | 58 | // don't send to the player who started the vote |
59 | 59 | if ($player->getAccountID() != $accountID) { |
60 | 60 | SmrPlayer::sendMessageFromRace($player->getRaceID(), $player->getGameID(), |
61 | - $accountID, $message, $time); |
|
61 | + $accountID, $message, $time); |
|
62 | 62 | } |
63 | 63 | } |
64 | 64 |
@@ -49,12 +49,12 @@ |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | foreach ($attackers as $attacker) { |
52 | - $playerResults =& $attacker->shootPlanet($planet, false); |
|
53 | - $results['Attackers']['Traders'][$attacker->getAccountID()] =& $playerResults; |
|
52 | + $playerResults = & $attacker->shootPlanet($planet, false); |
|
53 | + $results['Attackers']['Traders'][$attacker->getAccountID()] = & $playerResults; |
|
54 | 54 | $results['Attackers']['TotalDamage'] += $playerResults['TotalDamage']; |
55 | 55 | } |
56 | 56 | $results['Attackers']['Downgrades'] = $planet->checkForDowngrade($results['Attackers']['TotalDamage']); |
57 | -$results['Planet'] =& $planet->shootPlayers($attackers); |
|
57 | +$results['Planet'] = & $planet->shootPlayers($attackers); |
|
58 | 58 | |
59 | 59 | $account->log(LOG_TYPE_PLANET_BUSTING, 'Player attacks planet, the planet does ' . $results['Planet']['TotalDamage'] . ', their team does ' . $results['Attackers']['TotalDamage'] . ' and downgrades: ' . var_export($results['Attackers']['Downgrades'], true), $planet->getSectorID()); |
60 | 60 |