From 0acaac7115017f72120a6baea13778563a755238 Mon Sep 17 00:00:00 2001 From: wn_ Date: Sun, 18 May 2025 14:09:27 +0000 Subject: [PATCH 1/6] Remove an outdated check for 'E_DEPRECATED' existence. --- include/functions.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/include/functions.php b/include/functions.php index c573042a2..fc79d2fca 100644 --- a/include/functions.php +++ b/include/functions.php @@ -11,11 +11,8 @@ if (function_exists("mb_internal_encoding")) mb_internal_encoding("UTF-8"); date_default_timezone_set('UTC'); - if (defined('E_DEPRECATED')) { - error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED); - } else { - error_reporting(E_ALL & ~E_NOTICE); - } + + error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED); ini_set('display_errors', "false"); ini_set('display_startup_errors', "false"); From 2fa54cc627cd9a370004a48e1b6430a8a9990846 Mon Sep 17 00:00:00 2001 From: wn_ Date: Sun, 18 May 2025 14:26:05 +0000 Subject: [PATCH 2/6] Deprecate and remove use of the 'SUBSTRING_FOR_DATE' constant. With MySQL support removed (b154bc7a10e46dc9fa0406996507c4fd410366da) this constant is unnecessary. --- classes/API.php | 6 +++--- classes/Counters.php | 4 ++-- classes/Digest.php | 2 +- classes/Feeds.php | 6 +++--- classes/Pref_Feeds.php | 6 +++--- classes/Pref_Users.php | 4 ++-- classes/RSSUtils.php | 2 +- include/functions.php | 3 ++- plugins/share/init.php | 2 +- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/classes/API.php b/classes/API.php index 2a554e888..e1d4de214 100644 --- a/classes/API.php +++ b/classes/API.php @@ -310,7 +310,7 @@ class API extends Handler { ->select_many('e.id', 'e.guid', 'e.title', 'e.link', 'e.author', 'e.content', 'e.lang', 'e.comments', 'ue.feed_id', 'ue.int_id', 'ue.marked', 'ue.unread', 'ue.published', 'ue.score', 'ue.note') ->select_many_expr([ - 'updated' => SUBSTRING_FOR_DATE.'(updated,1,16)', + 'updated' => 'SUBSTRING_FOR_DATE(updated,1,16)', 'feed_title' => '(SELECT title FROM ttrss_feeds WHERE id = ue.feed_id)', 'site_url' => '(SELECT site_url FROM ttrss_feeds WHERE id = ue.feed_id)', 'hide_images' => '(SELECT hide_images FROM ttrss_feeds WHERE id = feed_id)', @@ -619,7 +619,7 @@ class API extends Handler { /* API only: -3 (Feeds::CATEGORY_ALL_EXCEPT_VIRTUAL) All feeds, excluding virtual feeds (e.g. Labels and such) */ $feeds_obj = ORM::for_table('ttrss_feeds') ->select_many('id', 'feed_url', 'cat_id', 'title', 'order_id', 'last_error', 'update_interval') - ->select_expr(SUBSTRING_FOR_DATE.'(last_updated,1,19)', 'last_updated') + ->select_expr('SUBSTRING_FOR_DATE(last_updated,1,19)', 'last_updated') ->where('owner_uid', $_SESSION['uid']) ->order_by_asc('order_id') ->order_by_asc('title'); @@ -670,7 +670,7 @@ class API extends Handler { $feed = ORM::for_table('ttrss_feeds') ->select_many('id', 'cache_images') - ->select_expr(SUBSTRING_FOR_DATE.'(last_updated,1,19)', 'last_updated') + ->select_expr('SUBSTRING_FOR_DATE(last_updated,1,19)', 'last_updated') ->find_one($feed_id); if ($feed) { diff --git a/classes/Counters.php b/classes/Counters.php index e20657947..4f23a7a41 100644 --- a/classes/Counters.php +++ b/classes/Counters.php @@ -157,7 +157,7 @@ class Counters { $sth = $pdo->prepare("SELECT f.id, f.title, - ".SUBSTRING_FOR_DATE."(f.last_updated,1,19) AS last_updated, + SUBSTRING_FOR_DATE(f.last_updated,1,19) AS last_updated, f.last_error, SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count, SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked @@ -169,7 +169,7 @@ class Counters { } else { $sth = $pdo->prepare("SELECT f.id, f.title, - ".SUBSTRING_FOR_DATE."(f.last_updated,1,19) AS last_updated, + SUBSTRING_FOR_DATE(f.last_updated,1,19) AS last_updated, f.last_error, SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count, SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked diff --git a/classes/Digest.php b/classes/Digest.php index f0ffafcbf..36389b09f 100644 --- a/classes/Digest.php +++ b/classes/Digest.php @@ -110,7 +110,7 @@ class Digest link, score, content, - ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated + SUBSTRING_FOR_DATE(last_updated,1,19) AS last_updated FROM ttrss_user_entries,ttrss_entries,ttrss_feeds LEFT JOIN diff --git a/classes/Feeds.php b/classes/Feeds.php index 7640185c1..7b0fc60cc 100644 --- a/classes/Feeds.php +++ b/classes/Feeds.php @@ -400,8 +400,8 @@ class Feeds extends Handler_Protected { $reply['content'] .= "

"; - $sth = $this->pdo->prepare("SELECT " . SUBSTRING_FOR_DATE . "(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds - WHERE owner_uid = ?"); + $sth = $this->pdo->prepare("SELECT SUBSTRING_FOR_DATE(MAX(last_updated), 1, 19) AS last_updated + FROM ttrss_feeds WHERE owner_uid = ?"); $sth->execute([$_SESSION['uid']]); $row = $sth->fetch(); @@ -2239,7 +2239,7 @@ class Feeds extends Handler_Protected { $orig_ts = strtotime(substr($k, 1)); $k = date("Y-m-d", TimeHelper::convert_timestamp($orig_ts, $user_tz_string, 'UTC')); - array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH(".$pdo->quote($k).")) $not = ".$pdo->quote($k).")"); + array_push($query_keywords, "(SUBSTRING_FOR_DATE(updated,1,LENGTH(".$pdo->quote($k).")) $not = ".$pdo->quote($k).")"); } else { // treat as leftover text diff --git a/classes/Pref_Feeds.php b/classes/Pref_Feeds.php index 75ae053bd..d27b7d750 100644 --- a/classes/Pref_Feeds.php +++ b/classes/Pref_Feeds.php @@ -74,7 +74,7 @@ class Pref_Feeds extends Handler_Protected { $feeds_obj = ORM::for_table('ttrss_feeds') ->table_alias('f') ->select_many('id', 'title', 'last_error', 'update_interval') - ->select_expr(SUBSTRING_FOR_DATE.'(last_updated,1,19)', 'last_updated') + ->select_expr('SUBSTRING_FOR_DATE(last_updated,1,19)', 'last_updated') ->left_outer_join('ttrss_user_entries', [ 'ue.feed_id', '=', 'f.id'], 'ue') ->select_expr('COUNT(ue.int_id) AS num_articles') ->where(['cat_id' => $cat_id, 'owner_uid' => $_SESSION['uid']]) @@ -261,7 +261,7 @@ class Pref_Feeds extends Handler_Protected { $feeds_obj = ORM::for_table('ttrss_feeds') ->table_alias('f') ->select_many('id', 'title', 'last_error', 'update_interval') - ->select_expr(SUBSTRING_FOR_DATE.'(last_updated,1,19)', 'last_updated') + ->select_expr('SUBSTRING_FOR_DATE(last_updated,1,19)', 'last_updated') ->left_outer_join('ttrss_user_entries', [ 'ue.feed_id', '=', 'f.id'], 'ue') ->select_expr('COUNT(ue.int_id) AS num_articles') ->where('owner_uid', $_SESSION['uid']) @@ -305,7 +305,7 @@ class Pref_Feeds extends Handler_Protected { $feeds_obj = ORM::for_table('ttrss_feeds') ->table_alias('f') ->select_many('id', 'title', 'last_error', 'update_interval') - ->select_expr(SUBSTRING_FOR_DATE.'(last_updated,1,19)', 'last_updated') + ->select_expr('SUBSTRING_FOR_DATE(last_updated,1,19)', 'last_updated') ->left_outer_join('ttrss_user_entries', [ 'ue.feed_id', '=', 'f.id'], 'ue') ->select_expr('COUNT(ue.int_id) AS num_articles') ->where('owner_uid', $_SESSION['uid']) diff --git a/classes/Pref_Users.php b/classes/Pref_Users.php index ef44dad30..8c54010ee 100644 --- a/classes/Pref_Users.php +++ b/classes/Pref_Users.php @@ -24,11 +24,11 @@ class Pref_Users extends Handler_Administrative { $id = (int) clean($_REQUEST["id"]); $sth = $this->pdo->prepare("SELECT login, - ".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login, + SUBSTRING_FOR_DATE(last_login,1,16) AS last_login, access_level, (SELECT COUNT(int_id) FROM ttrss_user_entries WHERE owner_uid = id) AS stored_articles, - ".SUBSTRING_FOR_DATE."(created,1,16) AS created + SUBSTRING_FOR_DATE(created,1,16) AS created FROM ttrss_users WHERE id = ?"); $sth->execute([$id]); diff --git a/classes/RSSUtils.php b/classes/RSSUtils.php index 9403cebdd..017deaf8b 100644 --- a/classes/RSSUtils.php +++ b/classes/RSSUtils.php @@ -345,7 +345,7 @@ class RSSUtils { $feed_obj = ORM::for_table('ttrss_feeds') ->select_expr("ttrss_feeds.*, - ".SUBSTRING_FOR_DATE."(last_unconditional, 1, 19) AS last_unconditional, + SUBSTRING_FOR_DATE(last_unconditional, 1, 19) AS last_unconditional, (favicon_is_custom IS NOT TRUE AND (favicon_last_checked IS NULL OR favicon_last_checked < NOW() - INTERVAL '12 hour')) AS favicon_needs_check") ->find_one($feed); diff --git a/include/functions.php b/include/functions.php index fc79d2fca..f100e3046 100644 --- a/include/functions.php +++ b/include/functions.php @@ -23,7 +23,8 @@ require_once "autoload.php"; - define('SUBSTRING_FOR_DATE', 'SUBSTRING_FOR_DATE'); + /** @deprecated use the 'SUBSTRING_FOR_DATE' string directly */ + const SUBSTRING_FOR_DATE = 'SUBSTRING_FOR_DATE'; /** * @deprecated by Prefs::get() diff --git a/plugins/share/init.php b/plugins/share/init.php index 8e25dc677..0a2e60dcf 100644 --- a/plugins/share/init.php +++ b/plugins/share/init.php @@ -123,7 +123,7 @@ class Share extends Plugin { $pdo = Db::pdo(); $sth = $pdo->prepare("SELECT id,title,link,content,feed_id,comments,int_id,lang, - ".SUBSTRING_FOR_DATE."(updated,1,16) as updated, + SUBSTRING_FOR_DATE(updated,1,16) as updated, (SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url, (SELECT title FROM ttrss_feeds WHERE id = feed_id) as feed_title, (SELECT hide_images FROM ttrss_feeds WHERE id = feed_id) as hide_images, From cdd48bb1fa67092b2f610ed2b609a9debe97e839 Mon Sep 17 00:00:00 2001 From: wn_ Date: Sun, 18 May 2025 14:51:47 +0000 Subject: [PATCH 3/6] Use ORM in 'Counters::get_feeds()' (and simplify stuff). --- classes/Counters.php | 77 ++++++++++++++------------------------------ 1 file changed, 24 insertions(+), 53 deletions(-) diff --git a/classes/Counters.php b/classes/Counters.php index 4f23a7a41..613210ecc 100644 --- a/classes/Counters.php +++ b/classes/Counters.php @@ -147,63 +147,34 @@ class Counters { private static function get_feeds(?array $feed_ids = null): array { $ret = []; - $pdo = Db::pdo(); + if (is_array($feed_ids) && count($feed_ids) === 0) + return $ret; - if (is_array($feed_ids)) { - if (count($feed_ids) == 0) - return []; + $feeds = ORM::for_table('ttrss_feeds') + ->table_alias('f') + ->select_many('f.id', 'f.title', 'f.last_error') + ->select_many_expr([ + 'count' => 'SUM(CASE WHEN ue.unread THEN 1 ELSE 0 END)', + 'count_marked' => 'SUM(CASE WHEN ue.marked THEN 1 ELSE 0 END)', + 'last_updated' => 'SUBSTRING_FOR_DATE(f.last_updated,1,19)', + ]) + ->join('ttrss_user_entries', [ 'ue.feed_id', '=', 'f.id'], 'ue') + ->where('ue.owner_uid', $_SESSION['uid']) + ->group_by('f.id'); - $feed_ids_qmarks = arr_qmarks($feed_ids); + if (is_array($feed_ids)) + $feeds->where_in('f.id', $feed_ids); - $sth = $pdo->prepare("SELECT f.id, - f.title, - SUBSTRING_FOR_DATE(f.last_updated,1,19) AS last_updated, - f.last_error, - SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count, - SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked - FROM ttrss_feeds f, ttrss_user_entries ue - WHERE f.id = ue.feed_id AND ue.owner_uid = ? AND f.id IN ($feed_ids_qmarks) - GROUP BY f.id"); - - $sth->execute([$_SESSION['uid'], ...$feed_ids]); - } else { - $sth = $pdo->prepare("SELECT f.id, - f.title, - SUBSTRING_FOR_DATE(f.last_updated,1,19) AS last_updated, - f.last_error, - SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count, - SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked - FROM ttrss_feeds f, ttrss_user_entries ue - WHERE f.id = ue.feed_id AND ue.owner_uid = :uid - GROUP BY f.id"); - - $sth->execute(["uid" => $_SESSION['uid']]); - } - - while ($line = $sth->fetch()) { - - $id = $line["id"]; - $last_updated = TimeHelper::make_local_datetime($line['last_updated']); - - if (Feeds::_has_icon($id)) { - $ts = filemtime(Feeds::_get_icon_file($id)); - } else { - $ts = 0; - } - - $cv = [ - "id" => $id, - "updated" => $last_updated, - "counter" => (int) $line["count"], - "markedcounter" => (int) $line["count_marked"], - "ts" => (int) $ts + foreach ($feeds->find_many() as $feed) { + $ret[] = [ + 'id' => $feed->id, + 'title' => truncate_string($feed->title, 30), + 'error' => $feed->last_error, + 'updated' => TimeHelper::make_local_datetime($feed->last_updated), + 'counter' => (int) $feed->count, + 'markedcounter' => (int) $feed->count_marked, + 'ts' => Feeds::_has_icon($feed->id) ? (int) filemtime(Feeds::_get_icon_file($feed->id)) : 0, ]; - - $cv["error"] = $line["last_error"]; - $cv["title"] = truncate_string($line["title"], 30); - - array_push($ret, $cv); - } return $ret; From adf71f09a924de1113f6b25e8e3d480a971ee698 Mon Sep 17 00:00:00 2001 From: wn_ Date: Sun, 18 May 2025 15:46:35 +0000 Subject: [PATCH 4/6] Use ORM in remaining parts of 'Pref_Users'. --- classes/Pref_Users.php | 70 ++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 43 deletions(-) diff --git a/classes/Pref_Users.php b/classes/Pref_Users.php index 8c54010ee..6f220c441 100644 --- a/classes/Pref_Users.php +++ b/classes/Pref_Users.php @@ -6,7 +6,7 @@ class Pref_Users extends Handler_Administrative { function edit(): void { $user = ORM::for_table('ttrss_users') - ->select_expr("id,login,access_level,email,full_name,otp_enabled") + ->select_many('id', 'login', 'access_level', 'email', 'full_name', 'otp_enabled') ->find_one((int)$_REQUEST["id"]) ->as_array(); @@ -23,30 +23,25 @@ class Pref_Users extends Handler_Administrative { function userdetails(): void { $id = (int) clean($_REQUEST["id"]); - $sth = $this->pdo->prepare("SELECT login, - SUBSTRING_FOR_DATE(last_login,1,16) AS last_login, - access_level, - (SELECT COUNT(int_id) FROM ttrss_user_entries - WHERE owner_uid = id) AS stored_articles, - SUBSTRING_FOR_DATE(created,1,16) AS created - FROM ttrss_users - WHERE id = ?"); - $sth->execute([$id]); + $user = ORM::for_table('ttrss_users') + ->table_alias('u') + ->select_many('u.login', 'u.access_level') + ->select_many_expr([ + 'created' => 'SUBSTRING_FOR_DATE(u.created,1,16)', + 'last_login' => 'SUBSTRING_FOR_DATE(u.last_login,1,16)', + 'stored_articles' => '(SELECT COUNT(ue.int_id) FROM ttrss_user_entries ue WHERE ue.owner_uid = u.id)', + ]) + ->find_one($id); - if ($row = $sth->fetch()) { + if ($user) { + $created = TimeHelper::make_local_datetime($user->created); + $last_login = TimeHelper::make_local_datetime($user->last_login); - $last_login = TimeHelper::make_local_datetime($row['last_login']); - - $created = TimeHelper::make_local_datetime($row['created']); - - $stored_articles = $row["stored_articles"]; - - $sth = $this->pdo->prepare("SELECT COUNT(id) as num_feeds FROM ttrss_feeds - WHERE owner_uid = ?"); - $sth->execute([$id]); - $row = $sth->fetch(); - - $num_feeds = $row["num_feeds"]; + $user_owned_feeds = ORM::for_table('ttrss_feeds') + ->select_many('id', 'title', 'site_url') + ->where('owner_uid', $id) + ->order_by_expr('LOWER(title)') + ->find_many(); ?> @@ -62,31 +57,25 @@ class Pref_Users extends Handler_Administrative {

- +
- + stored_articles ?>
- pdo->prepare("SELECT id,title,site_url FROM ttrss_feeds - WHERE owner_uid = ? ORDER BY title"); - $sth->execute([$id]); - ?> -