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

Guides/Fixups

Browse Source 
* fix urls in user menu
 * strip anchors from tooltip title
 * prevent line breaks in description
 * make only in english info popup modular
This commit is contained in:
Sarjuuk
2023-05-11 14:37:34 +02:00
parent 0e9ca3ff90
commit bc3ba23162
12 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/user.class.php
View File

@@ -677,7 +677,7 @@ class User
if ($guides = DB::Aowow()->select('SELECT `id`, `title`, `url` FROM ?_guides WHERE `userId` = ?d AND `status` <> ?d', self::$id, GUIDE_STATUS_ARCHIVED))
{
// fix url
array_walk($guides, fn(&$x) => $x['url'] = '/?guide='.($x['url'] ?? $x['id']));
array_walk($guides, fn(&$x) => $x['url'] = '?guide='.($x['url'] ?? $x['id']));
$result = $guides;
}

10
includes/utilities.php
View File

@@ -18,6 +18,10 @@ class SimpleXML extends SimpleXMLElement
trait TrRequestData
{
// const in trait supported in php8.2+
public static $PATTERN_TEXT_LINE = '/[\p{Cc}\p{Cf}\p{Co}\p{Cs}\p{Cn}]/ui';
public static $PATTERN_TEXT_BLOB = '/[\x00-\x09\x0B-\x1F\p{Cf}\p{Co}\p{Cs}\p{Cn}]/ui';
private $filtered = false;
private function initRequestData() : void
@@ -61,7 +65,7 @@ trait TrRequestData
return $val === ''; // parameter is expected to be empty
}
public static function checkInt(string $val) : int
private static function checkInt(string $val) : int
{
if (preg_match('/^-?\d+$/', $val))
return intVal($val);
@@ -112,13 +116,13 @@ trait TrRequestData
private static function checkTextLine(string $val) : string
{
// trim non-printable chars
return preg_replace('/[\p{Cc}\p{Cf}\p{Co}\p{Cs}\p{Cn}]/ui', '', $val);
return preg_replace(self::$PATTERN_TEXT_LINE, '', $val);
}
private static function checkTextBlob(string $val) : string
{
// trim non-printable chars
return preg_replace('/[\x00-\x09\x0B-\x1F\p{Cf}\p{Co}\p{Cs}\p{Cn}]/ui', '', $val);
return preg_replace(self::$PATTERN_TEXT_BLOB, '', $val);
}
}