We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -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 |
@@ -30,8 +30,8 @@ |
||
30 | 30 | $leader = SmrPlayer::getPlayer($db->getInt('leader_account_id'), $player->getGameID()); |
31 | 31 | $pickedPlayer = SmrPlayer::getPlayer($db->getInt('picked_account_id'), $player->getGameID()); |
32 | 32 | $history[] = array('Leader' => $leader, |
33 | - 'Player' => $pickedPlayer, |
|
34 | - 'Time' => $db->getInt('time')); |
|
33 | + 'Player' => $pickedPlayer, |
|
34 | + 'Time' => $db->getInt('time')); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | $template->assign('History', $history); |
@@ -15,11 +15,11 @@ |
||
15 | 15 | // Special case for leaders who haven't made their own alliance yet, |
16 | 16 | // or are still in the Newbie Help Alliance. |
17 | 17 | $teams[$leader->getAccountId()] = array('Leader' => $leader, |
18 | - 'Size' => 0); |
|
18 | + 'Size' => 0); |
|
19 | 19 | } else { |
20 | 20 | $teams[$leader->getAccountId()] = array('Leader' => $leader, |
21 | - 'Alliance' => $alliance, |
|
22 | - 'Size' => $alliance->getNumMembers()); |
|
21 | + 'Alliance' => $alliance, |
|
22 | + 'Size' => $alliance->getNumMembers()); |
|
23 | 23 | } |
24 | 24 | } |
25 | 25 |
@@ -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,8 +102,8 @@ |
||
102 | 102 | if (!$UniGen) { |
103 | 103 | $CanScanSector = ($ThisShip->hasScanner() && $isLinkedSector) || $isCurrentSector; |
104 | 104 | $ShowFriendlyForces = isset($HideAlliedForces) && $HideAlliedForces ? |
105 | - $Sector->hasPlayerForces($MapPlayer) : |
|
106 | - $Sector->hasFriendlyForces($MapPlayer); |
|
105 | + $Sector->hasPlayerForces($MapPlayer) : |
|
106 | + $Sector->hasFriendlyForces($MapPlayer); |
|
107 | 107 | if( ($CanScanSector && ($Sector->hasForces() || $Sector->hasPlayers()) ) || $ShowFriendlyForces || $Sector->hasFriendlyTraders($MapPlayer)) { ?> |
108 | 108 | <div class="lmtf"><?php |
109 | 109 | if($CanScanSector && $Sector->hasEnemyTraders($MapPlayer)) { |
@@ -22,12 +22,12 @@ |
||
22 | 22 | } |
23 | 23 | else if($CombatResultsType=='PORT') { |
24 | 24 | $this->includeTemplate('includes/PortFullCombatResults.inc',array('FullPortCombatResults'=>$CombatResults, |
25 | - 'MinimalDisplay'=>false, |
|
26 | - 'AlreadyDestroyed'=>false)); |
|
25 | + 'MinimalDisplay'=>false, |
|
26 | + 'AlreadyDestroyed'=>false)); |
|
27 | 27 | } |
28 | 28 | else if($CombatResultsType=='PLANET') { |
29 | 29 | $this->includeTemplate('includes/PlanetFullCombatResults.inc',array('FullPlanetCombatResults'=>$CombatResults, |
30 | - 'MinimalDisplay'=>false, |
|
31 | - 'AlreadyDestroyed'=>false)); |
|
30 | + 'MinimalDisplay'=>false, |
|
31 | + 'AlreadyDestroyed'=>false)); |
|
32 | 32 | } |
33 | 33 | ?> |
@@ -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 | } |
@@ -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 /> |
@@ -3,11 +3,11 @@ |
||
3 | 3 | if (!empty($_POST['game_id'])) { |
4 | 4 | // Enable the requested game |
5 | 5 | $db->query('UPDATE game SET enabled=' . $db->escapeBoolean(true) . |
6 | - ' WHERE game_id=' . $db->escapeNumber($_POST['game_id'])); |
|
6 | + ' WHERE game_id=' . $db->escapeNumber($_POST['game_id'])); |
|
7 | 7 | |
8 | 8 | $game = SmrGame::getGame($_POST['game_id'])->getDisplayName(); |
9 | 9 | $msg = "<span class='green'>SUCCESS: </span>Enabled game $game."; |
10 | 10 | } |
11 | 11 | |
12 | 12 | forward(create_container('skeleton.php', 'enable_game.php', |
13 | - array('processing_msg' => $msg))); |
|
13 | + array('processing_msg' => $msg))); |