We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -5,7 +5,7 @@ |
||
| 5 | 5 | // Get the dates ("|" sets hr/min/sec to 0) |
| 6 | 6 | $join = DateTime::createFromFormat('d/m/Y|', Smr\Request::get('game_join')); |
| 7 | 7 | $start = empty(Smr\Request::get('game_start')) ? $join : |
| 8 | - DateTime::createFromFormat('d/m/Y|', Smr\Request::get('game_start')); |
|
| 8 | + DateTime::createFromFormat('d/m/Y|', Smr\Request::get('game_start')); |
|
| 9 | 9 | $end = DateTime::createFromFormat('d/m/Y|', Smr\Request::get('game_end')); |
| 10 | 10 | |
| 11 | 11 | $game = SmrGame::getGame($var['game_id']); |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | } |
| 36 | 36 | $helper = self::getTwitterObj($_SESSION['TwitterToken']); |
| 37 | 37 | $accessToken = $helper->oauth('oauth/access_token', |
| 38 | - ['oauth_verifier' => Request::get('oauth_verifier')]); |
|
| 38 | + ['oauth_verifier' => Request::get('oauth_verifier')]); |
|
| 39 | 39 | $auth = self::getTwitterObj($accessToken); |
| 40 | 40 | $userInfo = $auth->get('account/verify_credentials', ['include_email' => 'true']); |
| 41 | 41 | if ($auth->getLastHttpCode() == 200) { |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | // Send vote announcement to members of the player's council (war votes) |
| 45 | 45 | // or both races' councils (peace votes). |
| 46 | 46 | $councilMembers = Council::getRaceCouncil($player->getGameID(), |
| 47 | - $player->getRaceID()); |
|
| 47 | + $player->getRaceID()); |
|
| 48 | 48 | if ($type == 'PEACE') { |
| 49 | 49 | $otherCouncil = Council::getRaceCouncil($player->getGameID(), $race_id); |
| 50 | 50 | $councilMembers = array_merge($councilMembers, $otherCouncil); |
@@ -54,15 +54,15 @@ discard block |
||
| 54 | 54 | $color = ($type == 'PEACE' ? 'dgreen' : 'red'); |
| 55 | 55 | $type_fancy = "<span class=\"$color\">$type</span>"; |
| 56 | 56 | $message = $player->getLevelName() . " " . $player->getBBLink() |
| 57 | - . " has initiated a vote for $type_fancy with the [race=$race_id]!" |
|
| 58 | - . " You have " . format_time(TIME_FOR_COUNCIL_VOTE) |
|
| 59 | - . " to cast your vote."; |
|
| 57 | + . " has initiated a vote for $type_fancy with the [race=$race_id]!" |
|
| 58 | + . " You have " . format_time(TIME_FOR_COUNCIL_VOTE) |
|
| 59 | + . " to cast your vote."; |
|
| 60 | 60 | |
| 61 | 61 | foreach ($councilMembers as $accountID) { |
| 62 | 62 | // don't send to the player who started the vote |
| 63 | 63 | if ($player->getAccountID() != $accountID) { |
| 64 | 64 | SmrPlayer::sendMessageFromRace($player->getRaceID(), $player->getGameID(), |
| 65 | - $accountID, $message, $time); |
|
| 65 | + $accountID, $message, $time); |
|
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | foreach ($dbResult->records() as $dbRecord) { |
| 311 | 311 | try { |
| 312 | 312 | $otherPlayer = SmrPlayer::getPlayer($dbRecord->getInt('from_account_id'), |
| 313 | - $this->getGameID(), $forceUpdate); |
|
| 313 | + $this->getGameID(), $forceUpdate); |
|
| 314 | 314 | } catch (Smr\Exceptions\PlayerNotFound $e) { |
| 315 | 315 | // Skip players that have not joined this game |
| 316 | 316 | continue; |
@@ -867,9 +867,9 @@ discard block |
||
| 867 | 867 | */ |
| 868 | 868 | public function canFight() : bool { |
| 869 | 869 | return !($this->hasNewbieTurns() || |
| 870 | - $this->isDead() || |
|
| 871 | - $this->isLandedOnPlanet() || |
|
| 872 | - $this->hasFederalProtection()); |
|
| 870 | + $this->isDead() || |
|
| 871 | + $this->isLandedOnPlanet() || |
|
| 872 | + $this->hasFederalProtection()); |
|
| 873 | 873 | } |
| 874 | 874 | |
| 875 | 875 | public function setDead(bool $bool) : void { |