diff --git a/Admin/Templates/addUsers.tpl b/Admin/Templates/addUsers.tpl index 34164594..0d98f74e 100644 --- a/Admin/Templates/addUsers.tpl +++ b/Admin/Templates/addUsers.tpl @@ -54,35 +54,35 @@ elseif(isset($_GET['g']) && $_GET['g']=='OK'){ } ?> + getResourceLevel($village['wref']); if(isset($id)) { include("search2.tpl"); ?> -
diff --git a/Admin/Templates/maintenance.tpl b/Admin/Templates/maintenance.tpl index ee8cdcfc..5257861a 100644 --- a/Admin/Templates/maintenance.tpl +++ b/Admin/Templates/maintenance.tpl @@ -45,15 +45,15 @@ if($maint['started_by'] > 0){ } ?> diff --git a/Admin/Templates/server_info.tpl b/Admin/Templates/server_info.tpl index 9d7e7262..b7a8030f 100644 --- a/Admin/Templates/server_info.tpl +++ b/Admin/Templates/server_info.tpl @@ -50,23 +50,23 @@ $uv = q1("SELECT ".implode(',',$cells)." FROM ".TB_PREFIX."units"); $ue = q1("SELECT ".implode(',',$cells)." FROM ".TB_PREFIX."enforcement"); ?> diff --git a/GameEngine/Battle.php b/GameEngine/Battle.php index c73b5a78..1c8a76c0 100644 --- a/GameEngine/Battle.php +++ b/GameEngine/Battle.php @@ -119,8 +119,8 @@ class Battle { ******************************************************************/ $post['tribe'] = $target[0]; $_POST['result'] = $this->simulate($post); - $newWallLevel = $_POST['result'][7]; - $oldWallLevel = $_POST['result'][8]; + $newWallLevel = $_POST['result'][7]?? 0; + $oldWallLevel = $_POST['result'][8]?? 0; /****************************************************************** * WALL CHANGE RE-SIMULATION @@ -262,26 +262,23 @@ class Battle { /****************************************************************** * DEFENDER INIT - ******************************************************************/ - $defender = []; - $def_ab = []; - $defscout = 0; + ******************************************************************/ + + $defender = []; + $def_ab = []; + $defscout = 0; - for ($i = 1; $i <= 50; $i++) { + for ($i = 1; $i <= 50; $i++) { + $units = (int)($post['a2_'.$i] ?? 0); + $ab = (int)($post['f2_'.$i] ?? 0); - if (!empty($post['a2_'.$i])) { - $defender['u'.$i] = (int)$post['a2_'.$i]; - $def_ab[$i] = (int)$post['f2_'.$i]; + $defender['u'.$i] = $units; + $def_ab[$i] = $units > 0 ? $ab : 0; - if ($i == 4 || $i == 14 || $i == 23 || $i == 44) { - $defscout += $defender['u'.$i]; - } - - } else { - $defender['u'.$i] = 0; - $def_ab[$i] = 0; - } - } + if ($units > 0 && in_array($i, [4,14,23,44])) { + $defscout += $units; + } + } /****************************************************************** * BASIC VALUES diff --git a/Templates/Ranking/player_2.tpl b/Templates/Ranking/player_2.tpl index b5bfe58d..0a75a77c 100644 --- a/Templates/Ranking/player_2.tpl +++ b/Templates/Ranking/player_2.tpl @@ -92,8 +92,8 @@ if ($totalRanks > 0) { $uid = (int)$row['userid']; $rank = (int)$i; - $username = htmlspecialchars($row['username'], ENT_QUOTES, 'UTF-8'); - $aname = htmlspecialchars($row['aname'], ENT_QUOTES, 'UTF-8'); + $username = htmlspecialchars((string)$row['username'], ENT_QUOTES, 'UTF-8'); + $aname = htmlspecialchars((string)$row['aname'], ENT_QUOTES, 'UTF-8'); $highlight = ($i == $search) ? " class=\"hl\"" : "";