We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -76,7 +76,10 @@ discard block |
||
| 76 | 76 | <input type="number" name="amount" value="0" min="<?php echo MIN_GLOBAL_RELATIONS; ?>" max="<?php echo MAX_GLOBAL_RELATIONS; ?>" style="width:75px" /> |
| 77 | 77 | <select name="race"><?php |
| 78 | 78 | foreach (Smr\Race::getPlayableNames() as $raceID => $raceName) { |
| 79 | - if ($raceID == $ThisPlayer->getRaceID()) continue; ?> |
|
| 79 | + if ($raceID == $ThisPlayer->getRaceID()) { |
|
| 80 | + continue; |
|
| 81 | + } |
|
| 82 | + ?> |
|
| 80 | 83 | <option value="<?php echo $raceID; ?>"><?php echo $raceName; ?></option><?php |
| 81 | 84 | } ?> |
| 82 | 85 | </select> |
@@ -87,7 +90,10 @@ discard block |
||
| 87 | 90 | <form method="POST" action="<?php echo $ChangeRaceHREF; ?>"> |
| 88 | 91 | <select name="race"><?php |
| 89 | 92 | foreach (Smr\Race::getPlayableNames() as $raceID => $raceName) { |
| 90 | - if ($raceID == $ThisPlayer->getRaceID()) continue; ?> |
|
| 93 | + if ($raceID == $ThisPlayer->getRaceID()) { |
|
| 94 | + continue; |
|
| 95 | + } |
|
| 96 | + ?> |
|
| 91 | 97 | <option value="<?php echo $raceID; ?>"><?php echo $raceName; ?></option><?php |
| 92 | 98 | } ?> |
| 93 | 99 | </select> |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | // Send vote announcement to members of the player's council (war votes) |
| 45 | 45 | // or both races' councils (peace votes). |
| 46 | 46 | $councilMembers = Council::getRaceCouncil($player->getGameID(), |
| 47 | - $player->getRaceID()); |
|
| 47 | + $player->getRaceID()); |
|
| 48 | 48 | if ($type == 'PEACE') { |
| 49 | 49 | $otherCouncil = Council::getRaceCouncil($player->getGameID(), $race_id); |
| 50 | 50 | $councilMembers = array_merge($councilMembers, $otherCouncil); |
@@ -54,15 +54,15 @@ discard block |
||
| 54 | 54 | $color = ($type == 'PEACE' ? 'dgreen' : 'red'); |
| 55 | 55 | $type_fancy = "<span class=\"$color\">$type</span>"; |
| 56 | 56 | $message = $player->getLevelName() . " " . $player->getBBLink() |
| 57 | - . " has initiated a vote for $type_fancy with the [race=$race_id]!" |
|
| 58 | - . "You have " . format_time(TIME_FOR_COUNCIL_VOTE) |
|
| 59 | - . " to cast your vote."; |
|
| 57 | + . " has initiated a vote for $type_fancy with the [race=$race_id]!" |
|
| 58 | + . "You have " . format_time(TIME_FOR_COUNCIL_VOTE) |
|
| 59 | + . " to cast your vote."; |
|
| 60 | 60 | |
| 61 | 61 | foreach ($councilMembers as $accountID) { |
| 62 | 62 | // don't send to the player who started the vote |
| 63 | 63 | if ($player->getAccountID() != $accountID) { |
| 64 | 64 | SmrPlayer::sendMessageFromRace($player->getRaceID(), $player->getGameID(), |
| 65 | - $accountID, $message, $time); |
|
| 65 | + $accountID, $message, $time); |
|
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | |