diff options
| author |  maTh <1645099+math-GH@users.noreply.github.com>
| 2025-02-02 19:15:03 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2025-02-02 19:15:03 +0100 |
| commit | 1e8ef4bb7215417d425bb48cb2bec06f49e49bfc (patch) | |
| tree | 228757761fe7dbd87cdd1246550606d7923147cd /lib/Minz | |
| parent | 99d5c4852367eddca134f3aaf2370ce879dc6481 (diff) | |
Improve notifications: notificationName (#7287)
* notificationID
* 3 first examples
* fix
* notificationID -> notificationName
* Update lib/Minz/Request.php
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
---------
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Diffstat (limited to 'lib/Minz')
| -rw-r--r-- | lib/Minz/Request.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php index a5d599a45..b74331146 100644 --- a/lib/Minz/Request.php +++ b/lib/Minz/Request.php @@ -385,33 +385,33 @@ class Minz_Request { return $_GET['rid']; } - private static function setNotification(string $type, string $content): void { + private static function setNotification(string $type, string $content, string $notificationName = ''): void { Minz_Session::lock(); $requests = Minz_Session::paramArray('requests'); $requests[self::requestId()] = [ 'time' => time(), - 'notification' => [ 'type' => $type, 'content' => $content ], + 'notification' => [ 'type' => $type, 'content' => $content, 'notificationName' => $notificationName ], ]; Minz_Session::_param('requests', $requests); Minz_Session::unlock(); } - public static function setGoodNotification(string $content): void { - self::setNotification('good', $content); + public static function setGoodNotification(string $content, string $notificationName = ''): void { + self::setNotification('good', $content, $notificationName); } - public static function setBadNotification(string $content): void { - self::setNotification('bad', $content); + public static function setBadNotification(string $content, string $notificationName = ''): void { + self::setNotification('bad', $content, $notificationName); } /** * @param $pop true (default) to remove the notification, false to keep it. - * @return array{type:string,content:string}|null + * @return array{type:string,content:string,notificationName:string}|null */ public static function getNotification(bool $pop = true): ?array { $notif = null; Minz_Session::lock(); - /** @var array<string,array{time:int,notification:array{type:string,content:string}}> */ + /** @var array<string,array{time:int,notification:array{type:string,content:string,notificationName:string}}> */ $requests = Minz_Session::paramArray('requests'); if (!empty($requests)) { //Delete abandoned notifications @@ -461,8 +461,8 @@ class Minz_Request { * @param string $msg notification content * @param array{c?:string,a?:string,params?:array<string,mixed>} $url url array to where we should be forwarded */ - public static function good(string $msg, array $url = []): void { - Minz_Request::setGoodNotification($msg); + public static function good(string $msg, array $url = [], string $notificationName = ''): void { + Minz_Request::setGoodNotification($msg, $notificationName); Minz_Request::forward($url, true); } @@ -471,8 +471,8 @@ class Minz_Request { * @param string $msg notification content * @param array{c?:string,a?:string,params?:array<string,mixed>} $url url array to where we should be forwarded */ - public static function bad(string $msg, array $url = []): void { - Minz_Request::setBadNotification($msg); + public static function bad(string $msg, array $url = [], string $notificationName = ''): void { + Minz_Request::setBadNotification($msg, $notificationName); Minz_Request::forward($url, true); } |