smrealms /
smr
We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -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 | } |
@@ -5,8 +5,9 @@ discard block |
||
| 5 | 5 | require_once(ENGINE . 'Default/help.inc'); |
| 6 | 6 | |
| 7 | 7 | $topic_id = $_SERVER['QUERY_STRING']; |
| 8 | - if (empty($topic_id) || !is_numeric($topic_id)) |
|
| 9 | - $topic_id = 1; |
|
| 8 | + if (empty($topic_id) || !is_numeric($topic_id)) { |
|
| 9 | + $topic_id = 1; |
|
| 10 | + } |
|
| 10 | 11 | ?> |
| 11 | 12 | <!DOCTYPE html> |
| 12 | 13 | |
@@ -48,8 +49,7 @@ discard block |
||
| 48 | 49 | |
| 49 | 50 | </body> |
| 50 | 51 | </html><?php |
| 51 | -} |
|
| 52 | -catch (Throwable $e) { |
|
| 52 | +} catch (Throwable $e) { |
|
| 53 | 53 | handleException($e); |
| 54 | 54 | } |
| 55 | 55 | ?> |
@@ -68,8 +68,7 @@ |
||
| 68 | 68 | |
| 69 | 69 | </body> |
| 70 | 70 | </html><?php |
| 71 | -} |
|
| 72 | -catch (Throwable $e) { |
|
| 71 | +} catch (Throwable $e) { |
|
| 73 | 72 | handleException($e); |
| 74 | 73 | } |
| 75 | 74 | ?> |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | // Delete all tickets and re-insert the winning ticket |
| 24 | 24 | $db->query('DELETE FROM player_has_ticket WHERE game_id = ' . $db->escapeNumber($gameID)); |
| 25 | 25 | $db->query('INSERT INTO player_has_ticket (game_id, account_id, time, prize) ' |
| 26 | - .'VALUES (' . $db->escapeNumber($gameID) . ',' . $db->escapeNumber($winner_id) . ',\'0\',' . $db->escapeNumber($lottoInfo['Prize']) . ')'); |
|
| 26 | + .'VALUES (' . $db->escapeNumber($gameID) . ',' . $db->escapeNumber($winner_id) . ',\'0\',' . $db->escapeNumber($lottoInfo['Prize']) . ')'); |
|
| 27 | 27 | |
| 28 | 28 | //get around locked table problem |
| 29 | 29 | $lottoWon = true; |
@@ -1,5 +1,8 @@ |
||
| 1 | 1 | <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> |
| 2 | -<title><?php echo PAGE_TITLE; ?><?php if (isset($GameName)) echo ": $GameName"; ?></title> |
|
| 2 | +<title><?php echo PAGE_TITLE; ?><?php if (isset($GameName)) { |
|
| 3 | + echo ": $GameName"; |
|
| 4 | +} |
|
| 5 | +?></title> |
|
| 3 | 6 | <meta http-equiv="pragma" content="no-cache" /><?php |
| 4 | 7 | if (!is_object($ThisAccount) || $ThisAccount->isDefaultCSSEnabled()) { ?> |
| 5 | 8 | <link rel="stylesheet" type="text/css" href="<?php echo $CSSLink; ?>" /> |
