From e8bc37f82f419187c816eff8b5b24176f1fdd1dd Mon Sep 17 00:00:00 2001
From: Sarjuuk <junkdump@gmx.net>
Date: Mon, 27 Oct 2025 01:09:21 +0100
Subject: [PATCH] Filter/NPC  * fix react filter  * remove excess colons

---
 includes/dbtypes/creature.class.php |  4 ++--
 template/pages/areatriggers.tpl.php |  2 +-
 template/pages/npcs.tpl.php         | 16 ++++++++--------
 template/pages/quests.tpl.php       |  6 +++---
 template/pages/sounds.tpl.php       |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/includes/dbtypes/creature.class.php b/includes/dbtypes/creature.class.php
index 5eb4edd8..bd92c9ec 100644
--- a/includes/dbtypes/creature.class.php
+++ b/includes/dbtypes/creature.class.php
@@ -376,11 +376,11 @@ class CreatureListFilter extends Filter
             $parts[] = ['rank', $_v['cl']];
 
         // react Alliance [int]
-        if ($_v['ra'])
+        if (!is_null($_v['ra']))
             $parts[] = ['ft.A', $_v['ra']];
 
         // react Horde [int]
-        if ($_v['rh'])
+        if (!is_null($_v['rh']))
             $parts[] = ['ft.H', $_v['rh']];
 
         return $parts;
diff --git a/template/pages/areatriggers.tpl.php b/template/pages/areatriggers.tpl.php
index 3f187918..e9d574a3 100644
--- a/template/pages/areatriggers.tpl.php
+++ b/template/pages/areatriggers.tpl.php
@@ -26,7 +26,7 @@ $this->brick('redButtons');
                         <h1><?=$this->h1; ?></h1>
                     </div>
                     <div class="rightpanel">
-                        <div style="float: left"><?=Lang::game('type').Lang::main('colon'); ?></div>
+                        <div style="float: left"><?=Lang::game('type'); ?></div>
                         <small><a href="javascript:;" onclick="document.forms['fi'].elements['ty[]'].selectedIndex = -1; return false" onmousedown="return false"><?=Lang::main('clear'); ?></a></small>
                         <div class="clear"></div>
                         <select name="ty[]" size="6" multiple="multiple" class="rightselect">
diff --git a/template/pages/npcs.tpl.php b/template/pages/npcs.tpl.php
index 1ba1cd19..90100955 100644
--- a/template/pages/npcs.tpl.php
+++ b/template/pages/npcs.tpl.php
@@ -58,17 +58,17 @@ $this->brick('redButtons');
                             <td class="padded" width="100%">
                                 <table><tr>
                                     <td>&nbsp;&nbsp;&nbsp;<?=Lang::npc('react', ['']); ?></td>
-                                    <td>&nbsp;<select name="ra" onchange="fi_dropdownSync(this)" onkeyup="fi_dropdownSync(this)" style="background-color: #181818"<?=($f['ra'] ? ' class="q'.($f['ra'] == 1 ? '2' : ($f['ra'] == -1 ? '10' : '')).'"' : ''); ?>>
+                                    <td>&nbsp;<select name="ra" onchange="fi_dropdownSync(this)" onkeyup="fi_dropdownSync(this)" style="background-color: #181818" <?=(!is_null($f['ra']) ? ' class="q'.($f['ra'] == 1 ? '2' : ($f['ra'] == -1 ? '10' : '')).'"' : ''); ?>>
                                         <option></option>
-                                        <option value="1" class="q2"<?=(  $f['ra'] ==  1 ? ' selected' : ''); ?>>A</option>
-                                        <option value="0" class="q"<?=(   $f['ra'] ==  0 ? ' selected' : ''); ?>>A</option>
-                                        <option value="-1" class="q10"<?=($f['ra'] == -1 ? ' selected' : ''); ?>>A</option>
+                                        <option value="1" class="q2"<?=(  $f['ra'] ===  1 ? ' selected' : ''); ?>>A</option>
+                                        <option value="0" class="q"<?=(   $f['ra'] ===  0 ? ' selected' : ''); ?>>A</option>
+                                        <option value="-1" class="q10"<?=($f['ra'] === -1 ? ' selected' : ''); ?>>A</option>
                                     </select>
-                                    <select name="rh" onchange="fi_dropdownSync(this)" onkeyup="fi_dropdownSync(this)" style="background-color: #181818"<?=($f['rh'] ? ' class="q'.($f['rh'] == 1 ? '2' : ($f['rh'] == -1 ? '10' : '')).'"' : ''); ?>>
+                                    <select name="rh" onchange="fi_dropdownSync(this)" onkeyup="fi_dropdownSync(this)" style="background-color: #181818"<?=(!is_null($f['rh']) ? ' class="q'.($f['rh'] == 1 ? '2' : ($f['rh'] == -1 ? '10' : '')).'"' : ''); ?>>
                                         <option></option>
