tweak display of tweet button

[tt-rss.git] / backend.php

diff --git a/backend.php b/backend.php
index 9a1a4d7137ed03aac704c7b26ba371321fd46d48..c64ceaa977fef9b427f12311663e53d5dd331e34 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -131,7 +131,8 @@
        $update_methods = array(
                0   => __("Default"),
                1   => __("Magpie"),
-               2   => __("SimplePie"));
+               2   => __("SimplePie"), 
+               3   => __("Twitter OAuth"));
 
        if (DEFAULT_UPDATE_METHOD == "1") {
                $update_methods[0] .= ' (SimplePie)';
@@ -161,9 +162,8 @@
                break; // rpc
 
                case "feeds":
-                       $print_exec_time = true;
-
                        $subop = $_REQUEST["subop"];
+                       $root = (bool)$_REQUEST["root"];
 
                        switch($subop) {
                                case "catchupAll":
@@ -179,36 +179,46 @@
                                        toggle_collapse_cat($link, $cat_id, $mode);
                                        return;
                                break;
+                       }
 
-                               case "catsortreset":
-                                       db_query($link, "UPDATE ttrss_feed_categories 
-                                                       SET order_id = 0 WHERE owner_uid = " . $_SESSION["uid"]);
-                                       return;
-                               break;
+                       if (!$root) {
+                               print json_encode(outputFeedList($link));
+                       } else {
 
-                               case "catsort":
-                                       $corder = db_escape_string($_REQUEST["corder"]);
+                               $feeds = outputFeedList($link, false);
 
-                                       $cats = split(",", $corder);
+                               $root = array();
+                               $root['id'] = 'root';
+                               $root['name'] = __('Feeds');
+                               $root['items'] = $feeds['items'];
 
-                                       for ($i = 0; $i < count($cats); $i++) {
-                                               $cat_id = $cats[$i];
+                               $fl = array();
+                               $fl['identifier'] = 'id';
+                               $fl['label'] = 'name';
+                               $fl['items'] = array($root);
 
-                                               if ($cat_id > 0) {
-                                                       db_query($link, "UPDATE ttrss_feed_categories 
-                                                               SET order_id = '$i' WHERE id = '$cat_id' AND
-                                                               owner_uid = " . $_SESSION["uid"]);
-                                               }
-                                       }
+                               print json_encode($fl);
+                       }
 
-                                       return;
-                               break;
+               break; // feeds
 
-                       }
+               case "la":
+                       $id = db_escape_string($_REQUEST['id']);
 
-                       print json_encode(outputFeedList($link));
+                       $result = db_query($link, "SELECT link FROM ttrss_entries, ttrss_user_entries
+                               WHERE id = '$id' AND id = ref_id AND owner_uid = '".$_SESSION['uid']."'");
 
-               break; // feeds
+                       if (db_num_rows($result) == 1) {
+                               $article_url = db_fetch_result($result, 0, 'link');
+                               $article_url = str_replace("\n", "", $article_url);
+
+                               header("Location: $article_url");
+                               return;
+
+                       } else {
+                               print_error(__("Article not found."));
+                       }
+               break;
 
                case "view":