We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -46,5 +46,5 @@ |
||
| 46 | 46 | $template->assign('ProcessingHREF', $processingHREF); |
| 47 | 47 | |
| 48 | 48 | $template->assign('PermissionCategories', |
| 49 | - AdminPermissions::getPermissionsByCategory()); |
|
| 49 | + AdminPermissions::getPermissionsByCategory()); |
|
| 50 | 50 | } |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | // Send vote announcement to members of the player's council (war votes) |
| 40 | 40 | // or both races' councils (peace votes). |
| 41 | 41 | $councilMembers = Council::getRaceCouncil($player->getGameID(), |
| 42 | - $player->getRaceID()); |
|
| 42 | + $player->getRaceID()); |
|
| 43 | 43 | if ($type == 'PEACE') { |
| 44 | 44 | $otherCouncil = Council::getRaceCouncil($player->getGameID(), $race_id); |
| 45 | 45 | $councilMembers = array_merge($councilMembers, $otherCouncil); |
@@ -49,16 +49,16 @@ discard block |
||
| 49 | 49 | $color = ($type == 'PEACE' ? 'dgreen' : 'red'); |
| 50 | 50 | $type_fancy = "<span class=\"$color\">$type</span>"; |
| 51 | 51 | $message = $player->getLevelName() . " " . $player->getBBLink() |
| 52 | - . " has initiated a vote for $type_fancy with the " |
|
| 53 | - . Globals::getRaceName($race_id) |
|
| 54 | - . "! You have " . format_time(TIME_FOR_COUNCIL_VOTE) |
|
| 55 | - . " to cast your vote."; |
|
| 52 | + . " has initiated a vote for $type_fancy with the " |
|
| 53 | + . Globals::getRaceName($race_id) |
|
| 54 | + . "! You have " . format_time(TIME_FOR_COUNCIL_VOTE) |
|
| 55 | + . " to cast your vote."; |
|
| 56 | 56 | |
| 57 | 57 | foreach ($councilMembers as $accountID) { |
| 58 | 58 | // don't send to the player who started the vote |
| 59 | 59 | if ($player->getAccountID() != $accountID) { |
| 60 | 60 | SmrPlayer::sendMessageFromRace($player->getRaceID(), $player->getGameID(), |
| 61 | - $accountID, $message, $time); |
|
| 61 | + $accountID, $message, $time); |
|
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | 64 | |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | $account->increaseSmrRewardCredits(2 * CREDITS_PER_DOLLAR); // Give $2 worth of "reward" credits for joining. |
| 158 | 158 | if ($socialLogin) { |
| 159 | 159 | $account->addAuthMethod($_SESSION['socialLogin']->getLoginType(), |
| 160 | - $_SESSION['socialLogin']->getUserID()); |
|
| 160 | + $_SESSION['socialLogin']->getUserID()); |
|
| 161 | 161 | if ($validatedBySocial) { |
| 162 | 162 | $account->setValidated(true); |
| 163 | 163 | } |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | |
| 186 | 186 | // remember when we sent validation code |
| 187 | 187 | $db->query('INSERT INTO notification (notification_type, account_id, time) ' . |
| 188 | - 'VALUES(\'validation_code\', ' . $db->escapeNumber($account->getAccountID()) . ', ' . $db->escapeNumber(TIME) . ')'); |
|
| 188 | + 'VALUES(\'validation_code\', ' . $db->escapeNumber($account->getAccountID()) . ', ' . $db->escapeNumber(TIME) . ')'); |
|
| 189 | 189 | } |
| 190 | 190 | |
| 191 | 191 | $container = create_container('login_processing.php'); |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | // Delete all tickets and re-insert the winning ticket |
| 24 | 24 | $db->query('DELETE FROM player_has_ticket WHERE game_id = ' . $db->escapeNumber($gameID)); |
| 25 | 25 | $db->query('INSERT INTO player_has_ticket (game_id, account_id, time, prize) ' |
| 26 | - .'VALUES (' . $db->escapeNumber($gameID) . ',' . $db->escapeNumber($winner_id) . ',\'0\',' . $db->escapeNumber($lottoInfo['Prize']) . ')'); |
|
| 26 | + .'VALUES (' . $db->escapeNumber($gameID) . ',' . $db->escapeNumber($winner_id) . ',\'0\',' . $db->escapeNumber($lottoInfo['Prize']) . ')'); |
|
| 27 | 27 | |
| 28 | 28 | //get around locked table problem |
| 29 | 29 | $lottoWon = true; |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | |
| 36 | 36 | // Set the body of the e-mail |
| 37 | 37 | set_mail_body($mail, $var['newsletter_html'], $var['newsletter_text'], |
| 38 | - $_REQUEST['salutation']); |
|
| 38 | + $_REQUEST['salutation']); |
|
| 39 | 39 | |
| 40 | 40 | if ($_REQUEST['to_email'] == '*') { |
| 41 | 41 | // Send the newsletter to all players. |
@@ -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); |
@@ -316,8 +316,8 @@ |
||
| 316 | 316 | foreach (Globals::getAvailableTemplates() as $AvailableTemplate => $ColourSchemes) { |
| 317 | 317 | foreach ($ColourSchemes as $ColourScheme) { |
| 318 | 318 | $selected = ($ThisAccount->getTemplate() == $AvailableTemplate && |
| 319 | - $ThisAccount->getColourScheme() == $ColourScheme && |
|
| 320 | - $ThisAccount->isDefaultCSSEnabled()) ? 'selected' : ''; |
|
| 319 | + $ThisAccount->getColourScheme() == $ColourScheme && |
|
| 320 | + $ThisAccount->isDefaultCSSEnabled()) ? 'selected' : ''; |
|
| 321 | 321 | $name = $AvailableTemplate . ' - ' . $ColourScheme; |
| 322 | 322 | ?><option value="<?php echo $name; ?>" <?php echo $selected; ?>><?php echo $name; ?></option><?php |
| 323 | 323 | } |
@@ -20,11 +20,11 @@ |
||
| 20 | 20 | $this->includeTemplate('includes/ForceFullCombatResults.inc', array('FullForceCombatResults'=>$CombatResults)); |
| 21 | 21 | } else if ($CombatResultsType == 'PORT') { |
| 22 | 22 | $this->includeTemplate('includes/PortFullCombatResults.inc', array('FullPortCombatResults'=>$CombatResults, |
| 23 | - 'MinimalDisplay'=>false, |
|
| 24 | - 'AlreadyDestroyed'=>false)); |
|
| 23 | + 'MinimalDisplay'=>false, |
|
| 24 | + 'AlreadyDestroyed'=>false)); |
|
| 25 | 25 | } else if ($CombatResultsType == 'PLANET') { |
| 26 | 26 | $this->includeTemplate('includes/PlanetFullCombatResults.inc', array('FullPlanetCombatResults'=>$CombatResults, |
| 27 | - 'MinimalDisplay'=>false, |
|
| 28 | - 'AlreadyDestroyed'=>false)); |
|
| 27 | + 'MinimalDisplay'=>false, |
|
| 28 | + 'AlreadyDestroyed'=>false)); |
|
| 29 | 29 | } |
| 30 | 30 | ?> |
@@ -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)) { |