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; |
@@ -44,7 +44,10 @@ |
||
44 | 44 | <td> |
45 | 45 | <select name="game_type" class="InputFields"><?php |
46 | 46 | foreach (SmrGame::GAME_TYPES as $GameTypeID => $GameType) { |
47 | - ?><option value="<?php echo $GameTypeID; ?>" <?php if ($GameType == $Game['gameType']) echo 'selected'; ?>><?php echo $GameType; ?></option><?php |
|
47 | + ?><option value="<?php echo $GameTypeID; ?>" <?php if ($GameType == $Game['gameType']) { |
|
48 | + echo 'selected'; |
|
49 | + } |
|
50 | + ?>><?php echo $GameType; ?></option><?php |
|
48 | 51 | } ?> |
49 | 52 | </select> |
50 | 53 | </td> |
@@ -76,8 +76,13 @@ discard block |
||
76 | 76 | <input type="number" name="amount" value="0" min="<?php echo MIN_GLOBAL_RELATIONS; ?>" max="<?php echo MAX_GLOBAL_RELATIONS; ?>" style="width:75px" /> |
77 | 77 | <select name="race" class="InputFields"><?php |
78 | 78 | foreach (Globals::getRaces() as $race) { |
79 | - if ($race['Race ID'] == $ThisPlayer->getRaceID()) continue; |
|
80 | - if ($race['Race ID'] == RACE_NEUTRAL) continue; ?> |
|
79 | + if ($race['Race ID'] == $ThisPlayer->getRaceID()) { |
|
80 | + continue; |
|
81 | + } |
|
82 | + if ($race['Race ID'] == RACE_NEUTRAL) { |
|
83 | + continue; |
|
84 | + } |
|
85 | + ?> |
|
81 | 86 | <option value="<?php echo $race['Race ID']; ?>"><?php echo $race['Race Name']; ?></option><?php |
82 | 87 | } ?> |
83 | 88 | </select> |
@@ -88,8 +93,13 @@ discard block |
||
88 | 93 | <form method="POST" action="<?php echo $ChangeRaceHREF; ?>"> |
89 | 94 | <select name="race" class="InputFields"><?php |
90 | 95 | foreach (Globals::getRaces() as $race) { |
91 | - if ($race['Race ID'] == $ThisPlayer->getRaceID()) continue; |
|
92 | - if ($race['Race ID'] == RACE_NEUTRAL) continue; ?> |
|
96 | + if ($race['Race ID'] == $ThisPlayer->getRaceID()) { |
|
97 | + continue; |
|
98 | + } |
|
99 | + if ($race['Race ID'] == RACE_NEUTRAL) { |
|
100 | + continue; |
|
101 | + } |
|
102 | + ?> |
|
93 | 103 | <option value="<?php echo $race['Race ID']; ?>"><?php echo $race['Race Name']; ?></option><?php |
94 | 104 | } ?> |
95 | 105 | </select> |
@@ -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 | } |