From 41a7a066eff0c4914720685c38fa282e99d79041 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 11 Jul 2013 14:11:41 +0400 Subject: share: move unsharing all articles into the plugin --- classes/rpc.php | 8 -------- 1 file changed, 8 deletions(-) (limited to 'classes/rpc.php') diff --git a/classes/rpc.php b/classes/rpc.php index 46583feb5..9cc8e7046 100644 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -467,14 +467,6 @@ class RPC extends Handler_Protected { print_feed_cat_select("cat_id", $id, ''); } - // Silent - function clearArticleKeys() { - $this->dbh->query("UPDATE ttrss_user_entries SET uuid = '' WHERE - owner_uid = " . $_SESSION["uid"]); - - return; - } - function setpanelmode() { $wide = (int) $_REQUEST["wide"]; -- cgit v1.2.3 From 113c3dec9e02f48df22cda107257d15655e3f007 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 24 Jul 2013 12:55:10 +0400 Subject: make globalUpdateFeeds handler use simple update mechanism to prevent script timeouts --- classes/rpc.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'classes/rpc.php') diff --git a/classes/rpc.php b/classes/rpc.php index 9cc8e7046..cfd9c4f22 100644 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -476,7 +476,8 @@ class RPC extends Handler_Protected { print json_encode(array("wide" => $wide)); } - function updaterandomfeed() { + static function updaterandomfeed_real($dbh) { + // Test if the feed need a update (update interval exceded). if (DB_TYPE == "pgsql") { $update_limit_qpart = "AND (( @@ -508,7 +509,7 @@ class RPC extends Handler_Protected { $random_qpart = sql_random_function(); // We search for feed needing update. - $result = $this->dbh->query("SELECT ttrss_feeds.feed_url,ttrss_feeds.id + $result = $dbh->query("SELECT ttrss_feeds.feed_url,ttrss_feeds.id FROM ttrss_feeds, ttrss_users, ttrss_user_prefs WHERE @@ -527,7 +528,7 @@ class RPC extends Handler_Protected { $tstart = time(); - while ($line = $this->dbh->fetch_assoc($result)) { + while ($line = $dbh->fetch_assoc($result)) { $feed_id = $line["id"]; if (time() - $tstart < ini_get("max_execution_time") * 0.7) { @@ -551,6 +552,10 @@ class RPC extends Handler_Protected { } + function updaterandomfeed() { + RPC::updaterandomfeed_real($this->dbh); + } + private function markArticlesById($ids, $cmode) { $tmp_ids = array(); -- cgit v1.2.3 From e1f1857d95be8c226c67b588a21c78c964c8e3b0 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 25 Aug 2013 17:34:27 +0400 Subject: fix globalUpdateFeeds failing when no active session exists --- classes/rpc.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'classes/rpc.php') diff --git a/classes/rpc.php b/classes/rpc.php index cfd9c4f22..7d55e6ba8 100644 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -508,6 +508,13 @@ class RPC extends Handler_Protected { $random_qpart = sql_random_function(); + // we could be invoked from public.php with no active session + if ($_SESSION["uid"]) { + $owner_check_qpart = "AND ttrss_feeds.owner_uid = '".$_SESSION["uid"]."'"; + } else { + $owner_check_qpart = ""; + } + // We search for feed needing update. $result = $dbh->query("SELECT ttrss_feeds.feed_url,ttrss_feeds.id FROM @@ -516,8 +523,9 @@ class RPC extends Handler_Protected { ttrss_feeds.owner_uid = ttrss_users.id AND ttrss_users.id = ttrss_user_prefs.owner_uid AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL' - AND ttrss_feeds.owner_uid = ".$_SESSION["uid"]." - $update_limit_qpart $updstart_thresh_qpart + $owner_check_qpart + $update_limit_qpart + $updstart_thresh_qpart ORDER BY $random_qpart LIMIT 30"); $feed_id = -1; -- cgit v1.2.3 From 4a80c57c50a474c57ba76eb75c1f01daf6e7f121 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 19 Feb 2014 15:42:52 +0400 Subject: remove some unused code reported by phpmd --- classes/rpc.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'classes/rpc.php') diff --git a/classes/rpc.php b/classes/rpc.php index 7d55e6ba8..b4de44a74 100644 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -95,7 +95,7 @@ class RPC extends Handler_Protected { WHERE orig_feed_id = '$id') = 0 AND id = '$id' AND owner_uid = ".$_SESSION["uid"]); - $rc = $this->dbh->affected_rows($result); + $this->dbh->affected_rows($result); } } @@ -138,7 +138,7 @@ class RPC extends Handler_Protected { $mark = "false"; } - $result = $this->dbh->query("UPDATE ttrss_user_entries SET marked = $mark, + $this->dbh->query("UPDATE ttrss_user_entries SET marked = $mark, last_marked = NOW() WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]); @@ -148,8 +148,8 @@ class RPC extends Handler_Protected { function delete() { $ids = $this->dbh->escape_string($_REQUEST["ids"]); - $result = $this->dbh->query("DELETE FROM ttrss_user_entries - WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]); + $this->dbh->query("DELETE FROM ttrss_user_entries + WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]); purge_orphans(); @@ -258,7 +258,6 @@ class RPC extends Handler_Protected { function publ() { $pub = $_REQUEST["pub"]; $id = $this->dbh->escape_string($_REQUEST["id"]); - $note = trim(strip_tags($this->dbh->escape_string($_REQUEST["note"]))); if ($pub == "1") { $pub = "true"; @@ -266,7 +265,7 @@ class RPC extends Handler_Protected { $pub = "false"; } - $result = $this->dbh->query("UPDATE ttrss_user_entries SET + $this->dbh->query("UPDATE ttrss_user_entries SET published = $pub, last_published = NOW() WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]); @@ -620,7 +619,7 @@ class RPC extends Handler_Protected { $p = new Publisher(PUBSUBHUBBUB_HUB); - $pubsub_result = $p->publish_update($rss_link); + /* $pubsub_result = */ $p->publish_update($rss_link); } } -- cgit v1.2.3