]> git.wh0rd.org - tt-rss.git/blobdiff - backend.php
combined article display mode (option COMBINED_DISPLAY_MODE), remove xml feed output
[tt-rss.git] / backend.php
index 69559a69deb4847d09d4266d3307f2cf9599e7b0..97b5c5197ffd321d5d95c117e88ccd8167c55e64 100644 (file)
@@ -1,6 +1,14 @@
 <?
        session_start();
 
+       if ($_GET["debug"]) {
+               define('DEFAULT_ERROR_LEVEL', E_ALL);
+       } else {
+               define('DEFAULT_ERROR_LEVEL', E_ERROR | E_WARNING | E_PARSE);
+       }
+
+       error_reporting(DEFAULT_ERROR_LEVEL);
+
        $op = $_REQUEST["op"];
 
        if ((!$op || $op == "rpc" || $op == "globalUpdateFeeds") && !$_REQUEST["noxml"]) {
@@ -20,8 +28,9 @@
                exit;
        }
 
-       define(SCHEMA_VERSION, 2);
+       define('SCHEMA_VERSION', 2);
 
+       require_once "sanity_check.php";
        require_once "config.php";
        require_once "db.php";
        require_once "db-prefs.php";
 
        $fetch = $_GET["fetch"];
 
+       function getAllCounters($link) {
+               getLabelCounters($link);
+               getFeedCounters($link);
+               getTagCounters($link);
+               getGlobalCounters($link);
+       }       
+
+       function getFeedUnread($link, $feed) {
+               $n_feed = sprintf("%d", $feed);
+       
+               if ($n_feed == -1) {
+                       $match_part = "marked = true";
+               } else if ($feed > 0) {
+                       $match_part = "feed_id = '$n_feed'";
+               } else if ($feed < -10) {
+                       $label_id = -$feed - 11;
+
+                       $result = db_query($link, "SELECT sql_exp FROM ttrss_labels WHERE
+                               id = '$label_id' AND owner_uid = " . $_SESSION["uid"]);
+
+                       $match_part = db_fetch_result($result, 0, "sql_exp");
+               }
+
+               if ($match_part) {
+               
+                       $result = db_query($link, "SELECT count(int_id) AS unread 
+                               FROM ttrss_user_entries 
+                               WHERE   unread = true AND $match_part AND owner_uid = " . $_SESSION["uid"]);
+                               
+               } else {
+               
+                       $result = db_query($link, "SELECT COUNT(post_int_id) AS unread
+                               FROM ttrss_tags,ttrss_user_entries 
+                               WHERE tag_name = '$feed' AND post_int_id = int_id AND unread = true AND
+                                       ttrss_tags.owner_uid = " . $_SESSION["uid"]);
+               }
+               
+               $unread = db_fetch_result($result, 0, "unread");
+               return $unread;
+       }
+
        /* FIXME this needs reworking */
 
        function getGlobalCounters($link) {
                print "<counter id='global-unread' counter='$c_id'/>";
        }
 
-       function getTagCounters($link) {
-       
+       function getTagCounters($link, $smart_mode = SMART_RPC_COUNTERS) {
+
+               if ($smart_mode) {
+                       if (!$_SESSION["tctr_last_value"]) {
+                               $_SESSION["tctr_last_value"] = array();
+                       }
+               }
+
+               $old_counters = $_SESSION["tctr_last_value"];
+
+               $tctrs_modified = false;
+
                $result = db_query($link, "SELECT tag_name,count(ttrss_entries.id) AS count
                        FROM ttrss_tags,ttrss_entries,ttrss_user_entries WHERE
                        ttrss_user_entries.ref_id = ttrss_entries.id AND 
                        $unread = $tags[$tag];                  
 
                        $tag = htmlspecialchars($tag);
-                       print "<tag id=\"$tag\" counter=\"$unread\"/>";
+
+                       if (!$smart_mode || $old_counters[$tag] != $unread) {                   
+                               $old_counters[$tag] = $unread;
+                               $tctrs_modified = true;
+                               print "<tag id=\"$tag\" counter=\"$unread\"/>";
+                       }
+
                } 
+
+               if ($smart_mode && $tctrs_modified) {
+                       $_SESSION["tctr_last_value"] = $old_counters;
+               }
+
        }
 
-       function getLabelCounters($link) {
+       function getLabelCounters($link, $smart_mode = SMART_RPC_COUNTERS) {
+
+               if ($smart_mode) {
+                       if (!$_SESSION["lctr_last_value"]) {
+                               $_SESSION["lctr_last_value"] = array();
+                       }
+               }
+
+               $old_counters = $_SESSION["lctr_last_value"];
+               $lctrs_modified = false;
 
                $result = db_query($link, "SELECT count(id) as count FROM ttrss_entries,ttrss_user_entries
                        WHERE marked = true AND ttrss_user_entries.ref_id = ttrss_entries.id AND 
 
                        $count = db_fetch_result($tmp_result, 0, "count");
 
-                       print "<label id=\"$id\" counter=\"$count\"/>";
+                       if (!$smart_mode || $old_counters[$id] != $count) {     
+                               $old_counters[$id] = $count;
+                               $lctrs_modified = true;
+                               print "<label id=\"$id\" counter=\"$count\"/>";
+                       }
 
-                       error_reporting (E_ERROR | E_WARNING | E_PARSE);
-       
+                       error_reporting (DEFAULT_ERROR_LEVEL);
+               }
+
+               if ($smart_mode && $lctrs_modified) {
+                       $_SESSION["lctr_last_value"] = $old_counters;
                }
        }
 
                        print "<feed id=\"$id\" counter=\"$count\"/>";          
        }
 
-       function getFeedCounters($link) {
-       
+       function getFeedCounters($link, $smart_mode = SMART_RPC_COUNTERS) {
+
+               if ($smart_mode) {
+                       if (!$_SESSION["fctr_last_value"]) {
+                               $_SESSION["fctr_last_value"] = array();
+                       }
+               }
+
+               $old_counters = $_SESSION["fctr_last_value"];
+
                $result = db_query($link, "SELECT id,
                        (SELECT count(id) 
                                FROM ttrss_entries,ttrss_user_entries 
                                WHERE feed_id = ttrss_feeds.id AND ttrss_user_entries.ref_id = ttrss_entries.id
                                AND unread = true AND owner_uid = ".$_SESSION["uid"].") as count
                        FROM ttrss_feeds WHERE owner_uid = ".$_SESSION["uid"]);
-       
+
+               $fctrs_modified = false;
+
                while ($line = db_fetch_assoc($result)) {
                
                        $id = $line["id"];
                        $count = $line["count"];
 
-                       print "<feed id=\"$id\" counter=\"$count\"/>";
+                       if (!$smart_mode || $old_counters[$id] != $count) {
+                               $old_counters[$id] = $count;
+                               $fctrs_modified = true;
+                               print "<feed id=\"$id\" counter=\"$count\"/>";
+                       }
+               }
+
+               if ($smart_mode && $fctrs_modified) {
+                       $_SESSION["fctr_last_value"] = $old_counters;
                }
        }
 
                        <title>Tiny Tiny RSS : Feedlist</title>
                        <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">";
 
+               $user_theme = $_SESSION["theme"];
+               if ($user_theme) { 
+                       print "<link rel=\"stylesheet\" type=\"text/css\" 
+                               href=\"themes/$user_theme/theme.css\">";
+               }
+
                if (get_pref($link, 'USE_COMPACT_STYLESHEET')) {
                        print "<link rel=\"stylesheet\" type=\"text/css\" 
                                href=\"tt-rss_compact.css\"/>";
                                print "</li></ul>";
                        }
 
-                       if (get_pref($link, 'ENABLE_LABELS')) {
+                       if (GLOBAL_ENABLE_LABELS && get_pref($link, 'ENABLE_LABELS')) {
        
                                $result = db_query($link, "SELECT id,sql_exp,description FROM
                                        ttrss_labels WHERE owner_uid = '$owner_uid' ORDER by description");
                                                $class .= "Unread";
                                        }
                                        
-                                       error_reporting (E_ERROR | E_WARNING | E_PARSE);
+                                       error_reporting (DEFAULT_ERROR_LEVEL);
        
                                        printFeedEntry(-$line["id"]-11, 
                                                $class, $line["description"], $count, "images/label.png", $link);
        
                        while ($line = db_fetch_assoc($result)) {
                        
-                               $feed = $line["title"];
+                               $feed = db_unescape_string($line["title"]);
                                $feed_id = $line["id"];   
        
                                $subop = $_GET["subop"];
        
                                $unread = $tags[$tag];
        
-                               $class = "odd";
+                               $class = "tag";
        
                                if ($unread > 0) {
                                        $class .= "Unread";
                }
 
                if (db_num_rows($result) == 0) {
-                       print "<li>No tags/feeds to display.</li>";
+                       if ($tags) {
+                               $what = "tags";
+                       } else {
+                               $what = "feeds";
+                       }
+                       print "<li>No $what to display.</li>";
                }
 
                print "</ul>";
 
-               print "<div class=\"invisible\" id=\"FEEDTU\">$total_unread</div>";
-
        }
 
 
 
                if ($subop == "getAllCounters") {
                        print "<rpc-reply>";
-                       getLabelCounters($link);
-                       getFeedCounters($link);
-                       getTagCounters($link);
-                       getGlobalCounters($link);
+                       getAllCounters($link);
                        print "</rpc-reply>";
                }
 
                        getGlobalCounters($link);
                        print "</rpc-reply>";
                }
-               
+       
+               /* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
                if ($subop == "catchupSelected") {
 
-                       $ids = split(",", $_GET["ids"]);
+                       $ids = split(",", db_escape_string($_GET["ids"]));
 
-                       foreach ($ids as $id) {
+                       $cmode = sprintf("%d", $_GET["cmode"]);
 
-                               db_query($link, "UPDATE ttrss_user_entries SET unread=false,last_read = NOW()
-                                       WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+                       foreach ($ids as $id) {
 
+                               if ($cmode == 0) {
+                                       db_query($link, "UPDATE ttrss_user_entries SET 
+                                       unread = false,last_read = NOW()
+                                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+                               } else if ($cmode == 1) {
+                                       db_query($link, "UPDATE ttrss_user_entries SET 
+                                       unread = true
+                                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+                               } else {
+                                       db_query($link, "UPDATE ttrss_user_entries SET 
+                                       unread = NOT unread,last_read = NOW()
+                                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+                               }
                        }
+                       print "<rpc-reply>";
+                       getAllCounters($link);
+                       print "</rpc-reply>";
+               }
+
+               if ($subop == "markSelected") {
+
+                       $ids = split(",", db_escape_string($_GET["ids"]));
+
+                       $cmode = sprintf("%d", $_GET["cmode"]);
+
+                       foreach ($ids as $id) {
 
-                       print "Marked active page as read.";
+                               if ($cmode == 0) {
+                                       db_query($link, "UPDATE ttrss_user_entries SET 
+                                       marked = false
+                                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+                               } else if ($cmode == 1) {
+                                       db_query($link, "UPDATE ttrss_user_entries SET 
+                                       marked = true
+                                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+                               } else {
+                                       db_query($link, "UPDATE ttrss_user_entries SET 
+                                       marked = NOT marked
+                                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+                               }
+                       }
+                       print "<rpc-reply>";
+                       getAllCounters($link);
+                       print "</rpc-reply>";
                }
 
                if ($subop == "sanityCheck") {
 
                $addheader = $_GET["addheader"];
 
-               $result = db_query($link, "SELECT title,link,content,feed_id,comments,
-                       (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url 
+               $result = db_query($link, "SELECT title,link,content,feed_id,comments,int_id,
+                       SUBSTRING(updated,1,16) as updated,
+                       (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url,
+                       num_comments
                        FROM ttrss_entries,ttrss_user_entries
                        WHERE   id = '$id' AND ref_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>
+                               <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">";
+
+                       $user_theme = $_SESSION["theme"];
+                       if ($user_theme) { 
+                               print "<link rel=\"stylesheet\" type=\"text/css\" 
+                                       href=\"themes/$user_theme/theme.css\">";
+                       }
+
+                       if (get_pref($link, 'USE_COMPACT_STYLESHEET')) {
+                               print "<link rel=\"stylesheet\" type=\"text/css\" 
+                                       href=\"tt-rss_compact.css\"/>";
+                       } else {
+                               print "<link title=\"Compact Stylesheet\" rel=\"alternate stylesheet\" 
+                                               type=\"text/css\" href=\"tt-rss_compact.css\"/>";
+                       }
+
+                       print "<script type=\"text/javascript\" src=\"functions.js\"></script>
                                <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
                                </head><body>";
                }
                                $feed_icon = "&nbsp;";
                        }
 
-                       if ($line["comments"] && $line["link"] != $line["comments"]) {
+/*                     if ($line["comments"] && $line["link"] != $line["comments"]) {
                                $entry_comments = "(<a href=\"".$line["comments"]."\">Comments</a>)";
                        } else {
                                $entry_comments = "";
+                       } */
+
+                       $num_comments = $line["num_comments"];
+                       $entry_comments = "";
+
+                       if ($num_comments > 0) {
+                               if ($line["comments"]) {
+                                       $comments_url = $line["comments"];
+                               } else {
+                                       $comments_url = $line["link"];
+                               }
+                               $entry_comments = "<a href=\"$comments_url\">$num_comments comments</a>";
+                       } else {
+                               if ($line["comments"] && $line["link"] != $line["comments"]) {
+                                       $entry_comments = "<a href=\"".$line["comments"]."\">Comments</a>";
+                               }                               
                        }
 
                        print "<div class=\"postReply\">";
 
-                       print "<div class=\"postHeader\"><table>";
+                       print "<div class=\"postHeader\"><table width=\"100%\">";
+
+                       print "<tr><td><a href=\"" . $line["link"] . "\">" . $line["title"] . "</a></td>";
+
+                       $parsed_updated = date(get_pref($link, 'LONG_DATE_FORMAT'), 
+                               strtotime($line["updated"]));
+               
+                       print "<td class=\"postDate\">$parsed_updated</td>";
+                                               
+                       print "</tr>";
+
+                       $tmp_result = db_query($link, "SELECT DISTINCT tag_name FROM
+                               ttrss_tags WHERE post_int_id = " . $line["int_id"] . "
+                               ORDER BY tag_name");
+       
+                       $tags_str = "";
+                       $f_tags_str = "";
+
+                       $num_tags = 0;
 
-                       print "<tr><td><b>Title:</b></td>
-                               <td width='100%'>" . $line["title"] . "</td></tr>";
+                       while ($tmp_line = db_fetch_assoc($tmp_result)) {
+                               $num_tags++;
+                               $tag = $tmp_line["tag_name"];                           
+                               $tag_str = "<a href=\"javascript:parent.viewfeed('$tag')\">$tag</a>, "; 
                                
-                       print "<tr><td><b>Link:</b></td>
-                               <td width='100%'>
-                               <a href=\"" . $line["link"] . "\">".$line["link"]."</a>
-                               $entry_comments</td></tr>";
-                                       
+                               if ($num_tags == 5) {
+                                       $tags_str .= "<a href=\"javascript:showBlockElement('allEntryTags')\">...</a>";
+                               } else if ($num_tags < 5) {
+                                       $tags_str .= $tag_str;
+                               }
+                               $f_tags_str .= $tag_str;
+                       }
+
+                       $tags_str = preg_replace("/, $/", "", $tags_str);
+                       $f_tags_str = preg_replace("/, $/", "", $f_tags_str);
+
+//                     $truncated_link = truncate_string($line["link"], 60);
+
+                       if ($tags_str || $entry_comments) {
+                               print "<tr><td width='50%'>
+                                       $entry_comments</td>
+                                       <td align=\"right\">$tags_str</td></tr>";
+                       }
+
                        print "</table></div>";
 
                        print "<div class=\"postIcon\">" . $feed_icon . "</div>";
-                       print "<div class=\"postContent\">" . $line["content"] . "</div>";
+                       print "<div class=\"postContent\">";
+                       
+                       if (db_num_rows($tmp_result) > 5) {
+                               print "<div id=\"allEntryTags\">Tags: $f_tags_str</div>";
+                       }
+
+                       print $line["content"] . "</div>";
                        
                        print "</div>";
 
                        print "<script type=\"text/javascript\">
-                               update_label_counters('$feed_id');
+                               update_all_counters('$feed_id');
                        </script>";
                }
 
                $limit = $_GET["limit"];
 
                if (!$feed) {
-                       print "Error: no feed to display.";
                        return;
                }
 
                                <title>Tiny Tiny RSS : Feed $feed</title>
                                <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">";
 
+                       $user_theme = $_SESSION["theme"];
+                       if ($user_theme) { 
+                               print "<link rel=\"stylesheet\" type=\"text/css\" 
+                                       href=\"themes/$user_theme/theme.css\">";
+                       }
+
                        if (get_pref($link, 'USE_COMPACT_STYLESHEET')) {
                                print "<link rel=\"stylesheet\" 
                                                type=\"text/css\" href=\"tt-rss_compact.css\"/>";
                                print "<link title=\"Compact Stylesheet\" rel=\"alternate stylesheet\" 
                                                type=\"text/css\" href=\"tt-rss_compact.css\"/>";
                        }
+
                        print "<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>
                                        }
                                }
                        } else { // tag
-                               // FIXME, implement catchup for tags
-                       }
+                               db_query($link, "BEGIN");
 
-               }
+                               $tag_name = db_escape_string($feed);
+
+                               $result = db_query($link, "SELECT post_int_id FROM ttrss_tags
+                                       WHERE tag_name = '$tag_name' AND owner_uid = " . $_SESSION["uid"]);
 
-               print "<table class=\"headlinesList\" id=\"headlinesList\" width=\"100%\">";
+                               while ($line = db_fetch_assoc($result)) {
+                                       db_query($link, "UPDATE ttrss_user_entries SET
+                                               unread = false, last_read = NOW() 
+                                               WHERE int_id = " . $line["post_int_id"]);
+                               }
+                               db_query($link, "COMMIT");
+                       }
 
-               $search = $_GET["search"];
+               }
 
-               $search_mode = $_GET["smode"];
+               $search = db_escape_string($_GET["search"]);
+               $search_mode = db_escape_string($_GET["smode"]);
 
                if ($search) {
                        $search_query_part = "(upper(title) LIKE upper('%$search%') 
 
                $view_query_part = "";
 
+               if ($view_mode == "Adaptive") {
+                       if ($feed != -1) {
+                               $unread = getFeedUnread($link, $feed);
+                               if ($unread > 0) {
+                                       $view_query_part = " unread = true AND ";
+                               }
+                       }
+               }
+
                if ($view_mode == "Starred") {
                        $view_query_part = " marked = true AND ";
                }
                        $view_query_part = " unread = true AND ";
                }
 
-               if ($view_mode == "Unread or Starred") {
+/*             if ($view_mode == "Unread or Starred") {
                        $view_query_part = " (unread = true OR marked = true) AND ";
                }
 
                if ($view_mode == "Unread or Updated") {
                        $view_query_part = " (unread = true OR last_read is NULL) AND ";
-               }
+               } */
 
 /*             $result = db_query($link, "SELECT count(id) AS total_entries 
                        FROM ttrss_entries WHERE 
                        $query_strategy_part = "id > 0"; // dumb
                }
 
-
                $order_by = "updated DESC";
 
 //             if ($feed < -10) {
 //                     $order_by = "feed_id,updated DESC";
 //             }
 
+               $feed_title = "";
+
+               if ($search && $search_mode == "All feeds") {
+                       $feed_title = "Search results";
+               } else if (sprintf("%d", $feed) == 0) {
+                       $feed_title = $feed;
+               } else if ($feed > 0) {
+                       $result = db_query($link, "SELECT title,site_url FROM ttrss_feeds 
+                               WHERE id = '$feed'");
+
+                       $feed_title = db_fetch_result($result, 0, "title");
+                       $feed_site_url = db_fetch_result($result, 0, "site_url");
+
+               } else if ($feed == -1) {
+                       $feed_title = "Starred articles";
+               } else if ($feed < -10) {
+                       $label_id = -$feed - 11;
+                       $result = db_query($link, "SELECT description FROM ttrss_labels
+                               WHERE id = '$label_id'");
+                       $feed_title = db_fetch_result($result, 0, "description");
+               } else {
+                       $feed_title = "?";
+               }
+
                if ($feed < -10) error_reporting (0);
 
+               print "<div id=\"headlinesContainer\">";
+
                if (sprintf("%d", $feed) != 0) {
 
+                       if ($feed > 0) {                        
+                               $feed_kind = "Feeds";
+                       } else {
+                               $feed_kind = "Labels";
+                       }
+
+//                     if (!$vfeed_query_part) {
+                       $content_query_part = "content as content_preview,";
+//                     } else {
+//                             $content_query_part = "";
+//                     }
+
                        $result = db_query($link, "SELECT 
-                                       id,title,updated,unread,feed_id,marked,link,last_read,
+                                       id,title,
+                                       SUBSTRING(updated,1,16) as updated,
+                                       unread,feed_id,marked,link,last_read,
                                        SUBSTRING(last_read,1,19) as last_read_noms,
                                        $vfeed_query_part
+                                       $content_query_part
                                        SUBSTRING(updated,1,19) as updated_noms
                                FROM
                                        ttrss_entries,ttrss_user_entries
                } else {
                        // browsing by tag
 
+                       $feed_kind = "Tags";
+
                        $result = db_query($link, "SELECT
-                               ttrss_entries.id as id,title,updated,unread,feed_id,
+                               ttrss_entries.id as id,title,
+                               SUBSTRING(updated,1,16) as updated,
+                               unread,feed_id,
                                marked,link,last_read,
                                SUBSTRING(last_read,1,19) as last_read_noms,
                                $vfeed_query_part
+                               $content_query_part
                                SUBSTRING(updated,1,19) as updated_noms
                                FROM
                                        ttrss_entries,ttrss_user_entries,ttrss_tags
                }
 
                if (!$result) {
-                       print "<tr><td colspan='4' align='center'>
-                               Could not display feed (query failed). Please check match syntax or local configuration.</td></tr>";
+                       print "<div align='center'>
+                               Could not display feed (query failed). Please check label match syntax or local configuration.</div>";
                        return;
                }
+       
+               if (db_num_rows($result) > 0) {
 
-               $lnum = 0;
+                       print "<table class=\"headlinesSubToolbar\" 
+                               width=\"100%\" cellspacing=\"0\" cellpadding=\"0\"><tr>";
+
+                       if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
+
+                               print "<td class=\"headlineActions\">
+                                       Select: 
+                                                               <a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 
+                                                                       'RROW-', 'RCHK-', true)\">All</a>,
+                                                               <a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 
+                                                                       'RROW-', 'RCHK-', true, 'Unread')\">Unread</a>,
+                                                               <a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 
+                                                                       'RROW-', 'RCHK-', false)\">None</a>
+                                               &nbsp;&nbsp;
+                                               Toggle: <a href=\"javascript:selectionToggleUnread()\">Unread</a>,
+                                                               <a href=\"javascript:selectionToggleMarked()\">Starred</a>";
+                       
+                               print "</td>";
 
-               error_reporting (E_ERROR | E_WARNING | E_PARSE);
+                       } else {
 
-               $num_unread = 0;
+                               print "<td class=\"headlineActions\">
+                                       Select: 
+                                                               <a href=\"javascript:cdmSelectArticles('all')\">All</a>,
+                                                               <a href=\"javascript:cdmSelectArticles('unread')\">Unread</a>,
+                                                               <a href=\"javascript:cdmSelectArticles('none')\">None</a>
+                                               &nbsp;&nbsp;
+                                               Toggle: <a href=\"javascript:selectionToggleUnread(true)\">Unread</a>,
+                                                               <a href=\"javascript:selectionToggleMarked(true)\">Starred</a>";
+                       
+                               print "</td>";
 
-               while ($line = db_fetch_assoc($result)) {
 
-                       $class = ($lnum % 2) ? "even" : "odd";
+                       }
 
-                       $id = $line["id"];
-                       $feed_id = $line["feed_id"];
+                       print "<td class=\"headlineTitle\">";
+               
+                       if ($feed_site_url) {
+                               print "<a target=\"_blank\" href=\"$feed_site_url\">$feed_title</a>";
+                       } else {
+                               print $feed_title;
+                       }
+                               
+                       print "</td>";
+                       print "</tr></table>";
 
-//                     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 (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
+                               print "<table class=\"headlinesList\" id=\"headlinesList\" 
+                                       cellspacing=\"0\" width=\"100%\">";
+                       }
 
-/*                     if ($line["last_read"] != "" && $line["updated"] != "" &&
-                               strtotime($line["last_read_noms"]) < strtotime($line["updated_noms"])) {
+                       $lnum = 0;
+       
+                       error_reporting (DEFAULT_ERROR_LEVEL);
+       
+                       $num_unread = 0;
+       
+                       while ($line = db_fetch_assoc($result)) {
 
-                               $update_pic = "<img id='FUPDPIC-$id' src=\"images/updated.png\" 
-                                       alt=\"Updated\">";
+                               $class = ($lnum % 2) ? "even" : "odd";
+       
+                               $id = $line["id"];
+                               $feed_id = $line["feed_id"];
+       
+                               if ($line["last_read"] == "" && 
+                                               ($line["unread"] != "t" && $line["unread"] != "1")) {
+       
+                                       $update_pic = "<img id='FUPDPIC-$id' src=\"images/updated.png\" 
+                                               alt=\"Updated\">";
+                               } else {
+                                       $update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\" 
+                                               alt=\"Updated\">";
+                               }
+       
+                               if ($line["unread"] == "t" || $line["unread"] == "1") {
+                                       $class .= "Unread";
+                                       ++$num_unread;
+                                       $is_unread = true;
+                               } else {
+                                       $is_unread = false;
+                               }
+       
+                               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)'>";
+                               } else {
+                                       $marked_pic = "<img id=\"FMARKPIC-$id\" src=\"images/mark_unset.png\" 
+                                               alt=\"Set mark\" onclick='javascript:toggleMark($id)'>";
+                               }
+       
+                               $content_link = "<a href=\"javascript:view($id,$feed_id);\">" .
+                                       $line["title"] . "</a>";
 
-                       } else {
+                               if (get_pref($link, 'HEADLINES_SMART_DATE')) {
+                                       $updated_fmt = smart_date_time(strtotime($line["updated"]));
+                               } else {
+                                       $short_date = get_pref($link, 'SHORT_DATE_FORMAT');
+                                       $updated_fmt = date($short_date, strtotime($line["updated"]));
+                               }                               
 
-                               $update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\" 
-                                       alt=\"Updated\">";
+                               if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
+                                       $content_preview = truncate_string(strip_tags($line["content_preview"]), 
+                                               200);
+                               }
 
-                       } */
+                               if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
+                                       
+                                       print "<tr class='$class' id='RROW-$id'>";
+               
+                                       print "<td class='hlUpdatePic'>$update_pic</td>";
+               
+                                       print "<td class='hlSelectRow'>
+                                               <input type=\"checkbox\" onclick=\"toggleSelectRow(this)\"
+                                                       class=\"feedCheckBox\" id=\"RCHK-$id\">
+                                               </td>";
+               
+                                       print "<td class='hlMarkedPic'>$marked_pic</td>";
+               
+                                       if ($line["feed_title"]) {                      
+                                               print "<td class='hlContent'>$content_link</td>";
+                                               print "<td class='hlFeed'>
+                                                       <a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a>&nbsp;</td>";
+                                       } else {                        
+                                               print "<td class='hlContent' valign='middle'>";
+               
+                                               print "<a href=\"javascript:view($id,$feed_id);\">" .
+                                                       $line["title"];
+               
+                                               if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
+                                                               
+                                                       if ($content_preview) {
+                                                               print "<span class=\"contentPreview\"> - $content_preview</span>";
+                                                       }
+                                               }
+               
+                                               print "</a>";
+                                               print "</td>";
+                                       }
+                                       
+                                       print "<td class=\"hlUpdated\"><nobr>$updated_fmt&nbsp;</nobr></td>";
+               
+                                       print "</tr>";
 
-                       if ($line["last_read"] == "" && 
-                                       ($line["unread"] != "t" && $line["unread"] != "1")) {
+                               } else {
+                                       
+                                       if ($is_unread) {
+                                               $add_class = "Unread";
+                                       } else {
+                                               $add_class = "";
+                                       }       
+                                       
+                                       print "<div class=\"cdmArticle$add_class\" id=\"RROW-$id\">";
 
-                               $update_pic = "<img id='FUPDPIC-$id' src=\"images/updated.png\" 
-                                       alt=\"Updated\">";
-                       } else {
-                               $update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\" 
-                                       alt=\"Updated\">";
-                       }
+                                       print "<div class=\"cdmHeader\">";
 
-                       if ($line["unread"] == "t" || $line["unread"] == "1") {
-                               $class .= "Unread";
-                               ++$num_unread;
-                       }
+                                       print "<div style=\"float : right\">$updated_fmt</div>";
+                                       
+                                       print "<a href=\"".$line["link"]."\">".$line["title"]."</a>";
 
-                       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)'>";
-                       }
+                                       if ($line["feed_title"]) {      
+                                               print "&nbsp;(<a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a>)";
+                                       }
 
-                       $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 "</div>";
 
-                       print "<td valign='center' align='center'>$update_pic</td>";
-                       print "<td valign='center' align='center'>$marked_pic</td>";
+                                       print "<div class=\"cdmContent\">" . $line["content_preview"] . "</div>";
+       
+                                       print "<div style=\"float : right\">$marked_pic</div>
+                                               <div class=\"cdmFooter\">
+                                                       <input type=\"checkbox\" onclick=\"toggleSelectRowById(this, 
+                                                       'RROW-$id')\" class=\"feedCheckBox\" id=\"RCHK-$id\"></div>";
 
