We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | $template->assign('SelectedPortRaceID', $selectedPortRaceID); |
| 26 | 26 | |
| 27 | 27 | $sectorLocationIDs = array_pad(array_keys($editSector->getLocations()), |
| 28 | - UNI_GEN_LOCATION_SLOTS, 0); |
|
| 28 | + UNI_GEN_LOCATION_SLOTS, 0); |
|
| 29 | 29 | $template->assign('SectorLocationIDs', $sectorLocationIDs); |
| 30 | 30 | |
| 31 | 31 | if ($editSector->hasWarp()) { |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | // * C o l o r L e g e n d |
| 29 | 29 | // ********************************* |
| 30 | 30 | $avail_colors = array('#FFFFFF', '#00FF00', '#FF3377', '#0099FF', |
| 31 | - '#FF0000', '#0000FF'); |
|
| 31 | + '#FF0000', '#0000FF'); |
|
| 32 | 32 | |
| 33 | 33 | // now assign each account id a color |
| 34 | 34 | $colors = []; |
@@ -55,9 +55,9 @@ |
||
| 55 | 55 | function applyHofVisibilityMask($amount, $vis, $gameID, $accountID) { |
| 56 | 56 | global $account, $player; |
| 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($player))) |
|
| 58 | + ($vis == HOF_ALLIANCE && isset($gameID) && |
|
| 59 | + !SmrGame::getGame($gameID)->hasEnded() && |
|
| 60 | + !SmrPlayer::getPlayer($accountID, $gameID)->sameAlliance($player))) |
|
| 61 | 61 | { |
| 62 | 62 | return '-'; |
| 63 | 63 | } else { |
@@ -7,7 +7,7 @@ |
||
| 7 | 7 | $db->query('SELECT game_id, game_name FROM game WHERE join_time < ' . $db->escapeNumber(TIME) . ' AND end_time > ' . $db->escapeNumber(TIME) . ' ORDER BY start_time DESC'); |
| 8 | 8 | while ($db->nextRecord()) { |
| 9 | 9 | $activeGames[] = array('game_name' => $db->getField('game_name'), |
| 10 | - 'game_id' => $db->getInt('game_id')); |
|
| 10 | + 'game_id' => $db->getInt('game_id')); |
|
| 11 | 11 | } |
| 12 | 12 | $template->assign('ActiveGames', $activeGames); |
| 13 | 13 | |
@@ -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 | |
@@ -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; |
@@ -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); |
@@ -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)) { |