]> git.wh0rd.org - tt-rss.git/blobdiff - classes/rpc.php
js: simplify counter updating, remove some unused stuff
[tt-rss.git] / classes / rpc.php
index c55d13f9a75c3e9b71ea69ae813780adbe207c7f..5cc2235e8188eedefb448a285aaf2a116aaee46a 100644 (file)
@@ -1,8 +1,8 @@
 <?php
-class RPC extends Protected_Handler {
+class RPC extends Handler_Protected {
 
        function csrf_ignore($method) {
-               $csrf_ignored = array("sanitycheck", "buttonplugin", "exportget");
+               $csrf_ignored = array("sanitycheck", "completelabels");
 
                return array_search($method, $csrf_ignored) !== false;
        }
@@ -14,84 +14,6 @@ class RPC extends Protected_Handler {
                $_SESSION["prefs_cache"] = array();
        }
 
-       function exportget() {
-               $exportname = CACHE_DIR . "/export/" .
-                       sha1($_SESSION['uid'] . $_SESSION['login']) . ".xml";
-
-               if (file_exists($exportname)) {
-                       header("Content-type: text/xml");
-                       header("Content-Disposition: attachment; filename=TinyTinyRSS_exported.xml.gz");
-
-                       echo gzencode(file_get_contents($exportname));
-               } else {
-                       echo "File not found.";
-               }
-       }
-
-       function exportrun() {
-               $offset = (int) db_escape_string($_REQUEST['offset']);
-               $exported = 0;
-               $limit = 250;
-
-               if ($offset < 10000 && is_writable(CACHE_DIR . "/export")) {
-                       $result = db_query($this->link, "SELECT
-                                       ttrss_entries.guid,
-                                       ttrss_entries.title,
-                                       content,
-                                       marked,
-                                       published,
-                                       score,
-                                       note,
-                                       link,
-                                       tag_cache,
-                                       label_cache,
-                                       ttrss_feeds.title AS feed_title,
-                                       ttrss_feeds.feed_url AS feed_url,
-                                       ttrss_entries.updated
-                               FROM
-                                       ttrss_user_entries LEFT JOIN ttrss_feeds ON (ttrss_feeds.id = feed_id),
-                                       ttrss_entries
-                               WHERE
-                                       (marked = true OR feed_id IS NULL) AND
-                                       ref_id = ttrss_entries.id AND
-                                       ttrss_user_entries.owner_uid = " . $_SESSION['uid'] . "
-                               ORDER BY ttrss_entries.id LIMIT $limit OFFSET $offset");
-
-                       $exportname = sha1($_SESSION['uid'] . $_SESSION['login']);
-
-                       if ($offset == 0) {
-                               $fp = fopen(CACHE_DIR . "/export/$exportname.xml", "w");
-                               fputs($fp, "<articles schema-version=\"".SCHEMA_VERSION."\">");
-                       } else {
-                               $fp = fopen(CACHE_DIR . "/export/$exportname.xml", "a");
-                       }
-
-                       if ($fp) {
-
-                               while ($line = db_fetch_assoc($result)) {
-                                       fputs($fp, "<article>");
-
-                                       foreach ($line as $k => $v) {
-                                               fputs($fp, "<$k><![CDATA[$v]]></$k>");
-                                       }
-
-                                       fputs($fp, "</article>");
-                               }
-
-                               $exported = db_num_rows($result);
-
-                               if ($exported < $limit && $exported > 0) {
-                                       fputs($fp, "</articles>");
-                               }
-
-                               fclose($fp);
-                       }
-
-               }
-
-               print json_encode(array("exported" => $exported));
-       }
-
        function remprofiles() {
                $ids = explode(",", db_escape_string(trim($_REQUEST["ids"])));
 
@@ -183,18 +105,13 @@ class RPC extends Protected_Handler {
                $cat = db_escape_string($_REQUEST['cat']);
                $login = db_escape_string($_REQUEST['login']);
                $pass = db_escape_string($_REQUEST['pass']);
+               $need_auth = db_escape_string($_REQUEST['need_auth']) != "";
 
-               $rc = subscribe_to_feed($this->link, $feed, $cat, $login, $pass);
+               $rc = subscribe_to_feed($this->link, $feed, $cat, $login, $pass, $need_auth);
 
                print json_encode(array("result" => $rc));
        }
 
-       function extractfeedurls() {
-               $urls = get_feeds_from_html($_REQUEST['url']);
-
-               print json_encode(array("urls" => $urls));
-       }
-
        function togglepref() {
                $key = db_escape_string($_REQUEST["key"]);
                set_pref($this->link, $key, !get_pref($this->link, $key));
@@ -204,12 +121,11 @@ class RPC extends Protected_Handler {
        }
 
        function setpref() {
+               // set_pref escapes input, so no need to double escape it here
+               $key = $_REQUEST['key'];
                $value = str_replace("\n", "<br/>", $_REQUEST['value']);
 
-               $key = db_escape_string($_REQUEST["key"]);
-               $value = db_escape_string($value);
-
-               set_pref($this->link, $key, $value);
+               set_pref($this->link, $key, $value, $_SESSION['uid'], $key != 'USER_STYLESHEET');
 
                print json_encode(array("param" =>$key, "value" => $value));
        }
@@ -253,12 +169,44 @@ class RPC extends Protected_Handler {
                $ids = explode(",", db_escape_string($_REQUEST["ids"]));
 
                foreach ($ids as $id) {
-                       archive_article($this->link, $id, $_SESSION["uid"]);
+                       $this->archive_article($this->link, $id, $_SESSION["uid"]);
                }
 
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
 
+       private function archive_article($link, $id, $owner_uid) {
+               db_query($link, "BEGIN");
+
+               $result = db_query($link, "SELECT feed_id FROM ttrss_user_entries
+                       WHERE ref_id = '$id' AND owner_uid = $owner_uid");
+
+               if (db_num_rows($result) != 0) {
+
+                       /* prepare the archived table */
+
+                       $feed_id = (int) db_fetch_result($result, 0, "feed_id");
+
+                       if ($feed_id) {
+                               $result = db_query($link, "SELECT id FROM ttrss_archived_feeds
+                                       WHERE id = '$feed_id'");
+
+                               if (db_num_rows($result) == 0) {
+                                       db_query($link, "INSERT INTO ttrss_archived_feeds
+                                               (id, owner_uid, title, feed_url, site_url)
+                                       SELECT id, owner_uid, title, feed_url, site_url from ttrss_feeds
+                                       WHERE id = '$feed_id'");
+                               }
+
+                               db_query($link, "UPDATE ttrss_user_entries
+                                       SET orig_feed_id = feed_id, feed_id = NULL
+                                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+                       }
+               }
+
+               db_query($link, "COMMIT");
+       }
+
        function publ() {
                $pub = $_REQUEST["pub"];
                $id = db_escape_string($_REQUEST["id"]);
@@ -271,7 +219,7 @@ class RPC extends Protected_Handler {
                }
 
                $result = db_query($this->link, "UPDATE ttrss_user_entries SET
-                       published = $pub
+                       published = $pub, last_read = NOW()
                        WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
                $pubsub_result = false;
@@ -295,20 +243,15 @@ class RPC extends Protected_Handler {
 
                $reply = array();
 
-                if ($seq) $reply['seq'] = $seq;
-
-                if ($last_article_id != getLastArticleId($this->link)) {
-                               $omode = $_REQUEST["omode"];
+               if ($seq) $reply['seq'] = $seq;
 
-                       if ($omode != "T")
-                               $reply['counters'] = getAllCounters($this->link, $omode);
-                       else
-                               $reply['counters'] = getGlobalCounters($this->link);
-                }
+               if ($last_article_id != getLastArticleId($this->link)) {
+                       $reply['counters'] = getAllCounters($this->link);
+               }
 
-                $reply['runtime-info'] = make_runtime_info($this->link);
+               $reply['runtime-info'] = make_runtime_info($this->link);
 
-                print json_encode($reply);
+               print json_encode($reply);
        }
 
        /* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
@@ -325,7 +268,7 @@ class RPC extends Protected_Handler {
                $ids = explode(",", db_escape_string($_REQUEST["ids"]));
                $cmode = sprintf("%d", $_REQUEST["cmode"]);
 
-               markArticlesById($this->link, $ids, $cmode);
+               $this->markArticlesById($this->link, $ids, $cmode);
 
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
@@ -334,7 +277,7 @@ class RPC extends Protected_Handler {
                $ids = explode(",", db_escape_string($_REQUEST["ids"]));
                $cmode = sprintf("%d", $_REQUEST["cmode"]);
 
-               publishArticlesById($this->link, $ids, $cmode);
+               $this->publishArticlesById($this->link, $ids, $cmode);
 
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
@@ -355,7 +298,6 @@ class RPC extends Protected_Handler {
        }
 
        function setArticleTags() {
-               global $memcache;
 
                $id = db_escape_string($_REQUEST["id"]);
 
@@ -409,11 +351,6 @@ class RPC extends Protected_Handler {
 
                db_query($this->link, "COMMIT");
 
-               if ($memcache) {
-                       $obj_id = md5("TAGS:".$_SESSION["uid"].":$id");
-                       $memcache->delete($obj_id);
-               }
-
                $tags = get_article_tags($this->link, $id);
                $tags_str = format_tags_string($tags, $id);
                $tags_str_full = join(", ", $tags);
@@ -425,14 +362,31 @@ class RPC extends Protected_Handler {
        }
 
        function regenOPMLKey() {
-               update_feed_access_key($this->link, 'OPML:Publish',
+               $this->update_feed_access_key($this->link, 'OPML:Publish',
                false, $_SESSION["uid"]);
 
-               $new_link = opml_publish_url($this->link);
+               $new_link = Opml::opml_publish_url($this->link);
 
                print json_encode(array("link" => $new_link));
        }
 
+       function completeLabels() {
+               $search = db_escape_string($_REQUEST["search"]);
+
+               $result = db_query($this->link, "SELECT DISTINCT caption FROM
+                               ttrss_labels2
+                               WHERE owner_uid = '".$_SESSION["uid"]."' AND
+                               LOWER(caption) LIKE LOWER('$search%') ORDER BY caption
+                               LIMIT 5");
+
+               print "<ul>";
+               while ($line = db_fetch_assoc($result)) {
+                       print "<li>" . $line["caption"] . "</li>";
+               }
+               print "</ul>";
+       }
+
+
        function completeTags() {
                $search = db_escape_string($_REQUEST["search"]);
 
@@ -530,6 +484,8 @@ class RPC extends Protected_Handler {
                $limit = db_escape_string($_REQUEST["limit"]);
                $mode = (int) db_escape_string($_REQUEST["mode"]);
 
+               require_once "feedbrowser.php";
+
                print json_encode(array("content" =>
                        make_feed_browser($this->link, $search, $limit, $mode),
                                "mode" => $mode));
@@ -584,65 +540,12 @@ class RPC extends Protected_Handler {
                }
        }
 
-       function digestgetcontents() {
-               $article_id = db_escape_string($_REQUEST['article_id']);
-
-               $result = db_query($this->link, "SELECT content,title,link,marked,published
-                       FROM ttrss_entries, ttrss_user_entries
-                       WHERE id = '$article_id' AND ref_id = id AND owner_uid = ".$_SESSION['uid']);
-
-               $content = sanitize($this->link, db_fetch_result($result, 0, "content"));
-               $title = strip_tags(db_fetch_result($result, 0, "title"));
-               $article_url = htmlspecialchars(db_fetch_result($result, 0, "link"));
-               $marked = sql_bool_to_bool(db_fetch_result($result, 0, "marked"));
-               $published = sql_bool_to_bool(db_fetch_result($result, 0, "published"));
-
-               print json_encode(array("article" =>
-                       array("id" => $article_id, "url" => $article_url,
-                               "tags" => get_article_tags($this->link, $article_id),
-                               "marked" => $marked, "published" => $published,
-                               "title" => $title, "content" => $content)));
-       }
-
-       function digestupdate() {
-               $feed_id = db_escape_string($_REQUEST['feed_id']);
-               $offset = db_escape_string($_REQUEST['offset']);
-               $seq = db_escape_string($_REQUEST['seq']);
-
-               if (!$feed_id) $feed_id = -4;
-               if (!$offset) $offset = 0;
-
-               $reply = array();
-
-               $reply['seq'] = $seq;
-
-               $headlines = api_get_headlines($this->link, $feed_id, 30, $offset,
-                               '', ($feed_id == -4), true, false, "unread", "updated DESC", 0, 0);
-
-               $reply['headlines'] = array();
-               $reply['headlines']['title'] = getFeedTitle($this->link, $feed_id);
-               $reply['headlines']['content'] = $headlines;
-
-               print json_encode($reply);
-       }
-
-       function digestinit() {
-               $tmp_feeds = api_get_feeds($this->link, -4, true, false, 0);
-
-               $feeds = array();
-
-               foreach ($tmp_feeds as $f) {
-                       if ($f['id'] > 0 || $f['id'] == -4) array_push($feeds, $f);
-               }
-
-               print json_encode(array("feeds" => $feeds));
-       }
-
        function catchupFeed() {
                $feed_id = db_escape_string($_REQUEST['feed_id']);
                $is_cat = db_escape_string($_REQUEST['is_cat']) == "true";
+               $max_id = (int) db_escape_string($_REQUEST['max_id']);
 
-               catchup_feed($this->link, $feed_id, $is_cat);
+               catchup_feed($this->link, $feed_id, $is_cat, false, $max_id);
 
                print json_encode(array("message" => "UPDATE_COUNTERS"));
        }
@@ -668,7 +571,7 @@ class RPC extends Protected_Handler {
                $feed_id = db_escape_string($_REQUEST['id']);
                $is_cat = db_escape_string($_REQUEST['is_cat']) == "true";
 
-               $new_key = update_feed_access_key($this->link, $feed_id, $is_cat);
+               $new_key = $this->update_feed_access_key($this->link, $feed_id, $is_cat);
 
                print json_encode(array("link" => $new_key));
        }
@@ -687,7 +590,6 @@ class RPC extends Protected_Handler {
                return;
        }
 
-
        function verifyRegexp() {
                $reg_exp = $_REQUEST["reg_exp"];
 
@@ -696,91 +598,233 @@ class RPC extends Protected_Handler {
                print json_encode(array("status" => $status));
        }
 
-       // TODO: unify with digest-get-contents?
-       function cdmGetArticle() {
-               $ids = array(db_escape_string($_REQUEST["id"]));
-               $cids = explode(",", $_REQUEST["cids"]);
+       /* function buttonPlugin() {
+               $pclass = "button_" . basename($_REQUEST['plugin']);
+               $method = $_REQUEST['plugin_method'];
+
+               if (class_exists($pclass)) {
+                       $plugin = new $pclass($this->link);
+                       if (method_exists($plugin, $method)) {
+                               return $plugin->$method();
+                       }
+               }
+       } */
+
+       function genHash() {
+               $hash = sha1(uniqid(rand(), true));
+
+               print json_encode(array("hash" => $hash));
+       }
+
+       function batchAddFeeds() {
+               $cat_id = db_escape_string($_REQUEST['cat']);
+               $feeds = explode("\n", db_escape_string($_REQUEST['feeds']));
+               $login = db_escape_string($_REQUEST['login']);
+               $pass = db_escape_string($_REQUEST['pass']);
+               $need_auth = db_escape_string($_REQUEST['need_auth']) != "";
 
-               $ids = array_merge($ids, $cids);
+               foreach ($feeds as $feed) {
+                       $feed = trim($feed);
 
-               $rv = array();
+                       if (validate_feed_url($feed)) {
 
-               foreach ($ids as $id) {
-                       $id = (int)$id;
+                               db_query($this->link, "BEGIN");
 
-                       $result = db_query($this->link, "SELECT content,
-                                       ttrss_feeds.site_url AS site_url FROM ttrss_user_entries, ttrss_feeds,
-                                       ttrss_entries
-                                       WHERE feed_id = ttrss_feeds.id AND ref_id = '$id' AND
-                                       ttrss_entries.id = ref_id AND
-                                       ttrss_user_entries.owner_uid = ".$_SESSION["uid"]);
+                               if ($cat_id == "0" || !$cat_id) {
+                                       $cat_qpart = "NULL";
+                               } else {
+                                       $cat_qpart = "'$cat_id'";
+                               }
 
-                       if (db_num_rows($result) != 0) {
-                               $line = db_fetch_assoc($result);
+                               $result = db_query($this->link,
+                                       "SELECT id FROM ttrss_feeds
+                                       WHERE feed_url = '$feed' AND owner_uid = ".$_SESSION["uid"]);
 
-                               $article_content = sanitize($this->link, $line["content"],
-                                       false, false, $line['site_url']);
+                               if (db_num_rows($result) == 0) {
+                                       $result = db_query($this->link,
+                                               "INSERT INTO ttrss_feeds
+                                                       (owner_uid,feed_url,title,cat_id,auth_login,auth_pass,update_method)
+                                               VALUES ('".$_SESSION["uid"]."', '$feed',
+                                                       '[Unknown]', $cat_qpart, '$login', '$pass', 0)");
+                               }
 
-                               array_push($rv,
-                                       array("id" => $id, "content" => $article_content));
+                               db_query($this->link, "COMMIT");
                        }
                }
+       }
+
+       function setScore() {
+               $ids = db_escape_string($_REQUEST['id']);
+               $score = (int)db_escape_string($_REQUEST['score']);
 
-               print json_encode($rv);
+               db_query($this->link, "UPDATE ttrss_user_entries SET
+                       score = '$score' WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
+
+               print json_encode(array("id" => $id,
+                       "score_pic" => theme_image($link, get_score_pic($score))));
        }
 
-       function scheduleFeedUpdate() {
-               $feed_id = db_escape_string($_REQUEST["id"]);
-               $is_cat =  db_escape_string($_REQUEST['is_cat']) == 'true';
+       function setpanelmode() {
+               $wide = (int) $_REQUEST["wide"];
 
-               $message = __("Your request could not be completed.");
+               $_SESSION["widescreen"] = $wide;
 
-               if ($feed_id >= 0) {
-                       if (!$is_cat) {
-                               $message = __("Feed update has been scheduled.");
+               print json_encode(array("wide" => $wide));
+       }
 
-                               db_query($this->link, "UPDATE ttrss_feeds SET
-                                       last_update_started = '1970-01-01',
-                                       last_updated = '1970-01-01' WHERE id = '$feed_id' AND
-                                       owner_uid = ".$_SESSION["uid"]);
+       function updaterandomfeed() {
+               // Test if the feed need a update (update interval exceded).
+               if (DB_TYPE == "pgsql") {
+                       $update_limit_qpart = "AND ((
+                                       ttrss_feeds.update_interval = 0
+                                       AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
+                               ) OR (
+                                       ttrss_feeds.update_interval > 0
+                                       AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL)
+                               ) OR ttrss_feeds.last_updated IS NULL
+                               OR last_updated = '1970-01-01 00:00:00')";
+               } else {
+                       $update_limit_qpart = "AND ((
+                                       ttrss_feeds.update_interval = 0
+                                       AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE)
+                               ) OR (
+                                       ttrss_feeds.update_interval > 0
+                                       AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE)
+                               ) OR ttrss_feeds.last_updated IS NULL
+                               OR last_updated = '1970-01-01 00:00:00')";
+               }
 
-                       } else {
-                               $message = __("Category update has been scheduled.");
+               // Test if feed is currently being updated by another process.
+               if (DB_TYPE == "pgsql") {
+                       $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '5 minutes')";
+               } else {
+                       $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 5 MINUTE))";
+               }
 
-                               if ($feed_id)
-                               $cat_query = "cat_id = '$feed_id'";
-                               else
-                               $cat_query = "cat_id IS NULL";
+               $random_qpart = sql_random_function();
+
+               // We search for feed needing update.
+               $result = db_query($this->link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id
+                       FROM
+                               ttrss_feeds, ttrss_users, ttrss_user_prefs
+                       WHERE
+                               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
+                       ORDER BY $random_qpart LIMIT 30");
+
+               $feed_id = -1;
+
+               require_once "rssfuncs.php";
 
-                               db_query($this->link, "UPDATE ttrss_feeds SET
-                                               last_update_started = '1970-01-01',
-                                               last_updated = '1970-01-01' WHERE $cat_query AND
-                                               owner_uid = ".$_SESSION["uid"]);
+               $num_updated = 0;
+
+               $tstart = time();
+
+               while ($line = db_fetch_assoc($result)) {
+                       $feed_id = $line["id"];
+
+                       if (time() - $tstart < ini_get("max_execution_time") * 0.7) {
+                               update_rss_feed($this->link, $feed_id, true);
+                               ++$num_updated;
+                       } else {
+                               break;
                        }
+               }
+
+               if ($num_updated > 0) {
+                       print json_encode(array("message" => "UPDATE_COUNTERS",
+                               "num_updated" => $num_updated));
                } else {
-                       $message = __("Can't update this kind of feed.");
+                       print json_encode(array("message" => "NOTHING_TO_UPDATE"));
                }
 
-               print json_encode(array("message" => $message));
-               return;
        }
 
-       function buttonPlugin() {
-               $pclass = basename($_REQUEST['plugin']) . "_button";
-               $method = $_REQUEST['plugin_method'];
+       function update_feed_access_key($link, $feed_id, $is_cat, $owner_uid = false) {
+               if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-               if (class_exists($pclass)) {
-                       $plugin = new $pclass($this->link);
-                       if (method_exists($plugin, $method)) {
-                               return $plugin->$method();
-                       }
+               $sql_is_cat = bool_to_sql_bool($is_cat);
+
+               $result = db_query($link, "SELECT access_key FROM ttrss_access_keys
+                       WHERE feed_id = '$feed_id'      AND is_cat = $sql_is_cat
+                       AND owner_uid = " . $owner_uid);
+
+               if (db_num_rows($result) == 1) {
+                       $key = db_escape_string(sha1(uniqid(rand(), true)));
+
+                       db_query($link, "UPDATE ttrss_access_keys SET access_key = '$key'
+                               WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat
+                               AND owner_uid = " . $owner_uid);
+
+                       return $key;
+
+               } else {
+                       return get_feed_access_key($link, $feed_id, $is_cat, $owner_uid);
                }
        }
 
-       function genHash() {
-               $hash = sha1(uniqid(rand(), true));
+       private function markArticlesById($link, $ids, $cmode) {
 
-               print json_encode(array("hash" => $hash));
+               $tmp_ids = array();
+
+               foreach ($ids as $id) {
+                       array_push($tmp_ids, "ref_id = '$id'");
+               }
+
+               $ids_qpart = join(" OR ", $tmp_ids);
+
+               if ($cmode == 0) {
+                       db_query($link, "UPDATE ttrss_user_entries SET
+                       marked = false,last_read = NOW()
+                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+               } else if ($cmode == 1) {
+                       db_query($link, "UPDATE ttrss_user_entries SET
+                       marked = true
+                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+               } else {
+                       db_query($link, "UPDATE ttrss_user_entries SET
+                       marked = NOT marked,last_read = NOW()
+                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+               }
        }
+
+       private function publishArticlesById($link, $ids, $cmode) {
+
+               $tmp_ids = array();
+
+               foreach ($ids as $id) {
+                       array_push($tmp_ids, "ref_id = '$id'");
+               }
+
+               $ids_qpart = join(" OR ", $tmp_ids);
+
+               if ($cmode == 0) {
+                       db_query($link, "UPDATE ttrss_user_entries SET
+                       published = false,last_read = NOW()
+                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+               } else if ($cmode == 1) {
+                       db_query($link, "UPDATE ttrss_user_entries SET
+                       published = true,last_read = NOW()
+                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+               } else {
+                       db_query($link, "UPDATE ttrss_user_entries SET
+                       published = NOT published,last_read = NOW()
+                       WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
+               }
+
+               if (PUBSUBHUBBUB_HUB) {
+                       $rss_link = get_self_url_prefix() .
+                               "/public.php?op=rss&id=-2&key=" .
+                               get_feed_access_key($link, -2, false);
+
+                       $p = new Publisher(PUBSUBHUBBUB_HUB);
+
+                       $pubsub_result = $p->publish_update($rss_link);
+               }
+       }
+
 }
 ?>