OPML import

[tt-rss.git] / backend.php

diff --git a/backend.php b/backend.php
index 5854a421bfd87b6cb2b11e7eb1ed8808d218af85..56dd6441d4273b73fe4346adbe83da29f682884c 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -91,6 +91,9 @@
 
                print "</table>";
 
+               print "<div class=\"invisible\" id=\"FEEDTU\">$total_unread</div>";
+
+/*
                print "<p align=\"center\">All feeds: 
                        <a class=\"button\" 
                                href=\"javascript:scheduleFeedUpdate(true)\">Update</a>";
@@ -99,7 +102,7 @@
                                href=\"javascript:catchupAllFeeds()\">Mark as read</a></p>";
 
                print "<div class=\"invisible\" id=\"FEEDTU\">$total_unread</div>";
-
+*/
 
 
        }
@@ -109,29 +112,20 @@
 
                $subop = $_GET["subop"];
 
-               if ($subop == "getRelativeId") {
-                       $mode = $_GET["mode"];
-                       $id = $_GET["id"];
+               if ($subop == "updateFeed") {
                        $feed_id = $_GET["feed"];
 
-                       if ($id != 'false' && $feed_id != 'false') {
-
-                               if ($mode == 'next') {
-                                       $check_qpart = "updated >= ";
-                               } else {
-                                       $idcheck_qpart = "id < '$id'";
-                               }
-
-                               $result = pg_query("SELECT id FROM ttrss_entries WHERE
-                                       $check_qpart AND
-                                       feed_id = '$feed_id'
-                                       ORDER BY updated DESC LIMIT 1");
+                       $result = pg_query($link, 
+                               "SELECT feed_url FROM ttrss_feeds WHERE id = '$feed_id'");
 
-                               $result_id = pg_fetch_result($result, 0, "id");
+                       if (pg_num_rows($result) > 0) {                 
+                               $feed_url = pg_fetch_result($result, 0, "feed_url");
+//                             update_rss_feed($link, $feed_url, $feed_id);
+                       }
 
-                               print "M $mode : P $id -> P $result_id : F $feed_id";
+                       print "DONE-$feed_id";
 
-                       }
+                       return;
                }
 
                if ($subop == "forceUpdateAllFeeds") {
@@ -433,35 +427,6 @@
        
                $subop = $_GET["subop"];
 
-/*             if ($subop == "old_edit") {
-
-                       $feed_id = $_GET["id"];
-
-                       $result = pg_query("SELECT title,feed_url 
-                               FROM ttrss_feeds WHERE id = '$feed_id'");
-
-                       $fedit_link = pg_fetch_result($result, 0, "feed_url");
-                       $fedit_title = pg_fetch_result($result, 0, "title");
-               
-                       print "<table class=\"prefAddFeed\">
-                       <td>Title:</td><td><input id=\"fedit_title\" value=\"$fedit_title\"></td></tr>
-                       <td>Link:</td><td><input id=\"fedit_link\" value=\"$fedit_link\"></td></tr>             
-                       <tr><td colspan=\"2\" align=\"right\">
-                               <a class=\"button\" href=\"javascript:feedEditCancel()\">Cancel</a>
-                               <a class=\"button\" href=\"javascript:feedEditSave($feed_id)\">Save</a>
-                               </td></tr>
-                       </table>";
-
-               } else {
-
-                       print "<table class=\"prefAddFeed\">
-                       <td><input id=\"fadd_link\"></td>
-                       <td colspan=\"4\" align=\"right\">
-                               <a class=\"button\" href=\"javascript:addFeed()\">Add feed</a></td></tr>
-                       </table>";
-
-               } */
-
                if ($subop == "editSave") {
                        $feed_title = pg_escape_string($_GET["t"]);
                        $feed_link = pg_escape_string($_GET["l"]);
@@ -500,7 +465,8 @@
                                $result = pg_query(
                                        "INSERT INTO ttrss_feeds (feed_url,title) VALUES ('$feed_link', '')");
 
-                               $result = pg_query("SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_link'");
+                               $result = pg_query(
+                                       "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_link'");
 
                                $feed_id = pg_fetch_result($result, 0, "id");
 
@@ -559,14 +525,15 @@
 
                        } else if ($feed_id != $edit_feed_id) {
 
-                               print "<td><input disabled=\"true\" type=\"checkbox\" id=\"FRCHK-".$line["id"]."\"></td>";
+                               print "<td><input disabled=\"true\" type=\"checkbox\" 
+                                       id=\"FRCHK-".$line["id"]."\"></td>";
 
                                print "<td>".$line["title"]."</td>";            
                                print "<td>".$line["feed_url"]."</td>";         
 
                        } else {
 
-                               print "<td><input disabled=\"true\" type=\"checkbox\" id=\"FRCHK-".$line["id"]."\"></td>";
+                               print "<td><input disabled=\"true\" type=\"checkbox\"></td>";
 
                                print "<td><input id=\"iedit_title\" value=\"".$line["title"]."\"></td>";
                                print "<td><input id=\"iedit_link\" value=\"".$line["feed_url"]."\"></td>";
@@ -590,21 +557,23 @@
                                        <a class=\"button\" href=\"javascript:feedEditSave()\">Save</a>";
                        } else {
 
-//                     <a class=\"button\" 
-//                             href=\"javascript:editSelectedFeed()\">Edit</a>&nbsp;
-
-//                     <a class=\"button\" 
-//                             href=\"javascript:updateFeedList()\">Refresh</a>";
-
                        print "
                                Selection:&nbsp;
+                       <a class=\"button\" 
+                               href=\"javascript:editSelectedFeed()\">Edit</a>&nbsp;
                        <a class=\"buttonWarn\" 
                                href=\"javascript:removeSelectedFeeds()\">Remove</a>&nbsp;
                        <a class=\"button\" 
                                href=\"javascript:readSelectedFeeds()\">Mark as read</a>&nbsp;
                        <a class=\"button\" 
-                               href=\"javascript:unreadSelectedFeeds()\">Mark as unread</a>";
-
+                               href=\"javascript:unreadSelectedFeeds()\">Mark as unread</a>&nbsp;
+                       Page: 
+                               <a class=\"button\" 
+                               href=\"javascript:updateFeedList()\">Refresh</a>&nbsp;
+                       OPML: 
+                               <a class=\"button\" href=\"opml.php?op=Export\">Export</a>
+                               ";
+               
                        }
 
        }