coa/aowow
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Core/Endpoints

Browse source 
* don't use raw input to recreate subcategories for filter urls and
   external links
 * if a page does not expect categories it will now error out if it is
   called with parameters
 * fixed infite redirect loop that could occur if the pageName was an
   invalid string
 * added lost filter string for external page call to NPCs Page
This commit is contained in:
Sarjuuk 2026-01-01 01:15:08 +01:00
parent 23c5c71f4a
commit 715c1534eb
91 changed files with 288 additions and 261 deletions
Download patch file Download diff file Expand all files Collapse all files

14
includes/components/response/templateresponse.class.php
View file

@ -31,7 +31,7 @@ trait TrDetailPage
trait TrListPage
{
public ?string $subCat = null;
public string $subCat = '';
public ?Filter $filter = null;
public function getCacheKeyComponents() : array
@ -150,7 +150,7 @@ class TemplateResponse extends BaseResponse
public array $pageTemplate = []; // js PageTemplate object
public array $jsGlobals = []; // ready to be used in template
public function __construct(string $pageParam = '')
public function __construct(string $rawParam = '')
{
$this->title[] = Cfg::get('NAME');
self::$time = microtime(true);
@ -158,8 +158,8 @@ class TemplateResponse extends BaseResponse
parent::__construct();
$this->fullParams = $this->pageName;
if ($pageParam)
$this->fullParams .= '='.$pageParam;
if ($this->category)
$this->fullParams .= '='.implode('.', $this->category);
// prep js+css includes
$parentVars = get_class_vars(__CLASS__);
@ -175,7 +175,7 @@ class TemplateResponse extends BaseResponse
if ($this->pageName)
{
$this->wowheadLink = sprintf(WOWHEAD_LINK, Lang::getLocale()->domain(), $this->pageName, $pageParam ? '=' . $pageParam : '');
$this->wowheadLink = sprintf(WOWHEAD_LINK, Lang::getLocale()->domain(), $this->fullParams, '');
$this->pageTemplate['pageName'] = $this->pageName;
}
@ -672,15 +672,13 @@ class TemplateResponse extends BaseResponse
// has a valid combination of categories
private function isValidPage() : bool
{
if (!$this->category || !$this->validCats)
if (!$this->category)
return true;
$c = $this->category; // shorthand
switch (count($c))
{
case 0: // no params works always
return true;
case 1: // null is valid || value in a 1-dim-array || (key for a n-dim-array && ( has more subcats || no further subCats ))
$filtered = array_filter($this->validCats, fn ($x) => is_int($x));
return $c[0] === null || in_array($c[0], $filtered) || (!empty($this->validCats[$c[0]]) && (is_array($this->validCats[$c[0]]) || $this->validCats[$c[0]] === true));

6
includes/components/response/textresponse.class.php
View file

@ -96,12 +96,12 @@ class TextResponse extends BaseResponse
protected array $params = [];
/// generation stats
protected static float $time = 0.0;
protected static float $time = 0.0;
public function __construct(string $pageParam = '')
public function __construct(string $rawParam = '')
{
self::$time = microtime(true);
$this->params = explode('.', $pageParam);
$this->params = explode('.', $rawParam);
// todo - validate params?
parent::__construct();