diff options
| author | Simon Rettberg | 2025-03-31 11:00:48 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2025-03-31 11:00:48 +0200 |
| commit | d30ca86ef3a1fda50ab08fd4bea553e7134ab7f4 (patch) | |
| tree | 81da2b8883e28b2aaafbc9a7ea4c2f8b70072272 | |
| parent | [eventlog] Filter rules: Last use column nowrap (diff) | |
| download | slx-admin-d30ca86ef3a1fda50ab08fd4bea553e7134ab7f4.tar.gz slx-admin-d30ca86ef3a1fda50ab08fd4bea553e7134ab7f4.tar.xz slx-admin-d30ca86ef3a1fda50ab08fd4bea553e7134ab7f4.zip | |
[inc/Message] Output plain text in API mode
| -rw-r--r-- | inc/message.inc.php | 4 | ||||
| -rw-r--r-- | inc/request.inc.php | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/inc/message.inc.php b/inc/message.inc.php index 119bb2ba..2f565b9a 100644 --- a/inc/message.inc.php +++ b/inc/message.inc.php @@ -112,6 +112,10 @@ class Message foreach ($mangled as $entry) { echo Render::parse('messagebox', $entry, 'main'); } + } elseif (API) { + foreach ($mangled as $entry) { + echo $entry['message'], "\n"; + } } else { // Non-Ajax foreach ($mangled as $entry) { diff --git a/inc/request.inc.php b/inc/request.inc.php index cd782d99..e126d551 100644 --- a/inc/request.inc.php +++ b/inc/request.inc.php @@ -73,12 +73,16 @@ class Request if (!array_key_exists($key, $array)) { if ($default === self::REQUIRED || $default === self::REQUIRED_EMPTY) { Message::addError('main.parameter-missing', $key); + if (API) + exit; Util::redirect('?do=' . $_REQUEST['do']); } return $default; } if ($default === self::REQUIRED && $array[$key] === '') { Message::addError('main.parameter-empty', $key); + if (API) + exit; Util::redirect('?do=' . $_REQUEST['do']); } if ($type !== false) settype($array[$key], $type); |