summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rwxr-xr-xclasses/article.php2
-rw-r--r--classes/diskcache.php2
-rwxr-xr-xclasses/feeds.php78
-rwxr-xr-xclasses/handler/public.php19
-rwxr-xr-xclasses/pluginhost.php12
-rwxr-xr-xclasses/pref/feeds.php53
-rw-r--r--classes/pref/prefs.php2
-rwxr-xr-xclasses/rpc.php175
-rwxr-xr-xclasses/rssutils.php15
-rw-r--r--classes/userhelper.php4
10 files changed, 64 insertions, 298 deletions
diff --git a/classes/article.php b/classes/article.php
index 5527b7253..3a58f4576 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -29,7 +29,7 @@ class Article extends Handler_Protected {
if (!$content) {
$pluginhost = new PluginHost();
$pluginhost->load_all(PluginHost::KIND_ALL, $owner_uid);
- $pluginhost->load_data();
+ //$pluginhost->load_data();
foreach ($pluginhost->get_hooks(PluginHost::HOOK_GET_FULL_TEXT) as $p) {
$extracted_content = $p->hook_get_full_text($url);
diff --git a/classes/diskcache.php b/classes/diskcache.php
index c56dc6f14..daa171bf6 100644
--- a/classes/diskcache.php
+++ b/classes/diskcache.php
@@ -395,7 +395,7 @@ class DiskCache {
$tmppluginhost = new PluginHost();
$tmppluginhost->load(PLUGINS, PluginHost::KIND_SYSTEM);
- $tmppluginhost->load_data();
+ //$tmppluginhost->load_data();
foreach ($tmppluginhost->get_hooks(PluginHost::HOOK_SEND_LOCAL_FILE) as $plugin) {
if ($plugin->hook_send_local_file($filename)) return true;
diff --git a/classes/feeds.php b/classes/feeds.php
index 744c463af..2015f2435 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -61,54 +61,42 @@ class Feeds extends Handler_Protected {
$reply .= "<span class=\"right\">";
$reply .= "<span id='selected_prompt'></span>";
$reply .= "&nbsp;";
- $reply .= "<select dojoType=\"fox.form.Select\"
- onchange=\"Headlines.onActionChanged(this)\">";
- $reply .= "<option value=\"0\" disabled='1'>".__('Select...')."</option>";
-
- $reply .= "<option value=\"Headlines.select('all')\">".__('All')."</option>";
- $reply .= "<option value=\"Headlines.select('unread')\">".__('Unread')."</option>";
- $reply .= "<option value=\"Headlines.select('invert')\">".__('Invert')."</option>";
- $reply .= "<option value=\"Headlines.select('none')\">".__('None')."</option>";
-
- $reply .= "<option value=\"0\" disabled=\"1\">".__('Selection toggle:')."</option>";
-
- $reply .= "<option value=\"Headlines.selectionToggleUnread()\">".__('Unread')."</option>
- <option value=\"Headlines.selectionToggleMarked()\">".__('Starred')."</option>
- <option value=\"Headlines.selectionTogglePublished()\">".__('Published')."</option>";
-
- $reply .= "<option value=\"0\" disabled=\"1\">".__('Selection:')."</option>";
-
- $reply .= "<option value=\"Headlines.catchupSelection()\">".__('Mark as read')."</option>";
- $reply .= "<option value=\"Article.selectionSetScore()\">".__('Set score')."</option>";
-
- if ($feed_id == 0 && !$is_cat) {
- $reply .= "<option value=\"Headlines.archiveSelection()\">".__('Move back')."</option>";
- $reply .= "<option value=\"Headlines.deleteSelection()\">".__('Delete')."</option>";
- } else {
- $reply .= "<option value=\"Headlines.archiveSelection()\">".__('Archive')."</option>";
- }
+ $reply .= "<div dojoType='fox.form.DropDownButton' title='".__('Select articles')."'>
+ <span>".__("Select...")."</span>
+ <div dojoType='dijit.Menu' style='display: none;'>
+ <div dojoType='dijit.MenuItem' onclick='Headlines.select(\"all\")'>".__('All')."</div>
+ <div dojoType='dijit.MenuItem' onclick='Headlines.select(\"unread\")'>".__('Unread')."</div>
+ <div dojoType='dijit.MenuItem' onclick='Headlines.select(\"invert\")'>".__('Invert')."</div>
+ <div dojoType='dijit.MenuItem' onclick='Headlines.select(\"none\")'>".__('None')."</div>
+ <div dojoType='dijit.MenuSeparator'></div>
+ <div dojoType='dijit.MenuItem' onclick='Headlines.selectionToggleUnread()'>".__('Toggle unread')."</div>
+ <div dojoType='dijit.MenuItem' onclick='Headlines.selectionToggleMarked()'>".__('Toggle starred')."</div>
+ <div dojoType='dijit.MenuItem' onclick='Headlines.selectionTogglePublished()'>".__('Toggle published')."</div>
+ <div dojoType='dijit.MenuSeparator'></div>
+ <div dojoType='dijit.MenuItem' onclick='Headlines.catchupSelection()'>".__('Mark as read')."</div>
+ <div dojoType='dijit.MenuItem' onclick='Article.selectionSetScore()'>".__('Set score')."</div>";
if (PluginHost::getInstance()->get_plugin("mail")) {
- $reply .= "<option value=\"Plugins.Mail.send()\">".__('Forward by email').
- "</option>";
+ $reply .= "<div dojoType='dijit.MenuItem' value='Plugins.Mail.send()'>".__('Forward by email')."</div>";
}
if (PluginHost::getInstance()->get_plugin("mailto")) {
- $reply .= "<option value=\"Plugins.Mailto.send()\">".__('Forward by email').
- "</option>";
+ $reply .= "<div dojoType='dijit.MenuItem' value='Plugins.Mailto.send()'>".__('Forward by email')."</div>";
}
- $reply .= "<option value=\"0\" disabled=\"1\">".__('Feed:')."</option>";
+ foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HEADLINE_TOOLBAR_SELECT_MENU_ITEM) as $p) {
+ $reply .= $p->hook_headline_toolbar_select_menu_item($feed_id, $is_cat);
+ }
- //$reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>";
-
- $reply .= "<option value=\"App.displayDlg('".__("Show as feed")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">".
- __('Show as feed')."</option>";
+ if ($feed_id == 0 && !$is_cat) {
+ $reply .= "<div dojoType='dijit.MenuSeparator'></div>
+ <div dojoType='dijit.MenuItem' class='text-error' onclick='Headlines.deleteSelection()'>".__('Delete permanently')."</div>";
+ }
- $reply .= "</select>";
+ $reply .= "</div>"; /* menu */
- //$reply .= "</h2";
+ $reply .= "</div>"; /* dropdown */
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HEADLINE_TOOLBAR_BUTTON) as $p) {
$reply .= $p->hook_headline_toolbar_button($feed_id, $is_cat);
@@ -362,19 +350,6 @@ class Feeds extends Handler_Protected {
$this->mark_timestamp(" enclosures");
- if ($line["orig_feed_id"]) {
-
- $ofgh = $this->pdo->prepare("SELECT * FROM ttrss_archived_feeds
- WHERE id = ? AND owner_uid = ?");
- $ofgh->execute([$line["orig_feed_id"], $_SESSION['uid']]);
-
- if ($tmp_line = $ofgh->fetch()) {
- $line["orig_feed"] = [ $tmp_line["title"], $tmp_line["site_url"], $tmp_line["feed_url"] ];
- }
- }
-
- $this->mark_timestamp(" orig-feed-id");
-
$line["updated_long"] = TimeHelper::make_local_datetime($line["updated"],true);
$line["updated"] = TimeHelper::make_local_datetime($line["updated"], false, false, false, true);
@@ -1852,7 +1827,7 @@ class Feeds extends Handler_Protected {
uuid,
lang,
hide_images,
- unread,feed_id,marked,published,link,last_read,orig_feed_id,
+ unread,feed_id,marked,published,link,last_read,
last_marked, last_published,
$vfeed_query_part
$content_query_part
@@ -1896,7 +1871,6 @@ class Feeds extends Handler_Protected {
updated,
unread,
feed_id,
- orig_feed_id,
marked,
published,
num_comments,
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 86a82cc61..fdf55b1d2 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -45,7 +45,7 @@ class Handler_Public extends Handler {
$tmppluginhost = new PluginHost();
$tmppluginhost->load(PLUGINS, PluginHost::KIND_ALL);
$tmppluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
- $tmppluginhost->load_data();
+ //$tmppluginhost->load_data();
$handler = $tmppluginhost->get_feed_handler(
PluginHost::feed_to_pfeed_id($feed));
@@ -82,13 +82,14 @@ class Handler_Public extends Handler {
while ($line = $result->fetch()) {
$line["content_preview"] = Sanitizer::sanitize(truncate_string(strip_tags($line["content"]), 100, '...'));
+ $line["tags"] = Article::get_article_tags($line["id"], $owner_uid);
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
$line = $p->hook_query_headlines($line);
}
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
- $line = $p->hook_article_export_feed($line, $feed, $is_cat);
+ $line = $p->hook_article_export_feed($line, $feed, $is_cat, $owner_uid);
}
$tpl->setVariable('ARTICLE_ID',
@@ -121,9 +122,7 @@ class Handler_Public extends Handler {
$tpl->setVariable('ARTICLE_SOURCE_LINK', htmlspecialchars($line['site_url'] ? $line["site_url"] : get_self_url_prefix()), true);
$tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title'] ? $line['feed_title'] : $feed_title), true);
- $tags = Article::get_article_tags($line["id"], $owner_uid);
-
- foreach ($tags as $tag) {
+ foreach ($line["tags"] as $tag) {
$tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag), true);
$tpl->addBlock('category');
}
@@ -181,6 +180,7 @@ class Handler_Public extends Handler {
while ($line = $result->fetch()) {
$line["content_preview"] = Sanitizer::sanitize(truncate_string(strip_tags($line["content_preview"]), 100, '...'));
+ $line["tags"] = Article::get_article_tags($line["id"], $owner_uid);
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
$line = $p->hook_query_headlines($line, 100);
@@ -202,12 +202,10 @@ class Handler_Public extends Handler {
if ($line['note']) $article['note'] = $line['note'];
if ($article['author']) $article['author'] = $line['author'];
- $tags = Article::get_article_tags($line["id"], $owner_uid);
-
- if (count($tags) > 0) {
+ if (count($line["tags"]) > 0) {
$article['tags'] = array();
- foreach ($tags as $tag) {
+ foreach ($line["tags"] as $tag) {
array_push($article['tags'], $tag);
}
}
@@ -330,7 +328,6 @@ class Handler_Public extends Handler {
tag_cache,
author,
guid,
- orig_feed_id,
note
FROM ttrss_entries,ttrss_user_entries
WHERE id = ? AND ref_id = id AND owner_uid = ?");
@@ -1248,7 +1245,7 @@ class Handler_Public extends Handler {
$method = clean($_REQUEST["pmethod"]);
$host->load($plugin_name, PluginHost::KIND_USER, 0);
- $host->load_data();
+ //$host->load_data();
$plugin = $host->get_plugin($plugin_name);
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 3ff658918..08871af51 100755
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -14,6 +14,7 @@ class PluginHost {
private $plugin_actions = array();
private $owner_uid;
private $last_registered;
+ private $data_loaded;
private static $instance;
const API_VERSION = 2;
@@ -68,6 +69,7 @@ class PluginHost {
const HOOK_ENCLOSURE_IMPORTED = 45;
const HOOK_HEADLINES_CUSTOM_SORT_MAP = 46;
const HOOK_HEADLINES_CUSTOM_SORT_OVERRIDE = 47;
+ const HOOK_HEADLINE_TOOLBAR_SELECT_MENU_ITEM = 48;
const KIND_ALL = 1;
const KIND_SYSTEM = 2;
@@ -268,6 +270,8 @@ class PluginHost {
}
}
}
+
+ $this->load_data();
}
function is_system($plugin) {
@@ -352,8 +356,8 @@ class PluginHost {
}
}
- function load_data() {
- if ($this->owner_uid) {
+ private function load_data() {
+ if ($this->owner_uid && !$this->data_loaded && get_schema_version() > 100) {
$sth = $this->pdo->prepare("SELECT name, content FROM ttrss_plugin_storage
WHERE owner_uid = ?");
$sth->execute([$this->owner_uid]);
@@ -361,6 +365,8 @@ class PluginHost {
while ($line = $sth->fetch()) {
$this->storage[$line["name"]] = unserialize($line["content"]);
}
+
+ $this->data_loaded = true;
}
}
@@ -411,6 +417,8 @@ class PluginHost {
function get($sender, $name, $default_value = false) {
$idx = get_class($sender);
+ $this->load_data();
+
if (isset($this->storage[$idx][$name])) {
return $this->storage[$idx][$name];
} else {
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index e1e88ddc0..88c5b7f0e 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1607,54 +1607,23 @@ class Pref_Feeds extends Handler_Protected {
/* save starred articles in Archived feed */
- /* prepare feed if necessary */
+ $sth = $pdo->prepare("UPDATE ttrss_user_entries SET
+ feed_id = NULL, orig_feed_id = NULL
+ WHERE feed_id = ? AND marked = true AND owner_uid = ?");
- $sth = $pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?
- AND owner_uid = ?");
$sth->execute([$id, $owner_uid]);
- if ($row = $sth->fetch()) {
- $feed_url = $row["feed_url"];
+ /* Remove access key for the feed */
- $sth = $pdo->prepare("SELECT id FROM ttrss_archived_feeds
- WHERE feed_url = ? AND owner_uid = ?");
- $sth->execute([$feed_url, $owner_uid]);
-
- if ($row = $sth->fetch()) {
- $archive_id = $row["id"];
- } else {
- $res = $pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds");
- $row = $res->fetch();
-
- $new_feed_id = (int)$row['id'] + 1;
-
- $sth = $pdo->prepare("INSERT INTO ttrss_archived_feeds
- (id, owner_uid, title, feed_url, site_url, created)
- SELECT ?, owner_uid, title, feed_url, site_url, NOW() from ttrss_feeds
- WHERE id = ?");
- $sth->execute([$new_feed_id, $id]);
-
- $archive_id = $new_feed_id;
- }
-
- $sth = $pdo->prepare("UPDATE ttrss_user_entries SET feed_id = NULL,
- orig_feed_id = ? WHERE feed_id = ? AND
- marked = true AND owner_uid = ?");
-
- $sth->execute([$archive_id, $id, $owner_uid]);
-
- /* Remove access key for the feed */
-
- $sth = $pdo->prepare("DELETE FROM ttrss_access_keys WHERE
- feed_id = ? AND owner_uid = ?");
- $sth->execute([$id, $owner_uid]);
+ $sth = $pdo->prepare("DELETE FROM ttrss_access_keys WHERE
+ feed_id = ? AND owner_uid = ?");
+ $sth->execute([$id, $owner_uid]);
- /* remove the feed */
+ /* remove the feed */
- $sth = $pdo->prepare("DELETE FROM ttrss_feeds
- WHERE id = ? AND owner_uid = ?");
- $sth->execute([$id, $owner_uid]);
- }
+ $sth = $pdo->prepare("DELETE FROM ttrss_feeds
+ WHERE id = ? AND owner_uid = ?");
+ $sth->execute([$id, $owner_uid]);
$pdo->commit();
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index bce3c171b..55a15efb8 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -911,7 +911,7 @@ class Pref_Prefs extends Handler_Protected {
$tmppluginhost = new PluginHost();
$tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"], true);
- $tmppluginhost->load_data(true);
+ //$tmppluginhost->load_data(true);
foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
$about = $plugin->about();
diff --git a/classes/rpc.php b/classes/rpc.php
index 6b41a51b8..0e881b3ce 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -80,20 +80,6 @@ class RPC extends Handler_Protected {
}
}
- // Silent
- function remarchive() {
- $ids = explode(",", clean($_REQUEST["ids"]));
-
- $sth = $this->pdo->prepare("DELETE FROM ttrss_archived_feeds WHERE
- (SELECT COUNT(*) FROM ttrss_user_entries
- WHERE orig_feed_id = :id) = 0 AND
- id = :id AND owner_uid = :uid");
-
- foreach ($ids as $id) {
- $sth->execute([":id" => $id, ":uid" => $_SESSION['uid']]);
- }
- }
-
function addfeed() {
$feed = clean($_REQUEST['feed']);
$cat = clean($_REQUEST['cat']);
@@ -150,113 +136,6 @@ class RPC extends Handler_Protected {
print json_encode(array("message" => "UPDATE_COUNTERS"));
}
- function unarchive() {
- $ids = explode(",", clean($_REQUEST["ids"]));
-
- foreach ($ids as $id) {
- $this->pdo->beginTransaction();
-
- $sth = $this->pdo->prepare("SELECT feed_url,site_url,title FROM ttrss_archived_feeds
- WHERE id = (SELECT orig_feed_id FROM ttrss_user_entries WHERE ref_id = :id
- AND owner_uid = :uid) AND owner_uid = :uid");
- $sth->execute([":uid" => $_SESSION['uid'], ":id" => $id]);
-
- if ($row = $sth->fetch()) {
- $feed_url = $row['feed_url'];
- $site_url = $row['site_url'];
- $title = $row['title'];
-
- $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
- AND owner_uid = ?");
- $sth->execute([$feed_url, $_SESSION['uid']]);
-
- if ($row = $sth->fetch()) {
- $feed_id = $row["id"];
- } else {
- if (!$title) $title = '[Unknown]';
-
- $sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
- (owner_uid,feed_url,site_url,title,cat_id,auth_login,auth_pass,update_method)
- VALUES (?, ?, ?, ?, NULL, '', '', 0)");
- $sth->execute([$_SESSION['uid'], $feed_url, $site_url, $title]);
-
- $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
- AND owner_uid = ?");
- $sth->execute([$feed_url, $_SESSION['uid']]);
-
- if ($row = $sth->fetch()) {
- $feed_id = $row['id'];
- }
- }
-
- if ($feed_id) {
- $sth = $this->pdo->prepare("UPDATE ttrss_user_entries
- SET feed_id = ?, orig_feed_id = NULL
- WHERE ref_id = ? AND owner_uid = ?");
- $sth->execute([$feed_id, $id, $_SESSION['uid']]);
- }
- }
-
- $this->pdo->commit();
- }
-
- print json_encode(array("message" => "UPDATE_COUNTERS"));
- }
-
- function archive() {
- $ids = explode(",", clean($_REQUEST["ids"]));
-
- foreach ($ids as $id) {
- $this->archive_article($id, $_SESSION["uid"]);
- }
-
- print json_encode(array("message" => "UPDATE_COUNTERS"));
- }
-
- private function archive_article($id, $owner_uid) {
- $this->pdo->beginTransaction();
-
- if (!$owner_uid) $owner_uid = $_SESSION['uid'];
-
- $sth = $this->pdo->prepare("SELECT feed_id FROM ttrss_user_entries
- WHERE ref_id = ? AND owner_uid = ?");
- $sth->execute([$id, $owner_uid]);
-
- if ($row = $sth->fetch()) {
-
- /* prepare the archived table */
-
- $feed_id = (int) $row['feed_id'];
-
- if ($feed_id) {
- $sth = $this->pdo->prepare("SELECT id FROM ttrss_archived_feeds
- WHERE id = ? AND owner_uid = ?");
- $sth->execute([$feed_id, $owner_uid]);
-
- if ($row = $sth->fetch()) {
- $new_feed_id = $row['id'];
- } else {
- $row = $this->pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds")->fetch();
- $new_feed_id = (int)$row['id'] + 1;
-
- $sth = $this->pdo->prepare("INSERT INTO ttrss_archived_feeds
- (id, owner_uid, title, feed_url, site_url, created)
- SELECT ?, owner_uid, title, feed_url, site_url, NOW() from ttrss_feeds
- WHERE id = ?");
-
- $sth->execute([$new_feed_id, $feed_id]);
- }
-
- $sth = $this->pdo->prepare("UPDATE ttrss_user_entries
- SET orig_feed_id = ?, feed_id = NULL
- WHERE ref_id = ? AND owner_uid = ?");
- $sth->execute([$new_feed_id, $id, $owner_uid]);
- }
- }
-
- $this->pdo->commit();
- }
-
function publ() {
$pub = clean($_REQUEST["pub"]);
$id = clean($_REQUEST["id"]);
@@ -347,60 +226,6 @@ class RPC extends Handler_Protected {
print "</ul>";
}
- // Silent
- function massSubscribe() {
-
- $payload = json_decode(clean($_REQUEST["payload"]), false);
- $mode = clean($_REQUEST["mode"]);
-
- if (!$payload || !is_array($payload)) return;
-
- if ($mode == 1) {
- foreach ($payload as $feed) {
-
- $title = $feed[0];
- $feed_url = $feed[1];
-
- $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
- feed_url = ? AND owner_uid = ?");
- $sth->execute([$feed_url, $_SESSION['uid']]);
-
- if (!$sth->fetch()) {
- $sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
- (owner_uid,feed_url,title,cat_id,site_url)
- VALUES (?, ?, ?, NULL, '')");
-
- $sth->execute([$_SESSION['uid'], $feed_url, $title]);
- }
- }
- } else if ($mode == 2) {
- // feed archive
- foreach ($payload as $id) {
- $sth = $this->pdo->prepare("SELECT * FROM ttrss_archived_feeds
- WHERE id = ? AND owner_uid = ?");
- $sth->execute([$id, $_SESSION['uid']]);
-
- if ($row = $sth->fetch()) {
- $site_url = $row['site_url'];
- $feed_url = $row['feed_url'];
- $title = $row['title'];
-
- $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
- feed_url = ? AND owner_uid = ?");
- $sth->execute([$feed_url, $_SESSION['uid']]);
-
- if (!$sth->fetch()) {
- $sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
- (owner_uid,feed_url,title,cat_id,site_url)
- VALUES (?, ?, ?, NULL, ?)");
-
- $sth->execute([$_SESSION['uid'], $feed_url, $title, $site_url]);
- }
- }
- }
- }
- }
-
function catchupFeed() {
$feed_id = clean($_REQUEST['feed_id']);
$is_cat = clean($_REQUEST['is_cat']) == "true";
diff --git a/classes/rssutils.php b/classes/rssutils.php
index 857bc2948..96f7b7c36 100755
--- a/classes/rssutils.php
+++ b/classes/rssutils.php
@@ -276,7 +276,7 @@ class RSSUtils {
$pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
$pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
- $pluginhost->load_data();
+ //$pluginhost->load_data();
$basic_info = array();
foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_BASIC_INFO) as $plugin) {
@@ -403,7 +403,7 @@ class RSSUtils {
$pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
$pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
- $pluginhost->load_data();
+ //$pluginhost->load_data();
$rss_hash = false;
@@ -1379,18 +1379,11 @@ class RSSUtils {
}
}
+ // deprecated; table not used
static function expire_feed_archive() {
- Debug::log("Removing old archived feeds...");
-
$pdo = Db::pdo();
- if (DB_TYPE == "pgsql") {
- $pdo->query("DELETE FROM ttrss_archived_feeds
- WHERE created < NOW() - INTERVAL '1 month'");
- } else {
- $pdo->query("DELETE FROM ttrss_archived_feeds
- WHERE created < DATE_SUB(NOW(), INTERVAL 1 MONTH)");
- }
+ $pdo->query("DELETE FROM ttrss_archived_feeds");
}
static function expire_lock_files() {
diff --git a/classes/userhelper.php b/classes/userhelper.php
index 6a80aed2b..76bb338d4 100644
--- a/classes/userhelper.php
+++ b/classes/userhelper.php
@@ -80,9 +80,9 @@ class UserHelper {
$pluginhost->load($plugins, PluginHost::KIND_USER, $owner_uid);
- if (get_schema_version() > 100) {
+ /*if (get_schema_version() > 100) {
$pluginhost->load_data();
- }
+ }*/
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-11 23:56:45 +0000