Add editing of feed URL (#4)
- Move feed-specific database calls to Feed class - Detect when feed items have been updated - Add const keys for $_REQUEST values
This commit is contained in:
parent
7d294b9be8
commit
da9a569e4a
|
|
@ -8,7 +8,7 @@ class Data {
|
|||
* Obtain a new connection to the database
|
||||
* @return SQLite3 A new connection to the database
|
||||
*/
|
||||
private static function getConnection(): SQLite3 {
|
||||
public static function getConnection(): SQLite3 {
|
||||
$db = new SQLite3('../data/' . DATABASE_NAME);
|
||||
$db->exec('PRAGMA foreign_keys = ON;');
|
||||
return $db;
|
||||
|
|
@ -74,6 +74,7 @@ class Data {
|
|||
*/
|
||||
public static function findUserByEmail(string $email): ?array {
|
||||
$db = self::getConnection();
|
||||
try {
|
||||
$query = $db->prepare('SELECT * FROM frc_user WHERE email = :email');
|
||||
$query->bindValue(':email', $email);
|
||||
$result = $query->execute();
|
||||
|
|
@ -83,6 +84,9 @@ class Data {
|
|||
return null;
|
||||
}
|
||||
return null;
|
||||
} finally {
|
||||
$db->close();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -93,10 +97,14 @@ class Data {
|
|||
*/
|
||||
public static function addUser(string $email, string $password): void {
|
||||
$db = self::getConnection();
|
||||
try {
|
||||
$query = $db->prepare('INSERT INTO frc_user (email, password) VALUES (:email, :password)');
|
||||
$query->bindValue(':email', $email);
|
||||
$query->bindValue(':password', password_hash($password, PASSWORD_DEFAULT));
|
||||
$query->execute();
|
||||
} finally {
|
||||
$db->close();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -105,7 +113,7 @@ class Data {
|
|||
* @param ?string $value The date/time to be parsed and formatted
|
||||
* @return string|null The date/time in `DateTimeInterface::ATOM` format, or `null` if the input cannot be parsed
|
||||
*/
|
||||
private static function formatDate(?string $value): ?string {
|
||||
public static function formatDate(?string $value): ?string {
|
||||
try {
|
||||
return $value ? (new DateTimeImmutable($value))->format(DateTimeInterface::ATOM) : null;
|
||||
} catch (Exception) {
|
||||
|
|
@ -114,77 +122,22 @@ class Data {
|
|||
}
|
||||
|
||||
/**
|
||||
* Add an RSS feed
|
||||
* Retrieve a feed by its ID for the current user
|
||||
*
|
||||
* @param string $url The URL for the RSS feed
|
||||
* @param string $title The title of the RSS feed
|
||||
* @param ?string $updatedOn The date/time the RSS feed was last updated (from the XML, not when we checked)
|
||||
* @return int The ID of the added feed
|
||||
* @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 addFeed(string $url, string $title, ?string $updatedOn): int {
|
||||
$db = self::getConnection();
|
||||
$query = $db->prepare(<<<'SQL'
|
||||
INSERT INTO feed (
|
||||
user_id, url, title, updated_on, checked_on
|
||||
) VALUES (
|
||||
:user, :url, :title, :updated, :checked
|
||||
)
|
||||
SQL);
|
||||
$query->bindValue(':user', $_REQUEST['FRC_USER_ID']);
|
||||
$query->bindValue(':url', $url);
|
||||
$query->bindValue(':title', $title);
|
||||
$query->bindValue(':updated', self::formatDate($updatedOn));
|
||||
$query->bindValue(':checked', self::formatDate('now'));
|
||||
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', $_REQUEST[Key::USER_ID]);
|
||||
$result = $query->execute();
|
||||
return $result ? $db->lastInsertRowID() : -1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Does a feed item already exist?
|
||||
*
|
||||
* @param int $feedId The ID of the feed to which the item belongs
|
||||
* @param string $guid The GUID from the RSS feed, uniquely identifying the item
|
||||
* @return bool True if the item exists, false if not
|
||||
*/
|
||||
public static function itemExists(int $feedId, string $guid): bool {
|
||||
$db = self::getConnection();
|
||||
$query = $db->prepare('SELECT COUNT(*) FROM item WHERE feed_id = :feed AND item_guid = :guid');
|
||||
$query->bindValue(':feed', $feedId);
|
||||
$query->bindValue(':guid', $guid);
|
||||
$result = $query->execute();
|
||||
return $result && $result->fetchArray(SQLITE3_NUM)[0] == 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a feed item
|
||||
*
|
||||
* @param int $feedId The ID of the feed to which the item should be added
|
||||
* @param string $guid The GUID from the RSS feed (uses link if `<guid>` not specified)
|
||||
* @param string $link The link to this item
|
||||
* @param string $title The title of the item
|
||||
* @param string $publishedOn The date/time the item was published
|
||||
* @param ?string $updatedOn The date/time the item was last updated
|
||||
* @param string $content The content of the item
|
||||
* @param bool $isEncoded Whether the content has HTML (true) or is plaintext (false)
|
||||
*/
|
||||
public static function addItem(int $feedId, string $guid, string $link, string $title, string $publishedOn,
|
||||
?string $updatedOn, string $content, bool $isEncoded): void {
|
||||
$db = self::getConnection();
|
||||
$query = $db->prepare(<<<'SQL'
|
||||
INSERT INTO item (
|
||||
feed_id, item_guid, item_link, title, published_on, updated_on, content, is_encoded
|
||||
) VALUES (
|
||||
:feed, :guid, :link, :title, :published, :updated, :content, :encoded
|
||||
)
|
||||
SQL);
|
||||
$query->bindValue(':feed', $feedId);
|
||||
$query->bindValue(':guid', $guid);
|
||||
$query->bindValue(':link', $link);
|
||||
$query->bindValue(':title', $title);
|
||||
$query->bindValue(':published', self::formatDate($publishedOn));
|
||||
$query->bindValue(':updated', self::formatDate($updatedOn));
|
||||
$query->bindValue(':content', $content);
|
||||
$query->bindValue(':encoded', $isEncoded);
|
||||
$query->execute();
|
||||
return $result ? $result->fetchArray(SQLITE3_ASSOC) : false;
|
||||
} finally {
|
||||
if (is_null($dbConn)) $db->close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
197
src/lib/Feed.php
197
src/lib/Feed.php
|
|
@ -48,8 +48,8 @@ class Feed {
|
|||
* Retrieve the feed
|
||||
*
|
||||
* @param string $url
|
||||
* @return array|DOMDocument[]|string[] [ 'ok' => feedXml, 'url' => actualUrl ] if successful,
|
||||
* [ 'error' => message ] if not
|
||||
* @return array|DOMDocument[]|string[] ['ok' => feedXml, 'url' => actualUrl] if successful, ['error' => message] if
|
||||
* not
|
||||
*/
|
||||
public static function retrieveFeed(string $url): array {
|
||||
$feedReq = curl_init($url);
|
||||
|
|
@ -93,6 +93,81 @@ class Feed {
|
|||
return $tags->length == 0 ? "$tagName not found" : $tags->item(0)->textContent;
|
||||
}
|
||||
|
||||
/**
|
||||
* Extract the fields we need to keep from the feed
|
||||
*
|
||||
* @param DOMElement $item The item from the feed
|
||||
* @return array The fields for the item as an associative array
|
||||
*/
|
||||
private static function itemFields(DOMElement $item): array {
|
||||
$itemGuid = self::eltValue($item, 'guid');
|
||||
$updNodes = $item->getElementsByTagNameNS(self::ATOM_NS, 'updated');
|
||||
$encNodes = $item->getElementsByTagNameNS(self::CONTENT_NS, 'encoded');
|
||||
return [
|
||||
'guid' => $itemGuid == 'guid not found' ? self::eltValue($item, 'link') : $itemGuid,
|
||||
'title' => self::eltValue($item, 'title'),
|
||||
'link' => self::eltValue($item, 'link'),
|
||||
'published' => Data::formatDate(self::eltValue($item, 'pubDate')),
|
||||
'updated' => Data::formatDate($updNodes->length > 0 ? $updNodes->item(0)->textContent : null),
|
||||
'content' => $encNodes->length > 0 ? $encNodes->item(0)->textContent
|
||||
: self::eltValue($item, 'description'),
|
||||
'isEncoded' => $encNodes->length > 0
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Update a feed item
|
||||
*
|
||||
* @param int $itemId The ID of the item to be updated
|
||||
* @param array $item The fields from the updated item
|
||||
* @param SQLite3 $db A database connection to use for the update
|
||||
*/
|
||||
private static function updateItem(int $itemId, array $item, SQLite3 $db): void {
|
||||
$query = $db->prepare(<<<'SQL'
|
||||
UPDATE item
|
||||
SET title = :title,
|
||||
published_on = :published,
|
||||
updated_on = :updated,
|
||||
content = :content,
|
||||
is_encoded = :encoded,
|
||||
is_read = 0
|
||||
WHERE id = :id
|
||||
SQL);
|
||||
$query->bindValue(':title', $item['title']);
|
||||
$query->bindValue(':published', $item['published']);
|
||||
$query->bindValue(':updated', $item['updated']);
|
||||
$query->bindValue(':content', $item['content']);
|
||||
$query->bindValue(':encoded', $item['isEncoded']);
|
||||
$query->bindValue(':id', $itemId);
|
||||
$query->execute();
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a feed item
|
||||
*
|
||||
* @param int $feedId The ID of the feed to which the item should be added
|
||||
* @param array $item The fields for the item
|
||||
* @param SQLite3 $db A database connection to use for the addition
|
||||
*/
|
||||
private static function addItem(int $feedId, array $item, SQLite3 $db): void {
|
||||
$query = $db->prepare(<<<'SQL'
|
||||
INSERT INTO item (
|
||||
feed_id, item_guid, item_link, title, published_on, updated_on, content, is_encoded
|
||||
) VALUES (
|
||||
:feed, :guid, :link, :title, :published, :updated, :content, :encoded
|
||||
)
|
||||
SQL);
|
||||
$query->bindValue(':feed', $feedId);
|
||||
$query->bindValue(':guid', $item['guid']);
|
||||
$query->bindValue(':link', $item['link']);
|
||||
$query->bindValue(':title', $item['title']);
|
||||
$query->bindValue(':published', $item['published']);
|
||||
$query->bindValue(':updated', $item['updated']);
|
||||
$query->bindValue(':content', $item['content']);
|
||||
$query->bindValue(':encoded', $item['isEncoded']);
|
||||
$query->execute();
|
||||
}
|
||||
|
||||
/**
|
||||
* Update a feed's items
|
||||
*
|
||||
|
|
@ -100,28 +175,25 @@ class Feed {
|
|||
* @param DOMElement $channel The RSS feed items
|
||||
* @return array ['ok' => true] if successful, ['error' => message] if not
|
||||
*/
|
||||
public static function updateItems(int $feedId, DOMElement $channel): array {
|
||||
public static function updateItems(int $feedId, DOMElement $channel, SQLite3 $db): array {
|
||||
try {
|
||||
foreach ($channel->getElementsByTagName('item') as $item) {
|
||||
$itemGuid = self::eltValue($item, 'guid');
|
||||
if ($itemGuid == 'guid not found') $itemGuid = self::eltValue($item, 'link');
|
||||
$isNew = !Data::itemExists($feedId, $itemGuid);
|
||||
if ($isNew) {
|
||||
$title = self::eltValue($item, 'title');
|
||||
$link = self::eltValue($item, 'link');
|
||||
$published = self::eltValue($item, 'pubDate');
|
||||
$updNodes = $item->getElementsByTagNameNS(self::ATOM_NS, 'updated');
|
||||
$updated = $updNodes->length > 0 ? $updNodes->item(0)->textContent : null;
|
||||
$encNodes = $item->getElementsByTagNameNS(self::CONTENT_NS, 'encoded');
|
||||
if ($encNodes->length > 0) {
|
||||
$content = $encNodes->item(0)->textContent;
|
||||
$isEncoded = true;
|
||||
} else {
|
||||
$content = self::eltValue($item, 'description');
|
||||
$isEncoded = false;
|
||||
foreach ($channel->getElementsByTagName('item') as $rawItem) {
|
||||
$item = self::itemFields($rawItem);
|
||||
$existsQuery = $db->prepare(
|
||||
'SELECT id, published_on, updated_on FROM item WHERE feed_id = :feed AND item_guid = :guid');
|
||||
$existsQuery->bindValue(':feed', $feedId);
|
||||
$existsQuery->bindValue(':guid', $item['guid']);
|
||||
$exists = $existsQuery->execute();
|
||||
if ($exists) {
|
||||
$existing = $exists->fetchArray(SQLITE3_ASSOC);
|
||||
if ( $existing
|
||||
&& ( $existing['published_on'] != $item['published']
|
||||
|| $existing['updated_on'] ?? '' != $item['updated'] ?? '')) {
|
||||
self::updateItem($existing['id'], $item, $db);
|
||||
}
|
||||
} else {
|
||||
self::addItem($feedId, $item, $db);
|
||||
}
|
||||
Data::addItem($feedId, $itemGuid, $link, $title, $published, $updated, $content, $isEncoded);
|
||||
} // TODO: else check updated date; may want to return that from the isNew check instead
|
||||
}
|
||||
} catch (Exception $ex) {
|
||||
return ['error' => $ex->getMessage()];
|
||||
|
|
@ -130,16 +202,14 @@ class Feed {
|
|||
}
|
||||
|
||||
/**
|
||||
* Add an RSS feed
|
||||
* Find the `<channel>` element and derive the published/last updated date from the feed
|
||||
*
|
||||
* @param string $url The URL of the RSS feed to add
|
||||
* @return array [ 'ok' => true ] if successful, [ 'error' => message ] if not
|
||||
* @param DOMDocument $feed The feed from which the information should be extracted
|
||||
* @return array|string[]|DOMElement[] ['channel' => channel, 'updated' => date] if successful, ['error' => message]
|
||||
* if not
|
||||
*/
|
||||
public static function add(string $url): array {
|
||||
$feed = self::retrieveFeed($url);
|
||||
if (array_key_exists('error', $feed)) return $feed;
|
||||
|
||||
$channel = $feed['ok']->getElementsByTagName('channel')->item(0);
|
||||
private static function findChannelAndDate(DOMDocument $feed): array {
|
||||
$channel = $feed->getElementsByTagName('channel')->item(0);
|
||||
if (!$channel instanceof DOMElement) return [ 'error' => "Channel element not found ($channel->nodeType)" ];
|
||||
|
||||
// In Atom feeds, lastBuildDate contains the last time an item in the feed was updated; if that is not present,
|
||||
|
|
@ -149,9 +219,72 @@ class Feed {
|
|||
$updated = self::eltValue($channel, 'pubDate');
|
||||
if ($updated == 'pubDate not found') $updated = null;
|
||||
}
|
||||
$feedId = Data::addFeed($feed['url'], self::eltValue($channel, 'title'), $updated);
|
||||
return ['channel' => $channel, 'updated' => Data::formatDate($updated)];
|
||||
}
|
||||
|
||||
$result = self::updateItems($feedId, $channel);
|
||||
/**
|
||||
* Add an RSS feed
|
||||
*
|
||||
* @param string $url The URL of the RSS feed to add
|
||||
* @return array ['ok' => feedId] if successful, ['error' => message] if not
|
||||
*/
|
||||
public static function add(string $url, SQLite3 $db): array {
|
||||
$feed = self::retrieveFeed($url);
|
||||
if (array_key_exists('error', $feed)) return $feed;
|
||||
|
||||
$channelAndDate = self::findChannelAndDate($feed['ok']);
|
||||
if (array_key_exists('error', $channelAndDate)) return $channelAndDate;
|
||||
$channel = $channelAndDate['channel'];
|
||||
|
||||
$query = $db->prepare(<<<'SQL'
|
||||
INSERT INTO feed (user_id, url, title, updated_on, checked_on)
|
||||
VALUES (:user, :url, :title, :updated, :checked)
|
||||
SQL);
|
||||
$query->bindValue(':user', $_REQUEST[Key::USER_ID]);
|
||||
$query->bindValue(':url', $feed['url']);
|
||||
$query->bindValue(':title', self::eltValue($channel, 'title'));
|
||||
$query->bindValue(':updated', $channelAndDate['updated']);
|
||||
$query->bindValue(':checked', Data::formatDate('now'));
|
||||
$result = $query->execute();
|
||||
|
||||
$feedId = $result ? $db->lastInsertRowID() : -1;
|
||||
if ($feedId < 0) return ['error' => $db->lastErrorMsg()];
|
||||
|
||||
$result = self::updateItems($feedId, $channel, $db);
|
||||
if (array_key_exists('error', $result)) return $result;
|
||||
|
||||
return ['ok' => $feedId];
|
||||
}
|
||||
|
||||
/**
|
||||
* Update an RSS feed
|
||||
*
|
||||
* @param array $existing The existing RSS feed
|
||||
* @param string $url The URL with which the existing feed should be modified
|
||||
* @return bool[]|string[] [ 'ok' => true ] if successful, [ 'error' => message ] if not
|
||||
*/
|
||||
public static function update(array $existing, string $url, SQLite3 $db): array {
|
||||
$feed = self::retrieveFeed($url);
|
||||
if (array_key_exists('error', $feed)) return $feed;
|
||||
|
||||
$channelAndDate = self::findChannelAndDate($feed['ok']);
|
||||
if (array_key_exists('error', $channelAndDate)) return $channelAndDate;
|
||||
$channel = $channelAndDate['channel'];
|
||||
|
||||
$query = $db->prepare(<<<'SQL'
|
||||
UPDATE feed
|
||||
SET url = :url, title = :title, updated_on = :updated, checked_on = :checked
|
||||
WHERE id = :id AND user_id = :user
|
||||
SQL);
|
||||
$query->bindValue(':url', $feed['url']);
|
||||
$query->bindValue(':title', self::eltValue($channel, 'title'));
|
||||
$query->bindValue(':updated', $channelAndDate['updated']);
|
||||
$query->bindValue(':checked', Data::formatDate('now'));
|
||||
$query->bindValue(':id', $existing['id']);
|
||||
$query->bindValue(':user', $_REQUEST[Key::USER_ID]);
|
||||
$query->execute();
|
||||
|
||||
$result = self::updateItems($existing['id'], $channel, $db);
|
||||
if (array_key_exists('error', $result)) return $result;
|
||||
|
||||
return ['ok' => true];
|
||||
|
|
|
|||
13
src/lib/Key.php
Normal file
13
src/lib/Key.php
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<?php
|
||||
|
||||
class Key {
|
||||
|
||||
/** @var string The $_REQUEST key for teh current user's e-mail address */
|
||||
public const string USER_EMAIL = 'FRC_USER_EMAIL';
|
||||
|
||||
/** @var string The $_REQUEST key for the current user's ID */
|
||||
public const string USER_ID = 'FRC_USER_ID';
|
||||
|
||||
/** @var string The $_REQUEST key for the array of user messages to display */
|
||||
public const string USER_MSG = 'FRC_USER_MSG';
|
||||
}
|
||||
|
|
@ -31,11 +31,11 @@ class Security {
|
|||
die('Unrecognized security model (' . SECURITY_MODEL . ')');
|
||||
}
|
||||
if (!$user && $redirectIfAnonymous) {
|
||||
header('/logon?returnTo=' . $_SERVER["REQUEST_URI"], true, HTTP_REDIRECT_TEMP);
|
||||
header('/logon?returnTo=' . $_SERVER['REQUEST_URI'], true, HTTP_REDIRECT_TEMP);
|
||||
die();
|
||||
}
|
||||
$_REQUEST['FRC_USER_ID'] = $user['id'];
|
||||
$_REQUEST['FRC_USER_EMAIL'] = $user['email'];
|
||||
$_REQUEST[Key::USER_ID] = $user['id'];
|
||||
$_REQUEST[Key::USER_EMAIL] = $user['email'];
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -9,20 +9,35 @@ include '../start.php';
|
|||
|
||||
Security::verifyUser();
|
||||
|
||||
$feedId = array_key_exists('id', $_GET) ? $_GET['id'] : '';
|
||||
$db = Data::getConnection();
|
||||
|
||||
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
|
||||
// TODO: get feed, add if new, reject if existing but not owned by this user, update otherwise
|
||||
$result = Feed::add($_POST['url']);
|
||||
if (array_key_exists('ok', $result)) {
|
||||
add_message('INFO', 'Feed added successfully');
|
||||
$isNew = $_POST['id'] == 'new';
|
||||
if ($isNew) {
|
||||
$result = Feed::add($_POST['url'], $db);
|
||||
} else {
|
||||
add_message('ERROR', $result['error']);
|
||||
$toEdit = Data::retrieveFeedById($_POST['id'], $db);
|
||||
$result = $toEdit ? Feed::update($toEdit, $_POST['url'], $db) : [ 'error' => "Feed {$_POST['id']} not found" ];
|
||||
}
|
||||
$feed = [ 'id' => $_POST['id'], 'url' => $_POST['url'] ];
|
||||
$title = 'TODO';
|
||||
if (array_key_exists('ok', $result)) {
|
||||
add_info('Feed saved successfully');
|
||||
$feedId = $isNew ? $result['ok'] : $_POST['id'];
|
||||
} else {
|
||||
// TODO: Retrieve feed by ID if not new
|
||||
add_error($result['error']);
|
||||
}
|
||||
}
|
||||
|
||||
if ($feedId == 'new') {
|
||||
$feed = [ 'id' => $_GET['id'], 'url' => '' ];
|
||||
$title = 'Add RSS Feed';
|
||||
} else {
|
||||
$feed = Data::retrieveFeedById((int) $feedId, $db);
|
||||
if (!$feed) {
|
||||
http_response_code(404);
|
||||
die();
|
||||
}
|
||||
$title = 'Edit RSS Feed';
|
||||
}
|
||||
|
||||
page_head($title); ?>
|
||||
|
|
@ -38,3 +53,4 @@ page_head($title); ?>
|
|||
</form>
|
||||
</article><?php
|
||||
page_foot();
|
||||
$db->close();
|
||||
|
|
|
|||
|
|
@ -9,8 +9,6 @@ include '../start.php';
|
|||
|
||||
Security::verifyUser();
|
||||
|
||||
page_head('Welcome');
|
||||
?>
|
||||
|
||||
<?php
|
||||
page_head('Welcome'); ?>
|
||||
<p>Unread items go here</p><?php
|
||||
page_foot();
|
||||
|
|
|
|||
|
|
@ -19,8 +19,26 @@ Data::ensureDb();
|
|||
* @param string $message The message itself
|
||||
*/
|
||||
function add_message(string $level, string $message): void {
|
||||
if (!array_key_exists('USER_MSG', $_REQUEST)) $_REQUEST['USER_MSG'] = array();
|
||||
$_REQUEST['USER_MSG'][] = ['level' => $level, 'message' => $message];
|
||||
if (!array_key_exists(Key::USER_MSG, $_REQUEST)) $_REQUEST[Key::USER_MSG] = array();
|
||||
$_REQUEST[Key::USER_MSG][] = ['level' => $level, 'message' => $message];
|
||||
}
|
||||
|
||||
/**
|
||||
* Add an error message to be displayed at the top of the page
|
||||
*
|
||||
* @param string $message The message to be displayed
|
||||
*/
|
||||
function add_error(string $message): void {
|
||||
add_message('ERROR', $message);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add an error message to be displayed at the top of the page
|
||||
*
|
||||
* @param string $message The message to be displayed
|
||||
*/
|
||||
function add_info(string $message): void {
|
||||
add_message('INFO', $message);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -38,15 +56,15 @@ function page_head(string $title): void {
|
|||
<header>
|
||||
<a class=title href="/">Feed Reader Central</a>
|
||||
<div><?php
|
||||
if (array_key_exists('FRC_USER_ID', $_REQUEST)) {
|
||||
if (array_key_exists(Key::USER_ID, $_REQUEST)) {
|
||||
echo '<a href=/feed?id=new>Add Feed</a>';
|
||||
if ($_REQUEST['FRC_USER_EMAIL'] != 'solouser@example.com') echo " | {$_REQUEST['FRC_USER_EMAIL']}";
|
||||
if ($_REQUEST[Key::USER_EMAIL] != 'solouser@example.com') echo " | {$_REQUEST[Key::USER_EMAIL]}";
|
||||
} ?>
|
||||
</div>
|
||||
</header>
|
||||
<main hx-target=this><?php
|
||||
if (array_key_exists('USER_MSG', $_REQUEST)) {
|
||||
foreach ($_REQUEST['USER_MSG'] as $msg) { ?>
|
||||
if (array_key_exists(Key::USER_MSG, $_REQUEST)) {
|
||||
foreach ($_REQUEST[Key::USER_MSG] as $msg) { ?>
|
||||
<div>
|
||||
<?=$msg['level'] == 'INFO' ? '' : "<strong>{$msg['level']}</strong><br>"?>
|
||||
<?=$msg['message']?>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user