We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -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 | ?> |
@@ -102,7 +102,7 @@ |
||
| 102 | 102 | if (!$UniGen) { |
| 103 | 103 | $CanScanSector = ($ThisShip->hasScanner() && $isLinkedSector) || $isCurrentSector; |
| 104 | 104 | $ShowFriendlyForces = isset($HideAlliedForces) && $HideAlliedForces ? |
| 105 | - $Sector->hasPlayerForces($MapPlayer) : $Sector->hasFriendlyForces($MapPlayer); |
|
| 105 | + $Sector->hasPlayerForces($MapPlayer) : $Sector->hasFriendlyForces($MapPlayer); |
|
| 106 | 106 | if (($CanScanSector && ($Sector->hasForces() || $Sector->hasPlayers())) || $ShowFriendlyForces || $Sector->hasFriendlyTraders($MapPlayer)) { ?> |
| 107 | 107 | <div class="lmtf"><?php |
| 108 | 108 | if ($CanScanSector && $Sector->hasEnemyTraders($MapPlayer)) { |
@@ -735,7 +735,7 @@ |
||
| 735 | 735 | if ($buildingTypeID === null) { |
| 736 | 736 | $structs = $this->typeInfo::STRUCTURES; |
| 737 | 737 | return array_combine(array_keys($structs), |
| 738 | - array_column($structs, 'max_amount')); |
|
| 738 | + array_column($structs, 'max_amount')); |
|
| 739 | 739 | } |
| 740 | 740 | return $this->getStructureTypes($buildingTypeID)->maxAmount(); |
| 741 | 741 | } |
@@ -561,7 +561,7 @@ |
||
| 561 | 561 | */ |
| 562 | 562 | public function setWarp(SmrSector $warp) : void { |
| 563 | 563 | if ($this->getWarp() == $warp->getSectorID() && |
| 564 | - $warp->getWarp() == $this->getSectorID()) { |
|
| 564 | + $warp->getWarp() == $this->getSectorID()) { |
|
| 565 | 565 | // Warps are already set correctly! |
| 566 | 566 | return; |
| 567 | 567 | } |
@@ -735,14 +735,14 @@ |
||
| 735 | 735 | |
| 736 | 736 | public function isFederal() : bool { |
| 737 | 737 | return $this->getTypeID() === SHIP_TYPE_FEDERAL_DISCOVERY || |
| 738 | - $this->getTypeID() === SHIP_TYPE_FEDERAL_WARRANT || |
|
| 739 | - $this->getTypeID() === SHIP_TYPE_FEDERAL_ULTIMATUM; |
|
| 738 | + $this->getTypeID() === SHIP_TYPE_FEDERAL_WARRANT || |
|
| 739 | + $this->getTypeID() === SHIP_TYPE_FEDERAL_ULTIMATUM; |
|
| 740 | 740 | } |
| 741 | 741 | |
| 742 | 742 | public function isUnderground() : bool { |
| 743 | 743 | return $this->getTypeID() === SHIP_TYPE_THIEF || |
| 744 | - $this->getTypeID() === SHIP_TYPE_ASSASSIN || |
|
| 745 | - $this->getTypeID() === SHIP_TYPE_DEATH_CRUISER; |
|
| 744 | + $this->getTypeID() === SHIP_TYPE_ASSASSIN || |
|
| 745 | + $this->getTypeID() === SHIP_TYPE_DEATH_CRUISER; |
|
| 746 | 746 | } |
| 747 | 747 | |
| 748 | 748 | public function shootPlayers(array $targetPlayers) : array { |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | function get_turns_message(SmrPlayer $player) : string { |
| 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 |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | $db = Smr\Database::getInstance(); |
| 18 | 18 | $db->switchDatabases($var['HistoryDatabase']); |
| 19 | 19 | $dbResult = $db->read('SELECT start_date, type, end_date, game_name, speed, game_id ' . |
| 20 | - 'FROM game WHERE game_id = ' . $db->escapeNumber($game_id)); |
|
| 20 | + 'FROM game WHERE game_id = ' . $db->escapeNumber($game_id)); |
|
| 21 | 21 | $dbRecord = $dbResult->record(); |
| 22 | 22 | $template->assign('GameName', $game_name); |
| 23 | 23 | $template->assign('Start', date($account->getDateFormat(), $dbRecord->getInt('start_date'))); |
@@ -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) { |