Merge pull request 'Alpha 7' (#22) from alpha-7 into main

Reviewed-on: #22

src/app-config.php

@@ -1,7 +1,7 @@
 <?php
 
 /** The current Feed Reader Central version */
-const FRC_VERSION = '1.0.0-alpha5';
+const FRC_VERSION = '1.0.0-alpha7';
 
 spl_autoload_register(function ($class) {
     $file = implode(DIRECTORY_SEPARATOR, [__DIR__, 'lib', "$class.php"]);
@@ -18,3 +18,17 @@ Data::ensureDb();
 
 /** @var string The date the world wide web was created */
 const WWW_EPOCH = '1993-04-30T00:00:00+00:00';
+
+/**
+ * Capitalize the first letter of the given string
+ *
+ * @param string $value The string to be capitalized
+ * @return string The given string with the first letter capitalized
+ */
+function init_cap(string $value): string {
+    return match (strlen($value)) {
+        0       => "",
+        1       => strtoupper($value),
+        default => strtoupper(substr($value, 0, 1)) . substr($value, 1),
+    };
+}

src/cli-start.php

@@ -28,17 +28,3 @@ function cli_title(string $title): void {
     printfn('  | %s | %s |', $title, $appTitle);
     printfn($dashes . PHP_EOL);
 }
-
-/**
- * Capitalize the first letter of the given string
- *
- * @param string $value The string to be capitalized
- * @return string The given string with the first letter capitalized
- */
-function init_cap(string $value): string {
-    return match (strlen($value)) {
-        0       => "",
-        1       => strtoupper($value),
-        default => strtoupper(substr($value, 0, 1)) . substr($value, 1),
-    };
-}

src/lib/Data.php

@@ -14,6 +14,31 @@ class Data {
         return $db;
     }
 
+    /**
+     * Create the search index and synchronization triggers for the item table
+     *
+     * @param SQLite3 $db The database connection on which these will be created
+     */
+    public static function createSearchIndex(SQLite3 $db): void {
+        $db->exec("CREATE VIRTUAL TABLE item_search USING fts5(content, content='item', content_rowid='id')");
+        $db->exec(<<<'SQL'
+                CREATE TRIGGER item_ai AFTER INSERT ON item BEGIN
+                    INSERT INTO item_search (rowid, content) VALUES (new.id, new.content);
+                END;
+                SQL);
+        $db->exec(<<<'SQL'
+                CREATE TRIGGER item_au AFTER UPDATE ON item BEGIN
+                    INSERT INTO item_search (item_search, rowid, content) VALUES ('delete', old.id, old.content);
+                    INSERT INTO item_search (rowid, content) VALUES (new.id, new.content);
+                END;
+                SQL);
+        $db->exec(<<<'SQL'
+                CREATE TRIGGER item_ad AFTER DELETE ON item BEGIN
+                    INSERT INTO item_search (item_search, rowid, content) VALUES ('delete', old.id, old.content);
+                END;
+                SQL);
+    }
+
     /**
      * Make sure the expected tables exist
      */
@@ -23,17 +48,16 @@ class Data {
         $tableQuery = $db->query("SELECT name FROM sqlite_master WHERE type = 'table'");
         while ($table = $tableQuery->fetchArray(SQLITE3_NUM)) $tables[] = $table[0];
         if (!in_array('frc_user', $tables)) {
-            $query = <<<'SQL'
+            $db->exec(<<<'SQL'
                 CREATE TABLE frc_user (
                     id       INTEGER NOT NULL PRIMARY KEY,
                     email    TEXT    NOT NULL,
                     password TEXT    NOT NULL)
-                SQL;
-            $db->exec($query);
+                SQL);
             $db->exec('CREATE INDEX idx_user_email ON frc_user (email)');
         }
         if (!in_array('feed', $tables)) {
-            $query = <<<'SQL'
+            $db->exec(<<<'SQL'
                 CREATE TABLE feed (
                     id         INTEGER NOT NULL PRIMARY KEY,
                     user_id    INTEGER NOT NULL,
@@ -42,11 +66,10 @@ class Data {
                     updated_on TEXT,
                     checked_on TEXT,
                     FOREIGN KEY (user_id) REFERENCES frc_user (id))
-                SQL;
-            $db->exec($query);
+                SQL);
         }
         if (!in_array('item', $tables)) {
-            $query = <<<'SQL'
+            $db->exec(<<<'SQL'
                 CREATE TABLE item (
                     id            INTEGER NOT NULL PRIMARY KEY,
                     feed_id       INTEGER NOT NULL,
@@ -59,8 +82,8 @@ class Data {
                     is_read       BOOLEAN NOT NULL DEFAULT 0,
                     is_bookmarked BOOLEAN NOT NULL DEFAULT 0,
                     FOREIGN KEY (feed_id) REFERENCES feed (id))
-                SQL;
-            $db->exec($query);
+                SQL);
+            self::createSearchIndex($db);
         }
         $db->close();
     }
@@ -79,26 +102,6 @@ class Data {
         }
     }
 
-    /**
-     * Retrieve a feed by its ID for the current user
-     *
-     * @param int $feedId The ID of the feed to retrieve
-     * @param ?SQLite3 $dbConn A database connection to use (optional; will use standalone if not provided)
-     * @return array|bool The data for the feed if found, false if not found
-     */
-    public static function retrieveFeedById(int $feedId, ?SQLite3 $dbConn = null): array|bool {
-        $db = $dbConn ?? self::getConnection();
-        try {
-            $query = $db->prepare('SELECT * FROM feed WHERE id = :id AND user_id = :user');
-            $query->bindValue(':id', $feedId);
-            $query->bindValue(':user', $_SESSION[Key::USER_ID]);
-            $result = $query->execute();
-            return $result ? $result->fetchArray(SQLITE3_ASSOC) : false;
-        } finally {
-            if (is_null($dbConn)) $db->close();
-        }
-    }
-
     /**
      * Return the last SQLite error message as a result array
      *

src/lib/Feed.php

@@ -239,19 +239,19 @@ class Feed {
         $start = strtolower(strlen($doc['content']) >= 9 ? substr($doc['content'], 0, 9) : $doc['content']);
         if ($start == '<!doctype' || str_starts_with($start, '<html')) {
             $derivedURL = self::deriveFeedFromHTML($doc['content']);
-            if (array_key_exists('error', $derivedURL)) return ['error' => $derivedURL['error']];
+            if (key_exists('error', $derivedURL)) return ['error' => $derivedURL['error']];
             $feedURL = $derivedURL['ok'];
             if (!str_starts_with($feedURL, 'http')) {
                 // Relative URL; feed should be retrieved in the context of the original URL
                 $original = parse_url($url);
-                $port     = array_key_exists('port', $original) ? ":{$original['port']}" : '';
+                $port     = key_exists('port', $original) ? ":{$original['port']}" : '';
                 $feedURL  = $original['scheme'] . '://' . $original['host'] . $port . $feedURL;
             }
             $doc = self::retrieveDocument($feedURL);
         }
 
         $parsed = self::parseFeed($doc['content']);
-        if (array_key_exists('error', $parsed)) return ['error' => $parsed['error']];
+        if (key_exists('error', $parsed)) return ['error' => $parsed['error']];
 
         $extract = $parsed['ok']->getElementsByTagNameNS(self::ATOM_NS, 'feed')->length > 0
             ? self::fromAtom(...) : self::fromRSS(...);
@@ -388,7 +388,7 @@ class Feed {
      */
     public static function refreshFeed(int $feedId, string $url, SQLite3 $db): array {
         $feedRetrieval = self::retrieveFeed($url);
-        if (array_key_exists('error', $feedRetrieval)) return $feedRetrieval;
+        if (key_exists('error', $feedRetrieval)) return $feedRetrieval;
         $feed = $feedRetrieval['ok'];
 
         $lastCheckedQuery = $db->prepare('SELECT checked_on FROM feed where id = :id');
@@ -399,7 +399,7 @@ class Feed {
         }
 
         $itemUpdate = self::updateItems($feedId, $feed, $lastChecked, $db);
-        if (array_key_exists('error', $itemUpdate)) return $itemUpdate;
+        if (key_exists('error', $itemUpdate)) return $itemUpdate;
 
         $urlUpdate = $url == $feed->url ? '' : ', url = :url';
         $feedUpdate = $db->prepare(<<<SQL
@@ -428,7 +428,7 @@ class Feed {
      */
     public static function add(string $url, SQLite3 $db): array {
         $feedExtract = self::retrieveFeed($url);
-        if (array_key_exists('error', $feedExtract)) return $feedExtract;
+        if (key_exists('error', $feedExtract)) return $feedExtract;
 
         $feed = $feedExtract['ok'];
 
@@ -454,7 +454,7 @@ class Feed {
 
         $feedId = $db->lastInsertRowID();
         $result = self::updateItems($feedId, $feed, date_create_immutable(WWW_EPOCH), $db);
-        if (array_key_exists('error', $result)) return $result;
+        if (key_exists('error', $result)) return $result;
 
         return ['ok' => $feedId];
     }
@@ -504,14 +504,28 @@ class Feed {
      */
     public static function refreshAll(SQLite3 $db): array {
         $feeds = self::retrieveAll($db, $_SESSION[Key::USER_ID]);
-        if (array_key_exists('error', $feeds)) return $feeds;
+        if (key_exists('error', $feeds)) return $feeds;
 
         $errors = [];
         array_walk($feeds, function ($feed) use ($db, &$errors) {
             $result = self::refreshFeed($feed['id'], $feed['url'], $db);
-            if (array_key_exists('error', $result)) $errors[] = $result['error'];
+            if (key_exists('error', $result)) $errors[] = $result['error'];
         });
 
         return sizeof($errors) == 0 ? ['ok' => true] : ['error' => implode("\n", $errors)];
     }
+
+    /**
+     * Retrieve a feed by its ID for the current user
+     *
+     * @param int $feedId The ID of the feed to retrieve
+     * @param SQLite3 $db A database connection to use to retrieve the feed
+     * @return array|bool The data for the feed if found, false if not found
+     */
+    public static function retrieveById(int $feedId, SQLite3 $db): array|bool {
+        $query = $db->prepare('SELECT * FROM feed WHERE id = :id AND user_id = :user');
+        $query->bindValue(':id', $feedId);
+        $query->bindValue(':user', $_SESSION[Key::USER_ID]);
+        return ($result = $query->execute()) ? $result->fetchArray(SQLITE3_ASSOC) : false;
+    }
 }

src/lib/ItemList.php

@@ -0,0 +1,191 @@
+<?php
+
+/**
+ * A list of items to be displayed
+ *
+ * This is a wrapper for retrieval and display of arbitrary lists of items based on a SQLite result.
+ */
+class ItemList {
+
+    /** @var SQLite3Result The list of items to be displayed */
+    private SQLite3Result $items;
+
+    /** @var string The error message generated by executing a query */
+    public string $error = '';
+
+    /**
+     * Is there an error condition associated with this list?
+     *
+     * @return bool True if there is an error condition associated with this list, false if not
+     */
+    public function isError(): bool {
+        return $this->error != '';
+    }
+
+    /** @var bool Whether to render a link to the feed to which the item belongs */
+    public bool $linkFeed = false;
+
+    /** @var bool Whether to display the feed to which the item belongs */
+    public bool $displayFeed = false;
+
+    /** @var bool Whether to show read / bookmarked indicators on posts */
+    public bool $showIndicators = false;
+
+    /**
+     * Constructor
+     *
+     * @param SQLite3 $db The database connection (used to retrieve error information if the query fails)
+     * @param SQLite3Stmt $query The query to retrieve the items for this list
+     * @param string $itemType The type of item being displayed (unread, bookmark, etc.)
+     * @param string $returnURL The URL to which the item page should return once the item has been viewed
+     */
+    private function __construct(SQLite3 $db, SQLite3Stmt $query, public string $itemType, public string $returnURL = '') {
+        $result = $query->execute();
+        if (!$result) {
+            $this->error = Data::error($db)['error'];
+        } else {
+            $this->items = $result;
+        }
+    }
+
+    /**
+     * Create an item list query
+     *
+     * @param SQLite3 $db The database connection to use to obtain items
+     * @param array $criteria One or more SQL WHERE conditions (will be combined with AND)
+     * @param array $parameters Parameters to be added to the query (key index 0, value index 1; optional)
+     * @return SQLite3Stmt The query, ready to be executed
+     */
+    private static function makeQuery(SQLite3 $db, array $criteria, array $parameters = []): SQLite3Stmt {
+        $where = empty($criteria) ? '' : 'AND ' . implode(' AND ', $criteria);
+        $sql   = <<<SQL
+        SELECT item.id, item.feed_id, item.title AS item_title, coalesce(item.updated_on, item.published_on) AS as_of,
+               item.is_read, item.is_bookmarked, feed.title AS feed_title
+        FROM item INNER JOIN feed ON feed.id = item.feed_id
+        WHERE feed.user_id = :userId $where
+        ORDER BY coalesce(item.updated_on, item.published_on) DESC
+        SQL;
+        $query = $db->prepare($sql);
+        $query->bindValue(':userId', $_SESSION[Key::USER_ID]);
+        foreach ($parameters as $param) $query->bindValue($param[0], $param[1]);
+        return $query;
+    }
+
+    /**
+     * Create an item list with all the current user's bookmarked items
+     *
+     * @param SQLite3 $db The database connection to use to obtain items
+     * @return static An item list with all bookmarked items
+     */
+    public static function allBookmarked(SQLite3 $db): static {
+        $list = new static($db, self::makeQuery($db, ['item.is_bookmarked = 1']), 'Bookmarked', '/?bookmarked');
+        $list->linkFeed = true;
+        return $list;
+    }
+
+    /**
+     * Create an item list with all the current user's unread items
+     *
+     * @param SQLite3 $db The database connection to use to obtain items
+     * @return static An item list with all unread items
+     */
+    public static function allUnread(SQLite3 $db): static {
+        $list = new static($db, self::makeQuery($db, ['item.is_read = 0']), 'Unread');
+        $list->linkFeed = true;
+        return $list;
+    }
+
+    /**
+     * Create an item list with all items for the given feed
+     *
+     * @param int $feedId The ID of the feed for which items should be retrieved
+     * @param SQLite3 $db The database connection to use to obtain items
+     * @return static An item list with all items for the given feed
+     */
+    public static function allForFeed(int $feedId, SQLite3 $db): static {
+        $list = new static($db, self::makeQuery($db, ['feed.id = :feed'], [[':feed', $feedId]]), '',
+            "/feed/items?id=$feedId");
+        $list->showIndicators = true;
+        return $list;
+    }
+
+    /**
+     * Create an item list with unread items for the given feed
+     *
+     * @param int $feedId The ID of the feed for which items should be retrieved
+     * @param SQLite3 $db The database connection to use to obtain items
+     * @return static An item list with unread items for the given feed
+     */
+    public static function unreadForFeed(int $feedId, SQLite3 $db): static {
+        return new static($db, self::makeQuery($db, ['feed.id = :feed', 'item.is_read = 0'], [[':feed', $feedId]]),
+            'Unread', "/feed/items?id=$feedId&unread");
+    }
+
+    /**
+     * Create an item list with bookmarked items for the given feed
+     *
+     * @param int $feedId The ID of the feed for which items should be retrieved
+     * @param SQLite3 $db The database connection to use to obtain items
+     * @return static An item list with bookmarked items for the given feed
+     */
+    public static function bookmarkedForFeed(int $feedId, SQLite3 $db): static {
+        return new static($db,
+            self::makeQuery($db, ['feed.id = :feed', 'item.is_bookmarked = 1'], [[':feed', $feedId]]), 'Bookmarked',
+            "/feed/items?id=$feedId&bookmarked");
+    }
+
+    /**
+     * Create an item list with items matching given search terms
+     *
+     * @param string $search The item search terms / query
+     * @param bool $isBookmarked Whether to restrict the search to bookmarked items
+     * @param SQLite3 $db The database connection to use to obtain items
+     * @return static An item list match the given search terms
+     */
+    public static function matchingSearch(string $search, bool $isBookmarked, SQLite3 $db): static {
+        $where   = $isBookmarked ? ['item.is_bookmarked = 1'] : [];
+        $where[] = 'item.id IN (SELECT ROWID FROM item_search WHERE content MATCH :search)';
+        $list = new static($db, self::makeQuery($db, $where, [[':search', $search]]),
+            'Matching' . ($isBookmarked ? ' Bookmarked' : ''),
+            "/search?search=$search&items=" . ($isBookmarked ? 'bookmarked' : 'all'));
+        $list->showIndicators = true;
+        $list->displayFeed    = true;
+        return $list;
+    }
+
+    /**
+     * Render this item list
+     */
+    public function render(): void {
+        if ($this->isError()) { ?>
+            <p>Error retrieving list:<br><?=$this->error?><?php
+            return;
+        }
+        $item = $this->items->fetchArray(SQLITE3_ASSOC);
+        $return = $this->returnURL == '' ? '' : '&from=' . urlencode($this->returnURL);
+        echo '<article>';
+        if ($item) {
+            while ($item) { ?>
+                <p><?=hx_get("/item?id={$item['id']}$return", strip_tags($item['item_title']))?><br>
+                <small><?php
+                    if ($this->showIndicators) {
+                        if (!$item['is_read']) echo '<strong>Unread</strong> &nbsp; ';
+                        if ($item['is_bookmarked']) echo '<strong>Bookmarked</strong> &nbsp; ';
+                    }
+                    echo '<em>' . date_time($item['as_of']) . '</em>';
+                    if ($this->linkFeed) {
+                        echo ' &bull; ' .
+                            hx_get("/feed/items?id={$item['feed_id']}&" . strtolower($this->itemType),
+                                htmlentities($item['feed_title']));
+                    } elseif ($this->displayFeed) {
+                        echo ' &bull; ' . htmlentities($item['feed_title']);
+                    } ?>
+                </small><?php
+                $item = $this->items->fetchArray(SQLITE3_ASSOC);
+            }
+        } else { ?>
+            <p><em>There are no <?=strtolower($this->itemType)?> items</em><?php
+        }
+        echo '</article>';
+    }
+}

src/lib/Security.php

@@ -131,7 +131,7 @@ class Security {
      * @param bool $redirectIfAnonymous Whether to redirect the request if there is no user logged on
      */
     public static function verifyUser(SQLite3 $db, bool $redirectIfAnonymous = true): void {
-        if (array_key_exists(Key::USER_ID, $_SESSION)) return;
+        if (key_exists(Key::USER_ID, $_SESSION)) return;
 
         if (SECURITY_MODEL == self::SINGLE_USER) self::logOnSingleUser($db);
 

src/public/assets/style.css

@@ -22,27 +22,31 @@ header {
     border-bottom-right-radius: .5rem;
     color: white;
     display: flex;
-    flex-flow: row nowrap;
+    flex-flow: row wrap;
     justify-content: space-between;
     align-items: baseline;
-
+    div, nav {
+        margin-bottom: .25rem;
+    }
     .title {
         font-size: 1.5rem;
     }
-
     .version {
         font-size: .85rem;
         padding-left: .5rem;
         color: rgba(255, 255, 255, .75);
     }
-
     a:link, a:visited {
         color: white;
     }
+    nav {
+        display: flex;
+        flex-flow: row wrap;
+        gap: 0 .4rem;
+    }
 }
 main {
     padding: 0 .5rem;
-
     .refresh, .loading {
         font-style: italic;
         font-size: .9rem;
@@ -50,14 +54,12 @@ main {
     .htmx-request .refresh {
         display: none;
     }
-
     .loading {
         display: none;
     }
     .htmx-request .loading {
         display: inline;
     }
-
     .user_messages {
         display: flex;
         flex-flow: column;
@@ -70,15 +72,9 @@ main {
         background-color: rgba(255, 255, 255, .75);
         padding: .25rem;
     }
-
     .user_messages + h1 {
         margin-top: .25rem;
     }
-
-    .item_heading {
-        margin-bottom: 0;
-    }
-
     .item_published {
         margin-bottom: 1rem;
         line-height: 1.2;
@@ -87,33 +83,73 @@ main {
 article {
     max-width: 60rem;
     margin: auto;
-
     .item_content {
         border: solid 1px navy;
         border-radius: .5rem;
         background-color: white;
         padding: .5rem;
-
         img {
             max-width: 100%;
             object-fit: contain;
-            height: unset;
-            width: unset;
+        }
+    }
+    .meta {
+        font-size: .9rem;
+    }
+    &.docs {
+        line-height: 1.4rem;
+    }
+}
+form {
+    display: flex;
+    flex-flow: row wrap;
+    justify-content: center;
+    gap: 0 2rem;
+    label {
+        font-size: .9rem;
+        font-weight: bold;
+        input, select {
+            display: block;
+        }
+    }
+    .break {
+        flex-basis: 100%;
+        height: 1rem;
+        width: 0;
+    }
+    input[type=url],
+    input[type=text],
+    input[type=email],
+    input[type=password],
+    select {
+        min-width: 12rem;
+        max-width: 100%;
+        font-size: 1rem;
+        padding: .25rem;
+        border-radius: .25rem;
+        background-color: white;
+        border: solid 2px navy;
+    }
+    select {
+        min-width: unset;
+        max-width: unset;
+    }
+}
+@media all and (min-width: 60rem) {
+    form {
+        input[type=url],
+        input[type=text],
+        input[type=email],
+        input[type=password] {
+            min-width: 25rem;
         }
     }
 }
-article.docs {
-    line-height: 1.4rem;
-}
-
-input[type=url],
-input[type=text],
-input[type=email],
-input[type=password] {
-    width: 40%;
-    font-size: 1rem;
-    padding: .25rem;
-    border-radius: .25rem;
+.action_buttons {
+    margin: 1rem 0;
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-evenly;
 }
 button,
 .action_buttons a:link,
@@ -126,18 +162,11 @@ button,
     border-radius: .25rem;
     cursor: pointer;
     border: none;
-}
-button:hover,
-.action_buttons a:hover {
-    text-decoration: none;
-    cursor: pointer;
-    background: linear-gradient(navy, #000032);
-}
-.action_buttons {
-    margin: 1rem 0;
-    display: flex;
-    flex-flow: row nowrap;
-    justify-content: space-evenly;
+    &:hover {
+        text-decoration: none;
+        cursor: pointer;
+        background: linear-gradient(navy, #000032);
+    }
 }
 code {
     font-size: .9rem;
@@ -145,3 +174,28 @@ code {
 p.back-link {
     margin-top: -1rem;
 }
+.item_heading {
+    margin-bottom: 0;
+    .bookmark {
+        padding: 0;
+        border: solid 1px black;
+        border-radius: .5rem;
+        &.add {
+            background-color: lightgray;
+            &:hover {
+                background: linear-gradient(lightgreen, gray);
+            }
+        }
+        &.remove {
+            background: linear-gradient(lightgreen, green);
+            &:hover {
+                background: linear-gradient(gray, lightgreen);
+            }
+        }
+        img {
+            max-width: 1.5rem;
+            max-height: 1.5rem;
+            padding: .5rem;
+        }
+    }
+}

src/public/bookmark.php

@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Bookmark Partial Handler
+ *
+ * This will display a button which will either add or remove a bookmark for a given item.
+ */
+
+include '../start.php';
+
+$db = Data::getConnection();
+Security::verifyUser($db);
+
+$id = $_GET['id'];
+
+$existsQuery = $db->prepare(
+    'SELECT item.id FROM item INNER JOIN feed ON feed.id = item.feed_id WHERE item.id = :id AND feed.user_id = :user');
+$existsQuery->bindValue(':id',   $id);
+$existsQuery->bindValue(':user', $_SESSION[Key::USER_ID]);
+$existsResult = $existsQuery->execute();
+$exists = $existsResult ? $existsResult->fetchArray(SQLITE3_ASSOC) : false;
+
+if (!$exists) not_found();
+
+if (key_exists('action', $_GET)) {
+    if ($_GET['action'] == 'add') {
+        $flag = 1;
+    } elseif ($_GET['action'] == 'remove') {
+        $flag = 0;
+    }
+    if (isset($flag)) {
+        $update = $db->prepare('UPDATE item SET is_bookmarked = :flag WHERE id = :id');
+        $update->bindValue(':id',   $id);
+        $update->bindValue(':flag', $flag);
+        if (!$update->execute()) die(Data::error($db)['error']);
+    }
+}
+
+$bookQuery = $db->prepare('SELECT id, is_bookmarked FROM item WHERE id = :id');
+$bookQuery->bindValue(':id', $id);
+$bookResult = $bookQuery->execute();
+$bookmark = $bookResult ? $bookResult->fetchArray(SQLITE3_ASSOC) : ['id' => $id, 'is_bookmarked' => 0];
+
+$action = $bookmark['is_bookmarked'] ? 'remove' : 'add';
+$icon   = $bookmark['is_bookmarked'] ? 'added'  : 'add'; ?>
+<button class="bookmark <?=$action?>" type=button role=button hx-patch="/bookmark?id=<?=$id?>&action=<?=$action?>"
+        hx-target=this hx-swap=outerHTML hx-push-url=false title="<?=init_cap($action)?> Bookmark">
+    <img src=/assets/bookmark-<?=$icon?>.png alt="<?=$action?> bookmark">
+</button><?php

src/public/docs/index.php

@@ -7,10 +7,11 @@ Security::verifyUser($db, redirectIfAnonymous: false);
 page_head('Documentation'); ?>
 <h1>Documentation Home</h1>
 <article>
-    <p><a href=./the-cli>About the CLI</a> provides orientation on Feed Reader Central&rsquo;s command line interface
-    <p><a href=./security-modes>Configuring Security Modes</a> describes the three security modes and how to manage each
-        of them
-    <p><a href=./refresh-feeds>Refresh Feeds</a> has instructions on how feeds can be refreshed on a schedule
+    <p><?=hx_get('./the-cli', 'About the CLI')?> provides orientation on Feed Reader Central&rsquo;s command line
+        interface
+    <p><?=hx_get('./security-modes', 'Configuring Security Modes')?> describes the three security modes and how to
+        manage each of them
+    <p><?=hx_get('./refresh-feeds', 'Refresh Feeds')?> has instructions on how feeds can be refreshed on a schedule
 </article><?php
 page_foot();
 $db->close();

src/public/docs/refresh-feeds.php

@@ -6,7 +6,7 @@ Security::verifyUser($db, redirectIfAnonymous: false);
 
 page_head('Refresh Feeds | Documentation'); ?>
 <h1>Refresh Feeds</h1>
-<p class=back-link><a href=./>&lang;&lang; Documentation Home</a>
+<p class=back-link><?=hx_get('./', '&lang;&lang; Documentation Home')?>
 <article class=docs>
     <h2>Manual Feed Refresh</h2>
     <p>Next to the &ldquo;Your Unread Items&rdquo; heading on the main page, there is a link labeled &ldquo;Refresh All

src/public/docs/security-modes.php

@@ -6,7 +6,7 @@ Security::verifyUser($db, redirectIfAnonymous: false);
 
 page_head('Security Modes | Documentation'); ?>
 <h1>Configuring Security Modes</h1>
-<p class=back-link><a href=./>&lang;&lang; Documentation Home</a>
+<p class=back-link><?=hx_get('./', '&lang;&lang; Documentation Home')?>
 <article class=docs>
     <h2>Security Modes</h2>
     <p><strong>Single-User</strong> mode assumes that every connection to the application is the same person. It is

src/public/docs/the-cli.php

@@ -6,7 +6,7 @@ Security::verifyUser($db, redirectIfAnonymous: false);
 
 page_head('About the CLI | Documentation'); ?>
 <h1>About the CLI</h1>
-<p class=back-link><a href=./>&lang;&lang; Documentation Home</a>
+<p class=back-link><?=hx_get('./', '&lang;&lang; Documentation Home')?>
 <article class=docs>
     <p>Feed Reader Central&rsquo;s low-friction design includes having many administrative tasks run in a terminal or
         shell. &ldquo;CLI&rdquo; is short for &ldquo;Command Line Interface&rdquo;, and refers to commands that are run

src/public/feed.php

@@ -1,61 +0,0 @@
-<?php
-/**
- * Add/Edit Feed Page
- *
- * Allows users to add or edit RSS feeds
- */
-
-include '../start.php';
-
-$db = Data::getConnection();
-Security::verifyUser($db);
-
-$feedId = $_GET['id'] ?? '';
-
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-    $isNew = $_POST['id'] == 'new';
-    if ($isNew) {
-        $result = Feed::add($_POST['url'], $db);
-    } else {
-        $toEdit = Data::retrieveFeedById($_POST['id'], $db);
-        $result = $toEdit ? Feed::update($toEdit, $_POST['url'], $db) : ['error' => "Feed {$_POST['id']} not found"];
-    }
-    if (array_key_exists('ok', $result)) {
-        add_info('Feed saved successfully');
-        $feedId = $isNew ? $result['ok'] : $_POST['id'];
-    } else {
-        add_error($result['error']);
-        $feedId = 'error';
-    }
-}
-
-if ($feedId == 'new') {
-    $title = 'Add RSS Feed';
-    $feed = [ 'id' => $_GET['id'], 'url' => ''];
-} else {
-    $title = 'Edit RSS Feed';
-    if ($feedId == 'error') {
-        $feed = ['id' => $_POST['id'] ?? '', 'url' => $_POST['url'] ?? ''];
-    } else {
-        $feed = Data::retrieveFeedById((int) $feedId, $db);
-        if (!$feed) {
-            http_response_code(404);
-            die();
-        }
-    }
-}
-
-page_head($title); ?>
-<h1><?=$title?></h1>
-<article>
-    <form method=POST action=/feed hx-post=/feed>
-        <input type=hidden name=id value=<?=$feed['id']?>>
-        <label>
-            Feed URL
-            <input type=url name=url required autofocus value="<?=$feed['url']?>">
-        </label><br>
-        <button type=submit>Save</button>
-    </form>
-</article><?php
-page_foot();
-$db->close();

src/public/feed/index.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * Add/Edit/Delete Feed Page
+ *
+ * Allows users to add, edit, and delete feeds
+ */
+
+include '../../start.php';
+
+$db = Data::getConnection();
+Security::verifyUser($db);
+
+$feedId = $_GET['id'] ?? '';
+
+if ($_SERVER['REQUEST_METHOD'] == 'DELETE') {
+    if (!($feed = Feed::retrieveById($feedId, $db))) not_found();
+    $itemDelete = $db->prepare('DELETE FROM item WHERE feed_id = :feed');
+    $itemDelete->bindValue(':feed', $feed['id']);
+    if (!$itemDelete->execute()) add_error(Data::error($db)['error']);
+    $feedDelete = $db->prepare('DELETE FROM feed WHERE id = :feed');
+    $feedDelete->bindValue(':feed', $feed['id']);
+    if ($feedDelete->execute()) {
+        add_info('Feed &ldquo;' . htmlentities($feed['title']) . '&rdquo; deleted successfully');
+    } else {
+        add_error(Data::error($db)['error']);
+    }
+    frc_redirect('/feeds');
+}
+
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+    $isNew = $_POST['id'] == 'new';
+    if ($isNew) {
+        $result = Feed::add($_POST['url'], $db);
+    } else {
+        $toEdit = Feed::retrieveById($_POST['id'], $db);
+        $result = $toEdit ? Feed::update($toEdit, $_POST['url'], $db) : ['error' => "Feed {$_POST['id']} not found"];
+    }
+    if (key_exists('ok', $result)) {
+        add_info('Feed saved successfully');
+        frc_redirect('/feeds');
+    }
+    add_error($result['error']);
+    $feedId = 'error';
+}
+
+if ($feedId == 'new') {
+    $title = 'Add RSS Feed';
+    $feed = [ 'id' => $_GET['id'], 'url' => ''];
+} else {
+    $title = 'Edit RSS Feed';
+    if ($feedId == 'error') {
+        $feed = ['id' => $_POST['id'] ?? '', 'url' => $_POST['url'] ?? ''];
+    } elseif (!($feed = Feed::retrieveById((int) $feedId, $db))) not_found();
+}
+
+page_head($title); ?>
+<h1><?=$title?></h1>
+<article>
+    <form method=POST action=/feed/ hx-post=/feed/>
+        <input type=hidden name=id value=<?=$feed['id']?>>
+        <label>
+            Feed URL
+            <input type=url name=url required autofocus value="<?=$feed['url']?>">
+        </label>
+        <span class=break></span>
+        <button type=submit>Save</button>
+    </form>
+</article><?php
+page_foot();
+$db->close();

src/public/feed/items.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Feed Item List Page
+ *
+ * Lists items in a given feed (all, unread, or bookmarked)
+ */
+
+include '../../start.php';
+
+$db = Data::getConnection();
+Security::verifyUser($db);
+
+if (!($feed = Feed::retrieveById($_GET['id'], $db))) not_found();
+
+$list = match (true) {
+    key_exists('unread',     $_GET) => ItemList::unreadForFeed($feed['id'], $db),
+    key_exists('bookmarked', $_GET) => ItemList::bookmarkedForFeed($feed['id'], $db),
+    default                         => ItemList::allForFeed($feed['id'], $db)
+};
+
+page_head(($list->itemType != '' ? "$list->itemType Items | " : '') . strip_tags($feed['title']));
+if ($list->itemType == '') {
+    echo '<h1>' . htmlentities($feed['title']) . '</h1>';
+} else {
+    echo '<h1 class=item_heading>' . htmlentities($feed['title']) . '</h1>';
+    echo "<div class=item_published>$list->itemType Items</div>";
+}
+$list->render();
+page_foot();
+$db->close();

src/public/feeds.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Feed Maintenance Page
+ *
+ * List feeds and provide links for maintenance actions
+ */
+
+include '../start.php';
+
+$db = Data::getConnection();
+Security::verifyUser($db);
+
+$feedQuery = $db->prepare('SELECT * FROM feed WHERE user_id = :user ORDER BY lower(title)');
+$feedQuery->bindValue(':user', $_SESSION[Key::USER_ID]);
+if (!($feedResult = $feedQuery->execute())) {
+    add_error(Data::error($db)['error']);
+}
+
+page_head('Your Feeds'); ?>
+<h1>Your Feeds</h1>
+<article>
+    <p class=action_buttons><?=hx_get('/feed/?id=new', 'Add Feed')?></p><?php
+    if ($feedResult) {
+        while ($feed = $feedResult->fetchArray(SQLITE3_ASSOC)) {
+            $feedId = $feed['id'];
+            $countQuery = $db->prepare(<<<'SQL'
+                SELECT (SELECT COUNT(*) FROM item WHERE feed_id = :feed)                       AS total,
+                       (SELECT COUNT(*) FROM item WHERE feed_id = :feed AND is_read = 0)       AS unread,
+                       (SELECT COUNT(*) FROM item WHERE feed_id = :feed AND is_bookmarked = 1) AS marked
+                SQL);
+            $countQuery->bindValue(':feed', $feed['id']);
+            $countResult = $countQuery->execute();
+            $counts = $countResult
+                ? $countResult->fetchArray(SQLITE3_ASSOC) : ['total' => 0, 'unread' => 0, 'marked' => 0]; ?>
+            <p><strong><?=htmlentities($feed['title'])?></strong><br>
+                <span class=meta><em>Last Updated <?=date_time($feed['updated_on'])?> &bull;
+                    As of <?=date_time($feed['checked_on'])?></em><br>
+                <?=hx_get("/feed/?id=$feedId", 'Edit')?> &bull; Read
+                <?=$counts['unread'] > 0 ? hx_get("/feed/items?id=$feedId&unread", 'Unread') : 'Unread'?>
+                (<?=$counts['unread']?>) |
+                <?=$counts['total'] > 0 ? hx_get("/feed/items?id=$feedId", 'All') : 'All'?> (<?=$counts['total']?>) |
+                <?=$counts['marked'] > 0 ? hx_get("/feed/items?id=$feedId&bookmarked", 'Bookmarked') : 'Bookmarked'?>
+                (<?=$counts['marked']?>) &bull;
+                <a href=/feed/?id=<?=$feedId?> hx-delete=/feed/?id=<?=$feedId?>
+                   hx-confirm="Are you sure you want to delete &ldquo;<?=htmlentities($feed['title'], ENT_QUOTES)?>&rdquo;? This will remove the feed and all its items, including unread and bookmarked.">Delete</a>
+                </span><?php
+        }
+    } ?>
+</article><?php
+page_foot();
+$db->close();

src/public/index.php

@@ -2,7 +2,7 @@
 /**
  * Home Page
  *
- * Displays a list of unread feed items for the current user
+ * Displays a list of unread or bookmarked items for the current user
  */
 
 include '../start.php';
@@ -10,45 +10,28 @@ include '../start.php';
 $db = Data::getConnection();
 Security::verifyUser($db);
 
-if (array_key_exists('refresh', $_GET)) {
+if (key_exists('refresh', $_GET)) {
     $refreshResult = Feed::refreshAll($db);
-    if (array_key_exists('ok', $refreshResult)) {
+    if (key_exists('ok', $refreshResult)) {
         add_info('All feeds refreshed successfully');
     } else {
         add_error(nl2br($refreshResult['error']));
     }
 }
 
-$query = $db->prepare(<<<'SQL'
-    SELECT item.id, item.title AS item_title, coalesce(item.updated_on, item.published_on) AS as_of,
-           feed.title AS feed_title
-      FROM item
-           INNER JOIN feed ON feed.id = item.feed_id
-     WHERE feed.user_id = :userId 
-       AND item.is_read = 0
-     ORDER BY coalesce(item.updated_on, item.published_on) DESC
-    SQL);
-$query->bindValue(':userId', $_SESSION[Key::USER_ID]);
-$result = $query->execute();
-$item   = $result ? $result->fetchArray(SQLITE3_ASSOC) : false;
-
-page_head('Your Unread Items'); ?>
-<h1>
-    Your Unread Items &nbsp;
-    <a class=refresh href=/?refresh hx-get=/?refresh hx-indicator="closest h1">(Refresh All Feeds)</a>
-    <span class=loading>Refreshing&hellip;</span>
-</h1>
-<article><?php
-if ($item) {
-    while ($item) { ?>
-        <p><a href=/item?id=<?=$item['id']?> hx-get=/item?id=<?=$item['id']?>><?=strip_tags($item['item_title'])?></a>
-            <br><?=htmlentities($item['feed_title'])?><br><small><em><?=date_time($item['as_of'])?></em></small><?php
-        $item = $result->fetchArray(SQLITE3_ASSOC);
-    }
-} else { ?>
-    <p>There are no unread items</p><?php
-} ?>
-</article><?php
+$list = match (true) {
+    key_exists('bookmarked', $_GET) => ItemList::allBookmarked($db),
+    default                         => ItemList::allUnread($db)
+};
+$title = "Your $list->itemType Items";
 
+page_head($title);
+echo "<h1>$title";
+if ($list->itemType == 'Unread') {
+    echo ' &nbsp; ' . hx_get('/?refresh', '(Refresh All Feeds)', 'class=refresh hx-indicator="closest h1"')
+        . '<span class=loading>Refreshing&hellip;</span>';
+}
+echo '</h1>';
+$list->render();
 page_foot();
 $db->close();

src/public/item.php

@@ -27,9 +27,11 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
         $keepUnread->execute();
     }
     $db->close();
-    frc_redirect('/');
+    frc_redirect($_POST['from']);
 }
 
+$from = $_GET['from'] ?? '/';
+
 if ($_SERVER['REQUEST_METHOD'] == 'DELETE') {
     $deleteQuery = $db->prepare(<<<'SQL'
         DELETE FROM item
@@ -47,7 +49,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'DELETE') {
         add_error(Data::error($db)['error']);
     }
     $db->close();
-    frc_redirect('/');
+    frc_redirect($from);
 }
 
 $query = $db->prepare(<<<'SQL'
@@ -73,6 +75,8 @@ $updated   = isset($item['updated_on']) ? date_time($item['updated_on']) : null;
 
 page_head(htmlentities("{$item['item_title']} | {$item['feed_title']}")); ?>
 <h1 class=item_heading>
+    <span class=bookmark hx-get="/bookmark?id=<?=$_GET['id']?>" hx-trigger=load hx-target=this hx-swap=outerHTML
+          hx-push-url=false></span>
     <a href="<?=$item['item_link']?>" target=_blank rel=noopener><?=strip_tags($item['item_title'])?></a><br>
 </h1>
 <div class=item_published>
@@ -83,7 +87,8 @@ page_head(htmlentities("{$item['item_title']} | {$item['feed_title']}")); ?>
     <div class=item_content><?=str_replace('<a ', '<a target=_blank rel=noopener ', $item['content'])?></div>
     <form class=action_buttons action=/item method=POST hx-post=/item>
         <input type=hidden name=id value=<?=$_GET['id']?>>
-        <a href=/ hx-get="/">Done</a>
+        <input type=hidden name=from value="<?=$from?>">
+        <?=hx_get($from, 'Done')?>
         <button type=submit>Keep as New</button>
         <button type=button hx-delete=/item>Delete</button>
     </form>

src/public/search.php

@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * Item Search Page
+ *
+ * Search for items across all feeds
+ */
+
+include '../start.php';
+
+$db = Data::getConnection();
+Security::verifyUser($db);
+
+$search = $_GET['search'] ?? '';
+$items  = $_GET['items']  ?? 'all';
+
+if ($search != '') {
+    $list = ItemList::matchingSearch($search, $items == 'bookmarked', $db);
+}
+
+page_head('Item Search'); ?>
+<h1>Item Search</h1>
+<article>
+    <form method=GET action=/search>
+        <label>
+            Search Criteria
+            <input type=text name=search required autofocus value="<?=htmlspecialchars($search)?>">
+        </label>
+        <label>
+            Items to Search
+            <select name=items>
+                <option value=all <?=$items == 'all' ? ' selected' : ''?>>All</option>
+                <option value=bookmarked <?=$items == 'bookmarked' ? ' selected' : ''?>>Bookmarked</option>
+            </select>
+        </label>
+        <span class=break></span>
+        <button type=submit>Search</button>
+    </form><?php
+    if (isset($list)) { ?>
+        <hr><?php
+        $list->render();
+    } ?>
+</article><?php
+page_foot();
+$db->close();

src/public/user/log-off.php

@@ -5,6 +5,6 @@
 
 include '../../start.php';
 
-if (array_key_exists(Key::USER_ID, $_SESSION)) session_destroy();
+if (key_exists(Key::USER_ID, $_SESSION)) session_destroy();
 
 frc_redirect('/');

src/public/user/log-on.php

@@ -5,7 +5,7 @@ $db = Data::getConnection();
 Security::verifyUser($db, redirectIfAnonymous: false);
 
 // Users already logged on have no need of this page
-if (array_key_exists(Key::USER_ID, $_SESSION)) frc_redirect('/');
+if (key_exists(Key::USER_ID, $_SESSION)) frc_redirect('/');
 
 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
     Security::logOnUser($_POST['email'] ?? '', $_POST['password'], $_POST['returnTo'] ?? null, $db);
@@ -26,12 +26,13 @@ page_head('Log On'); ?>
             <label>
                 E-mail Address
                 <input type=email name=email required autofocus>
-            </label><br><?php
+            </label><?php
         } ?>
         <label>
             Password
             <input type=password name=password required<?=$isSingle ? ' autofocus' : ''?>>
-        </label><br>
+        </label>
+        <span class=break></span>
         <button type=submit>Log On</button>
     </form>
 </article><?php

src/start.php

@@ -16,7 +16,7 @@ session_start([
  * @param string $message The message itself
  */
 function add_message(string $level, string $message): void {
-    if (!array_key_exists(Key::USER_MSG, $_SESSION)) $_SESSION[Key::USER_MSG] = array();
+    if (!key_exists(Key::USER_MSG, $_SESSION)) $_SESSION[Key::USER_MSG] = array();
     $_SESSION[Key::USER_MSG][] = ['level' => $level, 'message' => $message];
 }
 
@@ -39,8 +39,56 @@ function add_info(string $message): void {
 }
 
 /** @var bool $is_htmx True if this request was initiated by htmx, false if not */
-$is_htmx = array_key_exists('HTTP_HX_REQUEST', $_SERVER)
-    && !array_key_exists('HTTP_HX_HISTORY_RESTORE_REQUEST', $_SERVER);
+$is_htmx = key_exists('HTTP_HX_REQUEST', $_SERVER) && !key_exists('HTTP_HX_HISTORY_RESTORE_REQUEST', $_SERVER);
+
+function nav_link(string $link, bool $isFirst = false) {
+    $sep = $isFirst ? '' : ' | ';
+    echo "<span>$sep$link</span>";
+}
+
+/**
+ * Render the title bar for the page
+ */
+function title_bar(): void {
+    $version = match (true) {
+        str_ends_with(FRC_VERSION, '.0.0') => substr(FRC_VERSION, 0, strlen(FRC_VERSION) - 4),
+        str_ends_with(FRC_VERSION, '.0')   => substr(FRC_VERSION, 0, strlen(FRC_VERSION) - 2),
+        default                            => FRC_VERSION
+    }; ?>
+    <header hx-target=#main hx-push-url=true>
+        <div><a href=/ class=title>Feed Reader Central</a><span class=version>v<?=$version?></span></div>
+        <nav><?php
+            if (key_exists(Key::USER_ID, $_SESSION)) {
+                $db = Data::getConnection();
+                try {
+                    $bookQuery = $db->prepare(<<<'SQL'
+                        SELECT EXISTS(
+                            SELECT 1
+                              FROM item INNER JOIN feed ON item.feed_id = feed.id
+                             WHERE feed.user_id = :id AND item.is_bookmarked = 1)
+                        SQL);
+                    $bookQuery->bindValue(':id', $_SESSION[Key::USER_ID]);
+                    $bookResult   = $bookQuery->execute();
+                    $hasBookmarks = $bookResult && $bookResult->fetchArray(SQLITE3_NUM)[0];
+                    nav_link(hx_get('/feeds', 'Feeds'), true);
+                    if ($hasBookmarks) nav_link(hx_get('/?bookmarked', 'Bookmarked'));
+                    nav_link(hx_get('/search', 'Search'));
+                    nav_link(hx_get('/docs/', 'Docs'));
+                    nav_link('<a href=/user/log-off>Log Off</a>');
+                    if ($_SESSION[Key::USER_EMAIL] != Security::SINGLE_USER_EMAIL) {
+                        nav_link($_SESSION[Key::USER_EMAIL]);
+                    }
+                } finally {
+                    $db->close();
+                }
+            } else {
+                nav_link(hx_get('/user/log-on', 'Log On'), true);
+                nav_link(hx_get('/docs/', 'Docs'));
+            } ?>
+        </nav>
+    </header>
+    <main id=main hx-target=this hx-push-url=true hx-swap="innerHTML show:window:top"><?php
+}
 
 /**
  * Render the page title
@@ -48,12 +96,6 @@ $is_htmx = array_key_exists('HTTP_HX_REQUEST', $_SERVER)
  */
 function page_head(string $title): void {
     global $is_htmx;
-    $version = match (true) {
-        str_ends_with(FRC_VERSION, '.0.0') => substr(FRC_VERSION, 0, strlen(FRC_VERSION) - 4),
-        str_ends_with(FRC_VERSION, '.0')   => substr(FRC_VERSION, 0, strlen(FRC_VERSION) - 2),
-        default                            => FRC_VERSION
-    };
-    //if ($is_htmx) header('HX-Push-Url: true');
     ?>
 <!DOCTYPE html>
 <html lang=en>
@@ -61,39 +103,23 @@ function page_head(string $title): void {
     <title><?=$title?> | Feed Reader Central</title><?php
     if (!$is_htmx) { ?>
         <meta name=viewport content="width=device-width, initial-scale=1">
+        <meta name=htmx-config content='{"historyCacheSize":0}'>
         <link href=/assets/style.css rel=stylesheet><?php
     } ?>
 </head>
 <body><?php
-    if (!$is_htmx) { ?>
-        <header hx-target=#main hx-push-url=true>
-            <div><a class=title href=/ hx-get="/">Feed Reader Central</a><span class=version>v<?=$version?></span></div>
-            <div><?php
-                if (array_key_exists(Key::USER_ID, $_SESSION)) { ?>
-                    <a href=/feed?id=new hx-get=/feed?id=new>Add Feed</a> |
-                    <a href=/docs/ hx-get=/docs/>Docs</a> |
-                    <a href=/user/log-off hx-get=/user/log-off>Log Off</a><?php
-                    if ($_SESSION[Key::USER_EMAIL] != Security::SINGLE_USER_EMAIL) { ?>
-                        | <?=$_SESSION[Key::USER_EMAIL]?><?php
-                    }
-                } else { ?>
-                    <a href=/user/log-on hx-get=/user/log-on>Log On</a> | <a href=/docs/ hx-get=/docs/>Docs</a><?php
-                } ?>
-            </div>
-        </header>
-        <main id=main hx-target=this hx-push-url=true hx-swap="innerHTML show:window:top"><?php
+    if (!$is_htmx) title_bar();
+    if (sizeof($messages = $_SESSION[Key::USER_MSG] ?? []) > 0) { ?>
+        <div class=user_messages><?php
+            array_walk($messages, function ($msg) { ?>
+                <div class=user_message>
+                    <?=$msg['level'] == 'INFO' ? '' : "<strong>{$msg['level']}</strong><br>"?>
+                    <?=$msg['message']?>
+                </div><?php
+            }); ?>
+        </div><?php
+        $_SESSION[Key::USER_MSG] = [];
     }
-        if (sizeof($messages = $_SESSION[Key::USER_MSG] ?? []) > 0) { ?>
-            <div class=user_messages><?php
-                array_walk($messages, function ($msg) { ?>
-                    <div class=user_message>
-                        <?=$msg['level'] == 'INFO' ? '' : "<strong>{$msg['level']}</strong><br>"?>
-                        <?=$msg['message']?>
-                    </div><?php
-                }); ?>
-            </div><?php
-            $_SESSION[Key::USER_MSG] = [];
-        }
 }
 
 /**
@@ -102,9 +128,7 @@ function page_head(string $title): void {
 function page_foot(): void {
     global $is_htmx; ?>
     </main><?php
-    if (!$is_htmx) { ?>
-        <script src=/assets/htmx.min.js></script><?php
-    } ?>
+    if (!$is_htmx) echo '<script src=/assets/htmx.min.js></script>'; ?>
 </body>
 </html><?php
     session_commit();
@@ -139,3 +163,25 @@ function date_time(string $value): string {
         return '(invalid date)';
     }
 }
+
+/**
+ * Create an anchor tag with both `href` and `hx-get` attributes
+ *
+ * @param string $url The URL to which navigation should occur
+ * @param string $text The text for the link
+ * @param string $extraAttrs Extra attributes for the anchor tag (must be attribute-encoded)
+ * @return string The anchor tag with both `href` and `hx-get` attributes
+ */
+function hx_get(string $url, string $text, string $extraAttrs = ''): string {
+    $attrs = $extraAttrs != '' ? " $extraAttrs" : '';
+    return "<a href=\"$url\" hx-get=\"$url\"$attrs>$text</a>";
+}
+
+/**
+ * Return a 404 Not Found
+ */
+#[NoReturn]
+function not_found(): void {
+    http_response_code(404);
+    die('Not Found');
+}

src/util/search.php

@@ -0,0 +1,49 @@
+<?php
+use JetBrains\PhpStorm\NoReturn;
+
+require __DIR__ . '/../cli-start.php';
+
+cli_title('SEARCH MAINTENANCE');
+
+if ($argc < 2) display_help();
+
+switch ($argv[1]) {
+    case 'rebuild':
+        rebuild_index();
+        break;
+    default:
+        printfn('Unrecognized option "%s"', $argv[1]);
+        display_help();
+}
+
+
+/**
+ * Display the options for this utility and exit
+ */
+#[NoReturn]
+function display_help(): void {
+    printfn('Options:');
+    printfn(' - rebuild');
+    printfn('     Rebuilds search index');
+    exit(0);
+}
+
+/**
+ * Rebuild the search index, creating it if it does not already exist
+ */
+function rebuild_index(): void {
+    $db = Data::getConnection();
+
+    try {
+        $hasIndex = $db->query("SELECT COUNT(*) FROM sqlite_master WHERE name = 'item_ai'");
+        if ($hasIndex->fetchArray(SQLITE3_NUM)[0] == 0) {
+            printfn('Creating search index....');
+            Data::createSearchIndex($db);
+        }
+        printfn('Rebuilding search index...');
+        $db->exec("INSERT INTO item_search (item_search) VALUES ('rebuild')");
+        printfn(PHP_EOL . 'Search index rebuilt');
+    } finally {
+        $db->close();
+    }
+}