smrealms /
smr
We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -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 | } |
@@ -44,7 +44,10 @@ |
||
| 44 | 44 | <td> |
| 45 | 45 | <select name="game_type" class="InputFields"><?php |
| 46 | 46 | foreach (SmrGame::GAME_TYPES as $GameTypeID => $GameType) { |
| 47 | - ?><option value="<?php echo $GameTypeID; ?>" <?php if ($GameType == $Game['gameType']) echo 'selected'; ?>><?php echo $GameType; ?></option><?php |
|
| 47 | + ?><option value="<?php echo $GameTypeID; ?>" <?php if ($GameType == $Game['gameType']) { |
|
| 48 | + echo 'selected'; |
|
| 49 | + } |
|
| 50 | + ?>><?php echo $GameType; ?></option><?php |
|
| 48 | 51 | } ?> |
| 49 | 52 | </select> |
| 50 | 53 | </td> |
@@ -76,8 +76,13 @@ 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" class="InputFields"><?php |
| 78 | 78 | foreach (Globals::getRaces() as $race) { |
| 79 | - if ($race['Race ID'] == $ThisPlayer->getRaceID()) continue; |
|
| 80 | - if ($race['Race ID'] == RACE_NEUTRAL) continue; ?> |
|
| 79 | + if ($race['Race ID'] == $ThisPlayer->getRaceID()) { |
|
| 80 | + continue; |
|
| 81 | + } |
|
| 82 | + if ($race['Race ID'] == RACE_NEUTRAL) { |
|
| 83 | + continue; |
|
| 84 | + } |
|
| 85 | + ?> |
|
| 81 | 86 | <option value="<?php echo $race['Race ID']; ?>"><?php echo $race['Race Name']; ?></option><?php |
| 82 | 87 | } ?> |
| 83 | 88 | </select> |
@@ -88,8 +93,13 @@ discard block |
||
| 88 | 93 | <form method="POST" action="<?php echo $ChangeRaceHREF; ?>"> |
| 89 | 94 | <select name="race" class="InputFields"><?php |
| 90 | 95 | foreach (Globals::getRaces() as $race) { |
| 91 | - if ($race['Race ID'] == $ThisPlayer->getRaceID()) continue; |
|
| 92 | - if ($race['Race ID'] == RACE_NEUTRAL) continue; ?> |
|
| 96 | + if ($race['Race ID'] == $ThisPlayer->getRaceID()) { |
|
| 97 | + continue; |
|
| 98 | + } |
|
| 99 | + if ($race['Race ID'] == RACE_NEUTRAL) { |
|
| 100 | + continue; |
|
| 101 | + } |
|
| 102 | + ?> |
|
| 93 | 103 | <option value="<?php echo $race['Race ID']; ?>"><?php echo $race['Race Name']; ?></option><?php |
| 94 | 104 | } ?> |
| 95 | 105 | </select> |
@@ -5,8 +5,9 @@ discard block |
||
| 5 | 5 | require_once(ENGINE . 'Default/help.inc'); |
| 6 | 6 | |
| 7 | 7 | $topic_id = $_SERVER['QUERY_STRING']; |
| 8 | - if (empty($topic_id) || !is_numeric($topic_id)) |
|
| 9 | - $topic_id = 1; |
|
| 8 | + if (empty($topic_id) || !is_numeric($topic_id)) { |
|
| 9 | + $topic_id = 1; |
|
| 10 | + } |
|
| 10 | 11 | ?> |
| 11 | 12 | <!DOCTYPE html> |
| 12 | 13 | |
@@ -48,8 +49,7 @@ discard block |
||
| 48 | 49 | |
| 49 | 50 | </body> |
| 50 | 51 | </html><?php |
| 51 | -} |
|
| 52 | -catch (Throwable $e) { |
|
| 52 | +} catch (Throwable $e) { |
|
| 53 | 53 | handleException($e); |
| 54 | 54 | } |
| 55 | 55 | ?> |
@@ -68,8 +68,7 @@ |
||
| 68 | 68 | |
| 69 | 69 | </body> |
| 70 | 70 | </html><?php |
| 71 | -} |
|
| 72 | -catch (Throwable $e) { |
|
| 71 | +} catch (Throwable $e) { |
|
| 73 | 72 | handleException($e); |
| 74 | 73 | } |
| 75 | 74 | ?> |
@@ -1,5 +1,8 @@ |
||
| 1 | 1 | <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> |
| 2 | -<title><?php echo PAGE_TITLE; ?><?php if (isset($GameName)) echo ": $GameName"; ?></title> |
|
| 2 | +<title><?php echo PAGE_TITLE; ?><?php if (isset($GameName)) { |
|
| 3 | + echo ": $GameName"; |
|
| 4 | +} |
|
| 5 | +?></title> |
|
| 3 | 6 | <meta http-equiv="pragma" content="no-cache" /><?php |
| 4 | 7 | if (!is_object($ThisAccount) || $ThisAccount->isDefaultCSSEnabled()) { ?> |
| 5 | 8 | <link rel="stylesheet" type="text/css" href="<?php echo $CSSLink; ?>" /> |
@@ -10,7 +10,10 @@ |
||
| 10 | 10 | <td style="width: 80%" class="center"> |
| 11 | 11 | Local Map of the Known <span class="big bold"><?php echo $GalaxyName ?></span> Galaxy |
| 12 | 12 | <br /><br /> |
| 13 | - <?php if (isset($Error)) echo $Error; ?> |
|
| 13 | + <?php if (isset($Error)) { |
|
| 14 | + echo $Error; |
|
| 15 | +} |
|
| 16 | +?> |
|
| 14 | 17 | </td> |
| 15 | 18 | <td style="width: 10%"></td> |
| 16 | 19 | </tr> |
@@ -19,8 +19,7 @@ |
||
| 19 | 19 | </tr><?php |
| 20 | 20 | if (isset($Locations)) { |
| 21 | 21 | $this->includeTemplate('includes/ViewLocations.inc', array('Locations'=>$Locations)); |
| 22 | -} |
|
| 23 | -else { ?> |
|
| 22 | +} else { ?> |
|
| 24 | 23 | <tr> |
| 25 | 24 | <td><input name="name" type="text" value="<?php echo htmlspecialchars($Location->getName()); ?>" /></td> |
| 26 | 25 | <td><input name="action" type="text" value="<?php echo htmlspecialchars($Location->getAction()); ?>" /></td> |
@@ -4,8 +4,7 @@ |
||
| 4 | 4 | <h1>Attacker Results</h1><br /><?php |
| 5 | 5 | } |
| 6 | 6 | $this->includeTemplate('includes/PlanetTraderTeamCombatResults.inc', array('TraderTeamCombatResults'=>$FullPlanetCombatResults['Attackers'], 'MinimalDisplay'=>$MinimalDisplay)); |
| 7 | -} |
|
| 8 | -else if (!$MinimalDisplay) { |
|
| 7 | +} else if (!$MinimalDisplay) { |
|
| 9 | 8 | ?><span class="bold">The planet is already destroyed.</span><?php |
| 10 | 9 | } |
| 11 | 10 | ?><br /><?php |
