smrealms /
smr
We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -4,7 +4,9 @@ |
||
| 4 | 4 | |
| 5 | 5 | $fn_forces = function($message, $params) { |
| 6 | 6 | $link = new GameLink($message->channel, $message->author); |
| 7 | - if (!$link->valid) return; |
|
| 7 | + if (!$link->valid) { |
|
| 8 | + return; |
|
| 9 | + } |
|
| 8 | 10 | |
| 9 | 11 | // print the next expiring forces |
| 10 | 12 | $option = isset($params[0]) ? $params[0] : null; |
@@ -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,9 +68,9 @@ discard block |
||
| 68 | 68 | if (!USING_AJAX) { |
| 69 | 69 | require_once(get_file_loc('smr.inc')); |
| 70 | 70 | create_error('Your browser lost the SN. Try to reload the page!'); |
| 71 | + } else { |
|
| 72 | + exit; |
|
| 71 | 73 | } |
| 72 | - else |
|
| 73 | - exit; |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | // do we have such a container object in the db? |
@@ -78,9 +78,9 @@ discard block |
||
| 78 | 78 | if (!USING_AJAX) { |
| 79 | 79 | require_once(get_file_loc('smr.inc')); |
| 80 | 80 | create_error('Please avoid using the back button!'); |
| 81 | + } else { |
|
| 82 | + exit; |
|
| 81 | 83 | } |
| 82 | - else |
|
| 83 | - exit; |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | // Determine where to load game scripts from (in case we need a special |
@@ -88,9 +88,15 @@ discard block |
||
| 88 | 88 | // Must not call `get_file_loc` until after we have set $overrideGameID |
| 89 | 89 | // (unless we're exiting immediately with an error, as above). |
| 90 | 90 | $overrideGameID = 0; |
| 91 | - if (isset($var['game_id']) && is_numeric($var['game_id'])) $overrideGameID = $var['game_id']; |
|
| 92 | - if ($overrideGameID == 0 && isset($var['GameID']) && is_numeric($var['GameID'])) $overrideGameID = $var['GameID']; |
|
| 93 | - if ($overrideGameID == 0) $overrideGameID = SmrSession::getGameID(); |
|
| 91 | + if (isset($var['game_id']) && is_numeric($var['game_id'])) { |
|
| 92 | + $overrideGameID = $var['game_id']; |
|
| 93 | + } |
|
| 94 | + if ($overrideGameID == 0 && isset($var['GameID']) && is_numeric($var['GameID'])) { |
|
| 95 | + $overrideGameID = $var['GameID']; |
|
| 96 | + } |
|
| 97 | + if ($overrideGameID == 0) { |
|
| 98 | + $overrideGameID = SmrSession::getGameID(); |
|
| 99 | + } |
|
| 94 | 100 | |
| 95 | 101 | require_once(get_file_loc('smr.inc')); |
| 96 | 102 | |
@@ -106,22 +112,19 @@ discard block |
||
| 106 | 112 | } else { |
| 107 | 113 | forward(create_container('skeleton.php', 'invalid_email.php')); |
| 108 | 114 | } |
| 109 | - } |
|
| 110 | - else if ($disabled['Reason'] == CLOSE_ACCOUNT_BY_REQUEST_REASON) { |
|
| 115 | + } else if ($disabled['Reason'] == CLOSE_ACCOUNT_BY_REQUEST_REASON) { |
|
| 111 | 116 | if (isset($var['do_reopen_account'])) { |
| 112 | 117 | // The user has requested to reopen their account |
| 113 | 118 | $account->unbanAccount($account); |
| 114 | 119 | } else { |
| 115 | 120 | forward(create_container('skeleton.php', 'reopen_account.php')); |
| 116 | 121 | } |
| 117 | - } |
|
| 118 | - else { |
|
| 122 | + } else { |
|
| 119 | 123 | forward(create_container('disabled.php')); |
| 120 | 124 | } |
| 121 | 125 | } |
| 122 | 126 | |
| 123 | 127 | do_voodoo(); |
| 124 | -} |
|
| 125 | -catch (Throwable $e) { |
|
| 128 | +} catch (Throwable $e) { |
|
| 126 | 129 | handleException($e); |
| 127 | 130 | } |
@@ -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 | ?> |
@@ -4,7 +4,9 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | $fn_seedlist = function($message) { |
| 6 | 6 | $link = new GameLink($message->channel, $message->author); |
| 7 | - if (!$link->valid) return; |
|
| 7 | + if (!$link->valid) { |
|
| 8 | + return; |
|
| 9 | + } |
|
| 8 | 10 | |
| 9 | 11 | // print the entire seedlist |
| 10 | 12 | $results = shared_channel_msg_seedlist($link->player); |
@@ -13,7 +15,9 @@ discard block |
||
| 13 | 15 | |
| 14 | 16 | $fn_seedlist_add = function($message, $sectors) { |
| 15 | 17 | $link = new GameLink($message->channel, $message->author); |
| 16 | - if (!$link->valid) return; |
|
| 18 | + if (!$link->valid) { |
|
| 19 | + return; |
|
| 20 | + } |
|
| 17 | 21 | |
| 18 | 22 | // add sectors to the seedlist |
| 19 | 23 | $results = shared_channel_msg_seedlist_add($link->player, $sectors); |
@@ -22,7 +26,9 @@ discard block |
||
| 22 | 26 | |
| 23 | 27 | $fn_seedlist_del = function($message, $sectors) { |
| 24 | 28 | $link = new GameLink($message->channel, $message->author); |
| 25 | - if (!$link->valid) return; |
|
| 29 | + if (!$link->valid) { |
|
| 30 | + return; |
|
| 31 | + } |
|
| 26 | 32 | |
| 27 | 33 | // delete sectors from the seedlist |
| 28 | 34 | $results = shared_channel_msg_seedlist_del($link->player, $sectors); |
@@ -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; ?>" /> |
@@ -10,7 +10,10 @@ |
||
| 10 | 10 | <td style="width: 80%" class="center"> |
| 11 | 11 | Local Map of the Known <span class="big bold"><?php echo $GalaxyName ?></span> Galaxy |
| 12 | 12 | <br /><br /> |
| 13 | - <?php if (isset($Error)) echo $Error; ?> |
|
| 13 | + <?php if (isset($Error)) { |
|
| 14 | + echo $Error; |
|
| 15 | +} |
|
| 16 | +?> |
|
| 14 | 17 | </td> |
| 15 | 18 | <td style="width: 10%"></td> |
| 16 | 19 | </tr> |
@@ -19,8 +19,7 @@ |
||
| 19 | 19 | </tr><?php |
| 20 | 20 | if (isset($Locations)) { |
| 21 | 21 | $this->includeTemplate('includes/ViewLocations.inc', array('Locations'=>$Locations)); |
| 22 | -} |
|
| 23 | -else { ?> |
|
| 22 | +} else { ?> |
|
| 24 | 23 | <tr> |
| 25 | 24 | <td><input name="name" type="text" value="<?php echo htmlspecialchars($Location->getName()); ?>" /></td> |
| 26 | 25 | <td><input name="action" type="text" value="<?php echo htmlspecialchars($Location->getAction()); ?>" /></td> |
@@ -4,8 +4,7 @@ |
||
| 4 | 4 | <h1>Attacker Results</h1><br /><?php |
| 5 | 5 | } |
| 6 | 6 | $this->includeTemplate('includes/PlanetTraderTeamCombatResults.inc', array('TraderTeamCombatResults'=>$FullPlanetCombatResults['Attackers'], 'MinimalDisplay'=>$MinimalDisplay)); |
| 7 | -} |
|
| 8 | -else if (!$MinimalDisplay) { |
|
| 7 | +} else if (!$MinimalDisplay) { |
|
| 9 | 8 | ?><span class="bold">The planet is already destroyed.</span><?php |
| 10 | 9 | } |
| 11 | 10 | ?><br /><?php |