-                                        <option value="1" class="q2"<?=(  $f['rh'] ==  1 ? ' selected' : ''); ?>>H</option>
-                                        <option value="0" class="q"<?=(   $f['rh'] ==  0 ? ' selected' : ''); ?>>H</option>
-                                        <option value="-1" class="q10"<?=($f['rh'] == -1 ? ' selected' : ''); ?>>H</option>
+                                        <option value="1" class="q2"<?=(  $f['rh'] ===  1 ? ' selected' : ''); ?>>H</option>
+                                        <option value="0" class="q"<?=(   $f['rh'] ===  0 ? ' selected' : ''); ?>>H</option>
+                                        <option value="-1" class="q10"<?=($f['rh'] === -1 ? ' selected' : ''); ?>>H</option>
                                     </select>
                                     </td>
                                 </tr></table>
diff --git a/template/pages/quests.tpl.php b/template/pages/quests.tpl.php
index e7de3d19..427e5aaa 100644
--- a/template/pages/quests.tpl.php
+++ b/template/pages/quests.tpl.php
@@ -26,7 +26,7 @@ $this->brick('redButtons');
                         <h1><?=$this->h1; ?></h1>
                     </div>
                     <div class="rightpanel">
-                        <div style="float: left"><?=Lang::game('type').Lang::main('colon'); ?></div><small><a href="javascript:;" onclick="document.forms['fi'].elements['ty[]'].selectedIndex = -1; return false" onmousedown="return false"><?=Lang::main('clear'); ?></a></small>
+                        <div style="float: left"><?=Lang::game('type'); ?></div><small><a href="javascript:;" onclick="document.forms['fi'].elements['ty[]'].selectedIndex = -1; return false" onmousedown="return false"><?=Lang::main('clear'); ?></a></small>
                         <div class="clear"></div>
                         <select name="ty[]" size="6" multiple="multiple" class="rightselect">
 <?=$this->makeOptionsList(Lang::quest('questInfo'), $f['ty'], 28); ?>
@@ -49,13 +49,13 @@ $this->brick('redButtons');
                             <td class="padded">&nbsp;<input type="text" name="minle" maxlength="2" class="smalltextbox" <?=($f['minle'] ? 'value="'.$f['minle'].'" ' : ''); ?>/> - <input type="text" name="maxle" maxlength="2" class="smalltextbox" <?=($f['maxle'] ? 'value="'.$f['maxle'].'" ' : ''); ?>/></td>
                             <td class="padded" width="100%">
                                 <table><tr>
-                                    <td>&nbsp;&nbsp;&nbsp;<?=Lang::main('_reqLevel').Lang::main('colon'); ?></td>
+                                    <td>&nbsp;&nbsp;&nbsp;<?=Lang::main('_reqLevel'); ?></td>
                                     <td>&nbsp;<input type="text" name="minrl" maxlength="2" class="smalltextbox" <?=($f['minrl'] ? 'value="'.$f['minrl'].'" ' : ''); ?>/> - <input type="text" name="maxrl" maxlength="2" class="smalltextbox" <?=($f['maxrl'] ? 'value="'.$f['maxrl'].'" ' : ''); ?>/></td>
                                 </tr></table>
                             </td>
                         </tr>
                         <tr>
-                            <td class="padded"><?=Lang::main('side').Lang::main('colon'); ?></td>
+                            <td class="padded"><?=Lang::main('side'); ?></td>
                             <td class="padded" colspan="3">&nbsp;<select name="si">
                                 <option></option>
 <?=$this->makeOptionsList(Lang::game('si'), $f['si'], 36); ?>
diff --git a/template/pages/sounds.tpl.php b/template/pages/sounds.tpl.php
index 96667b5d..283ded3f 100644
--- a/template/pages/sounds.tpl.php
+++ b/template/pages/sounds.tpl.php
@@ -26,7 +26,7 @@ $this->brick('redButtons');
                         <h1><?=$this->h1; ?></h1>
                     </div>
                     <div class="rightpanel">
-                        <div style="float: left"><?=Lang::game('type').Lang::main('colon'); ?></div>
+                        <div style="float: left"><?=Lang::game('type'); ?></div>
                         <small><a href="javascript:;" onclick="document.forms['fi'].elements['ty[]'].selectedIndex = -1; return false" onmousedown="return false"><?=Lang::main('clear'); ?></a></small>
                         <div class="clear"></div>
                         <select name="ty[]" size="6" multiple="multiple" class="rightselect">