We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -150,7 +150,7 @@ |
||
| 150 | 150 | $account->increaseSmrRewardCredits(2 * CREDITS_PER_DOLLAR); // Give $2 worth of "reward" credits for joining. |
| 151 | 151 | if ($socialLogin) { |
| 152 | 152 | $account->addAuthMethod($_SESSION['socialLogin']->getLoginType(), |
| 153 | - $_SESSION['socialLogin']->getUserID()); |
|
| 153 | + $_SESSION['socialLogin']->getUserID()); |
|
| 154 | 154 | if ($validatedBySocial) { |
| 155 | 155 | $account->setValidated(true); |
| 156 | 156 | $account->update(); |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | function get_turns_message($player) { |
| 4 | 4 | // turns only update when the player is active, so calculate current turns |
| 5 | 5 | $turns = min($player->getTurns() + $player->getTurnsGained(time(), true), |
| 6 | - $player->getMaxTurns()); |
|
| 6 | + $player->getMaxTurns()); |
|
| 7 | 7 | $msg = $player->getPlayerName() . " has $turns/" . $player->getMaxTurns() . " turns."; |
| 8 | 8 | |
| 9 | 9 | // Calculate time to max turns if under the max |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | continue; |
| 25 | 25 | } |
| 26 | 26 | $turns = min($attendeePlayer->getTurns() + $attendeePlayer->getTurnsGained(time(), true), |
| 27 | - $attendeePlayer->getMaxTurns()); |
|
| 27 | + $attendeePlayer->getMaxTurns()); |
|
| 28 | 28 | $oppers[$attendeePlayer->getPlayerName()] = $turns; |
| 29 | 29 | } |
| 30 | 30 | |
@@ -44,8 +44,8 @@ |
||
| 44 | 44 | */ |
| 45 | 45 | public function getValue() : int { |
| 46 | 46 | if ($this->rank == self::RANK_JACK || |
| 47 | - $this->rank == self::RANK_QUEEN || |
|
| 48 | - $this->rank == self::RANK_KING) { |
|
| 47 | + $this->rank == self::RANK_QUEEN || |
|
| 48 | + $this->rank == self::RANK_KING) { |
|
| 49 | 49 | return 10; |
| 50 | 50 | } elseif ($this->isAce()) { |
| 51 | 51 | return 11; |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | if (!empty(BUG_REPORT_TO_ADDRESSES)) { |
| 70 | 70 | $mail = setupMailer(); |
| 71 | 71 | $mail->Subject = (defined('PAGE_PREFIX') ? PAGE_PREFIX : '??? ') . |
| 72 | - 'Automatic Bug Report'; |
|
| 72 | + 'Automatic Bug Report'; |
|
| 73 | 73 | $mail->setFrom('[email protected]'); |
| 74 | 74 | $mail->Body = $message; |
| 75 | 75 | foreach (BUG_REPORT_TO_ADDRESSES as $toAddress) { |
@@ -3,10 +3,10 @@ |
||
| 3 | 3 | // Holds information linking the received message and the game data |
| 4 | 4 | class GameLink |
| 5 | 5 | { |
| 6 | - public $valid = false; // identifies if the message is linked to game data |
|
| 7 | - public $account; // SmrAccount instance |
|
| 8 | - public $alliance; // SmrAlliance instance |
|
| 9 | - public $player; // SmrPlayer instance |
|
| 6 | + public $valid = false; // identifies if the message is linked to game data |
|
| 7 | + public $account; // SmrAccount instance |
|
| 8 | + public $alliance; // SmrAlliance instance |
|
| 9 | + public $player; // SmrPlayer instance |
|
| 10 | 10 | |
| 11 | 11 | // $author can be either Discord\Parts\User\{User,Member} |
| 12 | 12 | function __construct(Discord\Parts\Channel\Channel $channel, $author) { |
@@ -20,11 +20,11 @@ |
||
| 20 | 20 | $this->includeTemplate('includes/ForceFullCombatResults.inc.php', array('FullForceCombatResults'=>$CombatResults)); |
| 21 | 21 | } elseif ($CombatResultsType == 'PORT') { |
| 22 | 22 | $this->includeTemplate('includes/PortFullCombatResults.inc.php', array('FullPortCombatResults'=>$CombatResults, |
| 23 | - 'MinimalDisplay'=>false, |
|
| 24 | - 'AlreadyDestroyed'=>false)); |
|
| 23 | + 'MinimalDisplay'=>false, |
|
| 24 | + 'AlreadyDestroyed'=>false)); |
|
| 25 | 25 | } elseif ($CombatResultsType == 'PLANET') { |
| 26 | 26 | $this->includeTemplate('includes/PlanetFullCombatResults.inc.php', array('FullPlanetCombatResults'=>$CombatResults, |
| 27 | - 'MinimalDisplay'=>false, |
|
| 28 | - 'AlreadyDestroyed'=>false)); |
|
| 27 | + 'MinimalDisplay'=>false, |
|
| 28 | + 'AlreadyDestroyed'=>false)); |
|
| 29 | 29 | } |
| 30 | 30 | ?> |
@@ -6,7 +6,7 @@ |
||
| 6 | 6 | } else { |
| 7 | 7 | // Killed by port, planet, forces |
| 8 | 8 | echo 'The <span class="creds"> ' . number_format($KillResults['LostCredits']) |
| 9 | - . '</span> credits that were onboard ' . $TargetPlayer->getDisplayName() |
|
| 10 | - . "'s ship are lost in the wreckage.<br />"; |
|
| 9 | + . '</span> credits that were onboard ' . $TargetPlayer->getDisplayName() |
|
| 10 | + . "'s ship are lost in the wreckage.<br />"; |
|
| 11 | 11 | } |
| 12 | 12 | ?> |
@@ -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; ?>" /> |