Documents and Documentation (beta 1) (#23)
- Change to SQLite document store - Complete documentation on usage of Feed Reader Central - Update INSTALLING.md for new installation procedures Reviewed-on: #23
This commit is contained in:
parent
819979f2b2
commit
0c87392910
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -1,3 +1,6 @@
|
||||||
.idea
|
.idea
|
||||||
src/data/*.db
|
vendor
|
||||||
|
src/data/*.db*
|
||||||
src/user-config.php
|
src/user-config.php
|
||||||
|
*.tar.bz2
|
||||||
|
*.zip
|
||||||
|
|
|
||||||
|
|
@ -1,30 +1,46 @@
|
||||||
# Installation
|
# Installation
|
||||||
|
|
||||||
## All Environments (FrankenPHP)
|
## Obtaining the Files
|
||||||
|
|
||||||
The easiest way to get up and running quickly is by using [FrankenPHP](https://frankenphp.dev), a version of [Caddy](https://caddyserver.com) that runs PHP in its process. There is a `Caddyfile` in the `/src` directory which will configure the site to run with FrankenPHP.
|
Releases are named `frc-[version]` and are provided in both `.zip` and `.tar.bz2` formats on [the release page](https://git.bitbadger.solutions/bit-badger/feed-reader-central/releases) (starting with beta1). Select a folder on the server that will host this instance and unarchive the release there.
|
||||||
|
|
||||||
For Linux / Mac users:
|
## Selecting a Server
|
||||||
- Follow [their instructions](https://frankenphp.dev/docs/#standalone-binary) for downloading a binary for your system
|
|
||||||
- Rename that binary to `frankenphp` and make it executable (`chmod +x ./frankenphp`)
|
|
||||||
- Move that binary to `/usr/local/bin`
|
|
||||||
|
|
||||||
For Windows users, the steps are the same; however, the binary should be named `frankenphp.exe` and be placed somewhere within your system's `PATH`.
|
Configuration samples are provided in the `/servers` directory for [Apache 2](https://httpd.apache.org/docs/), [nginx](https://nginx.org/en/), and [Caddy](https://caddyserver.com/docs/).
|
||||||
|
|
||||||
Once those steps are complete, from the `/src` directory, run `frankenphp run`.
|
### Apache 2
|
||||||
|
|
||||||
_(More environments will be detailed as part of a later release; an nginx reverse proxy via FastCGI is another common way to run PHP applications.)_
|
Configure a virtual host (if appropriate), then copy `/servers/htaccess` to `.htaccess` in the directory where the release archive was expanded. This file enables the extensionless rewrites required for the URLs to work.
|
||||||
|
|
||||||
|
### nginx
|
||||||
|
|
||||||
|
The configuration file `/servers/nginx.conf` is a full virtual host configuration. Update it with the paths for your installation, then add it to your configuration (on Debian/Ubuntu, copy it to `/etc/nginx/sites-available`, create a symlink in `/etc/nginx/sites-enabed`, and reload the nginx config).
|
||||||
|
|
||||||
|
### Caddy (with FastCGI)
|
||||||
|
|
||||||
|
`/servers/fastcgi.Caddyfile` contains configuration to host the site using Caddy. Ensure the PHP FPM address is correct, then rename it to `Caddyfile` and place it in the directory where the release archive was expanded. Running `caddy run` will serve the site with the given parameters.
|
||||||
|
|
||||||
|
### Caddy (with FrankenPHP)
|
||||||
|
|
||||||
|
_NOTE: This is currently not recommended. There is a known sequence of links that cause FrankenPHP to no longer respond. Hopefully this will be resolved before the beta moniker is dropped._
|
||||||
|
|
||||||
|
~~[FrankenPHP](https://frankenphp.dev) is a version of Caddy that runs PHP in its process. `/servers/frankenphp.Caddyfile` will configure the site to run with FrankenPHP.~~
|
||||||
|
|
||||||
|
~~Obtain a version for Linux / Mac users:~~
|
||||||
|
- ~~Follow [their instructions](https://frankenphp.dev/docs/#standalone-binary) for downloading a binary for your system~~
|
||||||
|
- ~~Rename that binary to `frankenphp` and make it executable (`chmod +x ./frankenphp`)~~
|
||||||
|
- ~~Move that binary to `/usr/local/bin`~~
|
||||||
|
|
||||||
|
~~For Windows users, the steps are the same; however, the binary should be named `frankenphp.exe` and be placed somewhere within your system's `PATH`.~~
|
||||||
|
|
||||||
|
~~Once those steps are complete, from the `/src` directory, run `frankenphp run`.~~
|
||||||
|
|
||||||
## PHP Requirements
|
## PHP Requirements
|
||||||
|
|
||||||
This is written to target PHP 8.3, and requires the `curl`, `DOM`, and `SQLite3` modules and the `php-cli` feature. _(FrankenPHP contains all these as part of its build.)_
|
This is written to target PHP 8.2, and requires the `curl`, `DOM`, and `SQLite3` modules and the `php-cli` feature. _(FrankenPHP contains all these as part of its build.)_
|
||||||
|
|
||||||
# Setup and Configuration
|
# Setup and Configuration
|
||||||
|
|
||||||
## Site Address
|
|
||||||
|
|
||||||
The default `Caddyfile` will run the site at `http://localhost:8205`. To have the process respond to other devices on your network, you can add the server name to that to line 5 (ex. `http://localhost:8205, http://server:8205`); you can also change the port on which it listens. (Note that if `http` is not specified, Caddy will attempt to obtain and install a server certificate. This may be what you want, but that also could be a source of startup errors.)
|
|
||||||
|
|
||||||
## Feed Reader Central Behavior
|
## Feed Reader Central Behavior
|
||||||
|
|
||||||
Within the `/src` directory, there is a file named `user-config.dist.php`. Rename this file to `user-config.php`; this is where customizations and configuration of the instance's behavior are placed.
|
Within the `/src` directory, there is a file named `user-config.dist.php`. Rename this file to `user-config.php`; this is where customizations and configuration of the instance's behavior are placed.
|
||||||
|
|
@ -38,7 +54,7 @@ There are three supported security models, designed around different ways the so
|
||||||
|
|
||||||
### Database Name
|
### Database Name
|
||||||
|
|
||||||
Data is stored under the `/src/data` directory, and the default database name is `frc.db`. If users want to change that path or file name, the path provided should be relative to `/src/data`, not just `/src`.
|
Data is stored in the `/data` subdirectory of the release extraction location, and the default database name is `frc.db`. If users want to change that path or file name, the path provided should be relative to `/data`.
|
||||||
|
|
||||||
### Date/Time Format
|
### Date/Time Format
|
||||||
|
|
||||||
|
|
@ -51,4 +67,3 @@ Feed Reader Central tries to keep the database tidy by purging items that have b
|
||||||
- `Feed::PURGE_READ` purges non-bookmarked read items for a feed whenever it is refreshed. This is the most aggressive purging strategy, but it is also the only one that will not purge unread items.
|
- `Feed::PURGE_READ` purges non-bookmarked read items for a feed whenever it is refreshed. This is the most aggressive purging strategy, but it is also the only one that will not purge unread items.
|
||||||
- `Feed::PURGE_BY_DAYS` purges non-bookmarked items that are older than `PURGE_NUMBER` days old. This is the default value, and `PURGE_NUMBER`'s default value is 30; items will be kept for 30 days, read or unread.
|
- `Feed::PURGE_BY_DAYS` purges non-bookmarked items that are older than `PURGE_NUMBER` days old. This is the default value, and `PURGE_NUMBER`'s default value is 30; items will be kept for 30 days, read or unread.
|
||||||
- `Feed::PURGE_BY_COUNT` purges items to preserve at most `PURGE_NUMBER` non-bookmarked items for each feed.
|
- `Feed::PURGE_BY_COUNT` purges items to preserve at most `PURGE_NUMBER` non-bookmarked items for each feed.
|
||||||
|
|
||||||
14
create_dist.sh
Executable file
14
create_dist.sh
Executable file
|
|
@ -0,0 +1,14 @@
|
||||||
|
#!/bin/bash
|
||||||
|
# Create release distribution archives
|
||||||
|
mkdir tmp
|
||||||
|
cd tmp || exit
|
||||||
|
cp -r ../src/* .
|
||||||
|
rm ./data/* || true
|
||||||
|
rm -rf ./vendor/bit-badger/pdo-document/.git* || true
|
||||||
|
rm -rf ./vendor/bit-badger/pdo-document/tests || true
|
||||||
|
rm -rf ./vendor/bit-badger/pdo-document/composer.lock || true
|
||||||
|
rm ./user-config.php || true
|
||||||
|
zip -q -r ../frc-"$1".zip *
|
||||||
|
tar cfj ../frc-"$1".tar.bz2 *
|
||||||
|
cd .. || exit
|
||||||
|
rm -rf tmp
|
||||||
|
|
@ -1,4 +1,7 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\{AutoId, Configuration};
|
||||||
|
use FeedReaderCentral\Data;
|
||||||
|
|
||||||
/** The current Feed Reader Central version */
|
/** The current Feed Reader Central version */
|
||||||
const FRC_VERSION = '1.0.0-beta1';
|
const FRC_VERSION = '1.0.0-beta1';
|
||||||
|
|
@ -19,17 +22,11 @@ function display_version(): string {
|
||||||
return "v$major$minor$rev";
|
return "v$major$minor$rev";
|
||||||
}
|
}
|
||||||
|
|
||||||
spl_autoload_register(function ($class) {
|
require __DIR__ . '/vendor/autoload.php';
|
||||||
$file = implode(DIRECTORY_SEPARATOR, [__DIR__, 'lib', "$class.php"]);
|
|
||||||
if (file_exists($file)) {
|
|
||||||
require $file;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
});
|
|
||||||
|
|
||||||
require 'user-config.php';
|
require 'user-config.php';
|
||||||
|
|
||||||
|
Configuration::$pdoDSN = 'sqlite:' . implode(DIRECTORY_SEPARATOR, [__DIR__, 'data', DATABASE_NAME]);
|
||||||
|
Configuration::$autoId = AutoId::Number;
|
||||||
Data::ensureDb();
|
Data::ensureDb();
|
||||||
|
|
||||||
/** @var string The date the world wide web was created */
|
/** @var string The date the world wide web was created */
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
require 'app-config.php';
|
require 'app-config.php';
|
||||||
|
|
||||||
if (php_sapi_name() != 'cli') {
|
if (php_sapi_name() != 'cli') {
|
||||||
|
|
@ -12,7 +13,8 @@ if (php_sapi_name() != 'cli') {
|
||||||
* @param string $format The format string
|
* @param string $format The format string
|
||||||
* @param mixed ...$values The values for the placeholders in the string
|
* @param mixed ...$values The values for the placeholders in the string
|
||||||
*/
|
*/
|
||||||
function printfn(string $format, mixed ...$values): void {
|
function printfn(string $format, mixed ...$values): void
|
||||||
|
{
|
||||||
printf($format . PHP_EOL, ...$values);
|
printf($format . PHP_EOL, ...$values);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -21,7 +23,8 @@ function printfn(string $format, mixed ...$values): void {
|
||||||
*
|
*
|
||||||
* @param string $title The title to display on the command line
|
* @param string $title The title to display on the command line
|
||||||
*/
|
*/
|
||||||
function cli_title(string $title): void {
|
function cli_title(string $title): void
|
||||||
|
{
|
||||||
$appTitle = 'Feed Reader Central ~ ' . display_version();
|
$appTitle = 'Feed Reader Central ~ ' . display_version();
|
||||||
$dashes = ' +' . str_repeat('-', strlen($title) + 2) . '+' . str_repeat('-', strlen($appTitle) + 2) . '+';
|
$dashes = ' +' . str_repeat('-', strlen($title) + 2) . '+' . str_repeat('-', strlen($appTitle) + 2) . '+';
|
||||||
printfn($dashes);
|
printfn($dashes);
|
||||||
|
|
|
||||||
18
src/composer.json
Normal file
18
src/composer.json
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
{
|
||||||
|
"name": "bit-badger/feed-reader-central",
|
||||||
|
"minimum-stability": "dev",
|
||||||
|
"require": {
|
||||||
|
"php": ">=8.2",
|
||||||
|
"bit-badger/pdo-document": "^1",
|
||||||
|
"ext-curl": "*",
|
||||||
|
"ext-dom": "*",
|
||||||
|
"ext-pdo": "*",
|
||||||
|
"ext-readline": "*",
|
||||||
|
"ext-sqlite3": "*"
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"FeedReaderCentral\\": "lib/"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
127
src/composer.lock
generated
Normal file
127
src/composer.lock
generated
Normal file
|
|
@ -0,0 +1,127 @@
|
||||||
|
{
|
||||||
|
"_readme": [
|
||||||
|
"This file locks the dependencies of your project to a known state",
|
||||||
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
|
"This file is @generated automatically"
|
||||||
|
],
|
||||||
|
"content-hash": "4f0add59e384feb6787acf3685c9e031",
|
||||||
|
"packages": [
|
||||||
|
{
|
||||||
|
"name": "bit-badger/pdo-document",
|
||||||
|
"version": "v1.0.0-alpha2",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://git.bitbadger.solutions/bit-badger/pdo-document",
|
||||||
|
"reference": "330e27218756df8b93081a17dead8aaec789b071"
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"ext-pdo": "*",
|
||||||
|
"netresearch/jsonmapper": "^4",
|
||||||
|
"php": ">=8.2"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "^11"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"BitBadger\\PDODocument\\": "./src",
|
||||||
|
"BitBadger\\PDODocument\\Query\\": "./src/Query",
|
||||||
|
"BitBadger\\PDODocument\\Mapper\\": "./src/Mapper"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Daniel J. Summers",
|
||||||
|
"email": "daniel@bitbadger.solutions",
|
||||||
|
"homepage": "https://bitbadger.solutions",
|
||||||
|
"role": "Developer"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Treat SQLite (and soon PostgreSQL) as a document store",
|
||||||
|
"keywords": [
|
||||||
|
"database",
|
||||||
|
"document",
|
||||||
|
"pdo",
|
||||||
|
"sqlite"
|
||||||
|
],
|
||||||
|
"support": {
|
||||||
|
"email": "daniel@bitbadger.solutions",
|
||||||
|
"rss": "https://git.bitbadger.solutions/bit-badger/pdo-document.rss",
|
||||||
|
"source": "https://git.bitbadger.solutions/bit-badger/pdo-document"
|
||||||
|
},
|
||||||
|
"time": "2024-06-11T11:07:56+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "netresearch/jsonmapper",
|
||||||
|
"version": "v4.4.1",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/cweiske/jsonmapper.git",
|
||||||
|
"reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0",
|
||||||
|
"reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"ext-json": "*",
|
||||||
|
"ext-pcre": "*",
|
||||||
|
"ext-reflection": "*",
|
||||||
|
"ext-spl": "*",
|
||||||
|
"php": ">=7.1"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0",
|
||||||
|
"squizlabs/php_codesniffer": "~3.5"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-0": {
|
||||||
|
"JsonMapper": "src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"OSL-3.0"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Christian Weiske",
|
||||||
|
"email": "cweiske@cweiske.de",
|
||||||
|
"homepage": "http://github.com/cweiske/jsonmapper/",
|
||||||
|
"role": "Developer"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Map nested JSON structures onto PHP classes",
|
||||||
|
"support": {
|
||||||
|
"email": "cweiske@cweiske.de",
|
||||||
|
"issues": "https://github.com/cweiske/jsonmapper/issues",
|
||||||
|
"source": "https://github.com/cweiske/jsonmapper/tree/v4.4.1"
|
||||||
|
},
|
||||||
|
"time": "2024-01-31T06:18:54+00:00"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"packages-dev": [],
|
||||||
|
"aliases": [],
|
||||||
|
"minimum-stability": "dev",
|
||||||
|
"stability-flags": [],
|
||||||
|
"prefer-stable": false,
|
||||||
|
"prefer-lowest": false,
|
||||||
|
"platform": {
|
||||||
|
"php": ">=8.2",
|
||||||
|
"ext-curl": "*",
|
||||||
|
"ext-dom": "*",
|
||||||
|
"ext-pdo": "*",
|
||||||
|
"ext-readline": "*",
|
||||||
|
"ext-sqlite3": "*"
|
||||||
|
},
|
||||||
|
"platform-dev": [],
|
||||||
|
"plugin-api-version": "2.6.0"
|
||||||
|
}
|
||||||
186
src/lib/Data.php
186
src/lib/Data.php
|
|
@ -1,91 +1,130 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace FeedReaderCentral;
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\{Configuration, Custom, Definition, DocumentException, Field};
|
||||||
|
use BitBadger\PDODocument\Mapper\StringMapper;
|
||||||
|
use DateTimeImmutable;
|
||||||
|
use DateTimeInterface;
|
||||||
|
use Exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A centralized place for data access for the application
|
* A centralized place for data access for the application
|
||||||
*/
|
*/
|
||||||
class Data {
|
class Data
|
||||||
|
{
|
||||||
/**
|
|
||||||
* Obtain a new connection to the database
|
|
||||||
* @return SQLite3 A new connection to the database
|
|
||||||
*/
|
|
||||||
public static function getConnection(): SQLite3 {
|
|
||||||
$db = new SQLite3(implode(DIRECTORY_SEPARATOR, [__DIR__, '..', 'data', DATABASE_NAME]));
|
|
||||||
$db->exec('PRAGMA foreign_keys = ON;');
|
|
||||||
return $db;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create the search index and synchronization triggers for the item table
|
* Create the search index and synchronization triggers for the item table
|
||||||
*
|
*
|
||||||
* @param SQLite3 $db The database connection on which these will be created
|
* @throws DocumentException If any is encountered
|
||||||
*/
|
*/
|
||||||
public static function createSearchIndex(SQLite3 $db): void {
|
public static function createSearchIndex(): void
|
||||||
$db->exec("CREATE VIRTUAL TABLE item_search USING fts5(content, content='item', content_rowid='id')");
|
{
|
||||||
$db->exec(<<<'SQL'
|
Custom::nonQuery("CREATE VIRTUAL TABLE item_search USING fts5(content, content='item', content_rowid='id')",
|
||||||
|
[]);
|
||||||
|
Custom::nonQuery(<<<'SQL'
|
||||||
CREATE TRIGGER item_ai AFTER INSERT ON item BEGIN
|
CREATE TRIGGER item_ai AFTER INSERT ON item BEGIN
|
||||||
INSERT INTO item_search (rowid, content) VALUES (new.id, new.content);
|
INSERT INTO item_search (rowid, content) VALUES (new.data->>'id', new.data->>'content');
|
||||||
END;
|
END;
|
||||||
SQL);
|
SQL, []);
|
||||||
$db->exec(<<<'SQL'
|
Custom::nonQuery(<<<'SQL'
|
||||||
CREATE TRIGGER item_au AFTER UPDATE ON item BEGIN
|
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 (
|
||||||
INSERT INTO item_search (rowid, content) VALUES (new.id, new.content);
|
item_search, rowid, content
|
||||||
|
) VALUES (
|
||||||
|
'delete', old.data->>'id', old.data->>'content'
|
||||||
|
);
|
||||||
|
INSERT INTO item_search (rowid, content) VALUES (new.data->>'id', new.data->>'content');
|
||||||
END;
|
END;
|
||||||
SQL);
|
SQL, []);
|
||||||
$db->exec(<<<'SQL'
|
Custom::nonQuery(<<<'SQL'
|
||||||
CREATE TRIGGER item_ad AFTER DELETE ON item BEGIN
|
CREATE TRIGGER item_ad AFTER DELETE ON item BEGIN
|
||||||
INSERT INTO item_search (item_search, rowid, content) VALUES ('delete', old.id, old.content);
|
INSERT INTO item_search (
|
||||||
|
item_search, rowid, content
|
||||||
|
) VALUES (
|
||||||
|
'delete', old.data->>'id', old.data->>'content'
|
||||||
|
);
|
||||||
END;
|
END;
|
||||||
SQL);
|
SQL, []);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Make sure the expected tables exist
|
* Make sure the expected tables exist
|
||||||
|
*
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
*/
|
*/
|
||||||
public static function ensureDb(): void {
|
public static function ensureDb(): void
|
||||||
$db = self::getConnection();
|
{
|
||||||
$tables = array();
|
$tables = Custom::array("SELECT name FROM sqlite_master WHERE type = 'table'", [], new StringMapper('name'));
|
||||||
$tableQuery = $db->query("SELECT name FROM sqlite_master WHERE type = 'table'");
|
if (!in_array(Table::USER, $tables)) {
|
||||||
while ($table = $tableQuery->fetchArray(SQLITE3_NUM)) $tables[] = $table[0];
|
Definition::ensureTable(Table::USER);
|
||||||
if (!in_array('frc_user', $tables)) {
|
Definition::ensureFieldIndex(Table::USER, 'email', ['email']);
|
||||||
$db->exec(<<<'SQL'
|
|
||||||
CREATE TABLE frc_user (
|
|
||||||
id INTEGER NOT NULL PRIMARY KEY,
|
|
||||||
email TEXT NOT NULL,
|
|
||||||
password TEXT NOT NULL)
|
|
||||||
SQL);
|
|
||||||
$db->exec('CREATE INDEX idx_user_email ON frc_user (email)');
|
|
||||||
}
|
}
|
||||||
if (!in_array('feed', $tables)) {
|
if (!in_array(Table::FEED, $tables)) {
|
||||||
$db->exec(<<<'SQL'
|
Definition::ensureTable(Table::FEED);
|
||||||
CREATE TABLE feed (
|
Definition::ensureFieldIndex(Table::FEED, 'user', ['user_id']);
|
||||||
id INTEGER NOT NULL PRIMARY KEY,
|
|
||||||
user_id INTEGER NOT NULL,
|
|
||||||
url TEXT NOT NULL,
|
|
||||||
title TEXT,
|
|
||||||
updated_on TEXT,
|
|
||||||
checked_on TEXT,
|
|
||||||
FOREIGN KEY (user_id) REFERENCES frc_user (id))
|
|
||||||
SQL);
|
|
||||||
}
|
}
|
||||||
if (!in_array('item', $tables)) {
|
if (!in_array(Table::ITEM, $tables)) {
|
||||||
$db->exec(<<<'SQL'
|
Definition::ensureTable(Table::ITEM);
|
||||||
CREATE TABLE item (
|
Definition::ensureFieldIndex(Table::ITEM, 'feed', ['feed_id', 'item_link']);
|
||||||
id INTEGER NOT NULL PRIMARY KEY,
|
self::createSearchIndex();
|
||||||
feed_id INTEGER NOT NULL,
|
|
||||||
title TEXT NOT NULL,
|
|
||||||
item_guid TEXT NOT NULL,
|
|
||||||
item_link TEXT NOT NULL,
|
|
||||||
published_on TEXT NOT NULL,
|
|
||||||
updated_on TEXT,
|
|
||||||
content TEXT NOT NULL,
|
|
||||||
is_read BOOLEAN NOT NULL DEFAULT 0,
|
|
||||||
is_bookmarked BOOLEAN NOT NULL DEFAULT 0,
|
|
||||||
FOREIGN KEY (feed_id) REFERENCES feed (id))
|
|
||||||
SQL);
|
|
||||||
self::createSearchIndex($db);
|
|
||||||
}
|
}
|
||||||
$db->close();
|
$journalMode = Custom::scalar("PRAGMA journal_mode", [], new StringMapper('journal_mode'));
|
||||||
|
if ($journalMode <> 'wal') Custom::nonQuery("PRAGMA journal_mode = 'wal'", []);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a JSON field comparison to find bookmarked items
|
||||||
|
*
|
||||||
|
* @param bool $value The flag to set (optional; defaults to true)
|
||||||
|
* @param string $qualifier The table qualifier to include (optional; defaults to no qualifier)
|
||||||
|
* @return Field A field that will find bookmarked items
|
||||||
|
*/
|
||||||
|
public static function bookmarkField(bool $value = true, string $qualifier = ''): Field
|
||||||
|
{
|
||||||
|
$bookField = Field::EQ('is_bookmarked', ($value ? 1 : 0), ':book');
|
||||||
|
$bookField->qualifier = $qualifier;
|
||||||
|
return $bookField;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a JSON field comparison to find items for a given feed
|
||||||
|
*
|
||||||
|
* @param int $feedId The ID of the feed for which items should be retrieved
|
||||||
|
* @param string $qualifier The table qualifier to include (optional; defaults to no qualifier)
|
||||||
|
* @return Field A field to find items for the give feed
|
||||||
|
*/
|
||||||
|
public static function feedField(int $feedId, string $qualifier = ''): Field
|
||||||
|
{
|
||||||
|
$feedField = Field::EQ(Configuration::$idField, $feedId, ':feed');
|
||||||
|
$feedField->qualifier = $qualifier;
|
||||||
|
return $feedField;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a JSON field comparison to find unread items
|
||||||
|
*
|
||||||
|
* @param string $qualifier The table qualifier to include (optional; defaults to no qualifier)
|
||||||
|
* @return Field A field to find unread items
|
||||||
|
*/
|
||||||
|
public static function unreadField(string $qualifier = ''): Field
|
||||||
|
{
|
||||||
|
$readField = Field::EQ('is_read', 0, ':read');
|
||||||
|
$readField->qualifier = $qualifier;
|
||||||
|
return $readField;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a JSON field comparison to find items belonging to feeds to which the given user is subscribed
|
||||||
|
*
|
||||||
|
* @param string $qualifier The table qualifier to include (optional; defaults to no qualifier)
|
||||||
|
* @return Field A field to find feeds belonging to the given user
|
||||||
|
*/
|
||||||
|
public static function userIdField(string $qualifier = ''): Field
|
||||||
|
{
|
||||||
|
$userField = Field::EQ('user_id', $_SESSION[Key::USER_ID], ':user');
|
||||||
|
$userField->qualifier = $qualifier;
|
||||||
|
return $userField;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -94,21 +133,12 @@ class Data {
|
||||||
* @param ?string $value The date/time to be parsed and formatted
|
* @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
|
* @return string|null The date/time in `DateTimeInterface::ATOM` format, or `null` if the input cannot be parsed
|
||||||
*/
|
*/
|
||||||
public static function formatDate(?string $value): ?string {
|
public static function formatDate(?string $value): ?string
|
||||||
|
{
|
||||||
try {
|
try {
|
||||||
return $value ? (new DateTimeImmutable($value))->format(DateTimeInterface::ATOM) : null;
|
return $value ? (new DateTimeImmutable($value))->format(DateTimeInterface::ATOM) : null;
|
||||||
} catch (Exception) {
|
} catch (Exception) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Return the last SQLite error message as a result array
|
|
||||||
*
|
|
||||||
* @param SQLite3 $db The database connection on which the error has occurred
|
|
||||||
* @return string[] ['error' => message] for last SQLite error message
|
|
||||||
*/
|
|
||||||
public static function error(SQLite3 $db): array {
|
|
||||||
return ['error' => 'SQLite error: ' . $db->lastErrorMsg()];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
562
src/lib/Feed.php
562
src/lib/Feed.php
|
|
@ -1,344 +1,91 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace FeedReaderCentral;
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\{
|
||||||
|
Configuration, Custom, Document, DocumentException, DocumentList, Exists, Field, Find, Parameters, Patch, Query
|
||||||
|
};
|
||||||
|
use DateTimeInterface;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Feed retrieval, parsing, and manipulation
|
* An RSS or Atom feed
|
||||||
*/
|
*/
|
||||||
class Feed {
|
class Feed
|
||||||
|
{
|
||||||
/** @var string The URL for the feed */
|
// ***** CONSTANTS *****
|
||||||
public string $url = '';
|
|
||||||
|
|
||||||
/** @var string The title of the feed */
|
|
||||||
public string $title = '';
|
|
||||||
|
|
||||||
/** @var ?string When the feed was last updated */
|
|
||||||
public ?string $updatedOn = null;
|
|
||||||
|
|
||||||
/** @var FeedItem[] The items contained in the feed */
|
|
||||||
public array $items = [];
|
|
||||||
|
|
||||||
/** @var string The XML namespace for Atom feeds */
|
|
||||||
public const string ATOM_NS = 'http://www.w3.org/2005/Atom';
|
|
||||||
|
|
||||||
/** @var string The XML namespace for the `<content:encoded>` tag that allows HTML content in a feed */
|
|
||||||
public const string CONTENT_NS = 'http://purl.org/rss/1.0/modules/content/';
|
|
||||||
|
|
||||||
/** @var string The XML namespace for XHTML */
|
|
||||||
public const string XHTML_NS = 'http://www.w3.org/1999/xhtml';
|
|
||||||
|
|
||||||
/** @var string The user agent for Feed Reader Central's refresh requests */
|
|
||||||
private const string USER_AGENT =
|
|
||||||
'FeedReaderCentral/' . FRC_VERSION . ' +https://bitbadger.solutions/open-source/feed-reader-central';
|
|
||||||
|
|
||||||
/** @var int Do not purge items */
|
/** @var int Do not purge items */
|
||||||
public const int PURGE_NONE = 0;
|
public const PURGE_NONE = 0;
|
||||||
|
|
||||||
/** @var int Purge all read items (will not purge unread items) */
|
/** @var int Purge all read items (will not purge unread items) */
|
||||||
public const int PURGE_READ = 1;
|
public const PURGE_READ = 1;
|
||||||
|
|
||||||
/** @var int Purge items older than the specified number of days */
|
/** @var int Purge items older than the specified number of days */
|
||||||
public const int PURGE_BY_DAYS = 2;
|
public const PURGE_BY_DAYS = 2;
|
||||||
|
|
||||||
/** @var int Purge items in number greater than the specified number of items to keep */
|
/** @var int Purge items in number greater than the specified number of items to keep */
|
||||||
public const int PURGE_BY_COUNT = 3;
|
public const PURGE_BY_COUNT = 3;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* When parsing XML into a DOMDocument, errors are presented as warnings; this creates an exception for them
|
* Constructor
|
||||||
*
|
*
|
||||||
* @param int $errno The error level encountered
|
* @param int $id The ID of the feed
|
||||||
* @param string $errstr The text of the error encountered
|
* @param int $user_id The ID of the user to whom this subscription belongs
|
||||||
* @return bool False, to delegate to the next error handler in the chain
|
* @param string $url The URL of the feed
|
||||||
* @throws DOMException If the error is a warning
|
* @param string|null $title The title of this feed
|
||||||
|
* @param string|null $updated_on The date/time items in this feed were last updated
|
||||||
|
* @param string|null $checked_on The date/time this feed was last checked
|
||||||
*/
|
*/
|
||||||
private static function xmlParseError(int $errno, string $errstr): bool {
|
public function __construct(public int $id = 0, public int $user_id = 0, public string $url = '',
|
||||||
if ($errno == E_WARNING && substr_count($errstr, 'DOMDocument::loadXML()') > 0) {
|
public ?string $title = null, public ?string $updated_on = null,
|
||||||
throw new DOMException($errstr, $errno);
|
public ?string $checked_on = null) { }
|
||||||
}
|
|
||||||
return false;
|
// ***** STATIC FUNCTIONS *****
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Parse a feed into an XML tree
|
* Create a document from the parsed feed
|
||||||
*
|
*
|
||||||
* @param string $content The feed's RSS content
|
* @param ParsedFeed $parsed The parsed feed
|
||||||
* @return array|DOMDocument[]|string[] ['ok' => feed] if successful, ['error' => message] if not
|
* @return static The document constructed from the parsed feed
|
||||||
*/
|
*/
|
||||||
public static function parseFeed(string $content): array {
|
public static function fromParsed(ParsedFeed $parsed): static
|
||||||
set_error_handler(self::xmlParseError(...));
|
{
|
||||||
try {
|
return new static(
|
||||||
$feed = new DOMDocument();
|
user_id: $_SESSION[Key::USER_ID],
|
||||||
$feed->loadXML($content);
|
url: $parsed->url,
|
||||||
return ['ok' => $feed];
|
title: $parsed->title,
|
||||||
} catch (DOMException $ex) {
|
updated_on: $parsed->updatedOn,
|
||||||
return ['error' => $ex->getMessage()];
|
checked_on: Data::formatDate('now'));
|
||||||
} finally {
|
|
||||||
restore_error_handler();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the value of a child element by its tag name for an RSS feed
|
|
||||||
*
|
|
||||||
* @param DOMNode $element The parent element
|
|
||||||
* @param string $tagName The name of the tag whose value should be obtained
|
|
||||||
* @return string The value of the element (or "[element] not found" if that element does not exist)
|
|
||||||
*/
|
|
||||||
public static function rssValue(DOMNode $element, string $tagName): string {
|
|
||||||
$tags = $element->getElementsByTagName($tagName);
|
|
||||||
return $tags->length == 0 ? "$tagName not found" : $tags->item(0)->textContent;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Extract items from an RSS feed
|
|
||||||
*
|
|
||||||
* @param DOMDocument $xml The XML received from the feed
|
|
||||||
* @param string $url The actual URL for the feed
|
|
||||||
* @return array|Feed[]|string[] ['ok' => feed] if successful, ['error' => message] if not
|
|
||||||
*/
|
|
||||||
private static function fromRSS(DOMDocument $xml, string $url): array {
|
|
||||||
$channel = $xml->getElementsByTagName('channel')->item(0);
|
|
||||||
if (!($channel instanceof DOMElement)) {
|
|
||||||
$type = $channel?->nodeType ?? -1;
|
|
||||||
return ['error' => "Channel element not found ($type)"];
|
|
||||||
}
|
|
||||||
|
|
||||||
// The Atom namespace provides a lastBuildDate, which contains the last time an item in the feed was updated; if
|
|
||||||
// that is not present, use the pubDate element instead
|
|
||||||
if (($updatedOn = self::rssValue($channel, 'lastBuildDate')) == 'lastBuildDate not found') {
|
|
||||||
if (($updatedOn = self::rssValue($channel, 'pubDate')) == 'pubDate not found') {
|
|
||||||
$updatedOn = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$feed = new Feed();
|
|
||||||
$feed->title = self::rssValue($channel, 'title');
|
|
||||||
$feed->url = $url;
|
|
||||||
$feed->updatedOn = Data::formatDate($updatedOn);
|
|
||||||
foreach ($channel->getElementsByTagName('item') as $item) $feed->items[] = FeedItem::fromRSS($item);
|
|
||||||
|
|
||||||
return ['ok' => $feed];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an attribute value from a DOM node
|
|
||||||
*
|
|
||||||
* @param DOMNode $node The node with an attribute value to obtain
|
|
||||||
* @param string $name The name of the attribute whose value should be obtained
|
|
||||||
* @return string The attribute value if it exists, an empty string if not
|
|
||||||
*/
|
|
||||||
private static function attrValue(DOMNode $node, string $name): string {
|
|
||||||
return ($node->hasAttributes() ? $node->attributes->getNamedItem($name)?->value : null) ?? '';
|
|
||||||
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Get the value of a child element by its tag name for an Atom feed
|
|
||||||
*
|
|
||||||
* (Atom feeds can have type attributes on nearly any value. For our purposes, types "text" and "html" will work as
|
|
||||||
* regular string values; for "xhtml", though, we will need to get the `<div>` and extract its contents instead.)
|
|
||||||
*
|
|
||||||
* @param DOMNode $element The parent element
|
|
||||||
* @param string $tagName The name of the tag whose value should be obtained
|
|
||||||
* @return string The value of the element (or "[element] not found" if that element does not exist)
|
|
||||||
*/
|
|
||||||
public static function atomValue(DOMNode $element, string $tagName): string {
|
|
||||||
$tags = $element->getElementsByTagName($tagName);
|
|
||||||
if ($tags->length == 0) return "$tagName not found";
|
|
||||||
$tag = $tags->item(0);
|
|
||||||
if (!($tag instanceof DOMElement)) return $tag->textContent;
|
|
||||||
if (self::attrValue($tag, 'type') == 'xhtml') {
|
|
||||||
$div = $tag->getElementsByTagNameNS(Feed::XHTML_NS, 'div');
|
|
||||||
if ($div->length == 0) return "-- invalid XHTML content --";
|
|
||||||
return $div->item(0)->textContent;
|
|
||||||
}
|
|
||||||
return $tag->textContent;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Extract items from an Atom feed
|
|
||||||
*
|
|
||||||
* @param DOMDocument $xml The XML received from the feed
|
|
||||||
* @param string $url The actual URL for the feed
|
|
||||||
* @return array|Feed[] ['ok' => feed]
|
|
||||||
*/
|
|
||||||
private static function fromAtom(DOMDocument $xml, string $url): array {
|
|
||||||
$root = $xml->getElementsByTagNameNS(self::ATOM_NS, 'feed')->item(0);
|
|
||||||
if (($updatedOn = self::atomValue($root, 'updated')) == 'pubDate not found') $updatedOn = null;
|
|
||||||
|
|
||||||
$feed = new Feed();
|
|
||||||
$feed->title = self::atomValue($root, 'title');
|
|
||||||
$feed->url = $url;
|
|
||||||
$feed->updatedOn = Data::formatDate($updatedOn);
|
|
||||||
foreach ($root->getElementsByTagName('entry') as $entry) $feed->items[] = FeedItem::fromAtom($entry);
|
|
||||||
|
|
||||||
return ['ok' => $feed];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieve a document (http/https)
|
|
||||||
*
|
|
||||||
* @param string $url The URL of the document to retrieve
|
|
||||||
* @return array ['content' => document content, 'error' => error message, 'code' => HTTP response code,
|
|
||||||
* 'url' => effective URL]
|
|
||||||
*/
|
|
||||||
private static function retrieveDocument(string $url): array {
|
|
||||||
$docReq = curl_init($url);
|
|
||||||
curl_setopt($docReq, CURLOPT_FOLLOWLOCATION, true);
|
|
||||||
curl_setopt($docReq, CURLOPT_RETURNTRANSFER, true);
|
|
||||||
curl_setopt($docReq, CURLOPT_CONNECTTIMEOUT, 5);
|
|
||||||
curl_setopt($docReq, CURLOPT_TIMEOUT, 15);
|
|
||||||
curl_setopt($docReq, CURLOPT_USERAGENT, self::USER_AGENT);
|
|
||||||
|
|
||||||
$result = [
|
|
||||||
'content' => curl_exec($docReq),
|
|
||||||
'error' => curl_error($docReq),
|
|
||||||
'code' => curl_getinfo($docReq, CURLINFO_RESPONSE_CODE),
|
|
||||||
'url' => curl_getinfo($docReq, CURLINFO_EFFECTIVE_URL)
|
|
||||||
];
|
|
||||||
|
|
||||||
curl_close($docReq);
|
|
||||||
return $result;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Derive a feed URL from an HTML document
|
|
||||||
*
|
|
||||||
* @param string $content The HTML document content from which to derive a feed URL
|
|
||||||
* @return array|string[] ['ok' => feed URL] if successful, ['error' => message] if not
|
|
||||||
*/
|
|
||||||
private static function deriveFeedFromHTML(string $content): array {
|
|
||||||
$html = new DOMDocument();
|
|
||||||
$html->loadHTML(substr($content, 0, strpos($content, '</head>') + 7));
|
|
||||||
$headTags = $html->getElementsByTagName('head');
|
|
||||||
if ($headTags->length < 1) return ['error' => 'Cannot find feed at this URL'];
|
|
||||||
$head = $headTags->item(0);
|
|
||||||
foreach ($head->getElementsByTagName('link') as $link) {
|
|
||||||
if (self::attrValue($link, 'rel') == 'alternate') {
|
|
||||||
$type = self::attrValue($link, 'type');
|
|
||||||
if ($type == 'application/rss+xml' || $type == 'application/atom+xml') {
|
|
||||||
return ['ok' => self::attrValue($link, 'href')];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ['error' => 'Cannot find feed at this URL'];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieve the feed
|
|
||||||
*
|
|
||||||
* @param string $url The URL of the feed to retrieve
|
|
||||||
* @return array|Feed[]|string[] ['ok' => feed] if successful, ['error' => message] if not
|
|
||||||
*/
|
|
||||||
public static function retrieveFeed(string $url): array {
|
|
||||||
$doc = self::retrieveDocument($url);
|
|
||||||
|
|
||||||
if ($doc['error'] != '') return ['error' => $doc['error']];
|
|
||||||
if ($doc['code'] != 200) {
|
|
||||||
return ['error' => "Prospective feed URL $url returned HTTP Code {$doc['code']}: {$doc['content']}"];
|
|
||||||
}
|
|
||||||
|
|
||||||
$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 (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 = key_exists('port', $original) ? ":{$original['port']}" : '';
|
|
||||||
$feedURL = $original['scheme'] . '://' . $original['host'] . $port . $feedURL;
|
|
||||||
}
|
|
||||||
$doc = self::retrieveDocument($feedURL);
|
|
||||||
}
|
|
||||||
|
|
||||||
$parsed = self::parseFeed($doc['content']);
|
|
||||||
if (key_exists('error', $parsed)) return ['error' => $parsed['error']];
|
|
||||||
|
|
||||||
$extract = $parsed['ok']->getElementsByTagNameNS(self::ATOM_NS, 'feed')->length > 0
|
|
||||||
? self::fromAtom(...) : self::fromRSS(...);
|
|
||||||
return $extract($parsed['ok'], $doc['url']);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update a feed item
|
|
||||||
*
|
|
||||||
* @param int $itemId The ID of the item to be updated
|
|
||||||
* @param FeedItem $item The item to be updated
|
|
||||||
* @param SQLite3 $db A database connection to use for the update
|
|
||||||
* @return bool|SQLite3Result The result if the update is successful, false if it failed
|
|
||||||
*/
|
|
||||||
private static function updateItem(int $itemId, FeedItem $item, SQLite3 $db): bool|SQLite3Result {
|
|
||||||
$query = $db->prepare(<<<'SQL'
|
|
||||||
UPDATE item
|
|
||||||
SET title = :title,
|
|
||||||
published_on = :published,
|
|
||||||
updated_on = :updated,
|
|
||||||
content = :content,
|
|
||||||
is_read = 0
|
|
||||||
WHERE id = :id
|
|
||||||
SQL);
|
|
||||||
$query->bindValue(':title', $item->title);
|
|
||||||
$query->bindValue(':published', $item->publishedOn);
|
|
||||||
$query->bindValue(':updated', $item->updatedOn);
|
|
||||||
$query->bindValue(':content', $item->content);
|
|
||||||
$query->bindValue(':id', $itemId);
|
|
||||||
return $query->execute();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add a feed item
|
|
||||||
*
|
|
||||||
* @param int $feedId The ID of the feed to which the item should be added
|
|
||||||
* @param FeedItem $item The item to be added
|
|
||||||
* @param SQLite3 $db A database connection to use for the addition
|
|
||||||
* @return bool|SQLite3Result The result if the update is successful, false if it failed
|
|
||||||
*/
|
|
||||||
private static function addItem(int $feedId, FeedItem $item, SQLite3 $db): bool|SQLite3Result {
|
|
||||||
$query = $db->prepare(<<<'SQL'
|
|
||||||
INSERT INTO item (
|
|
||||||
feed_id, item_guid, item_link, title, published_on, updated_on, content
|
|
||||||
) VALUES (
|
|
||||||
:feed, :guid, :link, :title, :published, :updated, :content
|
|
||||||
)
|
|
||||||
SQL);
|
|
||||||
$query->bindValue(':feed', $feedId);
|
|
||||||
$query->bindValue(':guid', $item->guid);
|
|
||||||
$query->bindValue(':link', $item->link);
|
|
||||||
$query->bindValue(':title', $item->title);
|
|
||||||
$query->bindValue(':published', $item->publishedOn);
|
|
||||||
$query->bindValue(':updated', $item->updatedOn);
|
|
||||||
$query->bindValue(':content', $item->content);
|
|
||||||
return $query->execute();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update a feed's items
|
* Update a feed's items
|
||||||
*
|
*
|
||||||
* @param int $feedId The ID of the feed to which these items belong
|
* @param int $feedId The ID of the feed to which these items belong
|
||||||
* @param Feed $feed The extracted Atom or RSS feed items
|
* @param ParsedFeed $parsed The extracted Atom or RSS feed items
|
||||||
* @param DateTimeInterface $lastChecked When this feed was last checked (only new items will be added)
|
* @param DateTimeInterface $lastChecked When this feed was last checked (only new items will be added)
|
||||||
* @return array ['ok' => true] if successful, ['error' => message] if not
|
* @return array ['ok' => true] if successful, ['error' => message] if not
|
||||||
*/
|
*/
|
||||||
public static function updateItems(int $feedId, Feed $feed, DateTimeInterface $lastChecked, SQLite3 $db): array {
|
public static function updateItems(int $feedId, ParsedFeed $parsed, DateTimeInterface $lastChecked): array
|
||||||
|
{
|
||||||
$results =
|
$results =
|
||||||
array_map(function ($item) use ($db, $feedId) {
|
array_map(function ($item) use ($feedId) {
|
||||||
$existsQuery = $db->prepare(
|
try {
|
||||||
'SELECT id, published_on, updated_on FROM item WHERE feed_id = :feed AND item_guid = :guid');
|
$existing = Find::firstByFields(Table::ITEM,
|
||||||
$existsQuery->bindValue(':feed', $feedId);
|
[Field::EQ('feed_id', $feedId), Field::EQ('item_guid', $item->guid)], Item::class);
|
||||||
$existsQuery->bindValue(':guid', $item->guid);
|
if ($existing) {
|
||||||
if ($exists = $existsQuery->execute()) {
|
if ($existing->published_on != $item->publishedOn
|
||||||
if ($existing = $exists->fetchArray(SQLITE3_ASSOC)) {
|
|| ($existing->updated_on != ($item->updatedOn ?? ''))) {
|
||||||
if ( $existing['published_on'] != $item->publishedOn
|
Item::update($existing->id, $item);
|
||||||
|| ($existing['updated_on'] ?? '') != ($item->updatedOn ?? '')) {
|
|
||||||
if (!self::updateItem($existing['id'], $item, $db)) return Data::error($db);
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (!self::addItem($feedId, $item, $db)) return Data::error($db);
|
Item::add($feedId, $item);
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return Data::error($db);
|
|
||||||
}
|
}
|
||||||
return ['ok' => true];
|
return ['ok' => true];
|
||||||
}, array_filter($feed->items,
|
} catch (DocumentException $ex) {
|
||||||
|
return ['error' => "$ex"];
|
||||||
|
}
|
||||||
|
}, array_filter($parsed->items,
|
||||||
fn($it) => date_create_immutable($it->updatedOn ?? $it->publishedOn) >= $lastChecked));
|
fn($it) => date_create_immutable($it->updatedOn ?? $it->publishedOn) >= $lastChecked));
|
||||||
$errors = array_map(fn($it) => $it['error'], array_filter($results, fn($it) => array_key_exists('error', $it)));
|
$errors = array_map(fn($it) => $it['error'], array_filter($results, fn($it) => array_key_exists('error', $it)));
|
||||||
return sizeof($errors) > 0 ? ['error' => implode("\n", $errors)] : ['ok' => true];
|
return sizeof($errors) > 0 ? ['error' => implode("\n", $errors)] : ['ok' => true];
|
||||||
|
|
@ -348,33 +95,41 @@ class Feed {
|
||||||
* Purge items for a feed
|
* Purge items for a feed
|
||||||
*
|
*
|
||||||
* @param int $feedId The ID of the feed to be purged
|
* @param int $feedId The ID of the feed to be purged
|
||||||
* @param SQLite3 $db The database connection on which items should be purged
|
|
||||||
* @return array|string[]|true[] ['ok' => true] if purging was successful, ['error' => message] if not
|
* @return array|string[]|true[] ['ok' => true] if purging was successful, ['error' => message] if not
|
||||||
*/
|
*/
|
||||||
private static function purgeItems(int $feedId, SQLite3 $db): array {
|
private static function purgeItems(int $feedId): array
|
||||||
|
{
|
||||||
if (!array_search(PURGE_TYPE, [self::PURGE_READ, self::PURGE_BY_DAYS, self::PURGE_BY_COUNT])) {
|
if (!array_search(PURGE_TYPE, [self::PURGE_READ, self::PURGE_BY_DAYS, self::PURGE_BY_COUNT])) {
|
||||||
return ['error' => 'Unrecognized purge type ' . PURGE_TYPE];
|
return ['error' => 'Unrecognized purge type ' . PURGE_TYPE];
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
$fields = [Field::EQ('feed_id', $feedId, ':feed'), Data::bookmarkField(false)];
|
||||||
$sql = match (PURGE_TYPE) {
|
$sql = Query\Delete::byFields(Table::ITEM, $fields);
|
||||||
self::PURGE_READ => 'AND is_read = 1',
|
if (PURGE_TYPE == self::PURGE_READ) {
|
||||||
self::PURGE_BY_DAYS => 'AND date(coalesce(updated_on, published_on)) < date(:oldest)',
|
$readField = Field::EQ('is_read', 1, ':read');
|
||||||
self::PURGE_BY_COUNT => 'AND id IN (SELECT id FROM item WHERE feed_id = :feed
|
$fields[] = $readField;
|
||||||
ORDER BY date(coalesce(updated_on, published_on)) DESC
|
$sql .= ' AND ' . Query::whereByFields([$readField]);
|
||||||
LIMIT -1 OFFSET :keep)'
|
} elseif (PURGE_TYPE == self::PURGE_BY_DAYS) {
|
||||||
};
|
$fields[] = Field::EQ('', Data::formatDate('-' . PURGE_NUMBER . ' day'), ':oldest');
|
||||||
|
$sql .= " AND date(coalesce(data->>'updated_on', data->>'published_on')) < date(:oldest)";
|
||||||
$purge = $db->prepare("DELETE FROM item WHERE feed_id = :feed AND is_bookmarked = 0 $sql");
|
|
||||||
$purge->bindValue(':feed', $feedId);
|
|
||||||
if (PURGE_TYPE == self::PURGE_BY_DAYS) {
|
|
||||||
$purge->bindValue(':oldest', Data::formatDate('-' . PURGE_NUMBER . ' day'));
|
|
||||||
} elseif (PURGE_TYPE == self::PURGE_BY_COUNT) {
|
} elseif (PURGE_TYPE == self::PURGE_BY_COUNT) {
|
||||||
$purge->bindValue(':keep', PURGE_NUMBER);
|
$fields[] = Field::EQ('', PURGE_NUMBER, ':keep');
|
||||||
|
$id = Configuration::$idField;
|
||||||
|
$table = Table::ITEM;
|
||||||
|
$sql .= ' ' . <<<SQL
|
||||||
|
AND data->>'$id' IN (
|
||||||
|
SELECT data->>'$id' FROM $table
|
||||||
|
WHERE data->>'feed_id' = :feed
|
||||||
|
ORDER BY date(coalesce(data->>'updated_on', data->>'published_on')) DESC
|
||||||
|
LIMIT -1 OFFSET :keep
|
||||||
|
)
|
||||||
|
SQL;
|
||||||
}
|
}
|
||||||
return $purge->execute() ? ['ok' => true] : Data::error($db);
|
try {
|
||||||
} catch (Exception $ex) {
|
Custom::nonQuery($sql, Parameters::addFields($fields, []));
|
||||||
return ['error' => $ex->getMessage()];
|
return ['ok' => true];
|
||||||
|
} catch (DocumentException $ex) {
|
||||||
|
return ['error' => "$ex"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -383,41 +138,34 @@ class Feed {
|
||||||
*
|
*
|
||||||
* @param int $feedId The ID of the feed to be refreshed
|
* @param int $feedId The ID of the feed to be refreshed
|
||||||
* @param string $url The URL of the feed to be refreshed
|
* @param string $url The URL of the feed to be refreshed
|
||||||
* @param SQLite3 $db A database connection to use to refresh the feed
|
|
||||||
* @return array|string[]|true[] ['ok' => true] if successful, ['error' => message] if not
|
* @return array|string[]|true[] ['ok' => true] if successful, ['error' => message] if not
|
||||||
*/
|
*/
|
||||||
public static function refreshFeed(int $feedId, string $url, SQLite3 $db): array {
|
public static function refreshFeed(int $feedId, string $url): array
|
||||||
$feedRetrieval = self::retrieveFeed($url);
|
{
|
||||||
|
$feedRetrieval = ParsedFeed::retrieve($url);
|
||||||
if (key_exists('error', $feedRetrieval)) return $feedRetrieval;
|
if (key_exists('error', $feedRetrieval)) return $feedRetrieval;
|
||||||
$feed = $feedRetrieval['ok'];
|
$feed = $feedRetrieval['ok'];
|
||||||
|
|
||||||
$lastCheckedQuery = $db->prepare('SELECT checked_on FROM feed where id = :id');
|
try {
|
||||||
$lastCheckedQuery->bindValue(':id', $feedId);
|
$feedDoc = Find::byId(Table::FEED, $feedId, self::class);
|
||||||
if (!($lastCheckedResult = $lastCheckedQuery->execute())) return Data::error($db);
|
if (!$feedDoc) return ['error' => 'Could not derive date last checked for feed'];
|
||||||
if (!($lastChecked = date_create_immutable($lastCheckedResult->fetchArray(SQLITE3_NUM)[0] ?? WWW_EPOCH))) {
|
$lastChecked = date_create_immutable($feedDoc->checked_on ?? WWW_EPOCH);
|
||||||
return ['error' => 'Could not derive date last checked for feed'];
|
|
||||||
}
|
|
||||||
|
|
||||||
$itemUpdate = self::updateItems($feedId, $feed, $lastChecked, $db);
|
$itemUpdate = self::updateItems($feedId, $feed, $lastChecked);
|
||||||
if (key_exists('error', $itemUpdate)) return $itemUpdate;
|
if (key_exists('error', $itemUpdate)) return $itemUpdate;
|
||||||
|
|
||||||
$urlUpdate = $url == $feed->url ? '' : ', url = :url';
|
$patch = [
|
||||||
$feedUpdate = $db->prepare(<<<SQL
|
'title' => $feed->title,
|
||||||
UPDATE feed
|
'updated_on' => $feed->updatedOn,
|
||||||
SET title = :title,
|
'checked_on' => Data::formatDate('now')
|
||||||
updated_on = :updated,
|
];
|
||||||
checked_on = :checked
|
if ($url == $feed->url) $patch['url'] = $feed->url;
|
||||||
$urlUpdate
|
Patch::byId(Table::FEED, $feedId, $patch);
|
||||||
WHERE id = :id
|
} catch (DocumentException $ex) {
|
||||||
SQL);
|
return ['error' => "$ex"];
|
||||||
$feedUpdate->bindValue(':title', $feed->title);
|
}
|
||||||
$feedUpdate->bindValue(':updated', $feed->updatedOn);
|
|
||||||
$feedUpdate->bindValue(':checked', Data::formatDate('now'));
|
|
||||||
$feedUpdate->bindValue(':id', $feedId);
|
|
||||||
if ($urlUpdate != '') $feedUpdate->bindValue(':url', $feed->url);
|
|
||||||
if (!$feedUpdate->execute()) return Data::error($db);
|
|
||||||
|
|
||||||
return PURGE_TYPE == self::PURGE_NONE ? ['ok' => true] : self::purgeItems($feedId, $db);
|
return PURGE_TYPE == self::PURGE_NONE ? ['ok' => true] : self::purgeItems($feedId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -426,91 +174,86 @@ class Feed {
|
||||||
* @param string $url The URL of the RSS feed to add
|
* @param string $url The URL of the RSS feed to add
|
||||||
* @return array ['ok' => feedId] if successful, ['error' => message] if not
|
* @return array ['ok' => feedId] if successful, ['error' => message] if not
|
||||||
*/
|
*/
|
||||||
public static function add(string $url, SQLite3 $db): array {
|
public static function add(string $url): array
|
||||||
$feedExtract = self::retrieveFeed($url);
|
{
|
||||||
|
$feedExtract = ParsedFeed::retrieve($url);
|
||||||
if (key_exists('error', $feedExtract)) return $feedExtract;
|
if (key_exists('error', $feedExtract)) return $feedExtract;
|
||||||
|
|
||||||
$feed = $feedExtract['ok'];
|
$feed = $feedExtract['ok'];
|
||||||
|
|
||||||
$existsQuery = $db->prepare('SELECT COUNT(*) FROM feed WHERE user_id = :user AND url = :url');
|
try {
|
||||||
$existsQuery->bindValue(':user', $_SESSION[Key::USER_ID]);
|
$fields = [Field::EQ('user_id', $_SESSION[Key::USER_ID]), Field::EQ('url', $feed->url)];
|
||||||
$existsQuery->bindValue(':url', $feed->url);
|
if (Exists::byFields(Table::FEED, $fields)) {
|
||||||
if (!($exists = $existsQuery->execute())) return Data::error($db);
|
return ['error' => "Already subscribed to feed $feed->url"];
|
||||||
if ($exists->fetchArray(SQLITE3_NUM)[0] > 0) return ['error' => "Already subscribed to feed $feed->url"];
|
}
|
||||||
|
|
||||||
$query = $db->prepare(<<<'SQL'
|
Document::insert(Table::FEED, self::fromParsed($feed));
|
||||||
INSERT INTO feed (
|
|
||||||
user_id, url, title, updated_on, checked_on
|
|
||||||
) VALUES (
|
|
||||||
:user, :url, :title, :updated, :checked
|
|
||||||
)
|
|
||||||
SQL);
|
|
||||||
$query->bindValue(':user', $_SESSION[Key::USER_ID]);
|
|
||||||
$query->bindValue(':url', $feed->url);
|
|
||||||
$query->bindValue(':title', $feed->title);
|
|
||||||
$query->bindValue(':updated', $feed->updatedOn);
|
|
||||||
$query->bindValue(':checked', Data::formatDate('now'));
|
|
||||||
if (!$query->execute()) return Data::error($db);
|
|
||||||
|
|
||||||
$feedId = $db->lastInsertRowID();
|
$doc = Find::firstByFields(Table::FEED, $fields, static::class);
|
||||||
$result = self::updateItems($feedId, $feed, date_create_immutable(WWW_EPOCH), $db);
|
if (!$doc) return ['error' => 'Could not retrieve inserted feed'];
|
||||||
|
|
||||||
|
$result = self::updateItems($doc->id, $feed, date_create_immutable(WWW_EPOCH));
|
||||||
if (key_exists('error', $result)) return $result;
|
if (key_exists('error', $result)) return $result;
|
||||||
|
|
||||||
return ['ok' => $feedId];
|
return ['ok' => $doc->id];
|
||||||
|
} catch (DocumentException $ex) {
|
||||||
|
return ['error' => "$ex"];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update an RSS feed
|
* Update an RSS feed
|
||||||
*
|
*
|
||||||
* @param array $existing The existing RSS feed
|
* @param Feed $existing The existing feed
|
||||||
* @param string $url The URL with which the existing feed should be modified
|
* @param string $url The URL with which the existing feed should be modified
|
||||||
* @param SQLite3 $db The database connection on which to execute the update
|
|
||||||
* @return bool[]|string[] [ 'ok' => true ] if successful, [ 'error' => message ] if not
|
* @return bool[]|string[] [ 'ok' => true ] if successful, [ 'error' => message ] if not
|
||||||
*/
|
*/
|
||||||
public static function update(array $existing, string $url, SQLite3 $db): array {
|
public static function update(Feed $existing, string $url): array
|
||||||
$query = $db->prepare('UPDATE feed SET url = :url WHERE id = :id AND user_id = :user');
|
{
|
||||||
$query->bindValue(':url', $url);
|
try {
|
||||||
$query->bindValue(':id', $existing['id']);
|
Patch::byFields(Table::FEED,
|
||||||
$query->bindValue(':user', $_SESSION[Key::USER_ID]);
|
[Field::EQ(Configuration::$idField, $existing->id), Field::EQ('user_id', $_SESSION[Key::USER_ID])],
|
||||||
if (!$query->execute()) return Data::error($db);
|
['url' => $url]);
|
||||||
|
|
||||||
return self::refreshFeed($existing['id'], $url, $db);
|
return self::refreshFeed($existing->id, $url);
|
||||||
|
} catch (DocumentException $ex) {
|
||||||
|
return ['error' => "$ex"];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieve all feeds, optionally for a specific user
|
* Retrieve all feeds, optionally for a specific user
|
||||||
*
|
*
|
||||||
* @param SQLite3 $db The database connection to use to retrieve the feeds
|
|
||||||
* @param int $user The ID of the user whose feeds should be retrieved (optional, defaults to all feeds)
|
* @param int $user The ID of the user whose feeds should be retrieved (optional, defaults to all feeds)
|
||||||
* @return array An array of arrays with ['id', 'url', 'email'] keys
|
* @return DocumentList<Feed> A list of feeds
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
*/
|
*/
|
||||||
public static function retrieveAll(SQLite3 $db, int $user = 0): array {
|
public static function retrieveAll(int $user = 0): DocumentList
|
||||||
$extraSQL = $user > 0 ? ' WHERE u.id = :user' : '';
|
{
|
||||||
$query = $db->prepare(
|
return $user == 0
|
||||||
"SELECT f.id, f.url, u.email FROM feed f INNER JOIN frc_user u ON u.id = f.user_id$extraSQL");
|
? Find::all(Table::FEED, self::class)
|
||||||
if ($user > 0) $query->bindValue(':user', $user);
|
: Find::byFields(Table::FEED, [Field::EQ('user_id', $user)], self::class);
|
||||||
if (!($result = $query->execute())) return Data::error($db);
|
|
||||||
$feeds = [];
|
|
||||||
while ($feed = $result->fetchArray(SQLITE3_ASSOC)) $feeds[] = $feed;
|
|
||||||
return $feeds;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Refresh all feeds
|
* Refresh all feeds
|
||||||
*
|
*
|
||||||
* @param SQLite3 $db The database connection to use for refreshing feeds
|
|
||||||
* @return array|true[]|string[] ['ok' => true] if successful,
|
* @return array|true[]|string[] ['ok' => true] if successful,
|
||||||
* ['error' => message] if not (may have multiple error lines)
|
* ['error' => message] if not (may have multiple error lines)
|
||||||
*/
|
*/
|
||||||
public static function refreshAll(SQLite3 $db): array {
|
public static function refreshAll(): array
|
||||||
$feeds = self::retrieveAll($db, $_SESSION[Key::USER_ID]);
|
{
|
||||||
if (key_exists('error', $feeds)) return $feeds;
|
try {
|
||||||
|
$feeds = self::retrieveAll($_SESSION[Key::USER_ID]);
|
||||||
|
|
||||||
$errors = [];
|
$errors = [];
|
||||||
array_walk($feeds, function ($feed) use ($db, &$errors) {
|
foreach ($feeds->items() as $feed) {
|
||||||
$result = self::refreshFeed($feed['id'], $feed['url'], $db);
|
$result = self::refreshFeed($feed->id, $feed->url);
|
||||||
if (key_exists('error', $result)) $errors[] = $result['error'];
|
if (key_exists('error', $result)) $errors[] = $result['error'];
|
||||||
});
|
}
|
||||||
|
} catch (DocumentException $ex) {
|
||||||
|
return ['error' => "$ex"];
|
||||||
|
}
|
||||||
|
|
||||||
return sizeof($errors) == 0 ? ['ok' => true] : ['error' => implode("\n", $errors)];
|
return sizeof($errors) == 0 ? ['ok' => true] : ['error' => implode("\n", $errors)];
|
||||||
}
|
}
|
||||||
|
|
@ -519,13 +262,12 @@ class Feed {
|
||||||
* Retrieve a feed by its ID for the current user
|
* Retrieve a feed by its ID for the current user
|
||||||
*
|
*
|
||||||
* @param int $feedId The ID of the feed to retrieve
|
* @param int $feedId The ID of the feed to retrieve
|
||||||
* @param SQLite3 $db A database connection to use to retrieve the feed
|
* @return static|false The data for the feed if found, false if not found
|
||||||
* @return array|bool The data for the feed if found, false if not found
|
* @throws DocumentException If any is encountered
|
||||||
*/
|
*/
|
||||||
public static function retrieveById(int $feedId, SQLite3 $db): array|bool {
|
public static function retrieveById(int $feedId): static|false
|
||||||
$query = $db->prepare('SELECT * FROM feed WHERE id = :id AND user_id = :user');
|
{
|
||||||
$query->bindValue(':id', $feedId);
|
$doc = Find::byId(Table::FEED, $feedId, static::class);
|
||||||
$query->bindValue(':user', $_SESSION[Key::USER_ID]);
|
return $doc && $doc->user_id == $_SESSION[Key::USER_ID] ? $doc : false;
|
||||||
return ($result = $query->execute()) ? $result->fetchArray(SQLITE3_ASSOC) : false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,80 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Information for a feed item
|
|
||||||
*/
|
|
||||||
class FeedItem {
|
|
||||||
|
|
||||||
/** @var string The title of the feed item */
|
|
||||||
public string $title = '';
|
|
||||||
|
|
||||||
/** @var string The unique ID for the feed item */
|
|
||||||
public string $guid = '';
|
|
||||||
|
|
||||||
/** @var string The link to the original content */
|
|
||||||
public string $link = '';
|
|
||||||
|
|
||||||
/** @var string When this item was published */
|
|
||||||
public string $publishedOn = '';
|
|
||||||
|
|
||||||
/** @var ?string When this item was last updated */
|
|
||||||
public ?string $updatedOn = null;
|
|
||||||
|
|
||||||
/** @var string The content for the item */
|
|
||||||
public string $content = '';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Construct a feed item from an Atom feed's `<entry>` tag
|
|
||||||
*
|
|
||||||
* @param DOMNode $node The XML node from which a feed item should be constructed
|
|
||||||
* @return FeedItem A feed item constructed from the given node
|
|
||||||
*/
|
|
||||||
public static function fromAtom(DOMNode $node): FeedItem {
|
|
||||||
$guid = Feed::atomValue($node, 'id');
|
|
||||||
$link = '';
|
|
||||||
foreach ($node->getElementsByTagName('link') as $linkElt) {
|
|
||||||
if ($linkElt->hasAttributes()) {
|
|
||||||
$relAttr = $linkElt->attributes->getNamedItem('rel');
|
|
||||||
if ($relAttr && $relAttr->value == 'alternate') {
|
|
||||||
$link = $linkElt->attributes->getNamedItem('href')->value;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if ($link == '' && str_starts_with($guid, 'http')) $link = $guid;
|
|
||||||
|
|
||||||
$item = new FeedItem();
|
|
||||||
$item->guid = $guid;
|
|
||||||
$item->title = Feed::atomValue($node, 'title');
|
|
||||||
$item->link = $link;
|
|
||||||
$item->publishedOn = Data::formatDate(Feed::atomValue($node, 'published'));
|
|
||||||
$item->updatedOn = Data::formatDate(Feed::atomValue($node, 'updated'));
|
|
||||||
$item->content = Feed::atomValue($node, 'content');
|
|
||||||
|
|
||||||
return $item;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Construct a feed item from an RSS feed's `<item>` tag
|
|
||||||
*
|
|
||||||
* @param DOMNode $node The XML node from which a feed item should be constructed
|
|
||||||
* @return FeedItem A feed item constructed from the given node
|
|
||||||
*/
|
|
||||||
public static function fromRSS(DOMNode $node): FeedItem {
|
|
||||||
$itemGuid = Feed::rssValue($node, 'guid');
|
|
||||||
$updNodes = $node->getElementsByTagNameNS(Feed::ATOM_NS, 'updated');
|
|
||||||
$encNodes = $node->getElementsByTagNameNS(Feed::CONTENT_NS, 'encoded');
|
|
||||||
|
|
||||||
$item = new FeedItem();
|
|
||||||
$item->guid = $itemGuid == 'guid not found' ? Feed::rssValue($node, 'link') : $itemGuid;
|
|
||||||
$item->title = Feed::rssValue($node, 'title');
|
|
||||||
$item->link = Feed::rssValue($node, 'link');
|
|
||||||
$item->publishedOn = Data::formatDate(Feed::rssValue($node, 'pubDate'));
|
|
||||||
$item->updatedOn = Data::formatDate($updNodes->length > 0 ? $updNodes->item(0)->textContent : null);
|
|
||||||
$item->content = $encNodes->length > 0
|
|
||||||
? $encNodes->item(0)->textContent
|
|
||||||
: Feed::rssValue($node, 'description');
|
|
||||||
|
|
||||||
return $item;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
87
src/lib/Item.php
Normal file
87
src/lib/Item.php
Normal file
|
|
@ -0,0 +1,87 @@
|
||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace FeedReaderCentral;
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\{Document, DocumentException, Patch};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An item from a feed
|
||||||
|
*/
|
||||||
|
class Item
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param int $id The ID of this item in the Feed Reader Central database
|
||||||
|
* @param int $feed_id The ID of the feed to which this item belongs
|
||||||
|
* @param string $title The title of this item
|
||||||
|
* @param string $item_guid The Globally Unique ID (GUID) for this item (an attribute in the feed XML)
|
||||||
|
* @param string $item_link The link to the item on its original site
|
||||||
|
* @param string $published_on The date/time this item was published
|
||||||
|
* @param string|null $updated_on The date/time this item was last updated
|
||||||
|
* @param string $content The content for this item
|
||||||
|
* @param int $is_read 1 if the item has been read, 0 if not
|
||||||
|
* @param int $is_bookmarked 1 if the item is bookmarked, 0 if not
|
||||||
|
*/
|
||||||
|
public function __construct(public int $id = 0, public int $feed_id = 0, public string $title = '',
|
||||||
|
public string $item_guid = '', public string $item_link = '',
|
||||||
|
public string $published_on = '', public ?string $updated_on = null,
|
||||||
|
public string $content = '', public int $is_read = 0, public int $is_bookmarked = 0) { }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Has the item been read?
|
||||||
|
*
|
||||||
|
* @return bool True if the item has been read, false if not
|
||||||
|
*/
|
||||||
|
public function isRead(): bool
|
||||||
|
{
|
||||||
|
return $this->is_read <> 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Is the item bookmarked?
|
||||||
|
*
|
||||||
|
* @return bool True if the item is bookmarked, false if not
|
||||||
|
*/
|
||||||
|
public function isBookmarked(): bool
|
||||||
|
{
|
||||||
|
return $this->is_bookmarked <> 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add an item
|
||||||
|
*
|
||||||
|
* @param int $feedId The ID of the feed to which the item belongs
|
||||||
|
* @param ParsedItem $parsed The parsed item from the feed XML
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
|
*/
|
||||||
|
public static function add(int $feedId, ParsedItem $parsed): void
|
||||||
|
{
|
||||||
|
Document::insert(Table::ITEM, new static(
|
||||||
|
feed_id: $feedId,
|
||||||
|
title: $parsed->title,
|
||||||
|
item_guid: $parsed->guid,
|
||||||
|
item_link: $parsed->link,
|
||||||
|
published_on: $parsed->publishedOn,
|
||||||
|
updated_on: $parsed->updatedOn,
|
||||||
|
content: $parsed->content));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update an item
|
||||||
|
*
|
||||||
|
* @param int $id The ID of the item to be updated
|
||||||
|
* @param ParsedItem $parsed The parsed item from the feed XML
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
|
*/
|
||||||
|
public static function update(int $id, ParsedItem $parsed): void
|
||||||
|
{
|
||||||
|
Patch::byId(Table::ITEM, $id, [
|
||||||
|
'title' => $parsed->title,
|
||||||
|
'published_on' => $parsed->publishedOn,
|
||||||
|
'updated_on' => $parsed->updatedOn,
|
||||||
|
'content' => $parsed->content,
|
||||||
|
'is_read' => 0
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,14 +1,19 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace FeedReaderCentral;
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\{Configuration, Custom, DocumentException, DocumentList, Field, Parameters, Query};
|
||||||
|
use BitBadger\PDODocument\Mapper\DocumentMapper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A list of items to be displayed
|
* 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.
|
* This is a wrapper for retrieval and display of arbitrary lists of items based on a SQLite result.
|
||||||
*/
|
*/
|
||||||
class ItemList {
|
class ItemList
|
||||||
|
{
|
||||||
/** @var SQLite3Result The list of items to be displayed */
|
/** @var DocumentList<ItemWithFeed> The items matching the criteria, lazily iterable */
|
||||||
private SQLite3Result $items;
|
private DocumentList $dbList;
|
||||||
|
|
||||||
/** @var string The error message generated by executing a query */
|
/** @var string The error message generated by executing a query */
|
||||||
public string $error = '';
|
public string $error = '';
|
||||||
|
|
@ -18,7 +23,8 @@ class ItemList {
|
||||||
*
|
*
|
||||||
* @return bool True if there is an error condition associated with this list, false if not
|
* @return bool True if there is an error condition associated with this list, false if not
|
||||||
*/
|
*/
|
||||||
public function isError(): bool {
|
public function isError(): bool
|
||||||
|
{
|
||||||
return $this->error != '';
|
return $this->error != '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -34,51 +40,34 @@ class ItemList {
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* 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 $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
|
* @param string $returnURL The URL to which the item page should return once the item has been viewed
|
||||||
|
* @param array|Field[] $fields The fields to use to restrict the results
|
||||||
|
* @param string $searchWhere Additional WHERE clause to use for searching
|
||||||
*/
|
*/
|
||||||
private function __construct(SQLite3 $db, SQLite3Stmt $query, public string $itemType, public string $returnURL = '') {
|
private function __construct(public string $itemType, public string $returnURL = '', array $fields = [],
|
||||||
$result = $query->execute();
|
string $searchWhere = '')
|
||||||
if (!$result) {
|
{
|
||||||
$this->error = Data::error($db)['error'];
|
$allFields = [Data::userIdField(Table::FEED), ...$fields];
|
||||||
} else {
|
try {
|
||||||
$this->items = $result;
|
$this->dbList = Custom::list(
|
||||||
|
ItemWithFeed::SELECT_WITH_FEED . ' WHERE '
|
||||||
|
. Query::whereByFields(array_filter($allFields, fn($it) => $it->paramName <> ':search'))
|
||||||
|
. "$searchWhere ORDER BY coalesce(item.data->>'updated_on', item.data->>'published_on') DESC",
|
||||||
|
Parameters::addFields($allFields, []), new DocumentMapper(ItemWithFeed::class));
|
||||||
|
} catch (DocumentException $ex) {
|
||||||
|
$this->error = "$ex";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 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
|
* 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
|
* @return static An item list with all bookmarked items
|
||||||
*/
|
*/
|
||||||
public static function allBookmarked(SQLite3 $db): static {
|
public static function allBookmarked(): static
|
||||||
$list = new static($db, self::makeQuery($db, ['item.is_bookmarked = 1']), 'Bookmarked', '/?bookmarked');
|
{
|
||||||
|
$list = new static('Bookmarked', '/?bookmarked', [Data::bookmarkField(qualifier: Table::ITEM)]);
|
||||||
$list->linkFeed = true;
|
$list->linkFeed = true;
|
||||||
return $list;
|
return $list;
|
||||||
}
|
}
|
||||||
|
|
@ -86,11 +75,11 @@ class ItemList {
|
||||||
/**
|
/**
|
||||||
* Create an item list with all the current user's unread items
|
* 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
|
* @return static An item list with all unread items
|
||||||
*/
|
*/
|
||||||
public static function allUnread(SQLite3 $db): static {
|
public static function allUnread(): static
|
||||||
$list = new static($db, self::makeQuery($db, ['item.is_read = 0']), 'Unread');
|
{
|
||||||
|
$list = new static('Unread', fields: [Data::unreadField(Table::ITEM)]);
|
||||||
$list->linkFeed = true;
|
$list->linkFeed = true;
|
||||||
return $list;
|
return $list;
|
||||||
}
|
}
|
||||||
|
|
@ -99,12 +88,11 @@ class ItemList {
|
||||||
* Create an item list with all items for the given feed
|
* 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 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
|
* @return static An item list with all items for the given feed
|
||||||
*/
|
*/
|
||||||
public static function allForFeed(int $feedId, SQLite3 $db): static {
|
public static function allForFeed(int $feedId): static
|
||||||
$list = new static($db, self::makeQuery($db, ['feed.id = :feed'], [[':feed', $feedId]]), '',
|
{
|
||||||
"/feed/items?id=$feedId");
|
$list = new static('', "/feed/items?id=$feedId", [Data::feedField($feedId, Table::FEED)]);
|
||||||
$list->showIndicators = true;
|
$list->showIndicators = true;
|
||||||
return $list;
|
return $list;
|
||||||
}
|
}
|
||||||
|
|
@ -113,25 +101,24 @@ class ItemList {
|
||||||
* Create an item list with unread items for the given feed
|
* 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 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
|
* @return static An item list with unread items for the given feed
|
||||||
*/
|
*/
|
||||||
public static function unreadForFeed(int $feedId, SQLite3 $db): static {
|
public static function unreadForFeed(int $feedId): static
|
||||||
return new static($db, self::makeQuery($db, ['feed.id = :feed', 'item.is_read = 0'], [[':feed', $feedId]]),
|
{
|
||||||
'Unread', "/feed/items?id=$feedId&unread");
|
return new static('Unread', "/feed/items?id=$feedId&unread",
|
||||||
|
[Data::feedField($feedId, Table::FEED), Data::unreadField(Table::ITEM)]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create an item list with bookmarked items for the given feed
|
* 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 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
|
* @return static An item list with bookmarked items for the given feed
|
||||||
*/
|
*/
|
||||||
public static function bookmarkedForFeed(int $feedId, SQLite3 $db): static {
|
public static function bookmarkedForFeed(int $feedId): static
|
||||||
return new static($db,
|
{
|
||||||
self::makeQuery($db, ['feed.id = :feed', 'item.is_bookmarked = 1'], [[':feed', $feedId]]), 'Bookmarked',
|
return new static('Bookmarked', "/feed/items?id=$feedId&bookmarked",
|
||||||
"/feed/items?id=$feedId&bookmarked");
|
[Data::feedField($feedId, Table::FEED), Data::bookmarkField(qualifier: Table::ITEM)]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -139,15 +126,16 @@ class ItemList {
|
||||||
*
|
*
|
||||||
* @param string $search The item search terms / query
|
* @param string $search The item search terms / query
|
||||||
* @param bool $isBookmarked Whether to restrict the search to bookmarked items
|
* @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
|
* @return static An item list match the given search terms
|
||||||
*/
|
*/
|
||||||
public static function matchingSearch(string $search, bool $isBookmarked, SQLite3 $db): static {
|
public static function matchingSearch(string $search, bool $isBookmarked): static
|
||||||
$where = $isBookmarked ? ['item.is_bookmarked = 1'] : [];
|
{
|
||||||
$where[] = 'item.id IN (SELECT ROWID FROM item_search WHERE content MATCH :search)';
|
$fields = [Field::EQ('content', $search, ':search')];
|
||||||
$list = new static($db, self::makeQuery($db, $where, [[':search', $search]]),
|
if ($isBookmarked) $fields[] = Data::bookmarkField(qualifier: Table::ITEM);
|
||||||
'Matching' . ($isBookmarked ? ' Bookmarked' : ''),
|
$list = new static('Matching' . ($isBookmarked ? ' Bookmarked' : ''),
|
||||||
"/search?search=$search&items=" . ($isBookmarked ? 'bookmarked' : 'all'));
|
"/search?search=$search&items=" . ($isBookmarked ? 'bookmarked' : 'all'), $fields,
|
||||||
|
' AND ' . Table::ITEM . ".data->>'" . Configuration::$idField . "' IN "
|
||||||
|
. '(SELECT ROWID FROM item_search WHERE content MATCH :search)');
|
||||||
$list->showIndicators = true;
|
$list->showIndicators = true;
|
||||||
$list->displayFeed = true;
|
$list->displayFeed = true;
|
||||||
return $list;
|
return $list;
|
||||||
|
|
@ -156,35 +144,33 @@ class ItemList {
|
||||||
/**
|
/**
|
||||||
* Render this item list
|
* Render this item list
|
||||||
*/
|
*/
|
||||||
public function render(): void {
|
public function render(): void
|
||||||
if ($this->isError()) { ?>
|
{
|
||||||
<p>Error retrieving list:<br><?=$this->error?><?php
|
if ($this->isError()) {
|
||||||
|
echo "<p>Error retrieving list:<br>$this->error";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$item = $this->items->fetchArray(SQLITE3_ASSOC);
|
|
||||||
$return = $this->returnURL == '' ? '' : '&from=' . urlencode($this->returnURL);
|
$return = $this->returnURL == '' ? '' : '&from=' . urlencode($this->returnURL);
|
||||||
echo '<article>';
|
echo '<article>';
|
||||||
if ($item) {
|
if ($this->dbList->hasItems()) {
|
||||||
while ($item) { ?>
|
foreach ($this->dbList->items() as $it) {
|
||||||
<p><?=hx_get("/item?id={$item['id']}$return", strip_tags($item['item_title']))?><br>
|
echo '<p>' . hx_get("/item?id=$it->id$return", strip_tags($it->title)) . '<br><small>';
|
||||||
<small><?php
|
|
||||||
if ($this->showIndicators) {
|
if ($this->showIndicators) {
|
||||||
if (!$item['is_read']) echo '<strong>Unread</strong> ';
|
if (!$it->isRead()) echo '<strong>Unread</strong> ';
|
||||||
if ($item['is_bookmarked']) echo '<strong>Bookmarked</strong> ';
|
if ($it->isBookmarked()) echo '<strong>Bookmarked</strong> ';
|
||||||
}
|
}
|
||||||
echo '<em>' . date_time($item['as_of']) . '</em>';
|
echo '<em>' . date_time($it->updated_on ?? $it->published_on) . '</em>';
|
||||||
if ($this->linkFeed) {
|
if ($this->linkFeed) {
|
||||||
echo ' • ' .
|
echo ' • ' .
|
||||||
hx_get("/feed/items?id={$item['feed_id']}&" . strtolower($this->itemType),
|
hx_get("/feed/items?id={$it->feed->id}&" . strtolower($this->itemType),
|
||||||
htmlentities($item['feed_title']));
|
htmlentities($it->feed->title));
|
||||||
} elseif ($this->displayFeed) {
|
} elseif ($this->displayFeed) {
|
||||||
echo ' • ' . htmlentities($item['feed_title']);
|
echo ' • ' . htmlentities($it->feed->title);
|
||||||
} ?>
|
|
||||||
</small><?php
|
|
||||||
$item = $this->items->fetchArray(SQLITE3_ASSOC);
|
|
||||||
}
|
}
|
||||||
} else { ?>
|
echo '</small>';
|
||||||
<p><em>There are no <?=strtolower($this->itemType)?> items</em><?php
|
}
|
||||||
|
} else {
|
||||||
|
echo '<p><em>There are no ' . strtolower($this->itemType) . ' items</em>';
|
||||||
}
|
}
|
||||||
echo '</article>';
|
echo '</article>';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
67
src/lib/ItemWithFeed.php
Normal file
67
src/lib/ItemWithFeed.php
Normal file
|
|
@ -0,0 +1,67 @@
|
||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace FeedReaderCentral;
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\{Configuration, Custom, DocumentException, Field, Parameters, Query};
|
||||||
|
use BitBadger\PDODocument\Mapper\{DocumentMapper, ExistsMapper};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A combined item and feed (used for lists)
|
||||||
|
*/
|
||||||
|
class ItemWithFeed extends Item
|
||||||
|
{
|
||||||
|
/** @var string The body of the `FROM` clause to join item and feed */
|
||||||
|
public const FROM_WITH_JOIN = Table::ITEM . ' INNER JOIN ' . Table::FEED
|
||||||
|
. ' ON ' . Table::ITEM . ".data->>'feed_id' = " . Table::FEED . ".data->>'id'";
|
||||||
|
|
||||||
|
/** @var string The `SELECT` clause to add the feed as a property to the item's document */
|
||||||
|
public const SELECT_WITH_FEED =
|
||||||
|
'SELECT json_set(' . Table::ITEM . ".data, '$.feed', json(" . Table::FEED . '.data)) AS data FROM '
|
||||||
|
. self::FROM_WITH_JOIN;
|
||||||
|
|
||||||
|
/** @var Feed The feed to which this item belongs */
|
||||||
|
public Feed $feed;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create JSON comparison fields to retrieve items while also checking the owning user
|
||||||
|
*
|
||||||
|
* @param int $id The ID of the item being retrieved
|
||||||
|
* @return array|Field[] The fields for item ID and user ID
|
||||||
|
*/
|
||||||
|
private static function idAndUserFields(int $id): array
|
||||||
|
{
|
||||||
|
$idField = Field::EQ(Configuration::$idField, $id, ':id');
|
||||||
|
$idField->qualifier = Table::ITEM;
|
||||||
|
$userField = Field::EQ('user_id', $_SESSION[Key::USER_ID], ':user');
|
||||||
|
$userField->qualifier = Table::FEED;
|
||||||
|
return [$idField, $userField];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check an item's existence via its ID
|
||||||
|
*
|
||||||
|
* @param int $id The ID of the item whose existence should be checked
|
||||||
|
* @return bool True if the item exists for the current user, false if not
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
|
*/
|
||||||
|
public static function existsById(int $id): bool
|
||||||
|
{
|
||||||
|
$fields = self::idAndUserFields($id);
|
||||||
|
return Custom::scalar(Query\Exists::query(self::FROM_WITH_JOIN, Query::whereByFields($fields)),
|
||||||
|
Parameters::addFields($fields, []), new ExistsMapper());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieve an item via its ID
|
||||||
|
*
|
||||||
|
* @param int $id The ID of the item to be retrieved
|
||||||
|
* @return ItemWithFeed|false The item if it is found, false if not
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
|
*/
|
||||||
|
public static function retrieveById(int $id): ItemWithFeed|false
|
||||||
|
{
|
||||||
|
$fields = self::idAndUserFields($id);
|
||||||
|
return Custom::single(self::SELECT_WITH_FEED . ' WHERE ' . Query::whereByFields($fields),
|
||||||
|
Parameters::addFields($fields, []), new DocumentMapper(self::class));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,13 +1,18 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace FeedReaderCentral;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Session and other keys used for array indexes
|
||||||
|
*/
|
||||||
class Key {
|
class Key {
|
||||||
|
|
||||||
/** @var string The $_SESSION key for the current user's e-mail address */
|
/** @var string The $_SESSION key for the current user's e-mail address */
|
||||||
public const string USER_EMAIL = 'FRC_USER_EMAIL';
|
public const USER_EMAIL = 'FRC_USER_EMAIL';
|
||||||
|
|
||||||
/** @var string The $_SESSION key for the current user's ID */
|
/** @var string The $_SESSION key for the current user's ID */
|
||||||
public const string USER_ID = 'FRC_USER_ID';
|
public const USER_ID = 'FRC_USER_ID';
|
||||||
|
|
||||||
/** @var string The $_REQUEST key for the array of user messages to display */
|
/** @var string The $_REQUEST key for the array of user messages to display */
|
||||||
public const string USER_MSG = 'FRC_USER_MSG';
|
public const USER_MSG = 'FRC_USER_MSG';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
252
src/lib/ParsedFeed.php
Normal file
252
src/lib/ParsedFeed.php
Normal file
|
|
@ -0,0 +1,252 @@
|
||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace FeedReaderCentral;
|
||||||
|
|
||||||
|
use DOMDocument;
|
||||||
|
use DOMElement;
|
||||||
|
use DOMException;
|
||||||
|
use DOMNode;
|
||||||
|
|
||||||
|
class ParsedFeed
|
||||||
|
{
|
||||||
|
/** @var string The URL for the feed */
|
||||||
|
public string $url = '';
|
||||||
|
|
||||||
|
/** @var string The title of the feed */
|
||||||
|
public string $title = '';
|
||||||
|
|
||||||
|
/** @var ?string When the feed was last updated */
|
||||||
|
public ?string $updatedOn = null;
|
||||||
|
|
||||||
|
/** @var ParsedItem[] The items contained in the feed */
|
||||||
|
public array $items = [];
|
||||||
|
|
||||||
|
/** @var string The XML namespace for Atom feeds */
|
||||||
|
public const ATOM_NS = 'http://www.w3.org/2005/Atom';
|
||||||
|
|
||||||
|
/** @var string The XML namespace for the `<content:encoded>` tag that allows HTML content in a feed */
|
||||||
|
public const CONTENT_NS = 'http://purl.org/rss/1.0/modules/content/';
|
||||||
|
|
||||||
|
/** @var string The XML namespace for XHTML */
|
||||||
|
public const XHTML_NS = 'http://www.w3.org/1999/xhtml';
|
||||||
|
|
||||||
|
/** @var string The user agent for Feed Reader Central's refresh requests */
|
||||||
|
private const USER_AGENT =
|
||||||
|
'FeedReaderCentral/' . FRC_VERSION . ' +https://bitbadger.solutions/open-source/feed-reader-central';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* When parsing XML into a DOMDocument, errors are presented as warnings; this creates an exception for them
|
||||||
|
*
|
||||||
|
* @param int $errno The error level encountered
|
||||||
|
* @param string $errstr The text of the error encountered
|
||||||
|
* @return bool False, to delegate to the next error handler in the chain
|
||||||
|
* @throws DOMException If the error is a warning
|
||||||
|
*/
|
||||||
|
private static function xmlParseError(int $errno, string $errstr): bool {
|
||||||
|
if ($errno == E_WARNING && substr_count($errstr, 'DOMDocument::loadXML()') > 0) {
|
||||||
|
throw new DOMException($errstr, $errno);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parse a feed into an XML tree
|
||||||
|
*
|
||||||
|
* @param string $content The feed's RSS content
|
||||||
|
* @return array|DOMDocument[]|string[] ['ok' => feed] if successful, ['error' => message] if not
|
||||||
|
*/
|
||||||
|
public static function parseFeed(string $content): array {
|
||||||
|
set_error_handler(self::xmlParseError(...));
|
||||||
|
try {
|
||||||
|
$feed = new DOMDocument();
|
||||||
|
$feed->loadXML($content);
|
||||||
|
return ['ok' => $feed];
|
||||||
|
} catch (DOMException $ex) {
|
||||||
|
return ['error' => $ex->getMessage()];
|
||||||
|
} finally {
|
||||||
|
restore_error_handler();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the value of a child element by its tag name for an RSS feed
|
||||||
|
*
|
||||||
|
* @param DOMNode $element The parent element
|
||||||
|
* @param string $tagName The name of the tag whose value should be obtained
|
||||||
|
* @return string The value of the element (or "[element] not found" if that element does not exist)
|
||||||
|
*/
|
||||||
|
public static function rssValue(DOMNode $element, string $tagName): string {
|
||||||
|
$tags = $element->getElementsByTagName($tagName);
|
||||||
|
return $tags->length == 0 ? "$tagName not found" : $tags->item(0)->textContent;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extract items from an RSS feed
|
||||||
|
*
|
||||||
|
* @param DOMDocument $xml The XML received from the feed
|
||||||
|
* @param string $url The actual URL for the feed
|
||||||
|
* @return array|Feed[]|string[] ['ok' => feed] if successful, ['error' => message] if not
|
||||||
|
*/
|
||||||
|
private static function fromRSS(DOMDocument $xml, string $url): array {
|
||||||
|
$channel = $xml->getElementsByTagName('channel')->item(0);
|
||||||
|
if (!($channel instanceof DOMElement)) {
|
||||||
|
$type = $channel?->nodeType ?? -1;
|
||||||
|
return ['error' => "Channel element not found ($type)"];
|
||||||
|
}
|
||||||
|
|
||||||
|
// The Atom namespace provides a lastBuildDate, which contains the last time an item in the feed was updated; if
|
||||||
|
// that is not present, use the pubDate element instead
|
||||||
|
if (($updatedOn = self::rssValue($channel, 'lastBuildDate')) == 'lastBuildDate not found') {
|
||||||
|
if (($updatedOn = self::rssValue($channel, 'pubDate')) == 'pubDate not found') {
|
||||||
|
$updatedOn = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$feed = new static();
|
||||||
|
$feed->title = self::rssValue($channel, 'title');
|
||||||
|
$feed->url = $url;
|
||||||
|
$feed->updatedOn = Data::formatDate($updatedOn);
|
||||||
|
foreach ($channel->getElementsByTagName('item') as $item) $feed->items[] = ParsedItem::fromRSS($item);
|
||||||
|
|
||||||
|
return ['ok' => $feed];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get an attribute value from a DOM node
|
||||||
|
*
|
||||||
|
* @param DOMNode $node The node with an attribute value to obtain
|
||||||
|
* @param string $name The name of the attribute whose value should be obtained
|
||||||
|
* @return string The attribute value if it exists, an empty string if not
|
||||||
|
*/
|
||||||
|
private static function attrValue(DOMNode $node, string $name): string {
|
||||||
|
return ($node->hasAttributes() ? $node->attributes->getNamedItem($name)?->value : null) ?? '';
|
||||||
|
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* Get the value of a child element by its tag name for an Atom feed
|
||||||
|
*
|
||||||
|
* (Atom feeds can have type attributes on nearly any value. For our purposes, types "text" and "html" will work as
|
||||||
|
* regular string values; for "xhtml", though, we will need to get the `<div>` and extract its contents instead.)
|
||||||
|
*
|
||||||
|
* @param DOMNode $element The parent element
|
||||||
|
* @param string $tagName The name of the tag whose value should be obtained
|
||||||
|
* @return string The value of the element (or "[element] not found" if that element does not exist)
|
||||||
|
*/
|
||||||
|
public static function atomValue(DOMNode $element, string $tagName): string {
|
||||||
|
$tags = $element->getElementsByTagName($tagName);
|
||||||
|
if ($tags->length == 0) return "$tagName not found";
|
||||||
|
$tag = $tags->item(0);
|
||||||
|
if (!($tag instanceof DOMElement)) return $tag->textContent;
|
||||||
|
if (self::attrValue($tag, 'type') == 'xhtml') {
|
||||||
|
$div = $tag->getElementsByTagNameNS(self::XHTML_NS, 'div');
|
||||||
|
if ($div->length == 0) return "-- invalid XHTML content --";
|
||||||
|
return $div->item(0)->textContent;
|
||||||
|
}
|
||||||
|
return $tag->textContent;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extract items from an Atom feed
|
||||||
|
*
|
||||||
|
* @param DOMDocument $xml The XML received from the feed
|
||||||
|
* @param string $url The actual URL for the feed
|
||||||
|
* @return array|Feed[] ['ok' => feed]
|
||||||
|
*/
|
||||||
|
private static function fromAtom(DOMDocument $xml, string $url): array {
|
||||||
|
$root = $xml->getElementsByTagNameNS(self::ATOM_NS, 'feed')->item(0);
|
||||||
|
if (($updatedOn = self::atomValue($root, 'updated')) == 'pubDate not found') $updatedOn = null;
|
||||||
|
|
||||||
|
$feed = new static();
|
||||||
|
$feed->title = self::atomValue($root, 'title');
|
||||||
|
$feed->url = $url;
|
||||||
|
$feed->updatedOn = Data::formatDate($updatedOn);
|
||||||
|
foreach ($root->getElementsByTagName('entry') as $entry) $feed->items[] = ParsedItem::fromAtom($entry);
|
||||||
|
|
||||||
|
return ['ok' => $feed];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieve a document (http/https)
|
||||||
|
*
|
||||||
|
* @param string $url The URL of the document to retrieve
|
||||||
|
* @return array ['content' => document content, 'error' => error message, 'code' => HTTP response code,
|
||||||
|
* 'url' => effective URL]
|
||||||
|
*/
|
||||||
|
private static function retrieveDocument(string $url): array {
|
||||||
|
$docReq = curl_init($url);
|
||||||
|
curl_setopt($docReq, CURLOPT_FOLLOWLOCATION, true);
|
||||||
|
curl_setopt($docReq, CURLOPT_RETURNTRANSFER, true);
|
||||||
|
curl_setopt($docReq, CURLOPT_CONNECTTIMEOUT, 5);
|
||||||
|
curl_setopt($docReq, CURLOPT_TIMEOUT, 15);
|
||||||
|
curl_setopt($docReq, CURLOPT_USERAGENT, self::USER_AGENT);
|
||||||
|
|
||||||
|
$result = [
|
||||||
|
'content' => curl_exec($docReq),
|
||||||
|
'error' => curl_error($docReq),
|
||||||
|
'code' => curl_getinfo($docReq, CURLINFO_RESPONSE_CODE),
|
||||||
|
'url' => curl_getinfo($docReq, CURLINFO_EFFECTIVE_URL)
|
||||||
|
];
|
||||||
|
|
||||||
|
curl_close($docReq);
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Derive a feed URL from an HTML document
|
||||||
|
*
|
||||||
|
* @param string $content The HTML document content from which to derive a feed URL
|
||||||
|
* @return array|string[] ['ok' => feed URL] if successful, ['error' => message] if not
|
||||||
|
*/
|
||||||
|
private static function deriveFeedFromHTML(string $content): array {
|
||||||
|
$html = new DOMDocument();
|
||||||
|
$html->loadHTML(substr($content, 0, strpos($content, '</head>') + 7));
|
||||||
|
$headTags = $html->getElementsByTagName('head');
|
||||||
|
if ($headTags->length < 1) return ['error' => 'Cannot find feed at this URL'];
|
||||||
|
$head = $headTags->item(0);
|
||||||
|
foreach ($head->getElementsByTagName('link') as $link) {
|
||||||
|
if (self::attrValue($link, 'rel') == 'alternate') {
|
||||||
|
$type = self::attrValue($link, 'type');
|
||||||
|
if ($type == 'application/rss+xml' || $type == 'application/atom+xml') {
|
||||||
|
return ['ok' => self::attrValue($link, 'href')];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ['error' => 'Cannot find feed at this URL'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieve the feed
|
||||||
|
*
|
||||||
|
* @param string $url The URL of the feed to retrieve
|
||||||
|
* @return array|ParsedFeed[]|string[] ['ok' => feed] if successful, ['error' => message] if not
|
||||||
|
*/
|
||||||
|
public static function retrieve(string $url): array {
|
||||||
|
$doc = self::retrieveDocument($url);
|
||||||
|
|
||||||
|
if ($doc['error'] != '') return ['error' => $doc['error']];
|
||||||
|
if ($doc['code'] != 200) {
|
||||||
|
return ['error' => "Prospective feed URL $url returned HTTP Code {$doc['code']}: {$doc['content']}"];
|
||||||
|
}
|
||||||
|
|
||||||
|
$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 (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 = key_exists('port', $original) ? ":{$original['port']}" : '';
|
||||||
|
$feedURL = $original['scheme'] . '://' . $original['host'] . $port . $feedURL;
|
||||||
|
}
|
||||||
|
$doc = self::retrieveDocument($feedURL);
|
||||||
|
}
|
||||||
|
|
||||||
|
$parsed = self::parseFeed($doc['content']);
|
||||||
|
if (key_exists('error', $parsed)) return ['error' => $parsed['error']];
|
||||||
|
|
||||||
|
$extract = $parsed['ok']->getElementsByTagNameNS(self::ATOM_NS, 'feed')->length > 0
|
||||||
|
? self::fromAtom(...) : self::fromRSS(...);
|
||||||
|
return $extract($parsed['ok'], $doc['url']);
|
||||||
|
}
|
||||||
|
}
|
||||||
78
src/lib/ParsedItem.php
Normal file
78
src/lib/ParsedItem.php
Normal file
|
|
@ -0,0 +1,78 @@
|
||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace FeedReaderCentral;
|
||||||
|
|
||||||
|
use DOMNode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Information for a feed item
|
||||||
|
*/
|
||||||
|
class ParsedItem
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param string $guid The unique ID for the feed item
|
||||||
|
* @param string $title The title of the feed item
|
||||||
|
* @param string $link The link to the original content
|
||||||
|
* @param string $publishedOn When this item was published
|
||||||
|
* @param string|null $updatedOn When this item was last updated
|
||||||
|
* @param string $content The content for the item
|
||||||
|
*/
|
||||||
|
private function __construct(public string $guid = '', public string $title = '', public string $link = '',
|
||||||
|
public string $publishedOn = '', public ?string $updatedOn = null,
|
||||||
|
public string $content = '') { }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Construct a feed item from an Atom feed's `<entry>` tag
|
||||||
|
*
|
||||||
|
* @param DOMNode $node The XML node from which a feed item should be constructed
|
||||||
|
* @return static A feed item constructed from the given node
|
||||||
|
*/
|
||||||
|
public static function fromAtom(DOMNode $node): static
|
||||||
|
{
|
||||||
|
$guid = ParsedFeed::atomValue($node, 'id');
|
||||||
|
$link = '';
|
||||||
|
foreach ($node->getElementsByTagName('link') as $linkElt) {
|
||||||
|
if ($linkElt->hasAttributes()) {
|
||||||
|
$relAttr = $linkElt->attributes->getNamedItem('rel');
|
||||||
|
if ($relAttr && $relAttr->value == 'alternate') {
|
||||||
|
$link = $linkElt->attributes->getNamedItem('href')->value;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($link == '' && str_starts_with($guid, 'http')) $link = $guid;
|
||||||
|
|
||||||
|
return new static(
|
||||||
|
guid: $guid,
|
||||||
|
title: ParsedFeed::atomValue($node, 'title'),
|
||||||
|
link: $link,
|
||||||
|
publishedOn: Data::formatDate(ParsedFeed::atomValue($node, 'published')),
|
||||||
|
updatedOn: Data::formatDate(ParsedFeed::atomValue($node, 'updated')),
|
||||||
|
content: ParsedFeed::atomValue($node, 'content'));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Construct a feed item from an RSS feed's `<item>` tag
|
||||||
|
*
|
||||||
|
* @param DOMNode $node The XML node from which a feed item should be constructed
|
||||||
|
* @return static A feed item constructed from the given node
|
||||||
|
*/
|
||||||
|
public static function fromRSS(DOMNode $node): static
|
||||||
|
{
|
||||||
|
$itemGuid = ParsedFeed::rssValue($node, 'guid');
|
||||||
|
$updNodes = $node->getElementsByTagNameNS(ParsedFeed::ATOM_NS, 'updated');
|
||||||
|
$encNodes = $node->getElementsByTagNameNS(ParsedFeed::CONTENT_NS, 'encoded');
|
||||||
|
|
||||||
|
return new static(
|
||||||
|
guid: $itemGuid == 'guid not found' ? ParsedFeed::rssValue($node, 'link') : $itemGuid,
|
||||||
|
title: ParsedFeed::rssValue($node, 'title'),
|
||||||
|
link: ParsedFeed::rssValue($node, 'link'),
|
||||||
|
publishedOn: Data::formatDate(ParsedFeed::rssValue($node, 'pubDate')),
|
||||||
|
updatedOn: Data::formatDate($updNodes->length > 0 ? $updNodes->item(0)->textContent : null),
|
||||||
|
content: $encNodes->length > 0
|
||||||
|
? $encNodes->item(0)->textContent
|
||||||
|
: ParsedFeed::rssValue($node, 'description'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,74 +1,48 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace FeedReaderCentral;
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\{DocumentException, Field, Patch};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Security functions
|
* Security functions
|
||||||
*/
|
*/
|
||||||
class Security {
|
class Security
|
||||||
|
{
|
||||||
/** @var int Run as a single user requiring no password */
|
/** @var int Run as a single user requiring no password */
|
||||||
public const int SINGLE_USER = 0;
|
public const SINGLE_USER = 0;
|
||||||
|
|
||||||
/** @var int Run as a single user requiring a password */
|
/** @var int Run as a single user requiring a password */
|
||||||
public const int SINGLE_USER_WITH_PASSWORD = 1;
|
public const SINGLE_USER_WITH_PASSWORD = 1;
|
||||||
|
|
||||||
/** @var int Require users to provide e-mail address and password */
|
/** @var int Require users to provide e-mail address and password */
|
||||||
public const int MULTI_USER = 2;
|
public const MULTI_USER = 2;
|
||||||
|
|
||||||
/** @var string The e-mail address for the single user */
|
/** @var string The e-mail address for the single user */
|
||||||
public const string SINGLE_USER_EMAIL = 'solouser@example.com';
|
public const SINGLE_USER_EMAIL = 'solouser@example.com';
|
||||||
|
|
||||||
/** @var string The password for the single user with no password */
|
/** @var string The password for the single user with no password */
|
||||||
public const string SINGLE_USER_PASSWORD = 'no-password-required';
|
public const SINGLE_USER_PASSWORD = 'no-password-required';
|
||||||
|
|
||||||
/** @var string The password algorithm to use for our passwords */
|
/** @var string The password algorithm to use for our passwords */
|
||||||
public const string PW_ALGORITHM = PASSWORD_DEFAULT;
|
public const PW_ALGORITHM = PASSWORD_DEFAULT;
|
||||||
|
|
||||||
/**
|
|
||||||
* Find a user by their ID
|
|
||||||
*
|
|
||||||
* @param string $email The e-mail address of the user to retrieve
|
|
||||||
* @param SQLite3 $db The data connection to use to retrieve the user
|
|
||||||
* @return array|false The user information, or null if the user is not found
|
|
||||||
*/
|
|
||||||
public static function findUserByEmail(string $email, SQLite3 $db): array|false {
|
|
||||||
$query = $db->prepare('SELECT * FROM frc_user WHERE email = :email');
|
|
||||||
$query->bindValue(':email', $email);
|
|
||||||
$result = $query->execute();
|
|
||||||
return $result ? $result->fetchArray(SQLITE3_ASSOC) : false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add a user
|
|
||||||
*
|
|
||||||
* @param string $email The e-mail address for the user
|
|
||||||
* @param string $password The user's password
|
|
||||||
* @param SQLite3 $db The data connection to use to add the user
|
|
||||||
*/
|
|
||||||
public static function addUser(string $email, string $password, SQLite3 $db): void {
|
|
||||||
$query = $db->prepare('INSERT INTO frc_user (email, password) VALUES (:email, :password)');
|
|
||||||
$query->bindValue(':email', $email);
|
|
||||||
$query->bindValue(':password', password_hash($password, self::PW_ALGORITHM));
|
|
||||||
$query->execute();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Verify a user's password
|
* Verify a user's password
|
||||||
*
|
*
|
||||||
* @param array $user The user information retrieved from the database
|
* @param User $user The user information retrieved from the database
|
||||||
* @param string $password The password provided by the user
|
* @param string $password The password provided by the user
|
||||||
* @param string|null $returnTo The URL to which the user should be redirected
|
* @param string|null $returnTo The URL to which the user should be redirected
|
||||||
* @param SQLite3 $db The database connection to use to verify the user's credentials
|
* @throws DocumentException if any is encountered
|
||||||
*/
|
*/
|
||||||
private static function verifyPassword(array $user, string $password, ?string $returnTo, SQLite3 $db): void {
|
private static function verifyPassword(User $user, string $password, ?string $returnTo): void
|
||||||
if (password_verify($password, $user['password'])) {
|
{
|
||||||
if (password_needs_rehash($user['password'], self::PW_ALGORITHM)) {
|
if (password_verify($password, $user->password)) {
|
||||||
$rehash = $db->prepare('UPDATE frc_user SET password = :hash WHERE id = :id');
|
if (password_needs_rehash($user->password, self::PW_ALGORITHM)) {
|
||||||
$rehash->bindValue(':hash', password_hash($password, self::PW_ALGORITHM));
|
Patch::byId(Table::USER, $user->id, ['password' => password_hash($password, self::PW_ALGORITHM)]);
|
||||||
$rehash->bindValue(':id', $user['id']);
|
|
||||||
$rehash->execute();
|
|
||||||
}
|
}
|
||||||
$_SESSION[Key::USER_ID] = $user['id'];
|
$_SESSION[Key::USER_ID] = $user->id;
|
||||||
$_SESSION[Key::USER_EMAIL] = $user['email'];
|
$_SESSION[Key::USER_EMAIL] = $user->email;
|
||||||
frc_redirect($returnTo ?? '/');
|
frc_redirect($returnTo ?? '/');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -79,9 +53,9 @@ class Security {
|
||||||
* @param string $email The e-mail address for the user (cannot be the single-user mode user)
|
* @param string $email The e-mail address for the user (cannot be the single-user mode user)
|
||||||
* @param string $password The password provided by the user
|
* @param string $password The password provided by the user
|
||||||
* @param string|null $returnTo The URL to which the user should be redirected
|
* @param string|null $returnTo The URL to which the user should be redirected
|
||||||
* @param SQLite3 $db The database connection to use to verify the user's credentials
|
* @throws DocumentException If any is encountered
|
||||||
*/
|
*/
|
||||||
public static function logOnUser(string $email, string $password, ?string $returnTo, SQLite3 $db): void {
|
public static function logOnUser(string $email, string $password, ?string $returnTo): void {
|
||||||
if (SECURITY_MODEL == self::SINGLE_USER_WITH_PASSWORD) {
|
if (SECURITY_MODEL == self::SINGLE_USER_WITH_PASSWORD) {
|
||||||
$dbEmail = self::SINGLE_USER_EMAIL;
|
$dbEmail = self::SINGLE_USER_EMAIL;
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -91,8 +65,8 @@ class Security {
|
||||||
}
|
}
|
||||||
$dbEmail = $email;
|
$dbEmail = $email;
|
||||||
}
|
}
|
||||||
$user = self::findUserByEmail($dbEmail, $db);
|
$user = User::findByEmail($dbEmail);
|
||||||
if ($user) self::verifyPassword($user, $password, $returnTo, $db);
|
if ($user) self::verifyPassword($user, $password, $returnTo);
|
||||||
add_error('Invalid credentials; log on unsuccessful');
|
add_error('Invalid credentials; log on unsuccessful');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -101,39 +75,37 @@ class Security {
|
||||||
*
|
*
|
||||||
* @param string $email The e-mail address of the user whose password should be updated
|
* @param string $email The e-mail address of the user whose password should be updated
|
||||||
* @param string $password The new password for this user
|
* @param string $password The new password for this user
|
||||||
* @param SQLite3 $db The database connection to use in updating the password
|
* @throws DocumentException If any is encountered
|
||||||
*/
|
*/
|
||||||
public static function updatePassword(string $email, string $password, SQLite3 $db): void {
|
public static function updatePassword(string $email, string $password): void {
|
||||||
$query = $db->prepare('UPDATE frc_user SET password = :password WHERE email = :email');
|
Patch::byFields(Table::USER, [Field::EQ('email', $email)],
|
||||||
$query->bindValue(':password', password_hash($password, self::PW_ALGORITHM));
|
['password' => password_hash($password, self::PW_ALGORITHM)]);
|
||||||
$query->bindValue(':email', $email);
|
|
||||||
$query->execute();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Log on the single user
|
* Log on the single user
|
||||||
*
|
*
|
||||||
* @param SQLite3 $db The data connection to use to retrieve the user
|
* @throws DocumentException If any is encountered
|
||||||
*/
|
*/
|
||||||
private static function logOnSingleUser(SQLite3 $db): void {
|
private static function logOnSingleUser(): void {
|
||||||
$user = self::findUserByEmail(self::SINGLE_USER_EMAIL, $db);
|
$user = User::findByEmail(self::SINGLE_USER_EMAIL);
|
||||||
if (!$user) {
|
if (!$user) {
|
||||||
self::addUser(self::SINGLE_USER_EMAIL, self::SINGLE_USER_PASSWORD, $db);
|
User::add(self::SINGLE_USER_EMAIL, self::SINGLE_USER_PASSWORD);
|
||||||
$user = self::findUserByEmail(self::SINGLE_USER_EMAIL, $db);
|
$user = User::findByEmail(self::SINGLE_USER_EMAIL);
|
||||||
}
|
}
|
||||||
self::verifyPassword($user, self::SINGLE_USER_PASSWORD, $_GET['returnTo'], $db);
|
self::verifyPassword($user, self::SINGLE_USER_PASSWORD, $_GET['returnTo']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Verify that user is logged on
|
* Verify that user is logged on
|
||||||
*
|
*
|
||||||
* @param SQLite3 $db The data connection to use if required
|
|
||||||
* @param bool $redirectIfAnonymous Whether to redirect the request if there is no user logged on
|
* @param bool $redirectIfAnonymous Whether to redirect the request if there is no user logged on
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
*/
|
*/
|
||||||
public static function verifyUser(SQLite3 $db, bool $redirectIfAnonymous = true): void {
|
public static function verifyUser(bool $redirectIfAnonymous = true): void {
|
||||||
if (key_exists(Key::USER_ID, $_SESSION)) return;
|
if (key_exists(Key::USER_ID, $_SESSION)) return;
|
||||||
|
|
||||||
if (SECURITY_MODEL == self::SINGLE_USER) self::logOnSingleUser($db);
|
if (SECURITY_MODEL == self::SINGLE_USER) self::logOnSingleUser();
|
||||||
|
|
||||||
if (SECURITY_MODEL != self::SINGLE_USER_WITH_PASSWORD && SECURITY_MODEL != self::MULTI_USER) {
|
if (SECURITY_MODEL != self::SINGLE_USER_WITH_PASSWORD && SECURITY_MODEL != self::MULTI_USER) {
|
||||||
die('Unrecognized security model (' . SECURITY_MODEL . ')');
|
die('Unrecognized security model (' . SECURITY_MODEL . ')');
|
||||||
|
|
|
||||||
18
src/lib/Table.php
Normal file
18
src/lib/Table.php
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace FeedReaderCentral;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constants to use when accessing tables
|
||||||
|
*/
|
||||||
|
class Table
|
||||||
|
{
|
||||||
|
/** @var string The user table */
|
||||||
|
public const USER = 'frc_user';
|
||||||
|
|
||||||
|
/** @var string The feed table */
|
||||||
|
public const FEED = 'feed';
|
||||||
|
|
||||||
|
/** @var string The item table */
|
||||||
|
public const ITEM = 'item';
|
||||||
|
}
|
||||||
58
src/lib/User.php
Normal file
58
src/lib/User.php
Normal file
|
|
@ -0,0 +1,58 @@
|
||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace FeedReaderCentral;
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\{Custom, Document, DocumentException, Field, Find, Parameters, Query};
|
||||||
|
use BitBadger\PDODocument\Mapper\ExistsMapper;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A user of Feed Reader Central
|
||||||
|
*/
|
||||||
|
class User
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param int $id The ID of the user
|
||||||
|
* @param string $email The e-mail address for the user
|
||||||
|
* @param string $password The password for the user
|
||||||
|
*/
|
||||||
|
public function __construct(public int $id = 0, public string $email = '', public string $password = '') { }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find a user by their e=mail address
|
||||||
|
*
|
||||||
|
* @param string $email The e-mail address of the user to retrieve
|
||||||
|
* @return User|false The user information, or null if the user is not found
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
|
*/
|
||||||
|
public static function findByEmail(string $email): User|false
|
||||||
|
{
|
||||||
|
return Find::firstByFields(Table::USER, [Field::EQ('email', $email)], User::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add a user
|
||||||
|
*
|
||||||
|
* @param string $email The e-mail address for the user
|
||||||
|
* @param string $password The user's password
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
|
*/
|
||||||
|
public static function add(string $email, string $password): void
|
||||||
|
{
|
||||||
|
Document::insert(Table::USER, new User(email: $email, password: $password));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Does this user have any bookmarked items?
|
||||||
|
*
|
||||||
|
* @return bool True if the user has any bookmarked items, false if not
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
|
*/
|
||||||
|
public static function hasBookmarks(): bool
|
||||||
|
{
|
||||||
|
$fields = [Data::userIdField(Table::FEED), Data::bookmarkField(true, Table::ITEM)];
|
||||||
|
return Custom::scalar(Query\Exists::query(ItemWithFeed::FROM_WITH_JOIN, Query::whereByFields($fields)),
|
||||||
|
Parameters::addFields($fields, []), new ExistsMapper());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Bookmark Partial Handler
|
* Bookmark Partial Handler
|
||||||
|
|
@ -6,43 +6,35 @@
|
||||||
* This will display a button which will either add or remove a bookmark for a given item.
|
* This will display a button which will either add or remove a bookmark for a given item.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\{DocumentException, Patch};
|
||||||
|
use FeedReaderCentral\{ItemWithFeed, Table};
|
||||||
|
|
||||||
include '../start.php';
|
include '../start.php';
|
||||||
|
|
||||||
$db = Data::getConnection();
|
FeedReaderCentral\Security::verifyUser();
|
||||||
Security::verifyUser($db);
|
|
||||||
|
|
||||||
$id = $_GET['id'];
|
$id = key_exists('id', $_GET) ? (int)$_GET['id'] : -1;
|
||||||
|
|
||||||
$existsQuery = $db->prepare(
|
if (!$item = ItemWithFeed::retrieveById($id)) not_found();
|
||||||
'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 (key_exists('action', $_GET)) {
|
||||||
if ($_GET['action'] == 'add') {
|
$flag = match ($_GET['action']) {
|
||||||
$flag = 1;
|
'add' => 1,
|
||||||
} elseif ($_GET['action'] == 'remove') {
|
'remove' => 0,
|
||||||
$flag = 0;
|
default => null
|
||||||
}
|
};
|
||||||
if (isset($flag)) {
|
if (isset($flag)) {
|
||||||
$update = $db->prepare('UPDATE item SET is_bookmarked = :flag WHERE id = :id');
|
try {
|
||||||
$update->bindValue(':id', $id);
|
Patch::byId(Table::ITEM, $id, ['is_bookmarked' => $flag]);
|
||||||
$update->bindValue(':flag', $flag);
|
$item->is_bookmarked = $flag;
|
||||||
if (!$update->execute()) die(Data::error($db)['error']);
|
} catch (DocumentException $ex) {
|
||||||
|
add_error("$ex");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$bookQuery = $db->prepare('SELECT id, is_bookmarked FROM item WHERE id = :id');
|
$action = $item->isBookmarked() ? 'remove' : 'add';
|
||||||
$bookQuery->bindValue(':id', $id);
|
$icon = $item->isBookmarked() ? 'added' : 'add'; ?>
|
||||||
$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?>"
|
<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">
|
hx-target=this hx-swap=outerHTML hx-push-url=false title="<?=init_cap($action)?> Bookmark">
|
||||||
<img src=/assets/bookmark-<?=$icon?>.png alt="<?=$action?> bookmark">
|
<img src=/assets/bookmark-<?=$icon?>.png alt="<?=$action?> bookmark">
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
include '../../start.php';
|
include '../../start.php';
|
||||||
|
|
||||||
$db = Data::getConnection();
|
FeedReaderCentral\Security::verifyUser(redirectIfAnonymous: false);
|
||||||
Security::verifyUser($db, redirectIfAnonymous: false);
|
|
||||||
|
|
||||||
page_head('Feeds | Documentation'); ?>
|
page_head('Feeds | Documentation'); ?>
|
||||||
<h1>Feeds</h1>
|
<h1>Feeds</h1>
|
||||||
|
|
@ -71,4 +71,3 @@ php-cli util/refresh.php all</pre>
|
||||||
add <code>nice -n 1</code> (with a trailing space) before the path to the script.
|
add <code>nice -n 1</code> (with a trailing space) before the path to the script.
|
||||||
</article><?php
|
</article><?php
|
||||||
page_foot();
|
page_foot();
|
||||||
$db->close();
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
include '../../start.php';
|
include '../../start.php';
|
||||||
|
|
||||||
$db = Data::getConnection();
|
FeedReaderCentral\Security::verifyUser(redirectIfAnonymous: false);
|
||||||
Security::verifyUser($db, redirectIfAnonymous: false);
|
|
||||||
|
|
||||||
page_head('Documentation'); ?>
|
page_head('Documentation'); ?>
|
||||||
<h1>Documentation Home</h1>
|
<h1>Documentation Home</h1>
|
||||||
|
|
@ -31,4 +31,3 @@ page_head('Documentation'); ?>
|
||||||
that can be performed via its command line interface.
|
that can be performed via its command line interface.
|
||||||
</article><?php
|
</article><?php
|
||||||
page_foot();
|
page_foot();
|
||||||
$db->close();
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
include '../../start.php';
|
include '../../start.php';
|
||||||
|
|
||||||
$db = Data::getConnection();
|
FeedReaderCentral\Security::verifyUser(redirectIfAnonymous: false);
|
||||||
Security::verifyUser($db, redirectIfAnonymous: false);
|
|
||||||
|
|
||||||
page_head('Items | Documentation'); ?>
|
page_head('Items | Documentation'); ?>
|
||||||
<h1>Items</h1>
|
<h1>Items</h1>
|
||||||
|
|
@ -66,4 +66,3 @@ page_head('Items | Documentation'); ?>
|
||||||
others; if the items seem to move around in the list after a refresh, this is likely the cause.
|
others; if the items seem to move around in the list after a refresh, this is likely the cause.
|
||||||
</article><?php
|
</article><?php
|
||||||
page_foot();
|
page_foot();
|
||||||
$db->close();
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
include '../../start.php';
|
include '../../start.php';
|
||||||
|
|
||||||
$db = Data::getConnection();
|
FeedReaderCentral\Security::verifyUser(redirectIfAnonymous: false);
|
||||||
Security::verifyUser($db, redirectIfAnonymous: false);
|
|
||||||
|
|
||||||
page_head('Security Modes | Documentation'); ?>
|
page_head('Security Modes | Documentation'); ?>
|
||||||
<h1>Configuring Security Modes</h1>
|
<h1>Configuring Security Modes</h1>
|
||||||
|
|
@ -59,4 +59,3 @@ page_head('Security Modes | Documentation'); ?>
|
||||||
<p><code>php-cli util/user.php reset-single-password</code>
|
<p><code>php-cli util/user.php reset-single-password</code>
|
||||||
</article><?php
|
</article><?php
|
||||||
page_foot();
|
page_foot();
|
||||||
$db->close();
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
include '../../start.php';
|
include '../../start.php';
|
||||||
|
|
||||||
$db = Data::getConnection();
|
FeedReaderCentral\Security::verifyUser(redirectIfAnonymous: false);
|
||||||
Security::verifyUser($db, redirectIfAnonymous: false);
|
|
||||||
|
|
||||||
page_head('About the CLI | Documentation'); ?>
|
page_head('About the CLI | Documentation'); ?>
|
||||||
<h1>About the CLI</h1>
|
<h1>About the CLI</h1>
|
||||||
|
|
@ -21,4 +21,3 @@ page_head('About the CLI | Documentation'); ?>
|
||||||
<p><code>php-cli util/some-process.php command option1 option2</code>
|
<p><code>php-cli util/some-process.php command option1 option2</code>
|
||||||
</article><?php
|
</article><?php
|
||||||
page_foot();
|
page_foot();
|
||||||
$db->close();
|
|
||||||
|
|
|
||||||
|
|
@ -1,39 +1,43 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add/Edit/Delete Feed Page
|
* Add/Edit/Delete Feed Page
|
||||||
*
|
*
|
||||||
* Allows users to add, edit, and delete feeds
|
* Allows users to add, edit, and delete feeds
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\{Delete, DocumentException, Field};
|
||||||
|
use FeedReaderCentral\{Feed, Security, Table};
|
||||||
|
|
||||||
include '../../start.php';
|
include '../../start.php';
|
||||||
|
|
||||||
$db = Data::getConnection();
|
Security::verifyUser();
|
||||||
Security::verifyUser($db);
|
|
||||||
|
|
||||||
$feedId = $_GET['id'] ?? '';
|
$feedId = key_exists('id', $_GET) ? (int)$_GET['id'] : -1;
|
||||||
|
|
||||||
if ($_SERVER['REQUEST_METHOD'] == 'DELETE') {
|
if ($_SERVER['REQUEST_METHOD'] == 'DELETE') {
|
||||||
if (!($feed = Feed::retrieveById($feedId, $db))) not_found();
|
try {
|
||||||
$itemDelete = $db->prepare('DELETE FROM item WHERE feed_id = :feed');
|
if (!($feed = Feed::retrieveById($feedId))) not_found();
|
||||||
$itemDelete->bindValue(':feed', $feed['id']);
|
Delete::byFields(Table::ITEM, [Field::EQ('feed_id', $feed->id)]);
|
||||||
if (!$itemDelete->execute()) add_error(Data::error($db)['error']);
|
Delete::byId(Table::FEED, $feed->id);
|
||||||
$feedDelete = $db->prepare('DELETE FROM feed WHERE id = :feed');
|
add_info('Feed “' . htmlentities($feed->title) . '” deleted successfully');
|
||||||
$feedDelete->bindValue(':feed', $feed['id']);
|
|
||||||
if ($feedDelete->execute()) {
|
|
||||||
add_info('Feed “' . htmlentities($feed['title']) . '” deleted successfully');
|
|
||||||
} else {
|
|
||||||
add_error(Data::error($db)['error']);
|
|
||||||
}
|
|
||||||
frc_redirect('/feeds');
|
frc_redirect('/feeds');
|
||||||
|
} catch (DocumentException $ex) {
|
||||||
|
add_error("$ex");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
|
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
|
||||||
$isNew = $_POST['id'] == 'new';
|
try {
|
||||||
|
$isNew = $_POST['id'] == '-1';
|
||||||
if ($isNew) {
|
if ($isNew) {
|
||||||
$result = Feed::add($_POST['url'], $db);
|
$result = Feed::add($_POST['url']);
|
||||||
} else {
|
} else {
|
||||||
$toEdit = Feed::retrieveById($_POST['id'], $db);
|
$feedId = (int)$_POST['id'];
|
||||||
$result = $toEdit ? Feed::update($toEdit, $_POST['url'], $db) : ['error' => "Feed {$_POST['id']} not found"];
|
$toEdit = Feed::retrieveById($feedId);
|
||||||
|
$result = $toEdit
|
||||||
|
? Feed::update($toEdit, $_POST['url'])
|
||||||
|
: ['error' => "Feed $feedId not found"];
|
||||||
}
|
}
|
||||||
if (key_exists('ok', $result)) {
|
if (key_exists('ok', $result)) {
|
||||||
add_info('Feed saved successfully');
|
add_info('Feed saved successfully');
|
||||||
|
|
@ -41,30 +45,32 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
|
||||||
}
|
}
|
||||||
add_error($result['error']);
|
add_error($result['error']);
|
||||||
$feedId = 'error';
|
$feedId = 'error';
|
||||||
|
} catch (DocumentException $ex) {
|
||||||
|
add_error("$ex");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($feedId == 'new') {
|
if ($feedId == -1) {
|
||||||
$title = 'Add RSS Feed';
|
$title = 'Add RSS Feed';
|
||||||
$feed = [ 'id' => $_GET['id'], 'url' => ''];
|
$feed = new Feed(id: -1);
|
||||||
} else {
|
} else {
|
||||||
$title = 'Edit RSS Feed';
|
$title = 'Edit RSS Feed';
|
||||||
if ($feedId == 'error') {
|
if ($feedId == 'error') {
|
||||||
$feed = ['id' => $_POST['id'] ?? '', 'url' => $_POST['url'] ?? ''];
|
$feed = new Feed(id: (int)$_POST['id'], url: $_POST['url'] ?? '');
|
||||||
} elseif (!($feed = Feed::retrieveById((int) $feedId, $db))) not_found();
|
} elseif (!($feed = Feed::retrieveById((int)$feedId))) not_found();
|
||||||
}
|
}
|
||||||
|
|
||||||
page_head($title); ?>
|
page_head($title); ?>
|
||||||
<h1><?=$title?></h1>
|
<h1><?=$title?></h1>
|
||||||
<article>
|
<article>
|
||||||
<form method=POST action=/feed/ hx-post=/feed/>
|
<form method=POST action=/feed/ hx-post=/feed/>
|
||||||
<input type=hidden name=id value=<?=$feed['id']?>>
|
<input type=hidden name=id value=<?=$feed->id?>>
|
||||||
<label>
|
<label>
|
||||||
Feed URL
|
Feed URL
|
||||||
<input type=url name=url required autofocus value="<?=$feed['url']?>">
|
<input type=url name=url required autofocus value="<?=$feed->url?>">
|
||||||
</label>
|
</label>
|
||||||
<span class=break></span>
|
<span class=break></span>
|
||||||
<button type=submit>Save</button>
|
<button type=submit>Save</button>
|
||||||
</form>
|
</form>
|
||||||
</article><?php
|
</article><?php
|
||||||
page_foot();
|
page_foot();
|
||||||
$db->close();
|
|
||||||
|
|
|
||||||
|
|
@ -1,30 +1,32 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Feed Item List Page
|
* Feed Item List Page
|
||||||
*
|
*
|
||||||
* Lists items in a given feed (all, unread, or bookmarked)
|
* Lists items in a given feed (all, unread, or bookmarked)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
use FeedReaderCentral\{Feed, ItemList};
|
||||||
|
|
||||||
include '../../start.php';
|
include '../../start.php';
|
||||||
|
|
||||||
$db = Data::getConnection();
|
FeedReaderCentral\Security::verifyUser();
|
||||||
Security::verifyUser($db);
|
|
||||||
|
|
||||||
if (!($feed = Feed::retrieveById($_GET['id'], $db))) not_found();
|
$id = key_exists('id', $_GET) ? (int)$_GET['id'] : -1;
|
||||||
|
if (!($feed = Feed::retrieveById($id))) not_found();
|
||||||
|
|
||||||
$list = match (true) {
|
$list = match (true) {
|
||||||
key_exists('unread', $_GET) => ItemList::unreadForFeed($feed['id'], $db),
|
key_exists('unread', $_GET) => ItemList::unreadForFeed($feed->id),
|
||||||
key_exists('bookmarked', $_GET) => ItemList::bookmarkedForFeed($feed['id'], $db),
|
key_exists('bookmarked', $_GET) => ItemList::bookmarkedForFeed($feed->id),
|
||||||
default => ItemList::allForFeed($feed['id'], $db)
|
default => ItemList::allForFeed($feed->id)
|
||||||
};
|
};
|
||||||
|
|
||||||
page_head(($list->itemType != '' ? "$list->itemType Items | " : '') . strip_tags($feed['title']));
|
page_head(($list->itemType != '' ? "$list->itemType Items | " : '') . strip_tags($feed->title));
|
||||||
if ($list->itemType == '') {
|
if ($list->itemType == '') {
|
||||||
echo '<h1>' . htmlentities($feed['title']) . '</h1>';
|
echo '<h1>' . htmlentities($feed->title) . '</h1>';
|
||||||
} else {
|
} else {
|
||||||
echo '<h1 class=item_heading>' . htmlentities($feed['title']) . '</h1>';
|
echo '<h1 class=item_heading>' . htmlentities($feed->title) . '</h1>';
|
||||||
echo "<div class=item_published>$list->itemType Items</div>";
|
echo "<div class=item_published>$list->itemType Items</div>";
|
||||||
}
|
}
|
||||||
$list->render();
|
$list->render();
|
||||||
page_foot();
|
page_foot();
|
||||||
$db->close();
|
|
||||||
|
|
|
||||||
|
|
@ -1,51 +1,44 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Feed Maintenance Page
|
* Feed Maintenance Page
|
||||||
*
|
*
|
||||||
* List feeds and provide links for maintenance actions
|
* List feeds and provide links for maintenance actions
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\{Custom, Field, Query};
|
||||||
|
use BitBadger\PDODocument\Mapper\{ArrayMapper, DocumentMapper};
|
||||||
|
use FeedReaderCentral\{Feed, Key, Table};
|
||||||
|
|
||||||
include '../start.php';
|
include '../start.php';
|
||||||
|
|
||||||
$db = Data::getConnection();
|
FeedReaderCentral\Security::verifyUser();
|
||||||
Security::verifyUser($db);
|
|
||||||
|
|
||||||
$feedQuery = $db->prepare('SELECT * FROM feed WHERE user_id = :user ORDER BY lower(title)');
|
$field = Field::EQ('user_id', $_SESSION[Key::USER_ID], ':user');
|
||||||
$feedQuery->bindValue(':user', $_SESSION[Key::USER_ID]);
|
$feeds = Custom::list(Query\Find::byFields(Table::FEED, [$field]) . " ORDER BY lower(data->>'title')",
|
||||||
if (!($feedResult = $feedQuery->execute())) {
|
$field->appendParameter([]), new DocumentMapper(Feed::class));
|
||||||
add_error(Data::error($db)['error']);
|
|
||||||
|
page_head('Your Feeds');
|
||||||
|
echo '<h1>Your Feeds</h1><article><p class=action_buttons>' . hx_get('/feed/?id=-1', 'Add Feed') . '</p>';
|
||||||
|
foreach ($feeds->items() as /** @var Feed $feed */ $feed) {
|
||||||
|
$item = Table::ITEM;
|
||||||
|
$counts = Custom::single(<<<SQL
|
||||||
|
SELECT (SELECT COUNT(*) FROM $item WHERE data->>'feed_id' = :feed) AS total,
|
||||||
|
(SELECT COUNT(*) FROM $item WHERE data->>'feed_id' = :feed AND data->>'is_read' = 0) AS unread,
|
||||||
|
(SELECT COUNT(*) FROM $item WHERE data->>'feed_id' = :feed AND data->>'is_bookmarked' = 1) AS marked
|
||||||
|
SQL, [':feed' => $feed->id], new ArrayMapper()) ?? ['total' => 0, 'unread' => 0, 'marked' => 0];
|
||||||
|
echo '<p><strong>' . htmlentities($feed->title) . '</strong><br>'
|
||||||
|
. '<span class=meta><em>Last Updated ' . date_time($feed->updated_on) . ' • '
|
||||||
|
. 'As of ' . date_time($feed->checked_on) . '</em><br>' . hx_get("/feed/?id=$feed->id", 'Edit') . ' • '
|
||||||
|
. 'Read ' . ($counts['unread'] > 0 ? hx_get("/feed/items?id=$feed->id&unread", 'Unread') : 'Unread')
|
||||||
|
. " ({$counts['unread']}) | "
|
||||||
|
. ($counts['total'] > 0 ? hx_get("/feed/items?id=$feed->id", 'All') : 'All') . " ({$counts['total']}) | "
|
||||||
|
. ($counts['marked'] > 0 ? hx_get("/feed/items?id=$feed->id&bookmarked", 'Bookmarked') : 'Bookmarked')
|
||||||
|
. " ({$counts['marked']}) • "
|
||||||
|
. "<a href=/feed/?id=$feed->id hx-delete=/feed/?id=$feed->id "
|
||||||
|
. ' hx-confirm="Are you sure you want to delete “' . htmlspecialchars($feed->title)
|
||||||
|
. '”? This will remove the feed and all its items, including unread and bookmarked.">Delete</a>'
|
||||||
|
. '</span>';
|
||||||
}
|
}
|
||||||
|
echo '</article>';
|
||||||
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'])?> •
|
|
||||||
As of <?=date_time($feed['checked_on'])?></em><br>
|
|
||||||
<?=hx_get("/feed/?id=$feedId", 'Edit')?> • 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']?>) •
|
|
||||||
<a href=/feed/?id=<?=$feedId?> hx-delete=/feed/?id=<?=$feedId?>
|
|
||||||
hx-confirm="Are you sure you want to delete “<?=htmlentities($feed['title'], ENT_QUOTES)?>”? This will remove the feed and all its items, including unread and bookmarked.">Delete</a>
|
|
||||||
</span><?php
|
|
||||||
}
|
|
||||||
} ?>
|
|
||||||
</article><?php
|
|
||||||
page_foot();
|
page_foot();
|
||||||
$db->close();
|
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,19 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Home Page
|
* Home Page
|
||||||
*
|
*
|
||||||
* Displays a list of unread or bookmarked items for the current user
|
* Displays a list of unread or bookmarked items for the current user
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
use FeedReaderCentral\{Feed, ItemList};
|
||||||
|
|
||||||
include '../start.php';
|
include '../start.php';
|
||||||
|
|
||||||
$db = Data::getConnection();
|
FeedReaderCentral\Security::verifyUser();
|
||||||
Security::verifyUser($db);
|
|
||||||
|
|
||||||
if (key_exists('refresh', $_GET)) {
|
if (key_exists('refresh', $_GET)) {
|
||||||
$refreshResult = Feed::refreshAll($db);
|
$refreshResult = Feed::refreshAll();
|
||||||
if (key_exists('ok', $refreshResult)) {
|
if (key_exists('ok', $refreshResult)) {
|
||||||
add_info('All feeds refreshed successfully');
|
add_info('All feeds refreshed successfully');
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -20,8 +22,8 @@ if (key_exists('refresh', $_GET)) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$list = match (true) {
|
$list = match (true) {
|
||||||
key_exists('bookmarked', $_GET) => ItemList::allBookmarked($db),
|
key_exists('bookmarked', $_GET) => ItemList::allBookmarked(),
|
||||||
default => ItemList::allUnread($db)
|
default => ItemList::allUnread()
|
||||||
};
|
};
|
||||||
$title = "Your $list->itemType Items";
|
$title = "Your $list->itemType Items";
|
||||||
|
|
||||||
|
|
@ -34,4 +36,3 @@ if ($list->itemType == 'Unread') {
|
||||||
echo '</h1>';
|
echo '</h1>';
|
||||||
$list->render();
|
$list->render();
|
||||||
page_foot();
|
page_foot();
|
||||||
$db->close();
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Item View Page
|
* Item View Page
|
||||||
|
|
@ -6,85 +6,64 @@
|
||||||
* Retrieves and displays an item from a feed belonging to the current user
|
* Retrieves and displays an item from a feed belonging to the current user
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\{Delete, DocumentException, Patch};
|
||||||
|
use FeedReaderCentral\{ItemWithFeed, Table};
|
||||||
|
|
||||||
include '../start.php';
|
include '../start.php';
|
||||||
|
|
||||||
$db = Data::getConnection();
|
FeedReaderCentral\Security::verifyUser();
|
||||||
Security::verifyUser($db);
|
|
||||||
|
$id = match (true) {
|
||||||
|
key_exists('id', $_POST) => (int)$_POST['id'],
|
||||||
|
key_exists('id', $_GET) => (int)$_GET['id'],
|
||||||
|
default => -1
|
||||||
|
};
|
||||||
|
|
||||||
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
|
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
|
||||||
// "Keep as New" button sends a POST request to reset the is_read flag before going back to the list of unread items
|
try {
|
||||||
$isValidQuery = $db->prepare(<<<'SQL'
|
// "Keep as New" button sends a POST request to reset the is_read flag before going back to the item list
|
||||||
SELECT COUNT(*)
|
if (ItemWithFeed::existsById($id)) {
|
||||||
FROM item INNER JOIN feed ON feed.id = item.feed_id
|
Patch::byId(Table::ITEM, $id, ['is_read' => 0]);
|
||||||
WHERE item.id = :id AND feed.user_id = :user
|
|
||||||
SQL);
|
|
||||||
$isValidQuery->bindValue(':id', $_POST['id']);
|
|
||||||
$isValidQuery->bindValue(':user', $_SESSION[Key::USER_ID]);
|
|
||||||
$isValidResult = $isValidQuery->execute();
|
|
||||||
if ($isValidResult && $isValidResult->fetchArray(SQLITE3_NUM)[0] == 1) {
|
|
||||||
$keepUnread = $db->prepare('UPDATE item SET is_read = 0 WHERE id = :id');
|
|
||||||
$keepUnread->bindValue(':id', $_POST['id']);
|
|
||||||
$keepUnread->execute();
|
|
||||||
}
|
}
|
||||||
$db->close();
|
|
||||||
frc_redirect($_POST['from']);
|
frc_redirect($_POST['from']);
|
||||||
|
} catch (DocumentException $ex) {
|
||||||
|
add_error("$ex");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$from = $_GET['from'] ?? '/';
|
$from = $_GET['from'] ?? '/';
|
||||||
|
|
||||||
if ($_SERVER['REQUEST_METHOD'] == 'DELETE') {
|
if ($_SERVER['REQUEST_METHOD'] == 'DELETE') {
|
||||||
$deleteQuery = $db->prepare(<<<'SQL'
|
try {
|
||||||
DELETE FROM item
|
if (ItemWithFeed::existsById($id)) Delete::byId(Table::ITEM, $id);
|
||||||
WHERE id IN (
|
} catch (DocumentException $ex) {
|
||||||
SELECT item.id
|
add_error("$ex");
|
||||||
FROM item INNER JOIN feed ON feed.id = item.feed_id
|
|
||||||
WHERE item.id = :id
|
|
||||||
AND feed.user_id = :user)
|
|
||||||
SQL);
|
|
||||||
$deleteQuery->bindValue(':id', $_GET['id']);
|
|
||||||
$deleteQuery->bindValue(':user', $_SESSION[Key::USER_ID]);
|
|
||||||
if ($deleteQuery->execute()) {
|
|
||||||
add_info('Item deleted');
|
|
||||||
} else {
|
|
||||||
add_error(Data::error($db)['error']);
|
|
||||||
}
|
}
|
||||||
$db->close();
|
|
||||||
frc_redirect($from);
|
frc_redirect($from);
|
||||||
}
|
}
|
||||||
|
|
||||||
$query = $db->prepare(<<<'SQL'
|
if (!$item = ItemWithFeed::retrieveById($id)) not_found();
|
||||||
SELECT item.title AS item_title, item.item_link, item.published_on, item.updated_on, item.content,
|
try {
|
||||||
feed.title AS feed_title
|
Patch::byId(Table::ITEM, $id, ['is_read' => 1]);
|
||||||
FROM item INNER JOIN feed ON feed.id = item.feed_id
|
} catch (DocumentException $ex) {
|
||||||
WHERE item.id = :id
|
add_error("$ex");
|
||||||
AND feed.user_id = :user
|
|
||||||
SQL);
|
|
||||||
$query->bindValue(':id', $_GET['id']);
|
|
||||||
$query->bindValue(':user', $_SESSION[Key::USER_ID]);
|
|
||||||
$result = $query->execute();
|
|
||||||
$item = $result ? $result->fetchArray(SQLITE3_ASSOC) : false;
|
|
||||||
|
|
||||||
if ($item) {
|
|
||||||
$markRead = $db->prepare('UPDATE item SET is_read = 1 WHERE id = :id');
|
|
||||||
$markRead->bindValue(':id', $_GET['id']);
|
|
||||||
$markRead->execute();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$published = date_time($item['published_on']);
|
$published = date_time($item->published_on);
|
||||||
$updated = isset($item['updated_on']) ? date_time($item['updated_on']) : null;
|
$updated = isset($item->updated_on) ? date_time($item->updated_on) : null;
|
||||||
|
|
||||||
page_head(htmlentities("{$item['item_title']} | {$item['feed_title']}")); ?>
|
page_head(htmlentities("$item->title | {$item->feed->title}")); ?>
|
||||||
<h1 class=item_heading>
|
<h1 class=item_heading>
|
||||||
<span class=bookmark hx-get="/bookmark?id=<?=$_GET['id']?>" hx-trigger=load hx-target=this hx-swap=outerHTML
|
<span class=bookmark hx-get="/bookmark?id=<?=$_GET['id']?>" hx-trigger=load hx-target=this hx-swap=outerHTML
|
||||||
hx-push-url=false></span>
|
hx-push-url=false></span>
|
||||||
<a href="<?=$item['item_link']?>" target=_blank rel=noopener><?=strip_tags($item['item_title'])?></a><br>
|
<a href="<?=$item->item_link?>" target=_blank rel=noopener><?=strip_tags($item->title)?></a><br>
|
||||||
</h1>
|
</h1>
|
||||||
<div class=item_published>
|
<div class=item_published>
|
||||||
From <strong><?=htmlentities($item['feed_title'])?></strong><br>
|
From <strong><?=htmlentities($item->feed->title)?></strong><br>
|
||||||
Published <?=date_time($item['published_on'])?><?=$updated && $updated != $published ? " (Updated $updated)" : ''?>
|
Published <?=date_time($item->published_on)?><?=$updated && $updated != $published ? " (Updated $updated)" : ''?>
|
||||||
</div>
|
</div>
|
||||||
<article>
|
<article>
|
||||||
<div class=item_content><?=str_replace('<a ', '<a target=_blank rel=noopener ', $item['content'])?></div>
|
<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>
|
<form class=action_buttons action=/item method=POST hx-post=/item>
|
||||||
<input type=hidden name=id value=<?=$_GET['id']?>>
|
<input type=hidden name=id value=<?=$_GET['id']?>>
|
||||||
<input type=hidden name=from value="<?=$from?>">
|
<input type=hidden name=from value="<?=$from?>">
|
||||||
|
|
@ -94,4 +73,3 @@ page_head(htmlentities("{$item['item_title']} | {$item['feed_title']}")); ?>
|
||||||
</form>
|
</form>
|
||||||
</article><?php
|
</article><?php
|
||||||
page_foot();
|
page_foot();
|
||||||
$db->close();
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Item Search Page
|
* Item Search Page
|
||||||
|
|
@ -8,14 +8,13 @@
|
||||||
|
|
||||||
include '../start.php';
|
include '../start.php';
|
||||||
|
|
||||||
$db = Data::getConnection();
|
FeedReaderCentral\Security::verifyUser();
|
||||||
Security::verifyUser($db);
|
|
||||||
|
|
||||||
$search = $_GET['search'] ?? '';
|
$search = $_GET['search'] ?? '';
|
||||||
$items = $_GET['items'] ?? 'all';
|
$items = $_GET['items'] ?? 'all';
|
||||||
|
|
||||||
if ($search != '') {
|
if ($search != '') {
|
||||||
$list = ItemList::matchingSearch($search, $items == 'bookmarked', $db);
|
$list = FeedReaderCentral\ItemList::matchingSearch($search, $items == 'bookmarked');
|
||||||
}
|
}
|
||||||
|
|
||||||
page_head('Item Search'); ?>
|
page_head('Item Search'); ?>
|
||||||
|
|
@ -42,4 +41,3 @@ page_head('Item Search'); ?>
|
||||||
} ?>
|
} ?>
|
||||||
</article><?php
|
</article><?php
|
||||||
page_foot();
|
page_foot();
|
||||||
$db->close();
|
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,11 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* User Log Off Page
|
* User Log Off Page
|
||||||
*/
|
*/
|
||||||
|
|
||||||
include '../../start.php';
|
include '../../start.php';
|
||||||
|
|
||||||
if (key_exists(Key::USER_ID, $_SESSION)) session_destroy();
|
if (key_exists(FeedReaderCentral\Key::USER_ID, $_SESSION)) session_destroy();
|
||||||
|
|
||||||
frc_redirect('/');
|
frc_redirect('/');
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,23 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* User Log On Page
|
||||||
|
*
|
||||||
|
* Accepts the user's e-mail address (multi-user) and password (multi-user or single-user-with-password) and attempts
|
||||||
|
* to log them on to Feed Reader Central
|
||||||
|
*/
|
||||||
|
|
||||||
include '../../start.php';
|
include '../../start.php';
|
||||||
|
|
||||||
$db = Data::getConnection();
|
use FeedReaderCentral\{Key, Security};
|
||||||
Security::verifyUser($db, redirectIfAnonymous: false);
|
|
||||||
|
Security::verifyUser(redirectIfAnonymous: false);
|
||||||
|
|
||||||
// Users already logged on have no need of this page
|
// Users already logged on have no need of this page
|
||||||
if (key_exists(Key::USER_ID, $_SESSION)) frc_redirect('/');
|
if (key_exists(Key::USER_ID, $_SESSION)) frc_redirect('/');
|
||||||
|
|
||||||
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
|
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
|
||||||
Security::logOnUser($_POST['email'] ?? '', $_POST['password'], $_POST['returnTo'] ?? null, $db);
|
Security::logOnUser($_POST['email'] ?? '', $_POST['password'], $_POST['returnTo'] ?? null);
|
||||||
// If we're still here, something didn't work; preserve the returnTo parameter
|
// If we're still here, something didn't work; preserve the returnTo parameter
|
||||||
$_GET['returnTo'] = $_POST['returnTo'];
|
$_GET['returnTo'] = $_POST['returnTo'];
|
||||||
}
|
}
|
||||||
|
|
@ -37,4 +46,3 @@ page_head('Log On'); ?>
|
||||||
</form>
|
</form>
|
||||||
</article><?php
|
</article><?php
|
||||||
page_foot();
|
page_foot();
|
||||||
$db->close();
|
|
||||||
|
|
|
||||||
9
src/servers/fastcgi.Caddyfile
Normal file
9
src/servers/fastcgi.Caddyfile
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
# Rename this to Caddyfile and place it in the directory where the release is unarchived
|
||||||
|
http://localhost:8205 {
|
||||||
|
root * ./public
|
||||||
|
# May change based on your PHP FPM configuration
|
||||||
|
php_fastcgi //unix/run/php/php8.3-fpm.sock {
|
||||||
|
try_files {path} {path}.php
|
||||||
|
}
|
||||||
|
file_server
|
||||||
|
}
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
|
# Rename this to Caddyfile and place it in the directory where the release is unarchived
|
||||||
{
|
{
|
||||||
frankenphp
|
frankenphp
|
||||||
order php_server before file_server
|
order php_server before file_server
|
||||||
}
|
}
|
||||||
http://localhost:8205 {
|
http://localhost:8205 {
|
||||||
root ./public
|
root * ./public
|
||||||
try_files {path} {path}.php
|
try_files {path} {path}.php
|
||||||
php_server
|
php_server
|
||||||
}
|
}
|
||||||
5
src/servers/htaccess
Normal file
5
src/servers/htaccess
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
# Name this .htaccess and place it in the directory where the release is unarchived
|
||||||
|
RewriteEngine on
|
||||||
|
RewriteCond %{REQUEST_FILENAME} !-f
|
||||||
|
RewriteCond %{REQUEST_FILENAME} !-d
|
||||||
|
Rewrite "^(.*)" "$1.php" [QSA,L]
|
||||||
27
src/servers/nginx.conf
Normal file
27
src/servers/nginx.conf
Normal file
|
|
@ -0,0 +1,27 @@
|
||||||
|
## nginx Configuration for Feed Reader Central using FastCGI Process Manager (FPM)
|
||||||
|
server {
|
||||||
|
server_name server.name;
|
||||||
|
listen 80;
|
||||||
|
listen [::]:80;
|
||||||
|
# /path/to/files is the root directory for the site
|
||||||
|
access_log /path/to/files/log/access.log;
|
||||||
|
error_log /path/to/files/log/error.log;
|
||||||
|
# /path/to/files/app is where the release distribution should be unarchived
|
||||||
|
root /path/to/files/app/public;
|
||||||
|
index index.php;
|
||||||
|
|
||||||
|
location ~[^/]\.php(/|$) {
|
||||||
|
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
|
||||||
|
if (!-f $document_root$fastcgi_script_name) {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
# This may need to change based on the configuration of PHP FPM
|
||||||
|
fastcgi_pass unix:/run/php/php8.3-fpm.sock;
|
||||||
|
fastcgi_index index.php;
|
||||||
|
include /etc/nginx/fastcgi_params;
|
||||||
|
}
|
||||||
|
|
||||||
|
location / {
|
||||||
|
try_files $uri $uri/ $uri.php$is_args$args;
|
||||||
|
}
|
||||||
|
}
|
||||||
123
src/start.php
123
src/start.php
|
|
@ -1,5 +1,7 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
use JetBrains\PhpStorm\NoReturn;
|
|
||||||
|
use BitBadger\PDODocument\Configuration;
|
||||||
|
use FeedReaderCentral\{Key, Security, User};
|
||||||
|
|
||||||
require 'app-config.php';
|
require 'app-config.php';
|
||||||
|
|
||||||
|
|
@ -15,7 +17,8 @@ session_start([
|
||||||
* @param string $level The level (type) of the message
|
* @param string $level The level (type) of the message
|
||||||
* @param string $message The message itself
|
* @param string $message The message itself
|
||||||
*/
|
*/
|
||||||
function add_message(string $level, string $message): void {
|
function add_message(string $level, string $message): void
|
||||||
|
{
|
||||||
if (!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];
|
$_SESSION[Key::USER_MSG][] = ['level' => $level, 'message' => $message];
|
||||||
}
|
}
|
||||||
|
|
@ -25,7 +28,8 @@ function add_message(string $level, string $message): void {
|
||||||
*
|
*
|
||||||
* @param string $message The message to be displayed
|
* @param string $message The message to be displayed
|
||||||
*/
|
*/
|
||||||
function add_error(string $message): void {
|
function add_error(string $message): void
|
||||||
|
{
|
||||||
add_message('ERROR', $message);
|
add_message('ERROR', $message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -34,14 +38,22 @@ function add_error(string $message): void {
|
||||||
*
|
*
|
||||||
* @param string $message The message to be displayed
|
* @param string $message The message to be displayed
|
||||||
*/
|
*/
|
||||||
function add_info(string $message): void {
|
function add_info(string $message): void
|
||||||
|
{
|
||||||
add_message('INFO', $message);
|
add_message('INFO', $message);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @var bool $is_htmx True if this request was initiated by htmx, false if not */
|
/** @var bool $is_htmx True if this request was initiated by htmx, false if not */
|
||||||
$is_htmx = key_exists('HTTP_HX_REQUEST', $_SERVER) && !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) {
|
/**
|
||||||
|
* Create a navigation link in the top right nav bar
|
||||||
|
*
|
||||||
|
* @param string $link The link to be placed
|
||||||
|
* @param bool $isFirst True if this is the first link being placed, false if not
|
||||||
|
*/
|
||||||
|
function nav_link(string $link, bool $isFirst = false): void
|
||||||
|
{
|
||||||
$sep = $isFirst ? '' : ' | ';
|
$sep = $isFirst ? '' : ' | ';
|
||||||
echo "<span>$sep$link</span>";
|
echo "<span>$sep$link</span>";
|
||||||
}
|
}
|
||||||
|
|
@ -49,71 +61,53 @@ function nav_link(string $link, bool $isFirst = false) {
|
||||||
/**
|
/**
|
||||||
* Render the title bar for the page
|
* Render the title bar for the page
|
||||||
*/
|
*/
|
||||||
function title_bar(): void {
|
function title_bar(): void
|
||||||
$version = display_version();; ?>
|
{
|
||||||
<header hx-target=#main hx-push-url=true>
|
$version = display_version();
|
||||||
<div><a href=/ class=title>Feed Reader Central</a><span class=version><?=$version?></span></div>
|
echo "<header hx-target=#main hx-push-url=true>"
|
||||||
<nav><?php
|
. "<div><a href=/ class=title>Feed Reader Central</a><span class=version>$version</span></div>"
|
||||||
|
. "<nav>";
|
||||||
if (key_exists(Key::USER_ID, $_SESSION)) {
|
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);
|
nav_link(hx_get('/feeds', 'Feeds'), true);
|
||||||
if ($hasBookmarks) nav_link(hx_get('/?bookmarked', 'Bookmarked'));
|
if (User::hasBookmarks()) nav_link(hx_get('/?bookmarked', 'Bookmarked'));
|
||||||
nav_link(hx_get('/search', 'Search'));
|
nav_link(hx_get('/search', 'Search'));
|
||||||
nav_link(hx_get('/docs/', 'Docs'));
|
nav_link(hx_get('/docs/', 'Docs'));
|
||||||
nav_link('<a href=/user/log-off>Log Off</a>');
|
nav_link('<a href=/user/log-off>Log Off</a>');
|
||||||
if ($_SESSION[Key::USER_EMAIL] != Security::SINGLE_USER_EMAIL) {
|
if ($_SESSION[Key::USER_EMAIL] != Security::SINGLE_USER_EMAIL) {
|
||||||
nav_link($_SESSION[Key::USER_EMAIL]);
|
nav_link($_SESSION[Key::USER_EMAIL]);
|
||||||
}
|
}
|
||||||
} finally {
|
|
||||||
$db->close();
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
nav_link(hx_get('/user/log-on', 'Log On'), true);
|
nav_link(hx_get('/user/log-on', 'Log On'), true);
|
||||||
nav_link(hx_get('/docs/', 'Docs'));
|
nav_link(hx_get('/docs/', 'Docs'));
|
||||||
} ?>
|
}
|
||||||
</nav>
|
echo '</nav></header>'
|
||||||
</header>
|
. '<main id=main hx-target=this hx-push-url=true hx-swap="innerHTML show:window:top">';
|
||||||
<main id=main hx-target=this hx-push-url=true hx-swap="innerHTML show:window:top"><?php
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Render the page title
|
* Render the page title
|
||||||
* @param string $title The title of the page being displayed
|
* @param string $title The title of the page being displayed
|
||||||
*/
|
*/
|
||||||
function page_head(string $title): void {
|
function page_head(string $title): void
|
||||||
|
{
|
||||||
global $is_htmx;
|
global $is_htmx;
|
||||||
?>
|
echo '<!DOCTYPE html><html lang=en>'
|
||||||
<!DOCTYPE html>
|
. "<head><title>$title | Feed Reader Central</title>";
|
||||||
<html lang=en>
|
if (!$is_htmx) {
|
||||||
<head>
|
echo '<meta name=viewport content="width=device-width, initial-scale=1">'
|
||||||
<title><?=$title?> | Feed Reader Central</title><?php
|
. "<meta name=htmx-config content='{\"historyCacheSize\":0}'>"
|
||||||
if (!$is_htmx) { ?>
|
. '<link href=/assets/style.css rel=stylesheet>';
|
||||||
<meta name=viewport content="width=device-width, initial-scale=1">
|
}
|
||||||
<meta name=htmx-config content='{"historyCacheSize":0}'>
|
echo '</head><body>';
|
||||||
<link href=/assets/style.css rel=stylesheet><?php
|
|
||||||
} ?>
|
|
||||||
</head>
|
|
||||||
<body><?php
|
|
||||||
if (!$is_htmx) title_bar();
|
if (!$is_htmx) title_bar();
|
||||||
if (sizeof($messages = $_SESSION[Key::USER_MSG] ?? []) > 0) { ?>
|
if (sizeof($messages = $_SESSION[Key::USER_MSG] ?? []) > 0) {
|
||||||
<div class=user_messages><?php
|
echo '<div class=user_messages>';
|
||||||
array_walk($messages, function ($msg) { ?>
|
array_walk($messages, function ($msg) {
|
||||||
<div class=user_message>
|
echo '<div class=user_message>'
|
||||||
<?=$msg['level'] == 'INFO' ? '' : "<strong>{$msg['level']}</strong><br>"?>
|
. ($msg['level'] == 'INFO' ? '' : "<strong>{$msg['level']}</strong><br>")
|
||||||
<?=$msg['message']?>
|
. $msg['message'] . '</div>';
|
||||||
</div><?php
|
});
|
||||||
}); ?>
|
echo '</div>';
|
||||||
</div><?php
|
|
||||||
$_SESSION[Key::USER_MSG] = [];
|
$_SESSION[Key::USER_MSG] = [];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -121,12 +115,10 @@ function page_head(string $title): void {
|
||||||
/**
|
/**
|
||||||
* Render the end of the page
|
* Render the end of the page
|
||||||
*/
|
*/
|
||||||
function page_foot(): void {
|
function page_foot(): void
|
||||||
global $is_htmx; ?>
|
{
|
||||||
</main><?php
|
global $is_htmx;
|
||||||
if (!$is_htmx) echo '<script src=/assets/htmx.min.js></script>'; ?>
|
echo '</main>' . ($is_htmx ? '' : '<script src=/assets/htmx.min.js></script>') . '</body></html>';
|
||||||
</body>
|
|
||||||
</html><?php
|
|
||||||
session_commit();
|
session_commit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -135,14 +127,15 @@ function page_foot(): void {
|
||||||
*
|
*
|
||||||
* @param string $value A local URL to which the user should be redirected
|
* @param string $value A local URL to which the user should be redirected
|
||||||
*/
|
*/
|
||||||
#[NoReturn]
|
function frc_redirect(string $value): never
|
||||||
function frc_redirect(string $value): void {
|
{
|
||||||
if (str_starts_with($value, 'http')) {
|
if (str_starts_with($value, 'http')) {
|
||||||
http_response_code(400);
|
http_response_code(400);
|
||||||
die();
|
die();
|
||||||
}
|
}
|
||||||
session_commit();
|
session_commit();
|
||||||
header("Location: $value", true, 303);
|
header("Location: $value", true, 303);
|
||||||
|
Configuration::resetPDO();
|
||||||
die();
|
die();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -152,7 +145,8 @@ function frc_redirect(string $value): void {
|
||||||
* @param string $value The date/time string
|
* @param string $value The date/time string
|
||||||
* @return string The standard format of a date/time, or '(invalid date)' if the date could not be parsed
|
* @return string The standard format of a date/time, or '(invalid date)' if the date could not be parsed
|
||||||
*/
|
*/
|
||||||
function date_time(string $value): string {
|
function date_time(string $value): string
|
||||||
|
{
|
||||||
try {
|
try {
|
||||||
return (new DateTimeImmutable($value))->format(DATE_TIME_FORMAT);
|
return (new DateTimeImmutable($value))->format(DATE_TIME_FORMAT);
|
||||||
} catch (Exception) {
|
} catch (Exception) {
|
||||||
|
|
@ -168,7 +162,8 @@ function date_time(string $value): string {
|
||||||
* @param string $extraAttrs Extra attributes for the anchor tag (must be attribute-encoded)
|
* @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
|
* @return string The anchor tag with both `href` and `hx-get` attributes
|
||||||
*/
|
*/
|
||||||
function hx_get(string $url, string $text, string $extraAttrs = ''): string {
|
function hx_get(string $url, string $text, string $extraAttrs = ''): string
|
||||||
|
{
|
||||||
$attrs = $extraAttrs != '' ? " $extraAttrs" : '';
|
$attrs = $extraAttrs != '' ? " $extraAttrs" : '';
|
||||||
return "<a href=\"$url\" hx-get=\"$url\"$attrs>$text</a>";
|
return "<a href=\"$url\" hx-get=\"$url\"$attrs>$text</a>";
|
||||||
}
|
}
|
||||||
|
|
@ -176,8 +171,8 @@ function hx_get(string $url, string $text, string $extraAttrs = ''): string {
|
||||||
/**
|
/**
|
||||||
* Return a 404 Not Found
|
* Return a 404 Not Found
|
||||||
*/
|
*/
|
||||||
#[NoReturn]
|
function not_found(): never
|
||||||
function not_found(): void {
|
{
|
||||||
http_response_code(404);
|
http_response_code(404);
|
||||||
die('Not Found');
|
die('Not Found');
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* USER CONFIGURATION ITEMS
|
* USER CONFIGURATION ITEMS
|
||||||
*
|
*
|
||||||
|
|
@ -7,6 +8,7 @@
|
||||||
* On initial installation, rename this file to user-config.php and configure it as desired
|
* On initial installation, rename this file to user-config.php and configure it as desired
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
use FeedReaderCentral\{Feed, Security};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Which security model should the application use? Options are:
|
* Which security model should the application use? Options are:
|
||||||
|
|
|
||||||
110
src/util/db-update.php
Normal file
110
src/util/db-update.php
Normal file
|
|
@ -0,0 +1,110 @@
|
||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\{Custom, Document, DocumentException};
|
||||||
|
use BitBadger\PDODocument\Mapper\{ArrayMapper, ExistsMapper};
|
||||||
|
use FeedReaderCentral\{Data, Feed, Item, Table, User};
|
||||||
|
|
||||||
|
require __DIR__ . '/../cli-start.php';
|
||||||
|
|
||||||
|
cli_title('DATABASE UPDATE');
|
||||||
|
|
||||||
|
//const PDO_DOC_DEBUG_SQL = true;
|
||||||
|
|
||||||
|
if ($argc < 2) display_help();
|
||||||
|
|
||||||
|
switch ($argv[1]) {
|
||||||
|
case 'check':
|
||||||
|
check_status();
|
||||||
|
break;
|
||||||
|
case 'run':
|
||||||
|
run_update();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
printfn('Unrecognized option "%s"', $argv[1]);
|
||||||
|
display_help();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Display the options for this utility and exit
|
||||||
|
*/
|
||||||
|
function display_help(): never
|
||||||
|
{
|
||||||
|
printfn('Options:');
|
||||||
|
printfn(' - check');
|
||||||
|
printfn(' Check to see if the configured database has been updated');
|
||||||
|
printfn(' - run');
|
||||||
|
printfn(' Run the beta1 database storage update');
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
function json_column_exists(): bool
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
$table = Custom::single("SELECT sql FROM sqlite_master WHERE tbl_name='frc_user'", [], new ArrayMapper());
|
||||||
|
return $table && substr_compare(strtolower($table['sql']), 'data text not null', 0) >= 0;
|
||||||
|
} catch (DocumentException $ex) {
|
||||||
|
printfn("ERR $ex");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function check_status(): void
|
||||||
|
{
|
||||||
|
if (json_column_exists()) {
|
||||||
|
printfn('The database has already been updated');
|
||||||
|
} else {
|
||||||
|
printfn('The database has yet to be updated');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function run_update(): void
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
$searchExists = Custom::scalar("SELECT EXISTS (SELECT 1 FROM sqlite_master WHERE name = 'item_ai')", [],
|
||||||
|
new ExistsMapper());
|
||||||
|
if ($searchExists) {
|
||||||
|
printfn('Removing search index...');
|
||||||
|
Custom::nonQuery('DROP TRIGGER item_ai', []);
|
||||||
|
Custom::nonQuery('DROP TRIGGER item_au', []);
|
||||||
|
Custom::nonQuery('DROP TRIGGER item_ad', []);
|
||||||
|
Custom::nonQuery('DROP TABLE item_search', []);
|
||||||
|
}
|
||||||
|
printfn('Moving old tables...');
|
||||||
|
Custom::nonQuery('ALTER TABLE item RENAME TO old_item', []);
|
||||||
|
Custom::nonQuery('ALTER TABLE feed RENAME TO old_feed', []);
|
||||||
|
Custom::nonQuery('ALTER TABLE frc_user RENAME TO old_user', []);
|
||||||
|
printfn('Creating new tables...');
|
||||||
|
Data::ensureDb();
|
||||||
|
printfn('Migrating users...');
|
||||||
|
$users = Custom::list('SELECT * FROM old_user', [], new ArrayMapper());
|
||||||
|
if (!$users->hasItems()) throw new DocumentException('Could not retrieve users');
|
||||||
|
foreach ($users->items() as $user) {
|
||||||
|
Document::insert(Table::USER, new User($user['id'], $user['email'], $user['password']));
|
||||||
|
}
|
||||||
|
printfn('Migrating feeds...');
|
||||||
|
$feeds = Custom::list('SELECT * FROM old_feed', [], new ArrayMapper());
|
||||||
|
if (!$feeds->hasItems()) throw new DocumentException('Could not retrieve feeds');
|
||||||
|
foreach ($feeds->items() as $feed) {
|
||||||
|
Document::insert(Table::FEED,
|
||||||
|
new Feed($feed['id'], $feed['user_id'], $feed['url'], $feed['title'], $feed['updated_on'],
|
||||||
|
$feed['checked_on']));
|
||||||
|
}
|
||||||
|
printfn('Migrating items...');
|
||||||
|
$items = Custom::list('SELECT * FROM old_item', [], new ArrayMapper());
|
||||||
|
if (!$items->hasItems()) throw new DocumentException('Could not retrieve items');
|
||||||
|
foreach ($items->items() as $item) {
|
||||||
|
Document::insert(Table::ITEM,
|
||||||
|
new Item($item['id'], $item['feed_id'], $item['title'], $item['item_guid'], $item['item_link'],
|
||||||
|
$item['published_on'], $item['updated_on'], $item['content'], $item['is_read'],
|
||||||
|
$item['is_bookmarked']));
|
||||||
|
}
|
||||||
|
printfn('Dropping old tables...');
|
||||||
|
Custom::nonQuery('DROP TABLE old_item', []);
|
||||||
|
Custom::nonQuery('DROP TABLE old_feed', []);
|
||||||
|
Custom::nonQuery('DROP TABLE old_user', []);
|
||||||
|
printfn(PHP_EOL. 'Migration complete!');
|
||||||
|
} catch (DocumentException $ex) {
|
||||||
|
printfn("ERR $ex");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
use JetBrains\PhpStorm\NoReturn;
|
|
||||||
|
use BitBadger\PDODocument\{DocumentException, Find};
|
||||||
|
use FeedReaderCentral\{Feed, Table, User};
|
||||||
|
|
||||||
require __DIR__ . '/../cli-start.php';
|
require __DIR__ . '/../cli-start.php';
|
||||||
|
|
||||||
|
|
@ -20,34 +22,32 @@ switch ($argv[1]) {
|
||||||
/**
|
/**
|
||||||
* Display the options for this utility and exit
|
* Display the options for this utility and exit
|
||||||
*/
|
*/
|
||||||
#[NoReturn]
|
function display_help(): never
|
||||||
function display_help(): void {
|
{
|
||||||
printfn('Options:');
|
printfn('Options:');
|
||||||
printfn(' - all');
|
printfn(' - all');
|
||||||
printfn(' Refreshes all feeds');
|
printfn(' Refreshes all feeds');
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
function refresh_all(): void {
|
function refresh_all(): void
|
||||||
$db = Data::getConnection();
|
{
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$feeds = Feed::retrieveAll($db);
|
$users = [];
|
||||||
if (array_key_exists('error', $feeds)) {
|
iterator_apply(Feed::retrieveAll()->items(), function (Feed $feed) use (&$users) {
|
||||||
printfn('SQLite error: %s', $feeds['error']);
|
$result = Feed::refreshFeed($feed->id, $feed->url);
|
||||||
return;
|
$userKey = "$feed->user_id";
|
||||||
}
|
if (!key_exists($userKey, $users)) $users[$userKey] = Find::byId(Table::USER, $feed->user_id, User::class);
|
||||||
array_walk($feeds, function ($feed) use ($db) {
|
|
||||||
$result = Feed::refreshFeed($feed['id'], $feed['url'], $db);
|
|
||||||
if (array_key_exists('error', $result)) {
|
if (array_key_exists('error', $result)) {
|
||||||
printfn('ERR (%s) %s', $feed['email'], $feed['url']);
|
printfn('ERR (%s) %s', $users[$userKey]->email, $feed->url);
|
||||||
printfn(' %s', $result['error']);
|
printfn(' %s', $result['error']);
|
||||||
} else {
|
} else {
|
||||||
printfn('OK (%s) %s', $feed['email'], $feed['url']);
|
printfn('OK (%s) %s', $users[$userKey]->email, $feed->url);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
printfn(PHP_EOL . 'All feeds refreshed');
|
printfn(PHP_EOL . 'All feeds refreshed');
|
||||||
} finally {
|
} catch (DocumentException $ex) {
|
||||||
$db->close();
|
printfn("ERR $ex");
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,8 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
use JetBrains\PhpStorm\NoReturn;
|
|
||||||
|
use BitBadger\PDODocument\{Custom, DocumentException};
|
||||||
|
use BitBadger\PDODocument\Mapper\ExistsMapper;
|
||||||
|
use FeedReaderCentral\Data;
|
||||||
|
|
||||||
require __DIR__ . '/../cli-start.php';
|
require __DIR__ . '/../cli-start.php';
|
||||||
|
|
||||||
|
|
@ -20,8 +23,8 @@ switch ($argv[1]) {
|
||||||
/**
|
/**
|
||||||
* Display the options for this utility and exit
|
* Display the options for this utility and exit
|
||||||
*/
|
*/
|
||||||
#[NoReturn]
|
function display_help(): never
|
||||||
function display_help(): void {
|
{
|
||||||
printfn('Options:');
|
printfn('Options:');
|
||||||
printfn(' - rebuild');
|
printfn(' - rebuild');
|
||||||
printfn(' Rebuilds search index');
|
printfn(' Rebuilds search index');
|
||||||
|
|
@ -31,19 +34,19 @@ function display_help(): void {
|
||||||
/**
|
/**
|
||||||
* Rebuild the search index, creating it if it does not already exist
|
* Rebuild the search index, creating it if it does not already exist
|
||||||
*/
|
*/
|
||||||
function rebuild_index(): void {
|
function rebuild_index(): void
|
||||||
$db = Data::getConnection();
|
{
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$hasIndex = $db->query("SELECT COUNT(*) FROM sqlite_master WHERE name = 'item_ai'");
|
$hasIndex = Custom::scalar("SELECT EXISTS (SELECT 1 FROM sqlite_master WHERE name = 'item_ai')", [],
|
||||||
if ($hasIndex->fetchArray(SQLITE3_NUM)[0] == 0) {
|
new ExistsMapper());
|
||||||
|
if (!$hasIndex) {
|
||||||
printfn('Creating search index....');
|
printfn('Creating search index....');
|
||||||
Data::createSearchIndex($db);
|
Data::createSearchIndex();
|
||||||
}
|
}
|
||||||
printfn('Rebuilding search index...');
|
printfn('Rebuilding search index...');
|
||||||
$db->exec("INSERT INTO item_search (item_search) VALUES ('rebuild')");
|
Custom::nonQuery("INSERT INTO item_search (item_search) VALUES ('rebuild')", []);
|
||||||
printfn(PHP_EOL . 'Search index rebuilt');
|
printfn(PHP_EOL . 'Search index rebuilt');
|
||||||
} finally {
|
} catch (DocumentException $ex) {
|
||||||
$db->close();
|
printfn("$ex");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
<?php
|
<?php declare(strict_types=1);
|
||||||
use JetBrains\PhpStorm\NoReturn;
|
|
||||||
|
use BitBadger\PDODocument\{Count, Custom, Delete, DocumentException, Field, Parameters, Patch, Query};
|
||||||
|
use FeedReaderCentral\{Security, Table, User};
|
||||||
|
|
||||||
require __DIR__ . '/../cli-start.php';
|
require __DIR__ . '/../cli-start.php';
|
||||||
|
|
||||||
|
|
@ -58,8 +60,8 @@ switch ($argv[1]) {
|
||||||
/**
|
/**
|
||||||
* Display the options for this utility and exit
|
* Display the options for this utility and exit
|
||||||
*/
|
*/
|
||||||
#[NoReturn]
|
function display_help(): never
|
||||||
function display_help(): void {
|
{
|
||||||
printfn('Options:');
|
printfn('Options:');
|
||||||
printfn(' - add-user [e-mail] [password]');
|
printfn(' - add-user [e-mail] [password]');
|
||||||
printfn(' Adds a new user to this instance');
|
printfn(' Adds a new user to this instance');
|
||||||
|
|
@ -83,24 +85,23 @@ function display_help(): void {
|
||||||
/**
|
/**
|
||||||
* Add a new user
|
* Add a new user
|
||||||
*/
|
*/
|
||||||
function add_user(): void {
|
function add_user(): void
|
||||||
|
{
|
||||||
global $argv;
|
global $argv;
|
||||||
|
|
||||||
$db = Data::getConnection();
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Ensure there is not already a user with this e-mail address
|
// Ensure there is not already a user with this e-mail address
|
||||||
$user = Security::findUserByEmail($argv[2], $db);
|
$user = User::findByEmail($argv[2]);
|
||||||
if ($user) {
|
if ($user) {
|
||||||
printfn('A user with e-mail address "%s" already exists', $argv[2]);
|
printfn('A user with e-mail address "%s" already exists', $argv[2]);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Security::addUser($argv[2], $argv[3], $db);
|
User::add($argv[2], $argv[3]);
|
||||||
|
|
||||||
printfn('User "%s" with password "%s" added successfully', $argv[2], $argv[3]);
|
printfn('User "%s" with password "%s" added successfully', $argv[2], $argv[3]);
|
||||||
} finally {
|
} catch (DocumentException $ex) {
|
||||||
$db->close();
|
printfn("$ex");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -110,32 +111,33 @@ function add_user(): void {
|
||||||
* @param string $email The e-mail address of the user
|
* @param string $email The e-mail address of the user
|
||||||
* @return string The string to use when displaying results
|
* @return string The string to use when displaying results
|
||||||
*/
|
*/
|
||||||
function display_user(string $email): string {
|
function display_user(string $email): string
|
||||||
|
{
|
||||||
return $email == Security::SINGLE_USER_EMAIL ? 'single-user mode user' : "user \"$email\"";
|
return $email == Security::SINGLE_USER_EMAIL ? 'single-user mode user' : "user \"$email\"";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set a user's password
|
* Set a user's password
|
||||||
*/
|
*/
|
||||||
function set_password(string $email, string $password): void {
|
function set_password(string $email, string $password): void
|
||||||
$db = Data::getConnection();
|
{
|
||||||
try {
|
try {
|
||||||
$displayUser = display_user($email);
|
$displayUser = display_user($email);
|
||||||
|
|
||||||
// Ensure this user exists
|
// Ensure this user exists
|
||||||
$user = Security::findUserByEmail($email, $db);
|
$user = User::findByEmail($email);
|
||||||
if (!$user) {
|
if (!$user) {
|
||||||
printfn('No %s exists', $displayUser);
|
printfn('No %s exists', $displayUser);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Security::updatePassword($email, $password, $db);
|
Security::updatePassword($email, $password);
|
||||||
|
|
||||||
$msg = $email == Security::SINGLE_USER_EMAIL && $password == Security::SINGLE_USER_PASSWORD
|
$msg = $email == Security::SINGLE_USER_EMAIL && $password == Security::SINGLE_USER_PASSWORD
|
||||||
? 'reset' : sprintf('set to "%s"', $password);
|
? 'reset' : sprintf('set to "%s"', $password);
|
||||||
printfn('%s password %s successfully', init_cap($displayUser), $msg);
|
printfn('%s password %s successfully', init_cap($displayUser), $msg);
|
||||||
} finally {
|
} catch (DocumentException $ex) {
|
||||||
$db->close();
|
printfn("$ex");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -144,76 +146,66 @@ function set_password(string $email, string $password): void {
|
||||||
*
|
*
|
||||||
* @param string $email The e-mail address of the user to be deleted
|
* @param string $email The e-mail address of the user to be deleted
|
||||||
*/
|
*/
|
||||||
function delete_user(string $email): void {
|
function delete_user(string $email): void
|
||||||
|
{
|
||||||
$db = Data::getConnection();
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$displayUser = display_user($email);
|
$displayUser = display_user($email);
|
||||||
|
|
||||||
// Get the ID for the provided e-mail address
|
// Get the user for the provided e-mail address
|
||||||
$user = Security::findUserByEmail($email, $db);
|
$user = User::findByEmail($email);
|
||||||
if (!$user) {
|
if (!$user) {
|
||||||
printfn('No %s exists', $displayUser);
|
printfn('No %s exists', $displayUser);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$feedCountQuery = $db->prepare('SELECT COUNT(*) FROM feed WHERE user_id = :user');
|
try {
|
||||||
$feedCountQuery->bindValue(':user', $user['id']);
|
$feedCount = Count::byFields(Table::FEED, [Field::EQ('user_id', $user->id)]);
|
||||||
$feedCountResult = $feedCountQuery->execute();
|
} catch (DocumentException $ex) {
|
||||||
if (!$feedCountResult) {
|
printfn("$ex");
|
||||||
printfn('SQLite error: %s', $db->lastErrorMsg());
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$feedCount = $feedCountResult->fetchArray(SQLITE3_NUM);
|
|
||||||
|
|
||||||
$proceed = readline("Delete the $displayUser and their $feedCount[0] feed(s)? (y/N)" . PHP_EOL);
|
$proceed = readline("Delete the $displayUser and their $feedCount feed(s)? (y/N)" . PHP_EOL);
|
||||||
if (!$proceed || !str_starts_with(strtolower($proceed), 'y')) {
|
if (!$proceed || !str_starts_with(strtolower($proceed), 'y')) {
|
||||||
printfn('Deletion canceled');
|
printfn('Deletion canceled');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$itemDelete = $db->prepare('DELETE FROM item WHERE feed_id IN (SELECT id FROM feed WHERE user_id = :user)');
|
try {
|
||||||
$itemDelete->bindValue(':user', $user['id']);
|
$fields = [Field::EQ('user_id', $user->id, '@user')];
|
||||||
$itemDelete->execute();
|
Custom::nonQuery(
|
||||||
|
'DELETE FROM ' . Table::ITEM . " WHERE data->>'feed_id' IN (SELECT data->>'id' FROM " . Table::FEED
|
||||||
$feedDelete = $db->prepare('DELETE FROM feed WHERE user_id = :user');
|
. ' WHERE ' . Query::whereByFields($fields) . ')', Parameters::addFields($fields, []));
|
||||||
$feedDelete->bindValue(':user', $user['id']);
|
Delete::byFields(Table::FEED, $fields);
|
||||||
$feedDelete->execute();
|
Delete::byId(Table::USER, $user->id);
|
||||||
|
|
||||||
$userDelete = $db->prepare('DELETE FROM frc_user WHERE id = :user');
|
|
||||||
$userDelete->bindValue(':user', $user['id']);
|
|
||||||
$userDelete->execute();
|
|
||||||
|
|
||||||
printfn('%s deleted successfully', init_cap($displayUser));
|
printfn('%s deleted successfully', init_cap($displayUser));
|
||||||
} finally {
|
} catch (DocumentException $ex) {
|
||||||
$db->close();
|
printfn("$ex");
|
||||||
|
}
|
||||||
|
} catch (DocumentException $ex) {
|
||||||
|
printfn("$ex");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Change the single-user mode user to a different e-mail address and password
|
* Change the single-user mode user to a different e-mail address and password
|
||||||
*/
|
*/
|
||||||
function migrate_single_user(): void {
|
function migrate_single_user(): void
|
||||||
|
{
|
||||||
global $argv;
|
global $argv;
|
||||||
|
|
||||||
$db = Data::getConnection();
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$single = Security::findUserByEmail(Security::SINGLE_USER_EMAIL, $db);
|
if (!$single = User::findByEmail(Security::SINGLE_USER_EMAIL)) {
|
||||||
if (!$single) {
|
|
||||||
printfn('There is no single-user mode user to be migrated');
|
printfn('There is no single-user mode user to be migrated');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$migrateQuery = $db->prepare('UPDATE frc_user SET email = :email, password = :password WHERE id = :id');
|
Patch::byId(Table::USER, $single->id,
|
||||||
$migrateQuery->bindValue(':email', $argv[2]);
|
['email' => $argv[2], 'password' => password_hash($argv[3], Security::PW_ALGORITHM)]);
|
||||||
$migrateQuery->bindValue(':password', password_hash($argv[3], Security::PW_ALGORITHM));
|
|
||||||
$migrateQuery->bindValue(':id', $single['id']);
|
|
||||||
$migrateQuery->execute();
|
|
||||||
|
|
||||||
printfn('The single user has been moved to "%s", with password "%s"', $argv[2], $argv[3]);
|
printfn('The single user has been moved to "%s", with password "%s"', $argv[2], $argv[3]);
|
||||||
} finally {
|
} catch (DocumentException $ex) {
|
||||||
$db->close();
|
printfn("$ex");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user