]> git.wh0rd.org - tt-rss.git/blobdiff - backend.php
remove ACTFEEDID container, keep information in a cookie instead (getActiveFeedId...
[tt-rss.git] / backend.php
index bf93aa142fba9b1d6579c52e0e15b29b56f8194c..e9be94504646b6b251a0bd2a6004f14522f12a41 100644 (file)
@@ -2,41 +2,47 @@
 //     header("Content-Type: application/xml");
 
        require_once "config.php";
+       require_once "db.php";
        require_once "functions.php";
        require_once "magpierss/rss_fetch.inc";
 
-       error_reporting(0);
+       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
 
-       $link = pg_connect(DB_CONN);    
-
-       error_reporting (E_ERROR | E_WARNING | E_PARSE);
-
-       if (!$link) {
-               print "Could not connect to database. Please check local configuration.";
-               return;
+       if (DB_TYPE == "pgsql") {
+               pg_query("set client_encoding = 'utf-8'");
        }
 
-       pg_query("set client_encoding = 'utf-8'");
-
        $op = $_GET["op"];
        $fetch = $_GET["fetch"];
 
        function outputFeedList($link) {
 
-               $result = pg_query($link, "SELECT *,
+               print "<html><head>
+                       <title>Tiny Tiny RSS : Feedlist</title>
+                       <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">
+                       <script type=\"text/javascript\" src=\"functions.js\"></script>
+                       <script type=\"text/javascript\" src=\"feedlist.js\"></script>
+                       <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
+                       </head><body>";
+                       
+               $result = db_query($link, "SELECT *,
                        (SELECT count(id) FROM ttrss_entries 
                                WHERE feed_id = ttrss_feeds.id) AS total,
                        (SELECT count(id) FROM ttrss_entries
                                WHERE feed_id = ttrss_feeds.id AND unread = true) as unread
                        FROM ttrss_feeds ORDER BY title");                      
 
-               print "<table width=\"100%\" class=\"feeds\" id=\"feedsList\">";
+               $actid = $_GET["actid"];
+
+//             print "<table width=\"100%\" class=\"feedsList\" id=\"feedsList\">";
+
+               print "<ul class=\"feedList\" id=\"feedList\">";
 
                $lnum = 0;
 
                $total_unread = 0;
 
-               while ($line = pg_fetch_assoc($result)) {
+               while ($line = db_fetch_assoc($result)) {
                
                        $feed = $line["title"];
                        $feed_id = $line["id"];   
                        $total = $line["total"];
                        $unread = $line["unread"];
                        
-                       $class = ($lnum % 2) ? "even" : "odd";
+//                     $class = ($lnum % 2) ? "even" : "odd";
+
+                       $class = "odd";
 
                        if ($unread > 0) $class .= "Unread";
 
+                       if ($actid == $feed_id) {
+                               $class .= "Selected";
+                       }
+
                        $total_unread += $unread;
 
-                       print "<tr class=\"$class\" id=\"FEEDR-$feed_id\">";
+//                     print "<tr class=\"$class\" id=\"FEEDR-$feed_id\">";
 
                        $icon_file = ICONS_DIR . "/$feed_id.ico";
 
                        if ($subop != "piggie") {
 
                                if (file_exists($icon_file) && filesize($icon_file) > 0) {
-                                               $feed_icon = "<img width=\"16\" height=\"16\"
-                                                       src=\"" . ICONS_URL . "/$feed_id.ico\">";
+                                               $feed_icon = "<img src=\"" . ICONS_URL . "/$feed_id.ico\">";
                                } else {
-                                       $feed_icon = "&nbsp;";
+                                       $feed_icon = "<img src=\"images/blank_icon.gif\">";
                                }
                        } else {
                                $feed_icon = "<img width=\"16\" height=\"16\"
                        }
                
                        $feed = "<a href=\"javascript:viewfeed($feed_id, 0);\">$feed</a>";
-                       if (ENABLE_FEED_ICONS) {
+                       
+/*                     if (ENABLE_FEED_ICONS) {
                                print "<td>$feed_icon</td>";
                        }
+                       
                        print "<td id=\"FEEDN-$feed_id\">$feed</td>";
                        print "<td>";
                        print "<span id=\"FEEDU-$feed_id\">$unread</span>&nbsp;/&nbsp;";
                        print "<span id=\"FEEDT-$feed_id\">$total</span>";
                        print "</td>";
 
-                       print "</tr>";
-                       ++$lnum;
-               }
-
-//             print "<tr><td class=\"footer\" colspan=\"3\">
-//                     <a href=\"javascript:update_feed_list(false,true)\">Update all feeds</a></td></tr>";
+                       print "</tr>"; */
 
-//             print "<tr><td class=\"footer\" colspan=\"2\">&nbsp;";
-//             print "</td></tr>";
+                       print "<li id=\"FEEDR-$feed_id\" class=\"$class\">";
+                       if (ENABLE_FEED_ICONS) {
+                               print "$feed_icon";
+                       }
+                       print "<span id=\"FEEDN-$feed_id\">$feed</span>";
 
-               print "</table>";
+                       if ($unread != 0) {
+                               $fctr_class = "";
+                       } else {
+                               $fctr_class = "class=\"invisible\"";
+                       }
 
-               print "<div class=\"invisible\" id=\"FEEDTU\">$total_unread</div>";
+                       print "<span $fctr_class id=\"FEEDCTR-$feed_id\">
+                                (<span id=\"FEEDU-$feed_id\">$unread</span>)</span>";
+                       
+                       print "</li>";
 
-/*
-               print "<p align=\"center\">All feeds: 
-                       <a class=\"button\" 
-                               href=\"javascript:scheduleFeedUpdate(true)\">Update</a>";
+                       ++$lnum;
+               }
 
-               print "&nbsp;<a class=\"button\" 
-                               href=\"javascript:catchupAllFeeds()\">Mark as read</a></p>";
+               print "</table>";
 
                print "<div class=\"invisible\" id=\"FEEDTU\">$total_unread</div>";
-*/
-
+//             print "<div class=\"invisible\" id=\"ACTFEEDID\">$actid</div>";
 
        }
 
 
                $subop = $_GET["subop"];
 
+               if ($subop == "mark") {
+                       $mark = $_GET["mark"];
+                       $id = db_escape_string($_GET["id"]);
+
+                       if ($mark == "1") {
+                               $mark = "true";
+                       } else {
+                               $mark = "false";
+                       }
+
+                       $result = db_query($link, "UPDATE ttrss_entries SET marked = $mark
+                               WHERE id = '$id'");
+               }
+
                if ($subop == "updateFeed") {
-                       $feed_id = $_GET["feed"];
+                       $feed_id = db_escape_string($_GET["feed"]);
 
-                       $result = pg_query($link, 
+                       $result = db_query($link, 
                                "SELECT feed_url FROM ttrss_feeds WHERE id = '$feed_id'");
 
-                       if (pg_num_rows($result) > 0) {                 
-                               $feed_url = pg_fetch_result($result, 0, "feed_url");
+                       if (db_num_rows($result) > 0) {                 
+                               $feed_url = db_fetch_result($result, 0, "feed_url");
 //                             update_rss_feed($link, $feed_url, $feed_id);
                        }
 
 
                if ($subop == "forceUpdateAllFeeds") {
                        update_all_feeds($link, true);                  
-                       outputFeedList($link);
                }
 
                if ($subop == "updateAllFeeds") {
                        update_all_feeds($link, false);
-                       outputFeedList($link);
                }
                
                if ($subop == "catchupPage") {
 
                        foreach ($ids as $id) {
 
-                               pg_query("UPDATE ttrss_entries SET unread=false,last_read = NOW()
+                               db_query($link, "UPDATE ttrss_entries SET unread=false,last_read = NOW()
                                        WHERE id = '$id'");
 
                        }
                $subop = $_GET["subop"];
 
                if ($subop == "catchupAll") {
-                       pg_query("UPDATE ttrss_entries SET last_read = NOW(),unread = false");
+                       db_query($link, "UPDATE ttrss_entries SET last_read = NOW(),unread = false");
                }
 
                outputFeedList($link);
 
                $id = $_GET["id"];
 
-               $result = pg_query("UPDATE ttrss_entries SET unread = false,last_read = NOW() WHERE id = '$id'");
+               $result = db_query($link, "UPDATE ttrss_entries SET unread = false,last_read = NOW() WHERE id = '$id'");
+
+               $addheader = $_GET["addheader"];
 
-               $result = pg_query("SELECT title,link,content,feed_id,comments,
+               $result = db_query($link, "SELECT title,link,content,feed_id,comments,
                        (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url 
                        FROM ttrss_entries
                        WHERE   id = '$id'");
 
+               if ($addheader) {
+                       print "<html><head>
+                               <title>Tiny Tiny RSS : Article $id</title>
+                               <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">
+                               <script type=\"text/javascript\" src=\"functions.js\"></script>
+                               <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
+                               </head><body>";
+               }
+
                if ($result) {
 
-                       $line = pg_fetch_assoc($result);
+                       $line = db_fetch_assoc($result);
 
                        if ($line["icon_url"]) {
                                $feed_icon = "<img class=\"feedIcon\" src=\"" . $line["icon_url"] . "\">";
                                $feed_icon = "&nbsp;";
                        }
 
-                       print "<table class=\"postTable\" width=\"100%\" cellspacing=\"0\" 
-                               cellpadding=\"0\">";
-                               
-                       print "<tr class=\"titleTop\"><td align=\"right\"><b>Title:</b></td>
-                               <td width=\"100%\">".$line["title"]."</td>
-                               <td>&nbsp;</td></tr>";
+                       if ($line["comments"] && $line["link"] != $line["comments"]) {
+                               $entry_comments = "(<a href=\"".$line["comments"]."\">Comments</a>)";
+                       } else {
+                               $entry_comments = "";
+                       }
 
-                       if ($line["comments"] && $line["comments"] != $line["link"]) {
-//                             print "<tr class=\"titleInner\"><td align=\"right\"><b>Comments:</b></td>
-//                                     <td><a href=\"".$line["comments"]."\">".$line["comments"]."</a></td>
-//                                     <td>&nbsp;</td> </tr>";
+                       print "<div class=\"postReply\">";
 
-                               $comments_prompt = "(<a href=\"".$line["comments"]."\">Comments</a>)";
-                       }
+                       print "<div class=\"postHeader\"><table>";
+
+                       print "<tr><td><b>Title:</b></td>
+                               <td width='100%'>" . $line["title"] . "</td></tr>";
+                               
+                       print "<tr><td><b>Link:</b></td>
+                               <td width='100%'>
+                               <a href=\"" . $line["link"] . "\">".$line["link"]."</a>
+                               $entry_comments</td></tr>";
+                                       
+                       print "</table></div>";
+
+                       print "<div class=\"postIcon\">" . $feed_icon . "</div>";
+                       print "<div class=\"postContent\">" . $line["content"] . "</div>";
                        
-                       print "<tr class=\"titleBottom\"><td align=\"right\"><b>Link:</b></td>
-                               <td><a href=\"".$line["link"]."\">".$line["link"]."</a> $comments_prompt</td>
-                               <td>&nbsp;</td></tr>";
-                       print "<tr><td valign=\"top\" class=\"post\" 
-                               colspan=\"2\">" . $line["content"] . "</td>
-                               <td valign=\"top\">$feed_icon</td>
-                       </tr>";
-                       print "</table>";        
+                       print "</div>";
 
                }
+
+               if ($addheader) {
+                       print "</body></html>";
+               }
        }
 
        if ($op == "viewfeed") {
                $feed = $_GET["feed"];
                $skip = $_GET["skip"];
                $subop = $_GET["subop"];
+               $view_mode = $_GET["view"];
+               $addheader = $_GET["addheader"];
+               $limit = $_GET["limit"];
+
+               if (!$feed) {
+                       print "Error: no feed to display.";
+                       return;
+               }
 
                if (!$skip) $skip = 0;
 
                if ($subop == "undefined") $subop = "";
 
-               // FIXME: check for null value here
+               if ($addheader) {
+                       print "<html><head>
+                               <title>Tiny Tiny RSS : Feed $feed</title>
+                               <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">
+                               <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
+                               <script type=\"text/javascript\" src=\"functions.js\"></script>
+                               <script type=\"text/javascript\" src=\"viewfeed.js\"></script>
+                               </head><body>";
+               }
 
-               $result = pg_query("SELECT *,SUBSTRING(last_updated,1,16) as last_updated,
-                       EXTRACT(EPOCH FROM NOW()) - EXTRACT(EPOCH FROM last_updated) as update_timeout
+               $result = db_query($link, 
+                       "SELECT *,SUBSTRING(last_updated,1,16) as last_updated_s
                        FROM ttrss_feeds WHERE id = '$feed'");
-
+       
                if ($result) {
 
-                       $line = pg_fetch_assoc($result);
+                       $line = db_fetch_assoc($result);
 
-                       if ($subop == "ForceUpdate" || 
-                               (!$subop && $line["update_timeout"] > MIN_UPDATE_TIME)) {
+                       update_rss_feed($link, $line["feed_url"], $feed);
                                
-                               update_rss_feed($link, $line["feed_url"], $feed);
-
-                       } else {
-
-                               if ($subop == "MarkAllRead")  {
+                       if ($subop == "MarkAllRead")  {
 
-                                       pg_query("UPDATE ttrss_entries SET unread = false,last_read = NOW() 
-                                               WHERE feed_id = '$feed'");
-                               }
+                               db_query($link, "UPDATE ttrss_entries SET unread = false,last_read = NOW() 
+                                       WHERE feed_id = '$feed'");
                        }
                }
 
 
                $feed_last_updated = "Updated: " . $line["last_updated"];
 
-               print "<tr><td class=\"search\" colspan=\"3\">
-                       Search: <input id=\"searchbox\"
-                       onblur=\"javascript:enableHotkeys()\" onfocus=\"javascript:disableHotkeys()\"
-                       onchange=\"javascript:search($feed);\">
-                       <a class=\"button\" href=\"javascript:resetSearch()\">Reset</a>
-                       </td></tr>"; 
-               print "<tr>
-               <td colspan=\"3\" class=\"title\">" . $line["title"] . "</td></tr>"; 
-
                $search = $_GET["search"];
 
-               if (search) {
+               if ($search) {
                        $search_query_part = "(upper(title) LIKE upper('%$search%') 
                                OR content LIKE '%$search%') AND";
+               } else {
+                       $search_query_part = "";
                }
 
-               $result = pg_query("SELECT count(id) AS total_entries 
+               $view_query_part = "";
+
+               if ($view_mode == "Starred") {
+                       $view_query_part = " marked = true AND ";
+               }
+
+               if ($view_mode == "Unread") {
+                       $view_query_part = " unread = true AND ";
+               }
+
+               $result = db_query($link, "SELECT count(id) AS total_entries 
                        FROM ttrss_entries WHERE 
                        $search_query_part
                        feed_id = '$feed'");
 
-               $total_entries = pg_fetch_result($result, 0, "total_entries");
+               $total_entries = db_fetch_result($result, 0, "total_entries");
 
-               $result = pg_query("SELECT 
-                               id,title,updated,unread,feed_id,
-                               EXTRACT(EPOCH FROM last_read) AS last_read_ts,
-                               EXTRACT(EPOCH FROM updated) AS updated_ts
+/*             $result = db_query("SELECT count(id) AS unread_entries 
+                       FROM ttrss_entries WHERE 
+                       $search_query_part
+                       unread = true AND
+                       feed_id = '$feed'");
+
+               $unread_entries = db_fetch_result($result, 0, "unread_entries"); */
+
+               if ($limit && $limit != "All") {
+                       $limit_query_part = "LIMIT " . $limit;
+               } 
+
+               $result = db_query($link, "SELECT 
+                               id,title,updated,unread,feed_id,marked,link,last_read,
+                               SUBSTRING(last_read,1,19) as last_read_noms,
+                               SUBSTRING(updated,1,19) as updated_noms
                        FROM
                                ttrss_entries 
                        WHERE
                        $search_query_part
-                       feed_id = '$feed' ORDER BY updated DESC LIMIT ".HEADLINES_PER_PAGE." OFFSET $skip");
+                       $view_query_part
+                       feed_id = '$feed' ORDER BY updated DESC 
+                       $limit_query_part");
 
                $lnum = 0;
                
                $num_unread = 0;
 
-               while ($line = pg_fetch_assoc($result)) {
+               while ($line = db_fetch_assoc($result)) {
 
                        $class = ($lnum % 2) ? "even" : "odd";
 
-                       if ($line["last_read_ts"] < $line["updated_ts"] && $line["unread"] == "f") {
-                               $update_pic = "<img src=\"images/updated.png\" alt=\"Updated\">";
-                               ++$num_unread;
+                       $id = $line["id"];
+                       $feed_id = $line["feed_id"];
+
+//                     printf("L %d (%s) &gt; U %d (%s) = %d<br>", 
+//                             strtotime($line["last_read_noms"]), $line["last_read_noms"],
+//                             strtotime($line["updated"]), $line["updated"],
+//                             strtotime($line["last_read"]) >= strtotime($line["updated"]));
+
+                       if ($line["last_read"] != "" && $line["updated"] != "" &&
+                               strtotime($line["last_read_noms"]) < strtotime($line["updated_noms"])) {
+
+                               $update_pic = "<img id='FUPDPIC-$id' src=\"images/updated.png\" 
+                                       alt=\"Updated\">";
+
                        } else {
-                               $update_pic = "&nbsp;";
+
+                               $update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\" 
+                                       alt=\"Updated\">";
+
                        }
 
-                       if ($line["unread"] == "t") {
+                       if ($line["unread"] == "t" || $line["unread"] == "1") {
                                $class .= "Unread";
                                ++$num_unread;
                        }
 
-                       $id = $line["id"];
-                       $feed_id = $line["feed_id"];
+                       if ($line["marked"] == "t" || $line["marked"] == "1") {
+                               $marked_pic = "<img id=\"FMARKPIC-$id\" src=\"images/mark_set.png\" 
+                                       alt=\"Reset mark\" onclick='javascript:toggleMark($id, false)'>";
+                       } else {
+                               $marked_pic = "<img id=\"FMARKPIC-$id\" src=\"images/mark_unset.png\" 
+                                       alt=\"Set mark\" onclick='javascript:toggleMark($id, true)'>";
+                       }
 
-                       $content_link = "<a href=\"javascript:view($id,$feed_id);\">" .
+                       $content_link = "<a id=\"FTITLE-$id\" href=\"javascript:view($id,$feed_id);\">" .
                                $line["title"] . "</a>";
                                
                        print "<tr class='$class' id='RROW-$id'>";
+                       // onclick=\"javascript:view($id,$feed_id)\">
 
-                       print "<td id='FUPDPIC-$id' valign='center' class='headlineUpdateMark'>$update_pic</td>";
+                       print "<td valign='center' align='center'>$update_pic</td>";
+                       print "<td valign='center' align='center'>$marked_pic</td>";
 
-                       print "<td class='headlineUpdated'>
+                       print "<td width='25%'>
                                <a href=\"javascript:view($id,$feed_id);\">".$line["updated"]."</a></td>";
-                       print "<td class='headlineTitle'>$content_link</td>";
+                       print "<td width='70%'>$content_link</td>";
 
                        print "</tr>";
 
                        ++$lnum;
                        print "<tr><td>&nbsp;</td></tr>";
                }
+               
+               print "</table>";
 
-               // start unholy navbar block
+               $result = db_query($link, "SELECT id, (SELECT count(id) FROM ttrss_entries 
+                       WHERE feed_id = ttrss_feeds.id) AS total,
+               (SELECT count(id) FROM ttrss_entries
+                       WHERE feed_id = ttrss_feeds.id AND unread = true) as unread
+               FROM ttrss_feeds WHERE id = '$feed'");                  
 
-               print "<tr><td colspan=\"3\" class=\"headlineToolbar\">";
+               $total = db_fetch_result($result, 0, "total");
+               $unread = db_fetch_result($result, 0, "unread");
+
+               // update unread/total counters and status for active feed in the feedlist 
+               // kludge, because iframe doesn't seem to support onload() 
                
-               $next_skip = $skip + HEADLINES_PER_PAGE;
-               $prev_skip = $skip - HEADLINES_PER_PAGE;
+               print "<script type=\"text/javascript\">
+                       document.onkeydown = hotkey_handler;
 
-               print "Navigate: ";
+                       var p_document = parent.frames['feeds-frame'].document;
 
-               if ($prev_skip >= 0) {
-                       print "<a class=\"button\" 
-                               href=\"javascript:viewfeed($feed, $prev_skip);\">Previous Page</a>";
-               } else {
-                       print "<a class=\"disabledButton\">Previous Page</a>";
-               }
-               print "&nbsp;";
+                       var feedr = p_document.getElementById(\"FEEDR-\" + $feed);
+                       var feedu = p_document.getElementById(\"FEEDU-\" + $feed);
 
-               if ($next_skip < $total_entries) {              
-                       print "<a class=\"button\" 
-                               href=\"javascript:viewfeed($feed, $next_skip);\">Next Page</a>";
-               } else {
-                       print "<a class=\"disabledButton\">Next Page</a>";
-               }                       
-               print "&nbsp;&nbsp;Feed: ";
+                       if (feedu) {
+                               feedu.innerHTML = \"$unread\";
+                       }
 
-               print "<a class=\"button\" 
-                       href=\"javascript:viewfeed($feed, 0, 'ForceUpdate');\">Update</a>";
-               
-               print "&nbsp;&nbsp;Mark as read: ";
-               
-               if ($num_unread > 0) {
-                       print "<a class=\"button\" id=\"btnCatchupPage\" 
-                               href=\"javascript:catchupPage($feed);\">This Page</a>";
-                       print "&nbsp;";
-               } else {
-                       print "<a class=\"disabledButton\">This Page</a>";
-                       print "&nbsp;";
-               }
-               
-               print "<a class=\"button\" 
-                       href=\"javascript:viewfeed($feed, $skip, 'MarkAllRead');\">All Posts</a>";
+                       var feedctr = p_document.getElementById(\"FEEDCTR-\" + $feed);
 
-               print "</td></tr>";
+                       if ($unread > 0 && !feedr.className.match(\"Unread\")) {
+                                       feedr.className = feedr.className + \"Unread\";
+                                       feedctr.className = '';
+                       } else if ($unread <= 0) {      
+                                       feedr.className = feedr.className.replace(\"Unread\", \"\");
+                                       feedctr.className = 'invisible';
+                       }       
 
-               // end unholy navbar block
-               
-               print "</table>";
+//                     p_notify(\"\");
 
-               $result = pg_query("SELECT id, (SELECT count(id) FROM ttrss_entries 
-                       WHERE feed_id = ttrss_feeds.id) AS total,
-               (SELECT count(id) FROM ttrss_entries
-                       WHERE feed_id = ttrss_feeds.id AND unread = true) as unread
-               FROM ttrss_feeds WHERE id = '$feed'");                  
+               </script>";
 
-               $total = pg_fetch_result($result, 0, "total");
-               $unread = pg_fetch_result($result, 0, "unread");
-
-               print "<div class=\"invisible\" id=\"FACTIVE\">$feed</div>";
-               print "<div class=\"invisible\" id=\"FTOTAL\">$total</div>";
-               print "<div class=\"invisible\" id=\"FUNREAD\">$unread</div>";
+               if ($addheader) {
+                       print "</body></html>";
+               }
 
        }
 
                if ($subop == "unread") {
                        $ids = split(",", $_GET["ids"]);
                        foreach ($ids as $id) {
-                               pg_query("UPDATE ttrss_entries SET unread = true WHERE feed_id = '$id'");
+                               db_query($link, "UPDATE ttrss_entries SET unread = true WHERE feed_id = '$id'");
                        }
 
                        print "Marked selected feeds as read.";
                if ($subop == "read") {
                        $ids = split(",", $_GET["ids"]);
                        foreach ($ids as $id) {
-                               pg_query("UPDATE ttrss_entries 
+                               db_query($link, "UPDATE ttrss_entries 
                                        SET unread = false,last_read = NOW() WHERE feed_id = '$id'");
                        }
 
                $subop = $_GET["subop"];
 
                if ($subop == "editSave") {
-                       $feed_title = pg_escape_string($_GET["t"]);
-                       $feed_link = pg_escape_string($_GET["l"]);
+                       $feed_title = db_escape_string($_GET["t"]);
+                       $feed_link = db_escape_string($_GET["l"]);
                        $feed_id = $_GET["id"];
 
-                       $result = pg_query("UPDATE ttrss_feeds SET 
+                       $result = db_query($link, "UPDATE ttrss_feeds SET 
                                title = '$feed_title', feed_url = '$feed_link' WHERE id = '$feed_id'");                 
 
                }
                                $ids = split(",", $_GET["ids"]);
 
                                foreach ($ids as $id) {
-                                       pg_query("BEGIN");
-                                       pg_query("DELETE FROM ttrss_entries WHERE feed_id = '$id'");
-                                       pg_query("DELETE FROM ttrss_feeds WHERE id = '$id'");
-                                       pg_query("COMMIT");
+                                       db_query($link, "BEGIN");
+                                       db_query($link, "DELETE FROM ttrss_entries WHERE feed_id = '$id'");
+                                       db_query($link, "DELETE FROM ttrss_feeds WHERE id = '$id'");
+                                       db_query($link, "COMMIT");
                                        
                                        if (file_exists(ICONS_DIR . "/$id.ico")) {
                                                unlink(ICONS_DIR . "/$id.ico");
                
                        if (!WEB_DEMO_MODE) {
 
-                               $feed_link = pg_escape_string($_GET["link"]);
+                               $feed_link = db_escape_string($_GET["link"]);
                                        
-                               $result = pg_query(
+                               $result = db_query($link,
                                        "INSERT INTO ttrss_feeds (feed_url,title) VALUES ('$feed_link', '')");
 
-                               $result = pg_query(
+                               $result = db_query($link,
                                        "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_link'");
 
-                               $feed_id = pg_fetch_result($result, 0, "id");
+                               $feed_id = db_fetch_result($result, 0, "id");
 
                                if ($feed_id) {
                                        update_rss_feed($link, $feed_link, $feed_id);
                                }
                        }
                }
-       
-               $result = pg_query("SELECT 
+
+               print "<table class=\"prefAddFeed\"><tr>
+                       <td><input id=\"fadd_link\"></td>
+                       <td colspan=\"4\" align=\"right\">
+                               <a class=\"button\" href=\"javascript:addFeed()\">Add feed</a></td></tr>
+               </table>";
+
+               $result = db_query($link, "SELECT 
                                id,title,feed_url,substring(last_updated,1,16) as last_updated
                        FROM 
                                ttrss_feeds ORDER by title");
                print "<p><table width=\"100%\" class=\"prefFeedList\" id=\"prefFeedList\">";
                print "<tr class=\"title\">
                                        <td>&nbsp;</td><td>Select</td><td width=\"40%\">Title</td>
-                                       <td width=\"40%\">Link</td><td>Last Updated</td></tr>";
+                                       <td width=\"40%\">Link</td><td>Last updated</td></tr>";
                
                $lnum = 0;
                
-               while ($line = pg_fetch_assoc($result)) {
+               while ($line = db_fetch_assoc($result)) {
 
                        $class = ($lnum % 2) ? "even" : "odd";
 
                                print "<td><input id=\"iedit_link\" value=\"".$line["feed_url"]."\"></td>";
                                                
                        }
-                               
+
+                       if (!$line["last_updated"]) $line["last_updated"] = "Never";
+
                        print "<td>" . $line["last_updated"] . "</td>";
                        
                        print "</tr>";
                        ++$lnum;
                }
 
+               if ($lnum == 0) {
+                       print "<tr><td colspan=\"5\" align=\"center\">No feeds defined.</td></tr>";
+               }
+
                print "</table>";
 
                print "<p>";
 
                if ($subop == "edit") {
                        print "Edit feed:&nbsp;
-                                       <a class=\"button\" href=\"javascript:feedEditCancel()\">Cancel</a>&nbsp;
-                                       <a class=\"button\" href=\"javascript:feedEditSave()\">Save</a>";
+                               <input type=\"submit\" class=\"button\" 
+                                       onclick=\"javascript:feedEditCancel()\" value=\"Cancel\">
+                               <input type=\"submit\" class=\"button\" 
+                                       onclick=\"javascript:feedEditSave()\" value=\"Save\">";
                        } else {
 
                        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>&nbsp;
-                       Page: 
-                               <a class=\"button\" 
-                               href=\"javascript:updateFeedList()\">Refresh</a>";
+                       <input type=\"submit\" class=\"button\" 
+                               onclick=\"javascript:editSelectedFeed()\" value=\"Edit\">
+                       <input type=\"submit\" class=\"button\" 
+                               onclick=\"javascript:removeSelectedFeeds()\" value=\"Remove\">";
+                               
+                       if (ENABLE_PREFS_CATCHUP_UNCATCHUP) {
+                               print "
+                               <input type=\"submit\" class=\"button\" 
+                                       onclick=\"javascript:readSelectedFeeds()\" value=\"Mark as read\">
+                               <input type=\"submit\" class=\"button\" 
+                                       onclick=\"javascript:unreadSelectedFeeds()\" value=\"Mark as unread\">&nbsp;";
+                       }
+                       print "
+                       All feeds: 
+                               <input type=\"submit\" 
+                                       class=\"button\" onclick=\"gotoExportOpml()\" value=\"Export OPML\">";
+               
+                       }
+
+       }
+
+       if ($op == "pref-filters") {
+
+               $subop = $_GET["subop"];
+
+               if ($subop == "editSave") {
+
+                       $regexp = db_escape_string($_GET["r"]);
+                       $descr = db_escape_string($_GET["d"]);
+                       $match = db_escape_string($_GET["m"]);
+                       $filter_id = db_escape_string($_GET["id"]);
                        
+                       $result = db_query($link, "UPDATE ttrss_filters SET 
+                               reg_exp = '$regexp', 
+                               description = '$descr',
+                               filter_type = (SELECT id FROM ttrss_filter_types WHERE
+                                       description = '$match')
+                               WHERE id = '$filter_id'");
+               }
+
+               if ($subop == "remove") {
 
+                       if (!WEB_DEMO_MODE) {
+
+                               $ids = split(",", $_GET["ids"]);
+
+                               foreach ($ids as $id) {
+                                       db_query($link, "DELETE FROM ttrss_filters WHERE id = '$id'");
+                                       
+                               }
                        }
+               }
+
+               if ($subop == "add") {
+               
+                       if (!WEB_DEMO_MODE) {
+
+                               $regexp = db_escape_string($_GET["regexp"]);
+                               $match = db_escape_string($_GET["match"]);
+                                       
+                               $result = db_query($link,
+                                       "INSERT INTO ttrss_filters (reg_exp,filter_type) VALUES 
+                                               ('$regexp', (SELECT id FROM ttrss_filter_types WHERE
+                                                       description = '$match'))");
+                       } 
+               }
+
+               $result = db_query($link, "SELECT description 
+                       FROM ttrss_filter_types ORDER BY description");
+
+               $filter_types = array();
+
+               while ($line = db_fetch_assoc($result)) {
+                       array_push($filter_types, $line["description"]);
+               }
+
+               print "<table class=\"prefAddFeed\"><tr>
+                       <td><input id=\"fadd_regexp\"></td>
+                       <td>";
+                       print_select("fadd_match", "Title", $filter_types);     
+       
+               print"</td><td colspan=\"4\" align=\"right\">
+                               <a class=\"button\" href=\"javascript:addFilter()\">Add filter</a></td></tr>
+               </table>";
+
+               $result = db_query($link, "SELECT 
+                               id,reg_exp,description,
+                               (SELECT name FROM ttrss_filter_types WHERE 
+                                       id = filter_type) as filter_type_name,
+                               (SELECT description FROM ttrss_filter_types 
+                                       WHERE id = filter_type) as filter_type_descr
+                       FROM 
+                               ttrss_filters ORDER by reg_exp");
+
+               print "<p><table width=\"100%\" class=\"prefFilterList\" id=\"prefFilterList\">";
+
+               print "<tr class=\"title\">
+                                       <td width=\"5%\">Select</td><td width=\"40%\">Filter expression</td>
+                                       <td width=\"40%\">Description</td><td width=\"10%\">Match</td></tr>";
+               
+               $lnum = 0;
+               
+               while ($line = db_fetch_assoc($result)) {
+
+                       $class = ($lnum % 2) ? "even" : "odd";
+
+                       $filter_id = $line["id"];
+                       $edit_filter_id = $_GET["id"];
+
+                       if ($subop == "edit" && $filter_id != $edit_filter_id) {
+                               $class .= "Grayed";
+                       }
+
+                       print "<tr class=\"$class\" id=\"FILRR-$filter_id\">";
+
+                       $line["regexp"] = htmlspecialchars($line["reg_exp"]);
+                       $line["description"] = htmlspecialchars($line["description"]);
+
+                       if (!$edit_filter_id || $subop != "edit") {
+
+                               if (!$line["description"]) $line["description"] = "[No description]";
+
+                               print "<td><input onclick='toggleSelectRow(this);' 
+                               type=\"checkbox\" id=\"FICHK-".$line["id"]."\"></td>";
+
+                               print "<td><a href=\"javascript:editFilter($filter_id);\">" . 
+                                       $line["reg_exp"] . "</td>";             
+                                       
+                               print "<td><a href=\"javascript:editFilter($filter_id);\">" . 
+                                       $line["description"] . "</td>";                 
+
+                               print "<td>".$line["filter_type_descr"]."</td>";
+
+                       } else if ($filter_id != $edit_filter_id) {
+
+                               if (!$line["description"]) $line["description"] = "[No description]";
+
+                               print "<td><input disabled=\"true\" type=\"checkbox\" 
+                                       id=\"FICHK-".$line["id"]."\"></td>";
+
+                               print "<td>".$line["reg_exp"]."</td>";          
+                               print "<td>".$line["description"]."</td>";              
+                               print "<td>".$line["filter_type_descr"]."</td>";
+
+                       } else {
+
+                               print "<td><input disabled=\"true\" type=\"checkbox\"></td>";
+
+                               print "<td><input id=\"iedit_regexp\" value=\"".$line["reg_exp"].
+                                       "\"></td>";
+
+                               print "<td><input id=\"iedit_descr\" value=\"".$line["description"].
+                                       "\"></td>";
+
+                               print "<td>";
+                               print_select("iedit_match", $line["filter_type_descr"], $filter_types);
+                               print "</td>";
+                                               
+                       }
+                               
+                       
+                       print "</tr>";
+
+                       ++$lnum;
+               }
+
+               if ($lnum == 0) {
+                       print "<tr><td colspan=\"4\" align=\"center\">No filters defined.</td></tr>";
+               }
+
+               print "</table>";
+
+               print "<p>";
+
+               if ($subop == "edit") {
+                       print "Edit feed:
+                               <input type=\"submit\" class=\"button\" 
+                                       onclick=\"javascript:filterEditCancel()\" value=\"Cancel\">
+                               <input type=\"submit\" class=\"button\" 
+                                       onclick=\"javascript:filterEditSave()\" value=\"Save\">";
+                                       
+               } else {
+
+                       print "
+                               Selection:
+                       <input type=\"submit\" class=\"button\" 
+                               onclick=\"javascript:editSelectedFilter()\" value=\"Edit\">
+                       <input type=\"submit\" class=\"button\" 
+                               onclick=\"javascript:removeSelectedFilters()\" value=\"Remove\">";
+               }
+       }
 
+       if ($op == "error") {
+               print "<div width=\"100%\" align='center'>";
+               $msg = $_GET["msg"];
+               print $msg;
+               print "</div>";
        }
 
-       pg_close($link);
+       db_close($link);
 ?>