yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Misc/Util

Browse Source 
* relax numeric type requirements when working with filters
 * restore smart type casting functionality of Util::checkNumeric when used with NUM_ANY
 * enable Util::arraySumByKey to work recursively
 * fix source display in listview
This commit is contained in:
Sarjuuk
2024-06-16 17:05:23 +02:00
parent a4d05dc036
commit cb3c7d4ef0
6 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/types/creature.class.php
View File

@@ -393,7 +393,7 @@ class CreatureListFilter extends Filter
if (!$this->parentCats || $this->parentCats[0] != 1)
return false;
if (!Util::checkNumeric($val, NUM_REQ_INT))
if (!Util::checkNumeric($val, NUM_CAST_INT))
return false;
$type = FILTER_V_LIST;
@@ -518,7 +518,7 @@ class CreatureListFilter extends Filter
protected function cbFaction($cr)
{
if (!Util::checkNumeric($cr[1], NUM_REQ_INT))
if (!Util::checkNumeric($cr[1], NUM_CAST_INT))
return false;
if (!in_array($cr[1], $this->enums[$cr[0]]))

6
includes/types/item.class.php
View File

@@ -2503,7 +2503,7 @@ class ItemListFilter extends Filter
protected function cbDisenchantsInto($cr)
{
if (!Util::checkNumeric($cr[1], NUM_REQ_INT))
if (!Util::checkNumeric($cr[1], NUM_CAST_INT))
return false;
if (!in_array($cr[1], $this->enums[$cr[0]]))
@@ -2620,7 +2620,7 @@ class ItemListFilter extends Filter
if (!$this->parentCats)
return false;
if (!Util::checkNumeric($v, NUM_REQ_INT))
if (!Util::checkNumeric($v, NUM_CAST_INT))
return false;
$c = $this->parentCats;
@@ -2650,7 +2650,7 @@ class ItemListFilter extends Filter
protected function cbSlotCheck(&$v)
{
if (!Util::checkNumeric($v, NUM_REQ_INT))
if (!Util::checkNumeric($v, NUM_CAST_INT))
return false;
// todo (low): limit to concrete slots

6
includes/types/quest.class.php
View File

@@ -557,7 +557,7 @@ class QuestListFilter extends Filter
protected function cbReputation($cr, $sign)
{
if (!Util::checkNumeric($cr[1], NUM_REQ_INT))
if (!Util::checkNumeric($cr[1], NUM_CAST_INT))
return false;
if (!in_array($cr[1], $this->enums[$cr[0]]))
@@ -593,7 +593,7 @@ class QuestListFilter extends Filter
protected function cbCurrencyReward($cr)
{
if (!Util::checkNumeric($cr[1], NUM_REQ_INT))
if (!Util::checkNumeric($cr[1], NUM_CAST_INT))
return false;
if (!in_array($cr[1], $this->enums[$cr[0]]))
@@ -672,7 +672,7 @@ class QuestListFilter extends Filter
protected function cbEarnReputation($cr)
{
if (!Util::checkNumeric($cr[1], NUM_REQ_INT))
if (!Util::checkNumeric($cr[1], NUM_CAST_INT))
return false;
if ($cr[1] == FILTER_ENUM_ANY) // any

4
includes/types/spell.class.php
View File

@@ -2678,7 +2678,7 @@ class SpellListFilter extends Filter
if (!$this->parentCats || !in_array($this->parentCats[0], [-13, -2, 7]))
return false;
if (!Util::checkNumeric($val, NUM_REQ_INT))
if (!Util::checkNumeric($val, NUM_CAST_INT))
return false;
$type = FILTER_V_LIST;
@@ -2692,7 +2692,7 @@ class SpellListFilter extends Filter
if (!$this->parentCats || $this->parentCats[0] != -13)
return false;
if (!Util::checkNumeric($val, NUM_REQ_INT))
if (!Util::checkNumeric($val, NUM_CAST_INT))
return false;
$type = FILTER_V_LIST;