We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | foreach ($alliance_vs_ids as $id) { |
| 53 | 53 | $row_alliance = SmrAlliance::getAlliance($id, $player->getGameID()); |
| 54 | 54 | $showRed = (!$curr_alliance->isNone() && $curr_alliance->hasDisbanded()) || |
| 55 | - (!$row_alliance->isNone() && $row_alliance->hasDisbanded()); |
|
| 55 | + (!$row_alliance->isNone() && $row_alliance->hasDisbanded()); |
|
| 56 | 56 | $showBold = $curr_id == $player->getAllianceID() || $id == $player->getAllianceID(); |
| 57 | 57 | $style = ''; |
| 58 | 58 | if ($curr_id == $id && !$row_alliance->isNone()) { |
@@ -337,8 +337,8 @@ |
||
| 337 | 337 | foreach (Globals::getAvailableTemplates() as $Template) { |
| 338 | 338 | foreach (Globals::getAvailableColourSchemes($Template) as $ColourScheme) { |
| 339 | 339 | $selected = ($ThisAccount->getTemplate() == $Template && |
| 340 | - $ThisAccount->getColourScheme() == $ColourScheme && |
|
| 341 | - $ThisAccount->isDefaultCSSEnabled()) ? 'selected' : ''; |
|
| 340 | + $ThisAccount->getColourScheme() == $ColourScheme && |
|
| 341 | + $ThisAccount->isDefaultCSSEnabled()) ? 'selected' : ''; |
|
| 342 | 342 | $name = $Template . ' - ' . $ColourScheme; |
| 343 | 343 | ?><option value="<?php echo $name; ?>" <?php echo $selected; ?>><?php echo $name; ?></option><?php |
| 344 | 344 | } |
@@ -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) { |
@@ -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)) { |
@@ -53,9 +53,9 @@ |
||
| 53 | 53 | //get base for ports that dont happen to trade that good |
| 54 | 54 | $GOODS = Globals::getGoods(); |
| 55 | 55 | $fine = $totalFine = $port->getLevel() * |
| 56 | - (($ship->getCargo(GOODS_SLAVES) * $GOODS[GOODS_SLAVES]['BasePrice']) + |
|
| 57 | - ($ship->getCargo(GOODS_WEAPONS) * $GOODS[GOODS_WEAPONS]['BasePrice']) + |
|
| 58 | - ($ship->getCargo(GOODS_NARCOTICS) * $GOODS[GOODS_NARCOTICS]['BasePrice'])); |
|
| 56 | + (($ship->getCargo(GOODS_SLAVES) * $GOODS[GOODS_SLAVES]['BasePrice']) + |
|
| 57 | + ($ship->getCargo(GOODS_WEAPONS) * $GOODS[GOODS_WEAPONS]['BasePrice']) + |
|
| 58 | + ($ship->getCargo(GOODS_NARCOTICS) * $GOODS[GOODS_NARCOTICS]['BasePrice'])); |
|
| 59 | 59 | $player->increaseHOF($ship->getCargo(GOODS_SLAVES) + $ship->getCargo(GOODS_WEAPONS) + $ship->getCargo(GOODS_NARCOTICS), ['Trade', 'Search', 'Caught', 'Goods Confiscated'], HOF_PUBLIC); |
| 60 | 60 | $player->increaseHOF($totalFine, ['Trade', 'Search', 'Caught', 'Amount Fined'], HOF_PUBLIC); |
| 61 | 61 | $template->assign('TotalFine', $totalFine); |
@@ -26,8 +26,8 @@ discard block |
||
| 26 | 26 | $shareFrom[$fromAccountId] = [ |
| 27 | 27 | 'Player ID' => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(), |
| 28 | 28 | 'Player Name' => $otherPlayer == null ? |
| 29 | - '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() : |
|
| 30 | - $otherPlayer->getDisplayName(), |
|
| 29 | + '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() : |
|
| 30 | + $otherPlayer->getDisplayName(), |
|
| 31 | 31 | 'All Games' => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>', |
| 32 | 32 | 'Game ID' => $gameId, |
| 33 | 33 | ]; |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | $shareTo[$toAccountId] = [ |
| 48 | 48 | 'Player ID' => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(), |
| 49 | 49 | 'Player Name' => $otherPlayer == null ? |
| 50 | - '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() : |
|
| 51 | - $otherPlayer->getDisplayName(), |
|
| 50 | + '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() : |
|
| 51 | + $otherPlayer->getDisplayName(), |
|
| 52 | 52 | 'All Games' => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>', |
| 53 | 53 | 'Game ID' => $gameId, |
| 54 | 54 | ]; |
@@ -555,7 +555,7 @@ |
||
| 555 | 555 | */ |
| 556 | 556 | public function setWarp(SmrSector $warp): void { |
| 557 | 557 | if ($this->getWarp() == $warp->getSectorID() && |
| 558 | - $warp->getWarp() == $this->getSectorID()) { |
|
| 558 | + $warp->getWarp() == $this->getSectorID()) { |
|
| 559 | 559 | // Warps are already set correctly! |
| 560 | 560 | return; |
| 561 | 561 | } |
@@ -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 { |