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/Errors

Browse Source 
* Item/XML
    - fixed setting typeId when lookup was item name
    - fixed lookup by name with utf8-chars
 * Items
    - do not display page for invalid categories
 * NPC
    - fixed reputation display
 * Quest
    - broke infinite loop occuring when quest is in chain with itself
 * Filters
    - handle different sizes of cr, crs and crv passed
This commit is contained in:
Sarjuuk
2017-04-08 03:05:30 +02:00
parent bb00355ca3
commit 33b1e4a978
6 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
includes/basetype.class.php
View File

@@ -818,13 +818,32 @@ abstract class Filter
if (strpos($term, $c.'=') === 0)
{
$$c = explode(':', explode('=', $term)[1]);
$this->formData['setCriteria'][$c] = $$c; // todo (high): move to checks
unset($tmp[$i]);
}
}
}
for ($i = 0; $i < max(count($cr), count($crv), count($crs)); $i++)
// handle erronous input
if (count($cr) != count($crv) || count($cr) != count($crs))
{
// use min provided criterion as basis
$min = min(count($cr), count($crv), count($crs));
if (count($cr) > $min)
array_splice($cr, $min);
if (count($crv) > $min)
array_splice($crv, $min);
if (count($crs) > $min)
array_splice($crs, $min);
$this->error = true;
}
foreach (self::$criteria as $c)
$this->formData['setCriteria'][$c] = $$c;
for ($i = 0; $i < count($cr); $i++)
{
if (!isset($cr[$i]) || !isset($crs[$i]) || !isset($crv[$i]) ||
!intVal($cr[$i]) || $crs[$i] === '' || $crv[$i] === '')