-                       print "<td width='25%'>
-                               <a href=\"javascript:view($id,$feed_id);\">".$line["updated"]."</a></td>";
+                                       print "</div>"; 
 
-                       if ($line["feed_title"]) {                      
-                               print "<td width='50%'>$content_link</td>";
-                               print "<td width='20%'>
-                                       <a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a></td>";
-                       } else {
-                               print "<td width='70%'>$content_link</td>";
+                               }                               
+       
+                               ++$lnum;
                        }
 
-                       print "</tr>";
+                       if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {                        
+                               print "</table>";
+                       }
 
-                       ++$lnum;
+               } else {
+                       print "<div width='100%' align='center'>No articles found.</div>";
                }
 
-               if ($lnum == 0) {
-                       print "<tr><td align='center'>No articles found.</td></tr>";
-               }
-               
-               print "</table>";
-               
+               print "</div>";
+
                print "<script type=\"text/javascript\">
                        document.onkeydown = hotkey_handler;
-                       update_label_counters('$feed');
+                       update_all_counters('$feed');
                </script>";
-
+       
                if ($addheader) {
                        print "</body></html>";
                }
-
        }
 
        if ($op == "pref-rpc") {
                $subop = $_GET["subop"];
 
                if ($subop == "unread") {
-                       $ids = split(",", $_GET["ids"]);
+                       $ids = split(",", db_escape_string($_GET["ids"]));
                        foreach ($ids as $id) {
                                db_query($link, "UPDATE ttrss_user_entries SET unread = true 
                                        WHERE feed_id = '$id' AND owner_uid = ".$_SESSION["uid"]);
                }
 
                if ($subop == "read") {
-                       $ids = split(",", $_GET["ids"]);
+                       $ids = split(",", db_escape_string($_GET["ids"]));
                        foreach ($ids as $id) {
                                db_query($link, "UPDATE ttrss_user_entries 
                                        SET unread = false,last_read = NOW() WHERE 
        if ($op == "pref-feeds") {
        
                $subop = $_GET["subop"];
+               $quiet = $_GET["quiet"];
 
-               if ($subop == "editSave") {
-                       $feed_title = db_escape_string($_GET["t"]);
-                       $feed_link = db_escape_string($_GET["l"]);
-                       $upd_intl = db_escape_string($_GET["ui"]);
-                       $purge_intl = db_escape_string($_GET["pi"]);
+               if ($subop == "editfeed") {
                        $feed_id = db_escape_string($_GET["id"]);
-                       $cat_id = db_escape_string($_GET["catid"]);
 
-                       if (strtoupper($upd_intl) == "DEFAULT")
-                               $upd_intl = 0;
+                       $result = db_query($link, 
+                               "SELECT * FROM ttrss_feeds WHERE id = '$feed_id' AND
+                                       owner_uid = " . $_SESSION["uid"]);
 
-                       if (strtoupper($purge_intl) == "DEFAULT")
-                               $purge_intl = 0;
+                       $title = htmlspecialchars(db_unescape_string(db_fetch_result($result,
+                               0, "title")));
 
-                       if (strtoupper($purge_intl) == "DISABLED")
-                               $purge_intl = -1;
+                       print "<div class=\"infoBoxContents\">";
 
-                       if ($cat_id != 0) {
-                               $category_qpart = "cat_id = '$cat_id'";
-                       } else {
-                               $category_qpart = 'cat_id = NULL';
-                       }
+                       $icon_file = ICONS_DIR . "/$feed_id.ico";
+       
+                       if (file_exists($icon_file) && filesize($icon_file) > 0) {
+                                       $feed_icon = "<img width=\"16\" height=\"16\"
+                                               src=\"" . ICONS_URL . "/$feed_id.ico\">";
+                       } else {
+                               $feed_icon = "";
+                       }
+       
+                       print "<h1>$feed_icon $title</h1>";
+
+                       print "<table width='100%'>";
+
+                       $row_class = "odd";
+
+                       print "<tr class='$row_class'><td>Title:</td>";
+                       print "<td><input id=\"iedit_title\" value=\"$title\"></td></tr>";
+
+                       $feed_url = db_fetch_result($result, 0, "feed_url");
+                       $feed_url = htmlspecialchars(db_unescape_string(db_fetch_result($result,
+                               0, "feed_url")));
+                       $row_class = toggleEvenOdd($row_class);
+
+                       print "<tr class='$row_class'><td>Feed URL:</td>";
+                       print "<td><input id=\"iedit_link\" value=\"$feed_url\"></td></tr>";
+       
+                       if (get_pref($link, 'ENABLE_FEED_CATS')) {
+
+                               $cat_id = db_fetch_result($result, 0, "cat_id");
+
+                               $row_class = toggleEvenOdd($row_class);
+
+                               print "<tr class='$row_class'><td>Category:</td>";
+                               print "<td>";
+                               print "<select id=\"iedit_fcat\">";
+                               print "<option id=\"0\">Uncategorized</option>";
+
+                               $tmp_result = db_query($link, "SELECT id,title FROM ttrss_feed_categories
+                                       WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
+
+                               if (db_num_rows($tmp_result) > 0) {
+                                       print "<option disabled>--------</option>";
+                               }
+
+                               while ($tmp_line = db_fetch_assoc($tmp_result)) {
+                                       if ($tmp_line["id"] == $cat_id) {
+                                               $is_selected = "selected";
+                                       } else {
+                                               $is_selected = "";
+                                       }
+                                       printf("<option $is_selected id='%d'>%s</option>", 
+                                               $tmp_line["id"], $tmp_line["title"]);
+                               }
+
+                               print "</select></td>";
+                               print "</td></tr>";
+       
+                       }
+
+                       $update_interval = db_fetch_result($result, 0, "update_interval");
+                       $row_class = toggleEvenOdd($row_class);
+
+                       print "<tr class='$row_class'><td>Update Interval:</td>";
+                       print "<td><input id=\"iedit_updintl\" 
+                               value=\"$update_interval\"></td></tr>";
+
+                       $purge_interval = db_fetch_result($result, 0, "purge_interval");
+                       $row_class = toggleEvenOdd($row_class);
+
+                       print "<tr class='$row_class'><td>Purge Days:</td>";
+                       print "<td><input id=\"iedit_purgintl\" 
+                               value=\"$purge_interval\"></td></tr>";
+
+                       print "</table>";
+                       print "</div>";
+
+                       print "<div align='center'>
+                               <input type='submit' class='button'                     
+                               onclick=\"feedEditCancel()\" value=\"Cancel\">
+                               <input type=\"submit\" class=\"button\" 
+                               onclick=\"feedEditSave()\" value=\"Save\"></div>";
+                       return;
+               }
+
+               if ($subop == "editSave") {
+                       $feed_title = db_escape_string($_GET["t"]);
+                       $feed_link = db_escape_string($_GET["l"]);
+                       $upd_intl = db_escape_string($_GET["ui"]);
+                       $purge_intl = db_escape_string($_GET["pi"]);
+                       $feed_id = db_escape_string($_GET["id"]);
+                       $cat_id = db_escape_string($_GET["catid"]);
+
+                       if (strtoupper($upd_intl) == "DEFAULT")
+                               $upd_intl = 0;
+
+                       if (strtoupper($upd_intl) == "DISABLED")
+                               $upd_intl = -1;
+
+                       if (strtoupper($purge_intl) == "DEFAULT")
+                               $purge_intl = 0;
+
+                       if (strtoupper($purge_intl) == "DISABLED")
+                               $purge_intl = -1;
+
+                       if ($cat_id != 0) {
+                               $category_qpart = "cat_id = '$cat_id'";
+                       } else {
+                               $category_qpart = 'cat_id = NULL';
+                       }
 
                        $result = db_query($link, "UPDATE ttrss_feeds SET 
                                $category_qpart,
                                update_interval = '$upd_intl',
                                purge_interval = '$purge_intl'
                                WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);                    
+               }
+
+               if ($subop == "saveCat") {
+                       $cat_title = db_escape_string($_GET["title"]);
+                       $cat_id = db_escape_string($_GET["id"]);
+
+                       $result = db_query($link, "UPDATE ttrss_feed_categories SET
+                               title = '$cat_title' WHERE id = '$cat_id' AND owner_uid = ".$_SESSION["uid"]);
 
                }
 
 
                        if (!WEB_DEMO_MODE) {
 
-                               $ids = split(",", $_GET["ids"]);
+                               $ids = split(",", db_escape_string($_GET["ids"]));
 
                                foreach ($ids as $id) {
                                        db_query($link, "DELETE FROM ttrss_feeds 
                                        $feed_id = db_fetch_result($result, 0, "id");
 
                                        if ($feed_id) {
-                                               update_rss_feed($link, $feed_link, $feed_id);
+                                               update_rss_feed($link, $feed_link, $feed_id, true);
                                        }
                                } else {
 
 
                        if (!WEB_DEMO_MODE) {
 
-                               $ids = split(",", $_GET["ids"]);
+                               $ids = split(",", db_escape_string($_GET["ids"]));
 
                                foreach ($ids as $id) {
 
                        }
                }
 
+               if ($subop == "categorize") {
+
+                       if (!WEB_DEMO_MODE) {
+
+                               $ids = split(",", db_escape_string($_GET["ids"]));
+
+                               $cat_id = db_escape_string($_GET["cat_id"]);
+
+                               if ($cat_id == 0) {
+                                       $cat_id_qpart = 'NULL';
+                               } else {
+                                       $cat_id_qpart = "'$cat_id'";
+                               }
+
+                               db_query($link, "BEGIN");
+
+                               foreach ($ids as $id) {
+                               
+                                       db_query($link, "UPDATE ttrss_feeds SET cat_id = $cat_id_qpart
+                                               WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+                               }
+
+                               db_query($link, "COMMIT");
+                       }
+
+               }
+
+               if ($quiet) return;
+
 //             print "<h3>Edit Feeds</h3>";
 
                $result = db_query($link, "SELECT id,title,feed_url,last_error 
                
                        print "<div class=\"warning\">";
                
-                       print "<b>Feeds with update errors:</b>";
+                       print "<a href=\"javascript:showBlockElement('feedUpdateErrors')\">
+                               <b>Feeds with update errors</b> (click to expand)</a>";
 
-                       print "<ul class=\"nomarks\">";
+                       print "<ul id=\"feedUpdateErrors\" class=\"nomarks\">";
                                                
                        while ($line = db_fetch_assoc($result)) {
                                print "<li>" . $line["title"] . " (" . $line["feed_url"] . "): " . 
 
                }
 
-               print "<p><div class=\"prefGenericAddBox\">
-                       <input id=\"fadd_link\" size=\"40\">&nbsp;<input 
-                               type=\"submit\" class=\"button\" 
-                               onclick=\"javascript:addFeed()\" value=\"Add feed\"></div>";
+               $feed_search = db_escape_string($_GET["search"]);
 
-               $result = db_query($link, "SELECT 
-                               id,title,feed_url,substring(last_updated,1,16) as last_updated,
-                               update_interval,purge_interval,
-                               (SELECT title FROM ttrss_feed_categories 
-                                       WHERE id = cat_id) AS category
-                       FROM 
-                               ttrss_feeds WHERE owner_uid = '".$_SESSION["uid"]."' ORDER by title");
-
-               print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
+               if (array_key_exists("search", $_GET)) {
+                       $_SESSION["prefs_feed_search"] = $feed_search;
+               } else {
+                       $feed_search = $_SESSION["prefs_feed_search"];
+               }
+
+               print "<table width='100%' class=\"prefGenericAddBox\" 
+                       cellspacing='0' cellpadding='0'><tr>
+                       <td>
+                               <input id=\"fadd_link\" 
+                               onchange=\"javascript:addFeed()\"
+                               size=\"40\">
+                               <input type=\"submit\" class=\"button\"
+                               onclick=\"javascript:addFeed()\" value=\"Add feed\">
+                       </td><td align='right'>
+                               <input id=\"feed_search\" size=\"20\"  
+                               onchange=\"javascript:updateFeedList()\"
+                               value=\"$feed_search\">
+                               <input type=\"submit\" class=\"button\" 
+                               onclick=\"javascript:updateFeedList()\" value=\"Search\">
+                       </td>                   
+                       </tr></table>";
 
-               print "<p><table width=\"100%\" class=\"prefFeedList\" id=\"prefFeedList\">";
-               print "<tr class=\"title\">
-                                       <td>&nbsp;</td><td>Select</td><td width=\"20%\">Title</td>
-                                       <td width=\"20%\">Link</td>";
+               $feeds_sort = db_escape_string($_GET["sort"]);
 
-               if (get_pref($link, 'ENABLE_FEED_CATS')) {
-                       print "<td width=\"10%\">Category</td>";
+               if (!$feeds_sort || $feeds_sort == "undefined") {
+                       $feeds_sort = $_SESSION["pref_sort_feeds"];                     
+                       if (!$feeds_sort) $feeds_sort = "title";
                }
-               
-               print "<td width=\"10%\">Update Interval</td>
-                                       <td width=\"10%\">Purge Days</td>
-                                       <td>Last updated</td></tr>";
-               
-               $lnum = 0;
-               
-               while ($line = db_fetch_assoc($result)) {
 
-                       $class = ($lnum % 2) ? "even" : "odd";
-
-                       $feed_id = $line["id"];
+               $_SESSION["pref_sort_feeds"] = $feeds_sort;
 
-                       $edit_feed_id = $_GET["id"];
+               if ($feed_search) {
+                       $search_qpart = "(UPPER(title) LIKE UPPER('%$feed_search%') OR
+                               UPPER(feed_url) LIKE UPPER('%$feed_search%')) AND";
+               } else {
+                       $search_qpart = "";
+               }
 
-                       if ($subop == "edit" && $feed_id != $edit_feed_id) {
-                               $class .= "Grayed";
+               $result = db_query($link, "SELECT 
+                               id,title,feed_url,substring(last_updated,1,16) as last_updated,
+                               update_interval,purge_interval,cat_id,
+                               (SELECT title FROM ttrss_feed_categories 
+                                       WHERE id = cat_id) AS category
+                       FROM 
+                               ttrss_feeds 
+                       WHERE 
+                               $search_qpart owner_uid = '".$_SESSION["uid"]."'                        
+                       ORDER by category,$feeds_sort,title");
+
+               if (db_num_rows($result) != 0) {
+
+                       print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
+
+                       print "<p><table width=\"100%\" cellspacing=\"0\" 
+                               class=\"prefFeedList\" id=\"prefFeedList\">";
+                       print "<tr><td class=\"selectPrompt\" colspan=\"8\">
+                               Select: 
+                                       <a href=\"javascript:selectTableRowsByIdPrefix('prefFeedList', 
+                                               'FEEDR-', 'FRCHK-', true)\">All</a>,
+                                       <a href=\"javascript:selectTableRowsByIdPrefix('prefFeedList', 
+                                               'FEEDR-', 'FRCHK-', false)\">None</a>
+                               </td</tr>";
+
+                       if (!get_pref($link, 'ENABLE_FEED_CATS')) {
+                               print "<tr class=\"title\">
+                                       <td width='5%' align='center'>&nbsp;</td>
+                                       <td width='30%'><a href=\"javascript:updateFeedList('title')\">Title</a></td>
+                                       <td width='30%'><a href=\"javascript:updateFeedList('feed_url')\">Feed</a></td>
+                                       <td width='15%'><a href=\"javascript:updateFeedList('update_interval')\">Update Interval</a></td>
+                                       <td width='15%'><a href=\"javascript:updateFeedList('purge_interval')\">Purge Days</a></td></tr>";
                        }
+                       
+                       $lnum = 0;
+
+                       $cur_cat_id = -1;
+                       
+                       while ($line = db_fetch_assoc($result)) {
+       
+                               $feed_id = $line["id"];
+                               $cat_id = $line["cat_id"];
 
-                       print "<tr class=\"$class\" id=\"FEEDR-$feed_id\">";
+                               $edit_title = htmlspecialchars(db_unescape_string($line["title"]));
+                               $edit_link = htmlspecialchars(db_unescape_string($line["feed_url"]));
+                               $edit_cat = htmlspecialchars(db_unescape_string($line["category"]));
+       
+                               if ($line["update_interval"] == "0") $line["update_interval"] = "Default";
+                               if ($line["update_interval"] == "-1") $line["update_interval"] = "Disabled";
+                               if ($line["purge_interval"] == "0") $line["purge_interval"] = "Default";
+                               if ($line["purge_interval"] < 0)        $line["purge_interval"] = "Disabled";
 
-                       $icon_file = ICONS_DIR . "/$feed_id.ico";
+                               if (!$edit_cat) $edit_cat = "Uncategorized";
 
-                       if (file_exists($icon_file) && filesize($icon_file) > 0) {
-                                       $feed_icon = "<img width=\"16\" height=\"16\"
-                                               src=\"" . ICONS_URL . "/$feed_id.ico\">";
-                       } else {
-                               $feed_icon = "&nbsp;";
-                       }
-                       print "<td align='center'>$feed_icon</td>";             
 
-                       $edit_title = htmlspecialchars(db_unescape_string($line["title"]));
-                       $edit_link = htmlspecialchars(db_unescape_string($line["feed_url"]));
-                       $edit_cat = htmlspecialchars(db_unescape_string($line["category"]));
+                               if (get_pref($link, 'ENABLE_FEED_CATS') && $cur_cat_id != $cat_id) {
+                                       $lnum = 0;
+                               
+                                       print "<tr><td colspan=\"6\" class=\"feedEditCat\">$edit_cat</td></tr>";
+
+                                       print "<tr class=\"title\">
+                                               <td width='5%' align='center'>&nbsp;</td>
+                                               <td width='30%'><a href=\"javascript:updateFeedList('title')\">Title</a></td>
+                                               <td width='30%'><a href=\"javascript:updateFeedList('feed_url')\">Feed</a></td>
+                                               <td width='15%'><a href=\"javascript:updateFeedList('update_interval')\">Update Interval</a></td>
+                                               <td width='15%'><a href=\"javascript:updateFeedList('purge_interval')\">Purge Days</a></td></tr>";
 
-                       if (!$edit_cat) $edit_cat = "Uncategorized";
+                                       $cur_cat_id = $cat_id;
+                               }
 
-                       if (!$edit_feed_id || $subop != "edit") {
+                               $class = ($lnum % 2) ? "even" : "odd";
+                               $this_row_id = "id=\"FEEDR-$feed_id\"";
 
-                               print "<td><input onclick='toggleSelectRow(this);' 
+                               print "<tr class=\"$class\" $this_row_id>";
+       
+                               $icon_file = ICONS_DIR . "/$feed_id.ico";
+       
+                               if (file_exists($icon_file) && filesize($icon_file) > 0) {
+                                               $feed_icon = "<img class=\"tinyFeedIcon\"       src=\"" . ICONS_URL . "/$feed_id.ico\">";
+                               } else {
+                                       $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
+                               }
+//                             print "<td class='feedIcon'>$feed_icon</td>";           
+       
+                               print "<td class='feedSelect'><input onclick='toggleSelectRow(this);' 
                                type=\"checkbox\" id=\"FRCHK-".$line["id"]."\"></td>";
 
+                               $edit_title = truncate_string($edit_title, 40);
+                               $edit_link = truncate_string($edit_link, 60);
+
                                print "<td><a href=\"javascript:editFeed($feed_id);\">" . 
-                                       $edit_title . "</a></td>";              
+                                       "$feed_icon $edit_title" . "</a></td>";         
                                        
                                print "<td><a href=\"javascript:editFeed($feed_id);\">" . 
                                        $edit_link . "</a></td>";               
 
-                               if (get_pref($link, 'ENABLE_FEED_CATS')) {
+/*                             if (get_pref($link, 'ENABLE_FEED_CATS')) {
                                        print "<td><a href=\"javascript:editFeed($feed_id);\">" . 
                                                $edit_cat . "</a></td>";                
-                               }
-
-                               if ($line["update_interval"] == "0")
-                                       $line["update_interval"] = "Default";
+                               } */
 
                                print "<td><a href=\"javascript:editFeed($feed_id);\">" . 
                                        $line["update_interval"] . "</a></td>";
 
-                               if ($line["purge_interval"] == "0")
-                                       $line["purge_interval"] = "Default";
-
-                               if ($line["purge_interval"] < 0)
-                                       $line["purge_interval"] = "Disabled";
-
                                print "<td><a href=\"javascript:editFeed($feed_id);\">" . 
                                        $line["purge_interval"] . "</a></td>";
+       
+                               print "</tr>";
+       
+                               ++$lnum;
+                       }
+       
+                       print "</table>";
 
-                       } else if ($feed_id != $edit_feed_id) {
-
-                               print "<td><input disabled=\"true\" type=\"checkbox\" 
-                                       id=\"FRCHK-".$line["id"]."\"></td>";
-
-                               print "<td>$edit_title</td>";           
-                               print "<td>$edit_link</td>";            
+                       print "<p>";
+       
+                       if ($subop == "edit") {
+                               print "Edit feed:&nbsp;
+                                       <input type=\"submit\" class=\"button\" 
+                                               onclick=\"javascript:feedEditCancel()\" value=\"Cancel\">
+                                       <input type=\"submit\" class=\"button\" 
+                                               onclick=\"javascript:feedEditSave()\" value=\"Save\">";
+                       } else {
+       
+                               print "
+                                       Selection:&nbsp;
+                               <input type=\"submit\" class=\"button\" 
+                                       onclick=\"javascript:selectedFeedDetails()\" value=\"Details\">
+                               <input type=\"submit\" class=\"button\" 
+                                       onclick=\"javascript:editSelectedFeed()\" value=\"Edit\">
+                               <input type=\"submit\" class=\"button\" 
+                                       onclick=\"javascript:removeSelectedFeeds()\" value=\"Remove\">";
 
                                if (get_pref($link, 'ENABLE_FEED_CATS')) {
-                                       print "<td>$edit_cat</td>";             
-                               }
 
-                               if ($line["update_interval"] == "0")
-                                       $line["update_interval"] = "Default";
+                                       print "&nbsp;&nbsp;";                           
 
-                               print "<td>" . $line["update_interval"] . "</td>";
+                                       $result = db_query($link, "SELECT title,id FROM ttrss_feed_categories
+                                               WHERE owner_uid = ".$_SESSION["uid"]."
+                                               ORDER BY title");
 
-                               if ($line["purge_interval"] == "0")
-                                       $line["purge_interval"] = "Default";
-
-                               if ($line["purge_interval"] < 0)
-                                       $line["purge_interval"] = "Disabled";
-
-                               print "<td>" . $line["purge_interval"] . "</td>";
+                                       print "<select id=\"sfeed_set_fcat\">";
+                                       print "<option id=\"0\">Uncategorized</option>";
 
-                       } else {
+                                       if (db_num_rows($result) != 0) {
+               
+                                               print "<option disabled>--------</option>";
 
-                               print "<td><input disabled=\"true\" type=\"checkbox\" checked></td>";
+                                               while ($line = db_fetch_assoc($result)) {
+                                                       printf("<option id='%d'>%s</option>", 
+                                                               $line["id"], $line["title"]);
+                                               }               
+                                       }
 
-                               print "<td><input id=\"iedit_title\" value=\"$edit_title\"></td>";
-                               print "<td><input id=\"iedit_link\" value=\"$edit_link\"></td>";
+                                       print "</select>";
 
-                               if (get_pref($link, 'ENABLE_FEED_CATS')) {
+                                       print " <input type=\"submit\" class=\"button\" 
+                                       onclick=\"javascript:categorizeSelectedFeeds()\" value=\"Set category\">";
 
-                                       print "<td>";
-                                       print "<select id=\"iedit_fcat\">";
-                                       print "<option id=\"0\">Uncategorized</option>";
-       
-                                       if (db_num_rows($result) > 0) {
-                                               print "<option disabled>--------</option>";
-                                       }
-       
-                                       $tmp_result = db_query($link, "SELECT id,title FROM ttrss_feed_categories
-                                               WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
-       
-                                       while ($tmp_line = db_fetch_assoc($tmp_result)) {
-                                               if ($tmp_line["id"] == $line["cat_id"]) {
-                                                       $is_selected = "selected";
-                                               } else {
-                                                       $is_selected = "";
-                                               }
-                                               printf("<option $is_selected id='%d'>%s</option>", 
-                                                       $tmp_line["id"], $tmp_line["title"]);
-                                       }
-       
-                                       print "</select></td>";
-                                       print "</td>";
+                               }
 
+                               if (get_pref($link, 'ENABLE_PREFS_CATCHUP_UNCATCHUP')) {
+                                       print "
+                                       <input type=\"submit\" class=\"button\" 
+                                               onclick=\"javascript:readSelectedFeeds(true)\" value=\"Mark as read\">
+                                       <input type=\"submit\" class=\"button\" 
+                                               onclick=\"javascript:readSelectedFeeds(false)\" 
+                                               value=\"Mark as unread\">&nbsp;";
                                }
                                
-                               print "<td><input id=\"iedit_updintl\" 
-                                       value=\"".$line["update_interval"]."\"></td>";
-                               print "<td><input id=\"iedit_purgintl\" 
-                                       value=\"".$line["purge_interval"]."\"></td>";
-                                       
-                       }
-
-                       if (!$line["last_updated"]) $line["last_updated"] = "Never";
-
-                       print "<td>" . $line["last_updated"] . "</td>";
-                       
-                       print "</tr>";
+                               print "
+                                       &nbsp;All feeds: <input type=\"submit\" 
+                                                       class=\"button\" onclick=\"gotoExportOpml()\" 
+                                                       value=\"Export OPML\">";                        
+                               }
+               } else {
 
-                       ++$lnum;
-               }
+                       print "<p>No feeds defined.</p>";
 
-               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;
-                               <input type=\"submit\" class=\"button\" 
-                                       onclick=\"javascript:feedEditCancel()\" value=\"Cancel\">
-                               <input type=\"submit\" class=\"button\" 
-                                       onclick=\"javascript:feedEditSave()\" value=\"Save\">";
-                       } else {
-
-                       print "
-                               Selection:&nbsp;
-                       <input type=\"submit\" class=\"button\" 
-                               onclick=\"javascript:selectedFeedDetails()\" value=\"Details\">
-                       <input type=\"submit\" class=\"button\" 
-                               onclick=\"javascript:editSelectedFeed()\" value=\"Edit\">
-                       <input type=\"submit\" class=\"button\" 
-                               onclick=\"javascript:removeSelectedFeeds()\" value=\"Remove\">";
-                               
-                       if (get_pref($link, '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\">";
-               
-                       }
-
-               print "<h3>Edit Categories</h3>";
-
                if (get_pref($link, 'ENABLE_FEED_CATS')) {
 
+                       print "<h3>Edit Categories</h3>";
+
        //              print "<h3>Categories</h3>";
 
                        print "<div class=\"prefGenericAddBox\">
-                               <input id=\"fadd_cat\" size=\"40\">&nbsp;<input 
+                               <input id=\"fadd_cat\" 
+                                       onchange=\"javascript:addFeedCat()\"
+                                       size=\"40\">&nbsp;
+                               <input 
                                        type=\"submit\" class=\"button\" 
                                        onclick=\"javascript:addFeedCat()\" value=\"Add category\"></div>";
        
                        $result = db_query($link, "SELECT title,id FROM ttrss_feed_categories
                                WHERE owner_uid = ".$_SESSION["uid"]."
                                ORDER BY title");
+
+                       if (db_num_rows($result) != 0) {
        
-                       print "<p><table width=\"100%\" class=\"prefFeedCatList\" id=\"prefFeedCatList\">";
-                       print "<tr class=\"title\">
-                                               <td width=\"10%\">Select</td><td width=\"80%\">Title</td>
-                                       </tr>";
-                                       
-                       $lnum = 0;
-                       
-                       while ($line = db_fetch_assoc($result)) {
-       
-                               $class = ($lnum % 2) ? "even" : "odd";
-       
-                               $cat_id = $line["id"];
-       
-                               $edit_cat_id = $_GET["id"];
-       
-                               if ($subop == "editCat" && $cat_id != $edit_cat_id) {
-                                       $class .= "Grayed";
-                               }
-       
-                               print "<tr class=\"$class\" id=\"FCATR-$cat_id\">";
-       
-                               $edit_title = htmlspecialchars(db_unescape_string($line["title"]));
-       
-                               if (!$edit_cat_id || $subop != "editCat") {
-       
-                                       print "<td><input onclick='toggleSelectRow(this);' 
-                                       type=\"checkbox\" id=\"FCCHK-".$line["id"]."\"></td>";
-       
-                                       print "<td><a href=\"javascript:editFeedCat($cat_id);\">" . 
-                                               $edit_title . "</a></td>";              
-       
-                               } else if ($cat_id != $edit_cat_id) {
-       
-                                       print "<td><input disabled=\"true\" type=\"checkbox\" 
-                                               id=\"FRCHK-".$line["id"]."\"></td>";
-       
-                                       print "<td>$edit_title</td>";           
-       
-                               } else {
-       
-                                       print "<td><input disabled=\"true\" type=\"checkbox\" checked></td>";
-       
-                                       print "<td><input id=\"iedit_title\" value=\"$edit_title\"></td>";
+                               print "<p><table width=\"100%\" class=\"prefFeedCatList\" 
+                                       cellspacing=\"0\" id=\"prefFeedCatList\">";
+
+                               print "<tr><td class=\"selectPrompt\" colspan=\"8\">
+                               Select: 
+                                       <a href=\"javascript:selectTableRowsByIdPrefix('prefFeedCatList', 
+                                               'FCATR-', 'FCCHK-', true)\">All</a>,
+                                       <a href=\"javascript:selectTableRowsByIdPrefix('prefFeedCatList', 
+                                               'FCATR-', 'FCCHK-', false)\">None</a>
+                               </td</tr>";
+
+                               print "<tr class=\"title\">
+                                                       <td width=\"5%\"></td><td width=\"80%\">Title</td>
+                                               </tr>";
+                                               
+                               $lnum = 0;
+                               
+                               while ($line = db_fetch_assoc($result)) {
+               
+                                       $class = ($lnum % 2) ? "even" : "odd";
+               
+                                       $cat_id = $line["id"];
+               
+                                       $edit_cat_id = $_GET["id"];
+               
+                                       if ($subop == "editCat" && $cat_id != $edit_cat_id) {
+                                               $class .= "Grayed";
+                                               $this_row_id = "";
+                                       } else {
+                                               $this_row_id = "id=\"FCATR-$cat_id\"";
+                                       }
+               
+                                       print "<tr class=\"$class\" $this_row_id>";
+               
+                                       $edit_title = htmlspecialchars(db_unescape_string($line["title"]));
+               
+                                       if (!$edit_cat_id || $subop != "editCat") {
+               
+                                               print "<td align='center'><input onclick='toggleSelectRow(this);' 
+                                               type=\"checkbox\" id=\"FCCHK-".$line["id"]."\"></td>";
+               
+                                               print "<td><a href=\"javascript:editFeedCat($cat_id);\">" . 
+                                                       $edit_title . "</a></td>";              
+               
+                                       } else if ($cat_id != $edit_cat_id) {
+               
+                                               print "<td><input disabled=\"true\" type=\"checkbox\" 
+                                                       id=\"FRCHK-".$line["id"]."\"></td>";
+               
+                                               print "<td>$edit_title</td>";           
+               
+                                       } else {
+               
+                                               print "<td><input disabled=\"true\" type=\"checkbox\" checked></td>";
+               
+                                               print "<td><input id=\"iedit_title\" value=\"$edit_title\"></td>";
+                                               
+                                       }
                                        
+                                       print "</tr>";
+               
+                                       ++$lnum;
                                }
-                               
-                               print "</tr>";
        
-                               ++$lnum;
-                       }
-       
-                       if ($lnum == 0) {
-                               print "<tr><td colspan=\"5\" align=\"center\">No categories defined.</td></tr>";
-                       }
-       
-                       print "</table>";
+                               print "</table>";
        
-                       print "<p>";
+                               print "<p>";
        
-                       if ($subop == "editCat") {
-                               print "Edit category:&nbsp;
+                               if ($subop == "editCat") {
+                                       print "Edit category:&nbsp;
+                                               <input type=\"submit\" class=\"button\" 
+                                                       onclick=\"javascript:feedCatEditCancel()\" value=\"Cancel\">
+                                               <input type=\"submit\" class=\"button\" 
+                                                       onclick=\"javascript:feedCatEditSave()\" value=\"Save\">";
+                                       } else {
+               
+                                       print "
+                                               Selection:&nbsp;
                                        <input type=\"submit\" class=\"button\" 
-                                               onclick=\"javascript:feedCatEditCancel()\" value=\"Cancel\">
+                                               onclick=\"javascript:editSelectedFeedCat()\" value=\"Edit\">
                                        <input type=\"submit\" class=\"button\" 
-                                               onclick=\"javascript:feedCatEditSave()\" value=\"Save\">";
-                               } else {
+                                               onclick=\"javascript:removeSelectedFeedCats()\" value=\"Remove\">";
        
-                               print "
-                                       Selection:&nbsp;
-                               <input type=\"submit\" class=\"button\" 
-                                       onclick=\"javascript:editSelectedFeedCat()\" value=\"Edit\">
-                               <input type=\"submit\" class=\"button\" 
-                                       onclick=\"javascript:removeSelectedFeedCats()\" value=\"Remove\">";
-                       }
+                               }
+       
+                       } else {
+                               print "<p>No feed categories defined.</p>";
+                       }
                }
 
                print "<h3>Import OPML</h3>
        if ($op == "pref-filters") {
 
                $subop = $_GET["subop"];
+               $quiet = $_GET["quiet"];
 
                if ($subop == "editSave") {
 
                        $match = db_escape_string($_GET["m"]);
                        $filter_id = db_escape_string($_GET["id"]);
                        $feed_id = db_escape_string($_GET["fid"]);
+                       $action_id = db_escape_string($_GET["aid"]); 
 
                        if (!$feed_id) {
                                $feed_id = 'NULL';
                                reg_exp = '$regexp', 
                                description = '$descr',
                                feed_id = $feed_id,
+                               action_id = '$action_id',
                                filter_type = (SELECT id FROM ttrss_filter_types WHERE
                                        description = '$match')
                                WHERE id = '$filter_id'");
 
                        if (!WEB_DEMO_MODE) {
 
-                               $ids = split(",", $_GET["ids"]);
+                               $ids = split(",", db_escape_string($_GET["ids"]));
 
                                foreach ($ids as $id) {
                                        db_query($link, "DELETE FROM ttrss_filters WHERE id = '$id'");
                                $regexp = db_escape_string(trim($_GET["regexp"]));
                                $match = db_escape_string(trim($_GET["match"]));
                                $feed_id = db_escape_string($_GET["fid"]);
+                               $action_id = db_escape_string($_GET["aid"]); 
 
                                if (!$feed_id) {
                                        $feed_id = 'NULL';
                                }
 
                                $result = db_query($link,
-                                       "INSERT INTO ttrss_filters (reg_exp,filter_type,owner_uid,feed_id) VALUES 
+                                       "INSERT INTO ttrss_filters (reg_exp,filter_type,owner_uid,feed_id,
+                                               action_id) 
+                                       VALUES 
                                                ('$regexp', (SELECT id FROM ttrss_filter_types WHERE
-                                                       description = '$match'),'".$_SESSION["uid"]."', $feed_id)");
+                                                       description = '$match'),'".$_SESSION["uid"]."', 
+                                                       $feed_id, '$action_id')");
                        } 
                }
 
+               if ($quiet) return;
+
                $result = db_query($link, "SELECT description 
                        FROM ttrss_filter_types ORDER BY description");
 
                }
 
                print "</select>&nbsp;";
-       
+
+               print "&nbsp;Action: ";
+
+               print "<select id=\"fadd_action\">";
+
+               $result = db_query($link, "SELECT id,description FROM ttrss_filter_actions 
+                       ORDER BY name");
+
+               while ($line = db_fetch_assoc($result)) {                       
+                       printf("<option id='%d'>%s</option>", $line["id"], $line["description"]);
+               }
+
+               print "</select>&nbsp;";
+
                print "<input type=\"submit\" 
                        class=\"button\" onclick=\"javascript:addFilter()\" 
                        value=\"Add filter\">";
 
+               print "</div>";
+
                $result = db_query($link, "SELECT 
                                ttrss_filters.id AS id,reg_exp,
                                ttrss_filters.description AS description,
                                ttrss_filter_types.name AS filter_type_name,
                                ttrss_filter_types.description AS filter_type_descr,
                                feed_id,
+                               ttrss_filter_actions.description AS action_description,
                                (SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title
                        FROM 
-                               ttrss_filters,ttrss_filter_types
+                               ttrss_filters,ttrss_filter_types,ttrss_filter_actions
                        WHERE
                                filter_type = ttrss_filter_types.id AND
+                               ttrss_filter_actions.id = action_id AND
                                ttrss_filters.owner_uid = ".$_SESSION["uid"]."
                        ORDER by reg_exp");
 
-               print "<p><table width=\"100%\" class=\"prefFilterList\" id=\"prefFilterList\">";
+               if (db_num_rows($result) != 0) {
 
-               print "<tr class=\"title\">
-                                       <td width=\"5%\">Select</td><td width=\"30%\">Filter expression</td>
-                                       <td width=\"30%\">Feed</td><td width=\"10%\">Match</td>
-                                       <td width=\"30%\">Description</td></tr>";
+                       print "<p><table width=\"100%\" cellspacing=\"0\" class=\"prefFilterList\" 
+                               id=\"prefFilterList\">";
+
+                       print "<tr><td class=\"selectPrompt\" colspan=\"8\">
+                               Select: 
+                                       <a href=\"javascript:selectTableRowsByIdPrefix('prefFilterList', 
+                                               'FILRR-', 'FICHK-', true)\">All</a>,
+                                       <a href=\"javascript:selectTableRowsByIdPrefix('prefFilterList', 
+                                               'FILRR-', 'FICHK-', false)\">None</a>
+                               </td</tr>";
+
+                       print "<tr class=\"title\">
+                                               <td align='center' width=\"5%\">&nbsp;</td>
+                                               <td width=\"20%\">Filter expression</td>
+                                               <td width=\"20%\">Feed</td>
+                                               <td width=\"15%\">Match</td>
+                                               <td width=\"15%\">Action</td>
+                                               <td width=\"30%\">Description</td></tr>";
                
-               $lnum = 0;
+                       $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";
+                                       $this_row_id = "";
+                               } else {
+                                       $this_row_id = "id=\"FILRR-$filter_id\"";
+                               }
+       
+                               print "<tr class=\"$class\" $this_row_id>";
+       
+                               $line["regexp"] = htmlspecialchars($line["reg_exp"]);
+                               $line["description"] = htmlspecialchars($line["description"]);
+       
+                               if (!$line["feed_title"]) $line["feed_title"] = "All feeds";
+       
+                               if (!$edit_filter_id || $subop != "edit") {
+       
+                                       if (!$line["description"]) $line["description"] = "[No description]";
+       
+                                       print "<td align='center'><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["feed_title"] . "</td>";                  
+       
+                                       print "<td><a href=\"javascript:editFilter($filter_id);\">" . 
+                                               $line["filter_type_descr"] . "</td>";           
                
-               while ($line = db_fetch_assoc($result)) {
+                                       print "<td><a href=\"javascript:editFilter($filter_id);\">" . 
+                                               $line["action_description"] . "</td>";                  
 
-                       $class = ($lnum % 2) ? "even" : "odd";
-
-                       $filter_id = $line["id"];
-                       $edit_filter_id = $_GET["id"];
+                                       print "<td><a href=\"javascript:editFilter($filter_id);\">" . 
+                                               $line["description"] . "</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["feed_title"]."</td>";
+                                       print "<td>".$line["filter_type_descr"]."</td>";
+                                       print "<td>".$line["action_description"]."</td>";               
+                                       print "<td>".$line["description"]."</td>";              
 
-                       if ($subop == "edit" && $filter_id != $edit_filter_id) {
-                               $class .= "Grayed";
-                       }
+                               } else {
+       
+                                       print "<td><input disabled=\"true\" type=\"checkbox\" checked></td>";
+       
+                                       print "<td><input id=\"iedit_regexp\" value=\"".$line["reg_exp"].
+                                               "\"></td>";
+       
+                                       print "<td>";
+                                       print "<select id=\"iedit_feed\">";
+                                       print "<option id=\"0\">All feeds</option>";
+       
+                                       $tmp_result = db_query($link, "SELECT id,title FROM ttrss_feeds
+                                               WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
 
-                       print "<tr class=\"$class\" id=\"FILRR-$filter_id\">";
+                                       if (db_num_rows($tmp_result) > 0) {
+                                               print "<option disabled>--------</option>";
+                                       }
 
-                       $line["regexp"] = htmlspecialchars($line["reg_exp"]);
-                       $line["description"] = htmlspecialchars($line["description"]);
+                                       while ($tmp_line = db_fetch_assoc($tmp_result)) {
+                                               if ($tmp_line["id"] == $line["feed_id"]) {
+                                                       $is_selected = "selected";
+                                               } else {
+                                                       $is_selected = "";
+                                               }
+                                               printf("<option $is_selected id='%d'>%s</option>", 
+                                                       $tmp_line["id"], $tmp_line["title"]);
+                                       }
+       
+                                       print "</select></td>";
+       
+                                       print "<td>";
+                                       print_select("iedit_match", $line["filter_type_descr"], $filter_types);
+                                       print "</td>";
 
-                       if (!$line["feed_title"]) $line["feed_title"] = "All feeds";
+                                       print "<td>";
+                                       print "<select id=\"iedit_filter_action\">";
+       
+                                       $tmp_result = db_query($link, "SELECT id,description FROM ttrss_filter_actions
+                                               ORDER BY description");
 
-                       if (!$edit_filter_id || $subop != "edit") {
+                                       while ($tmp_line = db_fetch_assoc($tmp_result)) {
+                                               if ($tmp_line["description"] == $line["action_description"]) {
+                                                       $is_selected = "selected";
+                                               } else {
+                                                       $is_selected = "";
+                                               }
+                                               printf("<option $is_selected id='%d'>%s</option>", 
+                                                       $tmp_line["id"], $tmp_line["description"]);
+                                       }
+       
+                                       print "</select></td>";
 
-                               if (!$line["description"]) $line["description"] = "[No description]";
 
-                               print "<td><input onclick='toggleSelectRow(this);' 
-                               type=\"checkbox\" id=\"FICHK-".$line["id"]."\"></td>";
+                                       print "<td><input id=\"iedit_descr\" value=\"".$line["description"].
+                                               "\"></td>";
+       
+                                       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\">";
+                       }
 
-                               print "<td><a href=\"javascript:editFilter($filter_id);\">" . 
-                                       $line["reg_exp"] . "</td>";             
+               } else {
 
-                               print "<td><a href=\"javascript:editFilter($filter_id);\">" . 
-                                       $line["feed_title"] . "</td>";                  
+                       print "<p>No filters defined.</p>";
 
-                               print "<td><a href=\"javascript:editFilter($filter_id);\">" . 
-                                       $line["filter_type_descr"] . "</td>";           
-                                       
-                               print "<td><a href=\"javascript:editFilter($filter_id);\">" . 
-                                       $line["description"] . "</td>";                 
+               }
+       }
 
-                       } else if ($filter_id != $edit_filter_id) {
+       // We need to accept raw SQL data in label queries, so not everything is escaped
+       // here, this is by design. If you don't like the whole idea, disable labels
+       // altogether with GLOBAL_ENABLE_LABELS = false
 
-                               if (!$line["description"]) $line["description"] = "[No description]";
+       if ($op == "pref-labels") {
 
-                               print "<td><input disabled=\"true\" type=\"checkbox\" 
-                                       id=\"FICHK-".$line["id"]."\"></td>";
+               if (!GLOBAL_ENABLE_LABELS) { 
+                       return; 
+               }
 
-                               print "<td>".$line["reg_exp"]."</td>";          
-                               print "<td>".$line["feed_title"]."</td>";
-                               print "<td>".$line["filter_type_descr"]."</td>";
-                               print "<td>".$line["description"]."</td>";              
+               $subop = $_GET["subop"];
 
-                       } else {
+               if ($subop == "test") {
 
-                               print "<td><input disabled=\"true\" type=\"checkbox\" checked></td>";
+                       $expr = $_GET["expr"];
+                       $descr = $_GET["descr"];
 
-                               print "<td><input id=\"iedit_regexp\" value=\"".$line["reg_exp"].
-                                       "\"></td>";
+                       print "<div class='infoBoxContents'>";
+               
+                       print "<h1>Label &laquo;$descr&raquo;</h1>";
 
-                               print "<td>";
+//                     print "<p><b>Expression</b>: $expr</p>";
 
-                               print "<select id=\"iedit_feed\">";
+                       $result = db_query($link, 
+                               "SELECT count(id) AS num_matches
+                                       FROM ttrss_entries,ttrss_user_entries
+                                       WHERE ($expr) AND 
+                                               ttrss_user_entries.ref_id = ttrss_entries.id AND
+                                               owner_uid = " . $_SESSION["uid"]);
 
-                               print "<option id=\"0\">All feeds</option>";
+                       $num_matches = db_fetch_result($result, 0, "num_matches");;
+                       
+                       if ($num_matches > 0) { 
 
-                               if (db_num_rows($result) > 0) {
-                                       print "<option disabled>--------</option>";
-                               }
+                               print "<p>Query returned <b>$num_matches</b> matches, first 5 follow:</p>";
 
-                               $tmp_result = db_query($link, "SELECT id,title FROM ttrss_feeds
-                                       WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
+                               $result = db_query($link, 
+                                       "SELECT title, 
+                                               (SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title
+                                       FROM ttrss_entries,ttrss_user_entries
+                                                       WHERE ($expr) AND 
+                                                       ttrss_user_entries.ref_id = ttrss_entries.id
+                                                       AND owner_uid = " . $_SESSION["uid"] . " 
+                                                       ORDER BY date_entered DESC LIMIT 5");
 
-                               while ($tmp_line = db_fetch_assoc($tmp_result)) {
-                                       if ($tmp_line["id"] == $line["feed_id"]) {
-                                               $is_selected = "selected";
-                                       } else {
-                                               $is_selected = "";
-                                       }
-                                       printf("<option $is_selected id='%d'>%s</option>", 
-                                               $tmp_line["id"], $tmp_line["title"]);
+                               print "<ul class=\"nomarks\">";
+                               while ($line = db_fetch_assoc($result)) {
+                                       print "<li>".$line["title"].
+                                               " <span class=\"insensitive\">(".$line["feed_title"].")</span></li>";
                                }
+                               print "</ul>";
 
-                               print "</select></td>";
-
-                               print "<td>";
-                               print_select("iedit_match", $line["filter_type_descr"], $filter_types);
-                               print "</td>";
-
-                               print "<td><input id=\"iedit_descr\" value=\"".$line["description"].
-                                       "\"></td>";
-
-                               print "</td>";
+                       } else {
+                               print "<p>Query didn't return any matches.</p>";
                        }
-                       
-                       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 "</div>";
 
-                       print "
-                               Selection:
-                       <input type=\"submit\" class=\"button\" 
-                               onclick=\"javascript:editSelectedFilter()\" value=\"Edit\">
-                       <input type=\"submit\" class=\"button\" 
-                               onclick=\"javascript:removeSelectedFilters()\" value=\"Remove\">";
+                       print "<div align='center'>
+                               <input type='submit' class='button'                     
+                               onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
+                       return;
                }
-       }
-
-       if ($op == "pref-labels") {
-
-               $subop = $_GET["subop"];
 
                if ($subop == "editSave") {
 
 
                        if (!WEB_DEMO_MODE) {
 
-                               $ids = split(",", $_GET["ids"]);
+                               $ids = split(",", db_escape_string($_GET["ids"]));
 
                                foreach ($ids as $id) {
                                        db_query($link, "DELETE FROM ttrss_labels WHERE id = '$id'");
                                // no escaping is done here on purpose
                                $exp = trim($_GET["exp"]);
                                        
-                               $result = db_query($link,
-                                       "INSERT INTO ttrss_labels (sql_exp,description,owner_uid) 
-                                               VALUES ('$exp', '$exp', '".$_SESSION["uid"]."')");
-                       } 
-               }
-
-               print "<div class=\"prefGenericAddBox\">
-                       <input size=\"40\" id=\"ladd_expr\">&nbsp;";
-                       
-               print"<input type=\"submit\" class=\"button\" 
-                       onclick=\"javascript:addLabel()\" value=\"Add label\"></div>";
-
-               $result = db_query($link, "SELECT 
-                               id,sql_exp,description
-                       FROM 
-                               ttrss_labels 
-                       WHERE 
-                               owner_uid = ".$_SESSION["uid"]."
-                       ORDER by description");
-
-               print "<p><table width=\"100%\" class=\"prefLabelList\" id=\"prefLabelList\">";
-
-               print "<tr class=\"title\">
-                                       <td width=\"5%\">Select</td><td width=\"40%\">SQL expression
-                                       <a class=\"helpLink\" href=\"javascript:popupHelp(1)\">(?)</a>
-                                       </td>
-                                       <td width=\"40%\">Caption</td></tr>";
-               
-               $lnum = 0;
-               
-               while ($line = db_fetch_assoc($result)) {
-
-                       $class = ($lnum % 2) ? "even" : "odd";
-
-                       $label_id = $line["id"];
-                       $edit_label_id = $_GET["id"];
-
-                       if ($subop == "edit" && $label_id != $edit_label_id) {
-                               $class .= "Grayed";
-                       }
-
-                       print "<tr class=\"$class\" id=\"LILRR-$label_id\">";
-
-                       $line["sql_exp"] = htmlspecialchars($line["sql_exp"]);
-                       $line["description"] = htmlspecialchars($line["description"]);
-
-                       if (!$edit_label_id || $subop != "edit") {
-
-                               if (!$line["description"]) $line["description"] = "[No caption]";
-
-                               print "<td><input onclick='toggleSelectRow(this);' 
-                               type=\"checkbox\" id=\"LICHK-".$line["id"]."\"></td>";
-
-                               print "<td><a href=\"javascript:editLabel($label_id);\">" . 
-                                       $line["sql_exp"] . "</td>";             
-                                       
-                               print "<td><a href=\"javascript:editLabel($label_id);\">" . 
-                                       $line["description"] . "</td>";                 
-
-                       } else if ($label_id != $edit_label_id) {
+                               $result = db_query($link,
+                                       "INSERT INTO ttrss_labels (sql_exp,description,owner_uid) 
+                                               VALUES ('$exp', '$exp', '".$_SESSION["uid"]."')");
+                       } 
+               }
 
-                               if (!$line["description"]) $line["description"] = "[No description]";
+               print "<div class=\"prefGenericAddBox\">
+                       <input size=\"40\" id=\"ladd_expr\">&nbsp;";
+                       
+               print"<input type=\"submit\" class=\"button\" 
+                       onclick=\"javascript:addLabel()\" value=\"Add label\"></div>";
 
-                               print "<td><input disabled=\"true\" type=\"checkbox\" 
-                                       id=\"LICHK-".$line["id"]."\"></td>";
+               $result = db_query($link, "SELECT 
+                               id,sql_exp,description
+                       FROM 
+                               ttrss_labels 
+                       WHERE 
+                               owner_uid = ".$_SESSION["uid"]."
+                       ORDER by description");
 
-                               print "<td>".$line["sql_exp"]."</td>";          
-                               print "<td>".$line["description"]."</td>";              
+               print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
 
-                       } else {
+               if (db_num_rows($result) != 0) {
 
-                               print "<td><input disabled=\"true\" type=\"checkbox\" checked></td>";
+                       print "<p><table width=\"100%\" cellspacing=\"0\" 
+                               class=\"prefLabelList\" id=\"prefLabelList\">";
 
-                               print "<td><input id=\"iedit_expr\" value=\"".$line["sql_exp"].
-                                       "\"></td>";
+                       print "<tr><td class=\"selectPrompt\" colspan=\"8\">
+                               Select: 
+                                       <a href=\"javascript:selectTableRowsByIdPrefix('prefLabelList', 
+                                               'LILRR-', 'LICHK-', true)\">All</a>,
+                                       <a href=\"javascript:selectTableRowsByIdPrefix('prefLabelList', 
+                                               'LILRR-', 'LICHK-', false)\">None</a>
+                               </td</tr>";
 
-                               print "<td><input id=\"iedit_descr\" value=\"".$line["description"].
-                                       "\"></td>";
+                       print "<tr class=\"title\">
+                                               <td align='center' width=\"5%\">&nbsp;</td>
+                                               <td width=\"40%\">SQL expression
+                                               <a class=\"helpLink\" href=\"javascript:displayHelpInfobox(1)\">(?)</a>
+                                               </td>
+                                               <td width=\"40%\">Caption</td></tr>";
+                       
+                       $lnum = 0;
+                       
+                       while ($line = db_fetch_assoc($result)) {
+       
+                               $class = ($lnum % 2) ? "even" : "odd";
+       
+                               $label_id = $line["id"];
+                               $edit_label_id = $_GET["id"];
+       
+                               if ($subop == "edit" && $label_id != $edit_label_id) {
+                                       $class .= "Grayed";
+                                       $this_row_id = "";
+                               } else {
+                                       $this_row_id = "id=\"LILRR-$label_id\"";
+                               }
+       
+                               print "<tr class=\"$class\" $this_row_id>";
+       
+                               $line["sql_exp"] = htmlspecialchars($line["sql_exp"]);
+                               $line["description"] = htmlspecialchars($line["description"]);
+       
+                               if (!$edit_label_id || $subop != "edit") {
+       
+                                       if (!$line["description"]) $line["description"] = "[No caption]";
+       
+                                       print "<td align='center'><input onclick='toggleSelectRow(this);' 
+                                       type=\"checkbox\" id=\"LICHK-".$line["id"]."\"></td>";
+       
+                                       print "<td><a href=\"javascript:editLabel($label_id);\">" . 
+                                               $line["sql_exp"] . "</td>";             
                                                
-                       }
+                                       print "<td><a href=\"javascript:editLabel($label_id);\">" . 
+                                               $line["description"] . "</td>";                 
+       
+                               } else if ($label_id != $edit_label_id) {
+       
+                                       if (!$line["description"]) $line["description"] = "[No description]";
+       
+                                       print "<td><input disabled=\"true\" type=\"checkbox\" 
+                                               id=\"LICHK-".$line["id"]."\"></td>";
+       
+                                       print "<td>".$line["sql_exp"]."</td>";          
+                                       print "<td>".$line["description"]."</td>";              
+       
+                               } else {
+       
+                                       print "<td><input disabled=\"true\" type=\"checkbox\" checked></td>";
+       
+                                       print "<td><input id=\"iedit_expr\" value=\"".$line["sql_exp"].
+                                               "\"></td>";
+       
+                                       print "<td><input id=\"iedit_descr\" value=\"".$line["description"].
+                                               "\"></td>";
+                                                       
+                               }
+                                       
                                
-                       
-                       print "</tr>";
-
-                       ++$lnum;
-               }
-
-               if ($lnum == 0) {
-                       print "<tr><td colspan=\"4\" align=\"center\">No labels defined.</td></tr>";
-               }
-
-               print "</table>";
-
-               print "<p>";
-
-               if ($subop == "edit") {
-                       print "Edit label:
+                               print "</tr>";
+       
+                               ++$lnum;
+                       }
+       
+                       if ($lnum == 0) {
+                               print "<tr><td colspan=\"4\" align=\"center\">No labels defined.</td></tr>";
+                       }
+       
+                       print "</table>";
+       
+                       print "<p>";
+       
+                       if ($subop == "edit") {
+                               print "Edit label:
+                                       <input type=\"submit\" class=\"button\" 
+                                               onclick=\"javascript:labelTest()\" value=\"Test\">
+                                       <input type=\"submit\" class=\"button\" 
+                                               onclick=\"javascript:labelEditCancel()\" value=\"Cancel\">
+                                       <input type=\"submit\" class=\"button\" 
+                                               onclick=\"javascript:labelEditSave()\" value=\"Save\">";
+                                               
+                       } else {
+       
+                               print "
+                                       Selection:
                                <input type=\"submit\" class=\"button\" 
-                                       onclick=\"javascript:labelEditCancel()\" value=\"Cancel\">
+                                       onclick=\"javascript:editSelectedLabel()\" value=\"Edit\">
                                <input type=\"submit\" class=\"button\" 
-                                       onclick=\"javascript:labelEditSave()\" value=\"Save\">";
-                                       
+                                       onclick=\"javascript:removeSelectedLabels()\" value=\"Remove\">";
+                       }
                } else {
-
-                       print "
-                               Selection:
-                       <input type=\"submit\" class=\"button\" 
-                               onclick=\"javascript:editSelectedLabel()\" value=\"Edit\">
-                       <input type=\"submit\" class=\"button\" 
-                               onclick=\"javascript:removeSelectedLabels()\" value=\"Remove\">";
+                       print "<p>No labels defined.</p>";
                }
        }
 
        }
 
        if ($op == "help") {
-               print "<html><head>
-                       <title>Tiny Tiny RSS : Help</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 (!$_GET["noheaders"]) {
+                       print "<html><head>
+                               <title>Tiny Tiny RSS : Help</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>";
+               }
 
                $tid = sprintf("%d", $_GET["tid"]);
 
-               /* FIXME this badly needs real implementation */
-
-               print "<div class='helpResponse'>";
-
-               ?>
-
-               <h1>Help for SQL expressions</h1>
-
-               <h2>Description</h2>
-
-               <p>The &laquo;SQL expression&raquo; is added to WHERE clause of
-                       view feed query. You can match on ttrss_entries table fields
-                       and even use subselect to query additional information. This 
-                       functionality is considered to be advanced and requires basic
-                       understanding of SQL.</p>
-                       
-               <h2>Examples</h2>
-
-               <pre>unread = true</pre>
-
-               Matches all unread articles
-
-               <pre>title like '%Linux%'</pre>
-
-               Matches all articles which mention Linux in the title. You get the idea.
+               print "<div class='infoBoxContents'>";
 
-               <p>See the database schema included in the distribution package for gruesome
-               details.</p>
+               if (file_exists("help/$tid.php")) {
+                       include("help/$tid.php");
+               } else {
+                       print "<p>Help topic not found.</p>";
+               }
 
-               <?
+               print "</div>";
 
                print "<div align='center'>
-                       <a class=\"helpLink\"
-                       href=\"javascript:window.close()\">(Close this window)</a></div>";
-
-               print "</div>";
+                       <input type='submit' class='button'                     
+                       onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
 
-               print "</body></html>";
+               if (!$_GET["noheaders"]) { 
+                       print "</body></html>";
+               }
 
        }
 
                $param = $_GET["param"];
 
                if ($id == "quickAddFeed") {
-                       print "Feed URL: <input 
+                       print "
+                       Feed URL: <input 
                        onblur=\"javascript:enableHotkeys()\" onfocus=\"javascript:disableHotkeys()\"
                        id=\"qafInput\">
                        <input class=\"button\"
 
                                $f_title = db_fetch_result($result, 0, "title");
                
-                               print "Remove current feed ($f_title)?&nbsp;
+                               print "Remove current feed (<b>$f_title</b>)?&nbsp;
                                <input class=\"button\"
                                        type=\"submit\" onclick=\"javascript:qfdDelete($param)\" value=\"Remove\">
                                <input class=\"button\"
 
                }
 
+               if ($id == "quickAddFilter") {
+
+                       $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>";
+
+                       print "<tr><td>Match:</td><td><input id=\"fadd_regexp\" size=\"40\">&nbsp;";
+                       
+                       print_select("fadd_match", "Title", $filter_types);     
+       
+                       print "</td></tr>";
+                       print "<tr><td>Feed:</td><td><select id=\"fadd_feed\">";
+       
+                       print "<option selected id=\"0\">All feeds</option>";
+       
+                       $result = db_query($link, "SELECT id,title FROM ttrss_feeds
+                               WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
+       
+                       if (db_num_rows($result) > 0) {
+                               print "<option disabled>--------</option>";
+                       }
+       
+                       while ($line = db_fetch_assoc($result)) {
+                               if ($param == $line["id"]) {
+                                       $selected = "selected";
+                               } else {
+                                       $selected = "";
+                               }
+                               printf("<option id='%d' %s>%s</option>", $line["id"], $selected, $line["title"]);
+                       }
+       
+                       print "</select></td></tr>";
+       
+                       print "<tr><td>Action:</td>";
+       
+                       print "<td><select id=\"fadd_action\">";
+       
+                       $result = db_query($link, "SELECT id,description FROM ttrss_filter_actions 
+                               ORDER BY name");
+
+                       while ($line = db_fetch_assoc($result)) {
+                               printf("<option id='%d'>%s</option>", $line["id"], $line["description"]);
+                       }
+       
+                       print "</select>";
+       
+                       print "</td></tr><tr><td colspan=\"2\" align=\"right\">";
+       
+                       print "<input type=\"submit\" 
+                               class=\"button\" onclick=\"javascript:qaddFilter()\" 
+                               value=\"Add filter\"> ";
+
+                       print "<input class=\"button\"
+                               type=\"submit\" onclick=\"javascript:closeDlg()\" 
+                               value=\"Close\">";
+
+                       print "</td></tr></table>";
+               }
        }
 
        // update feeds of all users, may be used anonymously
 
                        header("Location: prefs.php");
 
+               } else if ($subop == "Change theme") {
+
+                       $theme = db_escape_string($_POST["theme"]);
+
+                       if ($theme == "Default") {
+                               $theme_qpart = 'NULL';
+                       } else {
+                               $theme_qpart = "'$theme'";
+                       }
+
+                       $result = db_query($link, "SELECT id,theme_path FROM ttrss_themes
+                               WHERE theme_name = '$theme'");
+
+                       if (db_num_rows($result) == 1) {
+                               $theme_id = db_fetch_result($result, 0, "id");
+                               $theme_path = db_fetch_result($result, 0, "theme_path");
+                       } else {
+                               $theme_id = "NULL";
+                               $theme_path = "";
+                       }
+
+                       db_query($link, "UPDATE ttrss_users SET
+                               theme_id = $theme_id WHERE id = " . $_SESSION["uid"]);
+
+                       $_SESSION["theme"] = $theme_path;
+
+                       header("Location: prefs.php");
+
                } else {
 
                        if (!SINGLE_USER_MODE) {
 
                        }
 
+                       $result = db_query($link, "SELECT
+                               theme_id FROM ttrss_users WHERE id = " . $_SESSION["uid"]);
+
+                       $user_theme_id = db_fetch_result($result, 0, "theme_id");
+
+                       $result = db_query($link, "SELECT
+                               id,theme_name FROM ttrss_themes ORDER BY theme_name");
+
+                       if (db_num_rows($result) > 0) {
+
+                               print "<form action=\"backend.php\" method=\"POST\">";
+                               print "<table width=\"100%\" class=\"prefPrefsList\">";
+                               print "<tr><td colspan='3'><h3>Themes</h3></tr></td>";
+                               print "<tr><td width=\"40%\">Select theme</td>";
+                               print "<td><select name=\"theme\">";
+                               print "<option>Default</option>";
+                               print "<option disabled>--------</option>";                             
+                               
+                               while ($line = db_fetch_assoc($result)) {       
+                                       if ($line["id"] == $user_theme_id) {
+                                               $selected = "selected";
+                                       } else {
+                                               $selected = "";
+                                       }
+                                       print "<option $selected>" . $line["theme_name"] . "</option>";
+                               }
+                               print "</select></td></tr>";
+                               print "</table>";
+                               print "<input type=\"hidden\" name=\"op\" value=\"pref-prefs\">";
+                               print "<p><input class=\"button\" type=\"submit\" 
+                                       value=\"Change theme\" name=\"subop\">";
+                               print "</form>";
+                       }
+
                        $result = db_query($link, "SELECT 
                                ttrss_user_prefs.pref_name,short_desc,help_text,value,type_name,
                                section_name,def_value
                                name=\"subop\" value=\"Save configuration\">";
                                
                        print "&nbsp;<input class=\"button\" type=\"submit\" 
-                               name=\"subop\" value=\"Reset to defaults\"></p>";
+                               name=\"subop\" onclick=\"return validatePrefsReset()\" 
+                               value=\"Reset to defaults\"></p>";
 
                        print "</form>";
 
 
                        if (!WEB_DEMO_MODE && $_SESSION["access_level"] >= 10) {
 
-                               $ids = split(",", $_GET["ids"]);
+                               $ids = split(",", db_escape_string($_GET["ids"]));
 
                                foreach ($ids as $id) {
                                        db_query($link, "DELETE FROM ttrss_users WHERE id = '$id' AND id != " . $_SESSION["uid"]);
                }
 
                print "<div class=\"prefGenericAddBox\">
-                       <input id=\"uadd_box\" size=\"40\">&nbsp;";
+                       <input id=\"uadd_box\" onchange=\"javascript:addUser()\" size=\"40\">&nbsp;";
                        
                print"<input type=\"submit\" class=\"button\" 
                        onclick=\"javascript:addUser()\" value=\"Add user\"></div>";
 
                print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
 
-               print "<p><table width=\"100%\" class=\"prefUserList\" id=\"prefUserList\">";
+               print "<p><table width=\"100%\" cellspacing=\"0\" 
+                       class=\"prefUserList\" id=\"prefUserList\">";
+
+               print "<tr><td class=\"selectPrompt\" colspan=\"8\">
+                               Select: 
+                                       <a href=\"javascript:selectTableRowsByIdPrefix('prefUserList', 
+                                               'UMRR-', 'UMCHK-', true)\">All</a>,
+                                       <a href=\"javascript:selectTableRowsByIdPrefix('prefUserList', 
+                                               'UMRR-', 'UMCHK-', false)\">None</a>
+                               </td</tr>";
 
                print "<tr class=\"title\">
-                                       <td width=\"5%\">Select</td>
+                                       <td align='center' width=\"5%\">&nbsp;</td>
                                        <td width='30%'>Username</td>
                                        <td width='30%'>Access Level</td>
                                        <td width='30%'>Last login</td></tr>";
 
                        if ($uid == $_SESSION["uid"] || ($subop == "edit" && $uid != $edit_uid)) {
                                $class .= "Grayed";
-                       }
-               
-                       print "<tr class=\"$class\" id=\"UMRR-$uid\">";
+                               $this_row_id = "";
+                       } else {
+                               $this_row_id = "id=\"UMRR-$uid\"";
+                       }               
+                       
+                       print "<tr class=\"$class\" $this_row_id>";
 
                        $line["login"] = htmlspecialchars($line["login"]);
 
+                       $line["last_login"] = date(get_pref($link, 'SHORT_DATE_FORMAT'),
+                               strtotime($line["last_login"]));
+
                        if ($uid == $_SESSION["uid"]) {
 
-                               print "<td><input disabled=\"true\" type=\"checkbox\" 
+                               print "<td align='center'><input disabled=\"true\" type=\"checkbox\" 
                                        id=\"UMCHK-".$line["id"]."\"></td>";
 
                                print "<td>".$line["login"]."</td>";            
 
                        } else if (!$edit_uid || $subop != "edit") {
 
-                               print "<td><input onclick='toggleSelectRow(this);' 
+                               print "<td align='center'><input onclick='toggleSelectRow(this);' 
                                type=\"checkbox\" id=\"UMCHK-$uid\"></td>";
 
                                print "<td><a href=\"javascript:editUser($uid);\">" . 
                print "<table width='100%'>";
 
                $login = db_fetch_result($result, 0, "login");
-               $last_login = db_fetch_result($result, 0, "last_login");
+               $last_login = date(get_pref($link, 'LONG_DATE_FORMAT'),
+                       strtotime(db_fetch_result($result, 0, "last_login")));
                $access_level = db_fetch_result($result, 0, "access_level");
                $stored_articles = db_fetch_result($result, 0, "stored_articles");
 
 
                print "<h1>Subscribed feeds</h1>";
 
-               $result = db_query($link, "SELECT id,title,feed_url FROM ttrss_feeds
-                       WHERE owner_uid = '$uid' ORDER BY title");
+               $result = db_query($link, "SELECT id,title,site_url FROM ttrss_feeds
+                       WHERE owner_uid = '$uid' ORDER BY title LIMIT 20");
 
                print "<ul class=\"nomarks\">";
 
                                $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
                        }
 
-                       print "<li>$feed_icon&nbsp;<a href=\"".$line["feed_url"]."\">".$line["title"]."</a></li>";
+                       print "<li>$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
                }
 
+               if (db_num_rows($result) < $num_feeds) {
+                        // FIXME - add link to show ALL subscribed feeds here somewhere
+                       print "<li><img 
+                               class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">&nbsp;...</li>";
+               }
+               
                print "</ul>";
 
                print "</div>";
 
        if ($op == "feed-details") {
 
-               $feed_id = $_GET["id"];
-
-               $result = db_query($link, 
-                       "SELECT 
-                               title,feed_url,last_updated,icon_url,site_url,
-                               (SELECT COUNT(int_id) FROM ttrss_user_entries 
-                                       WHERE feed_id = id) AS total,
-                               (SELECT COUNT(int_id) FROM ttrss_user_entries 
-                                       WHERE feed_id = id AND unread = true) AS unread,
-                               (SELECT COUNT(int_id) FROM ttrss_user_entries 
-                                       WHERE feed_id = id AND marked = true) AS marked
-                       FROM ttrss_feeds
-                       WHERE id = '$feed_id' AND owner_uid = ".$_SESSION["uid"]);
-
-               if (db_num_rows($result) == 0) return;
-
-               $title = db_fetch_result($result, 0, "title");
-               $last_updated = db_fetch_result($result, 0, "last_updated");
-               $feed_url = db_fetch_result($result, 0, "feed_url");
-               $icon_url = db_fetch_result($result, 0, "icon_url");
-               $total = db_fetch_result($result, 0, "total");
-               $unread = db_fetch_result($result, 0, "unread");
-               $marked = db_fetch_result($result, 0, "marked");
-               $site_url = db_fetch_result($result, 0, "site_url");
-
-               $result = db_query($link, "SELECT COUNT(id) AS subscribed
-                                       FROM ttrss_feeds WHERE feed_url = '$feed_url'");
+//             $feed_id = $_GET["id"];
 
-               $subscribed = db_fetch_result($result, 0, "subscribed");
+               $feed_ids = split(",", db_escape_string($_GET["id"]));
 
                print "<div class=\"infoBoxContents\">";
 
-               $icon_file = ICONS_DIR . "/$feed_id.ico";
-
-               if (file_exists($icon_file) && filesize($icon_file) > 0) {
-                               $feed_icon = "<img width=\"16\" height=\"16\"
-                                       src=\"" . ICONS_URL . "/$feed_id.ico\">";
-               } else {
-                       $feed_icon = "";
-               }
-
-               print "<h1>$feed_icon $title</h1>";
-
-               print "<table width='100%'>";
-
-               if ($site_url) {
-                       print "<tr><td width='30%'>Link</td>
-                               <td><a href=\"$site_url\">$site_url</a>
-                               <a href=\"$feed_url\">(feed)</a></td>
-                               </td></tr>";
-               } else {
-                       print "<tr><td width='30%'>Feed URL</td>
-                               <td><a href=\"$feed_url\">$feed_url</a></td></tr>";
-               }
-               print "<tr><td>Last updated</td><td>$last_updated</td></tr>";
-               print "<tr><td>Total articles</td><td>$total</td></tr>";
-               print "<tr><td>Unread articles</td><td>$unread</td></tr>";
-               print "<tr><td>Starred articles</td><td>$marked</td></tr>";
-               print "<tr><td>Subscribed users</td><td>$subscribed</td></tr>";
-
-               print "</table>";
-
-               $result = db_query($link, "SELECT title,
-                       SUBSTRING(updated,1,16) AS updated,unread
-                       FROM ttrss_entries,ttrss_user_entries
-                       WHERE ref_id = id AND feed_id = '$feed_id' 
-                       ORDER BY date_entered DESC LIMIT 5");
+               foreach ($feed_ids as $feed_id) {
 
-               if (db_num_rows($result) > 0) {
-
-                       print "<h1>Latest headlines</h1>";
-
-                       print "<ul class=\"nomarks\">";
+                       $result = db_query($link, 
+                               "SELECT 
+                                       title,feed_url,
+                                       SUBSTRING(last_updated,1,16) as last_updated,
+                                       icon_url,site_url,
+                                       (SELECT COUNT(int_id) FROM ttrss_user_entries 
+                                               WHERE feed_id = id) AS total,
+                                       (SELECT COUNT(int_id) FROM ttrss_user_entries 
+                                               WHERE feed_id = id AND unread = true) AS unread,
+                                       (SELECT COUNT(int_id) FROM ttrss_user_entries 
+                                               WHERE feed_id = id AND marked = true) AS marked
+                               FROM ttrss_feeds
+                               WHERE id = '$feed_id' AND owner_uid = ".$_SESSION["uid"]);
+       
+                       if (db_num_rows($result) == 0) return;
+       
+                       $title = db_unescape_string(db_fetch_result($result, 0, "title"));
+                       $last_updated = date(get_pref($link, 'LONG_DATE_FORMAT'),
+                               strtotime(db_fetch_result($result, 0, "last_updated")));
+                       $feed_url = db_fetch_result($result, 0, "feed_url");
+                       $icon_url = db_fetch_result($result, 0, "icon_url");
+                       $total = db_fetch_result($result, 0, "total");
+                       $unread = db_fetch_result($result, 0, "unread");
+                       $marked = db_fetch_result($result, 0, "marked");
+                       $site_url = db_fetch_result($result, 0, "site_url");
+       
+                       $result = db_query($link, "SELECT COUNT(id) AS subscribed
+                                               FROM ttrss_feeds WHERE feed_url = '$feed_url'");
+       
+                       $subscribed = db_fetch_result($result, 0, "subscribed");
        
-                       while ($line = db_fetch_assoc($result)) {
-                               if ($line["unread"] == "t" || $line["unread"] == "1") {
-                                       $line["title"] = "<b>" . $line["title"] . "</b>";
-                               }                               
-                               print "<li>" . $line["title"].
-                               "&nbsp;<span class=\"insensitive\">(" .$line["updated"].")</span></li>";
+                       $icon_file = ICONS_DIR . "/$feed_id.ico";
+       
+                       if (file_exists($icon_file) && filesize($icon_file) > 0) {
+                                       $feed_icon = "<img width=\"16\" height=\"16\"
+                                               src=\"" . ICONS_URL . "/$feed_id.ico\">";
+                       } else {
+                               $feed_icon = "";
                        }
        
-                       print "</ul>";
+                       print "<h1>$feed_icon $title</h1>";
        
-                       print "</div>";
+                       print "<table width='100%'>";
        
-                       print "<div align='center'>
-                               <input type='submit' class='button'                     
-                               onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
+                       if ($site_url) {
+                               print "<tr><td width='30%'>Link</td>
+                                       <td><a href=\"$site_url\">$site_url</a>
+                                       <a href=\"$feed_url\">(feed)</a></td>
+                                       </td></tr>";
+                       } else {
+                               print "<tr><td width='30%'>Feed URL</td>
+                                       <td><a href=\"$feed_url\">$feed_url</a></td></tr>";
+                       }
+                       print "<tr><td>Last updated</td><td>$last_updated</td></tr>";
+                       print "<tr><td>Total articles</td><td>$total</td></tr>";
+                       print "<tr><td>Unread articles</td><td>$unread</td></tr>";
+                       print "<tr><td>Starred articles</td><td>$marked</td></tr>";
+                       print "<tr><td>Subscribed users</td><td>$subscribed</td></tr>";
+       
+                       print "</table>";
+       
+/*                     $result = db_query($link, "SELECT title,
+                               SUBSTRING(updated,1,16) AS updated,unread
+                               FROM ttrss_entries,ttrss_user_entries
+                               WHERE ref_id = id AND feed_id = '$feed_id' 
+                               ORDER BY date_entered DESC LIMIT 5");
+       
+                       if (db_num_rows($result) > 0) {
+       
+                               print "<h1>Latest headlines</h1>";
+       
+                               print "<ul class=\"nomarks\">";
+               
+                               while ($line = db_fetch_assoc($result)) {
+                                       if ($line["unread"] == "t" || $line["unread"] == "1") {
+                                               $line["title"] = "<b>" . $line["title"] . "</b>";
+                                       }                               
+                                       print "<li>" . $line["title"].
+                                       "&nbsp;<span class=\"insensitive\">(" .
+                                               date(get_pref($link, 'SHORT_DATE_FORMAT'), 
+                                                       strtotime($line["updated"])).
+                                       ")</span></li>";
+                               }
+               
+                               print "</ul>";
+               
+                       } */
                }
-       }
+
+               print "</div>";
+       
+               print "<div align='center'>
+                       <input type='submit' class='button'                     
+                       onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
+       }       
 
        db_close($link);
 ?>