We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -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)) { |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | foreach (\Globals::getGoods() as $goodId => $value) { |
| 91 | 91 | if ($goods[$goodId] === true) { |
| 92 | 92 | if ($sectors[$currentSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_SELLS && |
| 93 | - $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_BUYS) { |
|
| 93 | + $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_BUYS) { |
|
| 94 | 94 | $rl[] = new OneWayRoute($currentSectorId, $targetSectorId, $raceID, $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getGoodDistance($goodId), $sectors[$targetSectorId]->getPort()->getGoodDistance($goodId), $distance, $goodId); |
| 95 | 95 | } |
| 96 | 96 | } |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | foreach (\Globals::getGoods() as $goodId => $value) { |
| 119 | 119 | if ($goods[$goodId] === true) { |
| 120 | 120 | if ($sectors[$currentSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_SELLS && |
| 121 | - $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_BUYS) { |
|
| 121 | + $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_BUYS) { |
|
| 122 | 122 | $owr = new OneWayRoute($currentSectorId, $targetSectorId, $sectors[$currentSectorId]->getPort()->getRaceID(), $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getGoodDistance($goodId), $sectors[$targetSectorId]->getPort()->getGoodDistance($goodId), $distance, $goodId); |
| 123 | 123 | $fakeReturn = new OneWayRoute($targetSectorId, $currentSectorId, $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getRaceID(), 0, 0, $distance, GOODS_NOTHING); |
| 124 | 124 | $mpr = new MultiplePortRoute($owr, $fakeReturn); |
@@ -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) { |
@@ -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 | } |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | |
| 34 | 34 | // Form to make planet changes |
| 35 | 35 | $container = Page::create('1.6/universe_create_save_processing.php', |
| 36 | - '1.6/universe_create_sectors.php', $var); |
|
| 36 | + '1.6/universe_create_sectors.php', $var); |
|
| 37 | 37 | $template->assign('CreatePlanetsFormHREF', $container->href()); |
| 38 | 38 | |
| 39 | 39 | // HREF to cancel and return to the previous page |
@@ -94,7 +94,7 @@ |
||
| 94 | 94 | |
| 95 | 95 | // Form to make location changes |
| 96 | 96 | $container = Page::create('1.6/universe_create_save_processing.php', |
| 97 | - '1.6/universe_create_sectors.php', $var); |
|
| 97 | + '1.6/universe_create_sectors.php', $var); |
|
| 98 | 98 | $template->assign('CreateLocationsFormHREF', $container->href()); |
| 99 | 99 | |
| 100 | 100 | // HREF to cancel and return to the previous page |
@@ -7,4 +7,4 @@ |
||
| 7 | 7 | $msg = '<span class="green">SUCCESS: </span>Enabled game ' . $game->getDisplayName(); |
| 8 | 8 | |
| 9 | 9 | Page::create('skeleton.php', 'enable_game.php', |
| 10 | - array('processing_msg' => $msg))->go(); |
|
| 10 | + array('processing_msg' => $msg))->go(); |
|
@@ -55,9 +55,9 @@ |
||
| 55 | 55 | $session = Smr\Session::getInstance(); |
| 56 | 56 | $account = $session->getAccount(); |
| 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($session->getPlayer()))) |
|
| 58 | + ($vis == HOF_ALLIANCE && isset($gameID) && |
|
| 59 | + !SmrGame::getGame($gameID)->hasEnded() && |
|
| 60 | + !SmrPlayer::getPlayer($accountID, $gameID)->sameAlliance($session->getPlayer()))) |
|
| 61 | 61 | { |
| 62 | 62 | return '-'; |
| 63 | 63 | } else { |