We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -3,7 +3,7 @@ |
||
3 | 3 | function get_turns_message($player) { |
4 | 4 | // turns only update when the player is active, so calculate current turns |
5 | 5 | $turns = min($player->getTurns() + $player->getTurnsGained(time(), true), |
6 | - $player->getMaxTurns()); |
|
6 | + $player->getMaxTurns()); |
|
7 | 7 | $msg = $player->getPlayerName() . " has $turns/" . $player->getMaxTurns() . " turns."; |
8 | 8 | |
9 | 9 | // Calculate time to max turns if under the max |
@@ -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 |
@@ -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()) { |
@@ -15,4 +15,4 @@ |
||
15 | 15 | } |
16 | 16 | |
17 | 17 | $template->assign('AllClaims', array($player->getClaimableBounties('HQ'), |
18 | - $player->getClaimableBounties('UG'))); |
|
18 | + $player->getClaimableBounties('UG'))); |
@@ -9,10 +9,11 @@ discard block |
||
9 | 9 | $realAttackers = array(); |
10 | 10 | $attackers = array(); |
11 | 11 | $i=1; |
12 | -if(isset($_POST['attackers'])) |
|
12 | +if(isset($_POST['attackers'])) { |
|
13 | 13 | foreach($_POST['attackers'] as $attackerName) { |
14 | 14 | if($attackerName=='none') |
15 | 15 | continue; |
16 | +} |
|
16 | 17 | if(isset($usedNames[$attackerName])) { |
17 | 18 | $duplicates = true; |
18 | 19 | continue; |
@@ -24,17 +25,19 @@ discard block |
||
24 | 25 | ++$i; |
25 | 26 | } |
26 | 27 | |
27 | -for(;$i<=10;++$i) |
|
28 | +for(;$i<=10;++$i) { |
|
28 | 29 | $attackers[$i] = null; |
30 | +} |
|
29 | 31 | $template->assign('Attackers',$attackers); |
30 | 32 | |
31 | 33 | $i=1; |
32 | 34 | $realDefenders = array(); |
33 | 35 | $defenders = array(); |
34 | -if(isset($_POST['defenders'])) |
|
36 | +if(isset($_POST['defenders'])) { |
|
35 | 37 | foreach($_POST['defenders'] as $defenderName) { |
36 | 38 | if($defenderName=='none') |
37 | 39 | continue; |
40 | +} |
|
38 | 41 | if(isset($usedNames[$defenderName])) { |
39 | 42 | $duplicates = true; |
40 | 43 | continue; |
@@ -46,8 +49,9 @@ discard block |
||
46 | 49 | ++$i; |
47 | 50 | } |
48 | 51 | |
49 | -for(;$i<=10;++$i) |
|
52 | +for(;$i<=10;++$i) { |
|
50 | 53 | $defenders[$i] = null; |
54 | +} |
|
51 | 55 | $template->assign('Defenders',$defenders); |
52 | 56 | |
53 | 57 | $template->assign('Duplicates',$duplicates); |
@@ -62,12 +66,14 @@ discard block |
||
62 | 66 | while(count($realAttackers)>0 && count($realDefenders)>0) { |
63 | 67 | runAnAttack($realAttackers,$realDefenders); |
64 | 68 | foreach($realAttackers as $key => &$teamPlayer) { |
65 | - if($teamPlayer->isDead()) |
|
66 | - unset($realAttackers[$key]); |
|
69 | + if($teamPlayer->isDead()) { |
|
70 | + unset($realAttackers[$key]); |
|
71 | + } |
|
67 | 72 | } unset($teamPlayer); |
68 | 73 | foreach($realDefenders as $key => &$teamPlayer) { |
69 | - if($teamPlayer->isDead()) |
|
70 | - unset($realDefenders[$key]); |
|
74 | + if($teamPlayer->isDead()) { |
|
75 | + unset($realDefenders[$key]); |
|
76 | + } |
|
71 | 77 | } unset($teamPlayer); |
72 | 78 | } |
73 | 79 | } |
@@ -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 | ?> |
@@ -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 /> |