From 8255f71c2eaf8df42ab70a70c0bbcdec6b241de6 Mon Sep 17 00:00:00 2001 From: wn_ Date: Mon, 2 Jun 2025 19:11:55 +0000 Subject: [PATCH] Fail early in 'Handler_Public#generate_syndicated_feed()' on unrecognized format. --- classes/Handler_Public.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/classes/Handler_Public.php b/classes/Handler_Public.php index 347a38381..e46ce2e5f 100644 --- a/classes/Handler_Public.php +++ b/classes/Handler_Public.php @@ -8,6 +8,13 @@ class Handler_Public extends Handler { int $limit, int $offset, string $search, string $view_mode = "", string $format = 'atom', string $order = "", string $orig_guid = "", string $start_ts = ""): void { + // fail early if the requested format isn't recognized + if (!in_array($format, ['atom', 'json'])) { + header('Content-Type: text/plain; charset=utf-8'); + print "Unknown format: $format."; + return; + } + $note_style = "background-color : #fff7d5; border-width : 1px; ". "padding : 5px; border-style : dashed; border-color : #e7d796;". @@ -251,9 +258,6 @@ class Handler_Public extends Handler { header("Content-Type: application/json; charset=utf-8"); print json_encode($feed); - } else { - header("Content-Type: text/plain; charset=utf-8"); - print "Unknown format: $format."; } }