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()) { |
@@ -50,9 +50,9 @@ |
||
| 50 | 50 | //get base for ports that dont happen to trade that good |
| 51 | 51 | $GOODS = Globals::getGoods(); |
| 52 | 52 | $fine = $totalFine = $port->getLevel() * |
| 53 | - (($ship->getCargo(GOODS_SLAVES) * $GOODS[GOODS_SLAVES]['BasePrice']) + |
|
| 54 | - ($ship->getCargo(GOODS_WEAPONS) * $GOODS[GOODS_WEAPONS]['BasePrice']) + |
|
| 55 | - ($ship->getCargo(GOODS_NARCOTICS) * $GOODS[GOODS_NARCOTICS]['BasePrice'])); |
|
| 53 | + (($ship->getCargo(GOODS_SLAVES) * $GOODS[GOODS_SLAVES]['BasePrice']) + |
|
| 54 | + ($ship->getCargo(GOODS_WEAPONS) * $GOODS[GOODS_WEAPONS]['BasePrice']) + |
|
| 55 | + ($ship->getCargo(GOODS_NARCOTICS) * $GOODS[GOODS_NARCOTICS]['BasePrice'])); |
|
| 56 | 56 | $player->increaseHOF($ship->getCargo(GOODS_SLAVES) + $ship->getCargo(GOODS_WEAPONS) + $ship->getCargo(GOODS_NARCOTICS), array('Trade', 'Search', 'Caught', 'Goods Confiscated'), HOF_PUBLIC); |
| 57 | 57 | $player->increaseHOF($totalFine, array('Trade', 'Search', 'Caught', 'Amount Fined'), HOF_PUBLIC); |
| 58 | 58 | $template->assign('TotalFine', $totalFine); |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | </center><?php |
| 75 | 75 | |
| 76 | 76 | } elseif (in_array($type, ['search', 'alliance_ips', 'wild_log', 'wild_in', |
| 77 | - 'compare', 'compare_log', 'wild_ip', 'wild_host'])) { ?> |
|
| 77 | + 'compare', 'compare_log', 'wild_ip', 'wild_host'])) { ?> |
|
| 78 | 78 | |
| 79 | 79 | <center> |
| 80 | 80 | <?php echo $Summary; ?><br /><br /> |
@@ -10,7 +10,10 @@ |
||
| 10 | 10 | <td style="width: 80%" class="center"> |
| 11 | 11 | Local Map of the Known <span class="big bold"><?php echo $GalaxyName ?></span> Galaxy |
| 12 | 12 | <br /><br /> |
| 13 | - <?php if (isset($Error)) echo $Error; ?> |
|
| 13 | + <?php if (isset($Error)) { |
|
| 14 | + echo $Error; |
|
| 15 | +} |
|
| 16 | +?> |
|
| 14 | 17 | </td> |
| 15 | 18 | <td style="width: 10%"></td> |
| 16 | 19 | </tr> |
@@ -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 | exit; |
| 70 | 70 | } |
| 71 | 71 | $account->addAuthMethod($_SESSION['socialLogin']->getLoginType(), |
| 72 | - $_SESSION['socialLogin']->getUserID()); |
|
| 72 | + $_SESSION['socialLogin']->getUserID()); |
|
| 73 | 73 | session_destroy(); |
| 74 | 74 | } |
| 75 | 75 | |
@@ -150,7 +150,7 @@ |
||
| 150 | 150 | $account->increaseSmrRewardCredits(2 * CREDITS_PER_DOLLAR); // Give $2 worth of "reward" credits for joining. |
| 151 | 151 | if ($socialLogin) { |
| 152 | 152 | $account->addAuthMethod($_SESSION['socialLogin']->getLoginType(), |
| 153 | - $_SESSION['socialLogin']->getUserID()); |
|
| 153 | + $_SESSION['socialLogin']->getUserID()); |
|
| 154 | 154 | if ($validatedBySocial) { |
| 155 | 155 | $account->setValidated(true); |
| 156 | 156 | $account->update(); |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | continue; |
| 25 | 25 | } |
| 26 | 26 | $turns = min($attendeePlayer->getTurns() + $attendeePlayer->getTurnsGained(time(), true), |
| 27 | - $attendeePlayer->getMaxTurns()); |
|
| 27 | + $attendeePlayer->getMaxTurns()); |
|
| 28 | 28 | $oppers[$attendeePlayer->getPlayerName()] = $turns; |
| 29 | 29 | } |
| 30 | 30 | |
@@ -44,8 +44,8 @@ |
||
| 44 | 44 | */ |
| 45 | 45 | public function getValue() : int { |
| 46 | 46 | if ($this->rank == self::RANK_JACK || |
| 47 | - $this->rank == self::RANK_QUEEN || |
|
| 48 | - $this->rank == self::RANK_KING) { |
|
| 47 | + $this->rank == self::RANK_QUEEN || |
|
| 48 | + $this->rank == self::RANK_KING) { |
|
| 49 | 49 | return 10; |
| 50 | 50 | } elseif ($this->isAce()) { |
| 51 | 51 | return 11; |