]> git.wh0rd.org - tt-rss.git/blobdiff - modules/backend-rpc.php
code cleanup; remove unnecessary callbacks; rework subscribtion dialog
[tt-rss.git] / modules / backend-rpc.php
index afcd82d3f591dc37304c0219f2780b24610a7395..e10a20de35e42e9b53fa61a7ce4f4bcbe3ed6065 100644 (file)
@@ -1,7 +1,24 @@
 <?php
        function handle_rpc_request($link) {
 
-               $subop = $_GET["subop"];
+               $subop = $_REQUEST["subop"];
+
+               if ($subop == "addfeed") {
+
+                       $feed = db_escape_string($_REQUEST['feed']);
+                       $cat = db_escape_string($_REQUEST['cat']);
+                       $login = db_escape_string($_REQUEST['login']);
+                       $pass = db_escape_string($_REQUEST['pass']);
+
+                       $rc = subscribe_to_feed($link, $feed, $cat, $login, $pass);
+
+                       print "<rpc-reply>";
+                       print "<result code='$rc'/>";
+                       print "</rpc-reply>";
+
+                       return;
+
+               }
 
                if ($subop == "setpref") {
                        if (WEB_DEMO_MODE) {
@@ -10,8 +27,8 @@
 
                        print "<rpc-reply>";
 
-                       $key = db_escape_string($_GET["key"]);
-                       $value = db_escape_string($_GET["value"]);
+                       $key = db_escape_string($_REQUEST["key"]);
+                       $value = db_escape_string($_REQUEST["value"]);
 
                        set_pref($link, $key, $value);
 
                        return;
                }
 
-               if ($subop == "getLabelCounters") {
-                       $aid = $_GET["aid"];            
-                       print "<rpc-reply>";
-                       print "<counters>";
-                       getLabelCounters($link);
-                       if ($aid) {
-                               getFeedCounter($link, $aid);
-                       }
-                       print "</counters>";
-                       print "</rpc-reply>";
-
-                       return;
-               }
-
-               if ($subop == "getFeedCounters") {
-                       print "<rpc-reply>";
-                       print "<counters>";
-                       getFeedCounters($link);
-                       print "</counters>";
-                       print "</rpc-reply>";
-
-                       return;
-               }
-
                if ($subop == "getAllCounters") {
                        print "<rpc-reply>";                    
                        print "<counters>";
 
-                       $omode = $_GET["omode"];
+                       $omode = $_REQUEST["omode"];
 
                        getAllCounters($link, $omode);
                        print "</counters>";
@@ -61,8 +54,8 @@
                }
 
                if ($subop == "mark") {
-                       $mark = $_GET["mark"];
-                       $id = db_escape_string($_GET["id"]);
+                       $mark = $_REQUEST["mark"];
+                       $id = db_escape_string($_REQUEST["id"]);
 
                        if ($mark == "1") {
                                $mark = "true";
@@ -77,6 +70,7 @@
 
                        print "<rpc-reply><counters>";
                        getGlobalCounters($link);
+                       getVirtCounters($link);
                        getLabelCounters($link);
                        if (get_pref($link, 'ENABLE_FEED_CATS')) {
                                getCategoryCounters($link);
                        return;
                }
 
+               if ($subop == "delete") {
+                       $ids = db_escape_string($_REQUEST["ids"]);
+
+                       $result = db_query($link, "DELETE FROM ttrss_user_entries                               
+                               WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
+
+                       print "<rpc-reply><counters>";
+                       getGlobalCounters($link);
+                       getVirtCounters($link);
+                       if (get_pref($link, 'ENABLE_FEED_CATS')) {
+                               getCategoryCounters($link);
+                       }
+                       print "</counters></rpc-reply>";
+
+                       return;
+               }
+
+               if ($subop == "unarchive") {
+                       $ids = db_escape_string($_REQUEST["ids"]);
+
+                       $result = db_query($link, "UPDATE ttrss_user_entries 
+                               SET feed_id = orig_feed_id, orig_feed_id = NULL
+                               WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
+
+                       print "<rpc-reply><counters>";
+                       getGlobalCounters($link);
+                       getVirtCounters($link);
+                       if (get_pref($link, 'ENABLE_FEED_CATS')) {
+                               getCategoryCounters($link);
+                       }
+                       print "</counters></rpc-reply>";
+
+                       return;
+               }
+
+               if ($subop == "archive") {
+                       $ids = split(",", db_escape_string($_REQUEST["ids"]));
+
+                       foreach ($ids as $id) {
+                               archive_article($link, $id, $_SESSION["uid"]);
+                       }
+
+                       print "<rpc-reply><counters>";
+                       getGlobalCounters($link);
+                       getVirtCounters($link);
+                       if (get_pref($link, 'ENABLE_FEED_CATS')) {
+                               getCategoryCounters($link);
+                       }
+                       print "</counters></rpc-reply>";
+
+                       return;
+               }
+
+
                if ($subop == "publ") {
-                       $pub = $_GET["pub"];
-                       $id = db_escape_string($_GET["id"]);
+                       $pub = $_REQUEST["pub"];
+                       $id = db_escape_string($_REQUEST["id"]);
+                       $note = trim(strip_tags(db_escape_string($_REQUEST["note"])));
 
                        if ($pub == "1") {
                                $pub = "true";
                                $pub = "false";
                        }
 
+                       if ($note != 'undefined') {
+                               $note_qpart = "note = '$note',";
+                       }
+
                        // FIXME this needs collision testing
 
-                       $result = db_query($link, "UPDATE ttrss_user_entries SET published = $pub
+                       $result = db_query($link, "UPDATE ttrss_user_entries SET 
+                               $note_qpart
+                               published = $pub
                                WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
-                       print "<rpc-reply><counters>";
+
+                       print "<rpc-reply>";
+                       
+                       print "<counters>";
                        getGlobalCounters($link);
+                       getVirtCounters($link);
                        getLabelCounters($link);
                        if (get_pref($link, 'ENABLE_FEED_CATS')) {
                                getCategoryCounters($link);
                        }
-                       print "</counters></rpc-reply>";
+                       print "</counters>";
+
+                       if ($note != 'undefined') {
+                               $note_size = strlen($note);
+                               print "<note id=\"$id\" size=\"$note_size\">";
+                               print "<![CDATA[" . format_article_note($id, $note) . "]]>";
+                               print "</note>";
+                       }
+
+                       print "</rpc-reply>";
 
                        return;
                }
 
                if ($subop == "updateFeed") {
-                       $feed_id = db_escape_string($_GET["feed"]);
+                       $feed_id = db_escape_string($_REQUEST["feed"]);
 
                        $result = db_query($link, 
                                "SELECT feed_url FROM ttrss_feeds WHERE id = '$feed_id'
 
                if ($subop == "forceUpdateAllFeeds" || $subop == "updateAllFeeds") {
        
-                       $global_unread_caller = sprintf("%d", $_GET["uctr"]);
+                       $global_unread_caller = sprintf("%d", $_REQUEST["uctr"]);
                        $global_unread = getGlobalUnread($link);
 
                        print "<rpc-reply>";
 
                        if ($global_unread_caller != $global_unread) {
 
-                               $omode = $_GET["omode"];
+                               $omode = $_REQUEST["omode"];
         
                                if (!$omode) $omode = "tflc";
 
+                               getVirtCounters($link);
+
                                if (strchr($omode, "l")) getLabelCounters($link);
 
                                if (strchr($omode, "c")) {                      
                /* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
                if ($subop == "catchupSelected") {
 
-                       $ids = split(",", db_escape_string($_GET["ids"]));
-                       $cmode = sprintf("%d", $_GET["cmode"]);
+                       $ids = split(",", db_escape_string($_REQUEST["ids"]));
+                       $cmode = sprintf("%d", $_REQUEST["cmode"]);
 
                        catchupArticlesById($link, $ids, $cmode);
 
                        print "<rpc-reply>";
                        print "<counters>";
-                       getAllCounters($link, $_GET["omode"]);
+                       getAllCounters($link, $_REQUEST["omode"]);
                        print "</counters>";
                        print_runtime_info($link);
                        print "</rpc-reply>";
 
                if ($subop == "markSelected") {
 
-                       $ids = split(",", db_escape_string($_GET["ids"]));
-                       $cmode = sprintf("%d", $_GET["cmode"]);
+                       $ids = split(",", db_escape_string($_REQUEST["ids"]));
+                       $cmode = sprintf("%d", $_REQUEST["cmode"]);
 
                        markArticlesById($link, $ids, $cmode);
 
                        print "<rpc-reply>";
                        print "<counters>";
-                       getAllCounters($link, $_GET["omode"]);
+                       getAllCounters($link, $_REQUEST["omode"]);
                        print "</counters>";
                        print_runtime_info($link);
                        print "</rpc-reply>";
 
                if ($subop == "publishSelected") {
 
-                       $ids = split(",", db_escape_string($_GET["ids"]));
-                       $cmode = sprintf("%d", $_GET["cmode"]);
+                       $ids = split(",", db_escape_string($_REQUEST["ids"]));
+                       $cmode = sprintf("%d", $_REQUEST["cmode"]);
 
                        publishArticlesById($link, $ids, $cmode);
 
                        print "<rpc-reply>";
                        print "<counters>";
-                       getAllCounters($link, $_GET["omode"]);
+                       getAllCounters($link, $_REQUEST["omode"]);
                        print "</counters>";
                        print_runtime_info($link);
                        print "</rpc-reply>";
                                print_runtime_info($link);
 
                                # assign client-passed params to session
-                               $_SESSION["client.userAgent"] = $_GET["ua"];
+                               $_SESSION["client.userAgent"] = $_REQUEST["ua"];
 
                        }
                        print "</rpc-reply>";
 
                if ($subop == "getArticleLink") {
 
-                       $id = db_escape_string($_GET["id"]);
+                       $id = db_escape_string($_REQUEST["id"]);
 
                        $result = db_query($link, "SELECT link FROM ttrss_entries, ttrss_user_entries
                                WHERE id = '$id' AND id = ref_id AND owner_uid = '".$_SESSION['uid']."'");
 
                if ($subop == "setArticleTags") {
 
-                       $id = db_escape_string($_GET["id"]);
+                       $id = db_escape_string($_REQUEST["id"]);
 
-                       $tags_str = db_escape_string($_GET["tags_str"]);
+                       $tags_str = db_escape_string($_REQUEST["tags_str"]);
 
                        $tags = array_unique(trim_array(split(",", $tags_str)));
 
                }
 
                if ($subop == "purge") {
-                       $ids = split(",", db_escape_string($_GET["ids"]));
-                       $days = sprintf("%d", $_GET["days"]);
+                       $ids = split(",", db_escape_string($_REQUEST["ids"]));
+                       $days = sprintf("%d", $_REQUEST["days"]);
 
                        print "<rpc-reply>";
 
                        $ids = split(",", db_escape_string($_REQUEST["ids"]));
                        $label_id = db_escape_string($_REQUEST["lid"]);
 
-                       $label = label_find_caption($link, $label_id, $_SESSION["uid"]);
+                       $label = db_escape_string(label_find_caption($link, $label_id, 
+                               $_SESSION["uid"]));
 
                        print "<rpc-reply>";
                        print "<info-for-headlines>";
                        $ids = split(",", db_escape_string($_REQUEST["ids"]));
                        $label_id = db_escape_string($_REQUEST["lid"]);
 
-                       $label = label_find_caption($link, $label_id, $_SESSION["uid"]);
+                       $label = db_escape_string(label_find_caption($link, $label_id, 
+                               $_SESSION["uid"]));
 
                        print "<rpc-reply>";                    
 
 
                        $search = db_escape_string($_REQUEST["search"]);
                        $limit = db_escape_string($_REQUEST["limit"]);
+                       $mode = db_escape_string($_REQUEST["mode"]);
 
                        print "<rpc-reply>";
                        print "<content>";
                        print "<![CDATA[";
-                       $ctr = print_feed_browser($link, $search, $limit);
+                       $ctr = print_feed_browser($link, $search, $limit, $mode);
                        print "]]>";
                        print "</content>";
                        print "<num-results value=\"$ctr\"/>";
                        //$unread_only = db_escape_string($_REQUEST["unread_only"]);
                        //if (!$amount) $amount = 50;
 
+                       /* Amount is not used by the frontend offline.js anymore, it goes by
+                        * date_qpart below + cidb/cidt IDs */
+
                        $amount = 2000;
                        $unread_only = true;
 
                                print "<feeds>";
 
                                $result = db_query($link, "SELECT id, title, cat_id FROM
-                                       ttrss_feeds WHERE hidden = false AND owner_uid = ".$_SESSION["uid"]);
+                                       ttrss_feeds WHERE owner_uid = ".$_SESSION["uid"]);
 
                                while ($line = db_fetch_assoc($result)) {
 
                                        ttrss_feed_categories WHERE owner_uid = ".$_SESSION["uid"]);
 
                                        print "<category id=\"0\" collapsed=\"".
-                                               (int)$_COOKIE["ttrss_vf_uclps"]."\"><![CDATA[";
+                                               (int)get_pref($link, "_COLLAPSED_UNCAT")."\"><![CDATA[";
                                        print __("Uncategorized");
                                        print "]]></category>";
 
                                        print "<category id=\"-1\" collapsed=\"".
-                                               (int)$_COOKIE["ttrss_vf_vclps"]."\"><![CDATA[";
+                                               (int)get_pref($link, "_COLLAPSED_SPECIAL")."\"><![CDATA[";
                                        print __("Special");
                                        print "]]></category>";
 
                                        print "<category id=\"-2\" collapsed=\"".
-                                               (int)$_COOKIE["ttrss_vf_lclps"]."\"><![CDATA[";
+                                               (int)get_pref($link, "_COLLAPSED_LABELS")."\"><![CDATA[";
                                        print __("Labels");
                                        print "]]></category>";
 
                        if ($stage > 0) {
                                print "<articles>";
 
-                               $limit = 200;
+                               $limit = 10;
                                $skip = $limit*($stage-1);
 
                                print "<limit value=\"$limit\"/>";
                                        }
 
                                        if (DB_TYPE == "pgsql") {
-                                               $date_qpart = "updated >= NOW() - INTERVAL '1 month' AND";
+                                               $date_qpart = "updated >= NOW() - INTERVAL '1 week' AND";
                                        } else {
-                                               $date_qpart = "updated >= DATE_SUB(NOW(), INTERVAL 1 MONTH) AND";
+                                               $date_qpart = "updated >= DATE_SUB(NOW(), INTERVAL 1 WEEK) AND";
                                        }                       
 
                                        $result = db_query($link,
                                                        feed_id,content,updated,unread,marked FROM
                                                        ttrss_user_entries,ttrss_entries,ttrss_feeds
                                                WHERE $unread_qpart $cid_qpart $date_qpart
-                                                       hidden = false AND
                                                        ttrss_feeds.id = feed_id AND
                                                        ref_id = ttrss_entries.id AND 
                                                        ttrss_user_entries.owner_uid = ".$_SESSION["uid"]."