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 | ?> |
@@ -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; ?>" /> |
@@ -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)) { |
@@ -44,7 +44,10 @@ |
||
| 44 | 44 | <td> |
| 45 | 45 | <select name="game_type"><?php |
| 46 | 46 | foreach (SmrGame::GAME_TYPES as $GameTypeID => $GameType) { |
| 47 | - ?><option value="<?php echo $GameTypeID; ?>" <?php if ($GameType == $Game['gameType']) echo 'selected'; ?>><?php echo $GameType; ?></option><?php |
|
| 47 | + ?><option value="<?php echo $GameTypeID; ?>" <?php if ($GameType == $Game['gameType']) { |
|
| 48 | + echo 'selected'; |
|
| 49 | + } |
|
| 50 | + ?>><?php echo $GameType; ?></option><?php |
|
| 48 | 51 | } ?> |
| 49 | 52 | </select> |
| 50 | 53 | </td> |
@@ -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 | } |
@@ -230,13 +230,13 @@ |
||
| 230 | 230 | $planet->increaseBuilding(PLANET_HANGAR, 4); |
| 231 | 231 | $this->assertTrue($planet->hasBuilding(PLANET_HANGAR)); |
| 232 | 232 | $this->assertSame(4, $planet->getBuilding(PLANET_HANGAR)); |
| 233 | - $this->assertSame(4/3, $planet->getLevel()); |
|
| 233 | + $this->assertSame(4 / 3, $planet->getLevel()); |
|
| 234 | 234 | |
| 235 | 235 | // Destroy some hangars |
| 236 | 236 | $planet->destroyBuilding(PLANET_HANGAR, 2); |
| 237 | 237 | $this->assertTrue($planet->hasBuilding(PLANET_HANGAR)); |
| 238 | 238 | $this->assertSame(2, $planet->getBuilding(PLANET_HANGAR)); |
| 239 | - $this->assertSame(2/3, $planet->getLevel()); |
|
| 239 | + $this->assertSame(2 / 3, $planet->getLevel()); |
|
| 240 | 240 | } |
| 241 | 241 | |
| 242 | 242 | } |