diff options
| author | Simon Rettberg | 2024-10-11 14:09:09 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2024-10-11 14:09:09 +0200 |
| commit | bd8569e1c7e615541e41b8aa8f7aa6f22918dd06 (patch) | |
| tree | 850fca09e6ceea00fd5c18e0dacadb7f788e1fc9 /inc | |
| parent | [webinterface] Add simple API to remotely supply a certificate (diff) | |
| download | slx-admin-bd8569e1c7e615541e41b8aa8f7aa6f22918dd06.tar.gz slx-admin-bd8569e1c7e615541e41b8aa8f7aa6f22918dd06.tar.xz slx-admin-bd8569e1c7e615541e41b8aa8f7aa6f22918dd06.zip | |
[webinterface] Add event log messages for cert changes
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/taskmanagercallback.inc.php | 13 | ||||
| -rw-r--r-- | inc/user.inc.php | 7 |
2 files changed, 18 insertions, 2 deletions
diff --git a/inc/taskmanagercallback.inc.php b/inc/taskmanagercallback.inc.php index 9f276020..536c899e 100644 --- a/inc/taskmanagercallback.inc.php +++ b/inc/taskmanagercallback.inc.php @@ -240,13 +240,22 @@ class TaskmanagerCallback SystemStatus::setUpgradableData($task); } - public static function acmeErrors(array $task): void + public static function acmeErrors(array $task, $args): void { $mod = Module::get('webinterface'); if ($mod === false) return; $mod->activate(1, false); - Acme::callbackErrorCheck($task); + Acme::callbackErrorCheck($task, $args); + } + + public static function webifCert(array $task, $args): void + { + $mod = Module::get('webinterface'); + if ($mod === false) + return; + $mod->activate(1, false); + WebInterface::certTaskFinishedCallback($task, $args); } } diff --git a/inc/user.inc.php b/inc/user.inc.php index 9ef27cd0..dd94ab71 100644 --- a/inc/user.inc.php +++ b/inc/user.inc.php @@ -30,6 +30,13 @@ class User return self::$user['fullname']; } + public static function getLogin(): ?string + { + if (!self::isLoggedIn()) + return null; + return self::$user['login']; + } + public static function hasPermission(string $permission, ?int $locationid = NULL): bool { if (!self::isLoggedIn()) |