]> git.wh0rd.org - tt-rss.git/blobdiff - modules/pref-feeds.php
prefs: add bookmarklet to subscribe to feeds
[tt-rss.git] / modules / pref-feeds.php
index c1190b549fa84371697842db8a5b84a1724b557b..dc3553d109f3f94c55f71659972bf5ac8db341bd 100644 (file)
                $quiet = $_REQUEST["quiet"];
                $mode = $_REQUEST["mode"];
 
-               if ($subop == "massSubscribe") {
+               if ($subop == "removeicon") {                   
+                       $feed_id = db_escape_string($_REQUEST["feed_id"]);
+
+                       $result = db_query($link, "SELECT id FROM ttrss_feeds
+                               WHERE id = '$feed_id' AND owner_uid = ". $_SESSION["uid"]);
+
+                       if (db_num_rows($result) != 0) {
+                               unlink(ICONS_DIR . "/$feed_id.ico");
+                       }
+
+                       return;
+               }
+
+               if ($subop == "uploadicon") {
+                       $icon_file = $_FILES['icon_file']['tmp_name'];
+                       $feed_id = db_escape_string($_REQUEST["feed_id"]);
+
+                       if (is_file($icon_file) && $feed_id) {
+                               if (filesize($icon_file) < 20000) {
+                                       
+                                       $result = db_query($link, "SELECT id FROM ttrss_feeds
+                                               WHERE id = '$feed_id' AND owner_uid = ". $_SESSION["uid"]);
+
+                                       if (db_num_rows($result) != 0) {
+                                               unlink(ICONS_DIR . "/$feed_id.ico");
+                                               move_uploaded_file($icon_file, ICONS_DIR . "/$feed_id.ico");
+                                               $rc = 0;
+                                       } else {
+                                               $rc = 2;
+                                       }
+                               } else {
+                                       $rc = 1;
+                               }
+                       } else {
+                               $rc = 2;
+                       }
+
+                       print "<script type=\"text/javascript\">";
+                       print "parent.uploadIconHandler($rc);";
+                       print "</script>";
+                       return;
+               }
+
+/*             if ($subop == "massSubscribe") {
                        $ids = split(",", db_escape_string($_REQUEST["ids"]));
 
                        $subscribed = array();
 
                                print format_notice($msg);
                        }
-               }               
 
-               if ($subop == "browse") {
+                       return;
+               } */
+
+/*             if ($subop == "browse") {
 
                        print "<div id=\"infoBoxTitle\">".__('Feed Browser')."</div>";
                        
 
                        print "</div>";
                        return;
-               }
+               } */
 
                if ($subop == "editfeed") {
                        $feed_id = db_escape_string($_REQUEST["id"]);
 
                        print "</select>";
 
-
+       
                        print "</div>";
 
                        print "<div class=\"dlgSec\">".__("Update")."</div>";
 
                        /* Update method */
 
-                       if (ALLOW_SELECT_UPDATE_METHOD) {
-                               $update_method = db_fetch_result($result, 0, "update_method");
+                       $update_method = db_fetch_result($result, 0, "update_method");
 
-                               print " " . __('using') . " ";
-                               print_select_hash("update_method", $update_method, $update_methods);                    
-                       }
+                       print " " . __('using') . " ";
+                       print_select_hash("update_method", $update_method, $update_methods);                    
 
                        $purge_interval = db_fetch_result($result, 0, "purge_interval");
 
                                $checked = "";
                        }
 
-                       if (ENABLE_SIMPLEPIE && SIMPLEPIE_CACHE_IMAGES) {
+                       if (SIMPLEPIE_CACHE_IMAGES) {
                                $disabled = "";
                                $label_class = "";
                        } else {
 
                        print "</form>";
 
+                       /* Icon */
+
+                       print "<br/>";
+
+                       print "<div class=\"dlgSec\">".__("Icon")."</div>";
+                       print "<div class=\"dlgSecCont\">";
+
+                       print "<iframe name=\"icon_upload_iframe\"
+                               style=\"width: 400px; height: 100px; display: none;\"></iframe>";
+
+                       print "<form style='display : block' target=\"icon_upload_iframe\"
+                               enctype=\"multipart/form-data\" method=\"POST\" 
+                               action=\"backend.php\">
+                               <input id=\"icon_file\" size=\"10\" name=\"icon_file\" type=\"file\">
+                               <input type=\"hidden\" name=\"op\" value=\"pref-feeds\">
+                               <input type=\"hidden\" name=\"feed_id\" value=\"$feed_id\">
+                               <input type=\"hidden\" name=\"subop\" value=\"uploadicon\">
+                               <button onclick=\"return uploadFeedIcon();\"
+                                       type=\"submit\">".__('Replace')."</button>
+                               <button onclick=\"return removeFeedIcon($feed_id);\"
+                                       type=\"submit\">".__('Remove')."</button>
+                               </form>";
+
+                       print "</div>";
+
                        $title = htmlspecialchars($title, ENT_QUOTES);
 
                        print "<div class='dlgButtons'>
 
                        /* Update method */
 
-                       if (ALLOW_SELECT_UPDATE_METHOD) {
-                               print " " . __('using') . " ";
-                               print_select_hash("update_method", $update_method, $update_methods, 
-                                       "disabled");                    
-                               batch_edit_cbox("update_method");
-                       }
+                       print " " . __('using') . " ";
+                       print_select_hash("update_method", $update_method, $update_methods, 
+                               "disabled");                    
+                       batch_edit_cbox("update_method");
 
                        /* Purge intl */
 
                                __('Cache images locally')."</label>";
 
 
-                       if (ENABLE_SIMPLEPIE && SIMPLEPIE_CACHE_IMAGES) {
+                       if (SIMPLEPIE_CACHE_IMAGES) {
                                print "&nbsp;"; batch_edit_cbox("cache_images", "cache_images_l");
                        }
 
                                $parent_qpart = 'parent_feed = NULL';
                        }
 
-                       if (ENABLE_SIMPLEPIE && SIMPLEPIE_CACHE_IMAGES) {
+                       if (SIMPLEPIE_CACHE_IMAGES) {
                                $cache_images_qpart = "cache_images = $cache_images,";
                        } else {
                                $cache_images_qpart = "";
                        foreach ($ids as $id) {
                                remove_feed($link, $id, $_SESSION["uid"]);
                        }
+
+                       return;
                }
 
                if ($subop == "clear") {
                }
 
                if ($subop == "add") {
-               
-                       if (!WEB_DEMO_MODE) {
-
-                               $feed_url = db_escape_string(trim($_REQUEST["feed_url"]));
-                               $cat_id = db_escape_string($_REQUEST["cat_id"]);
-                               $p_from = db_escape_string($_REQUEST["from"]);
-
-                               /* only read authentication information from POST */
-
-                               $auth_login = db_escape_string(trim($_POST["auth_login"]));
-                               $auth_pass = db_escape_string(trim($_POST["auth_pass"]));
-
-                               if ($p_from != 'tt-rss') {
-                                       print "<html>
-                                               <head>
-                                                       <title>Tiny Tiny RSS</title>
-                                                       <link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\">
-                                               </head>
-                                               <body>
-                                               <img class=\"floatingLogo\" src=\"images/ttrss_logo.png\"
-                                                       alt=\"Tiny Tiny RSS\"/> 
-                                               <h1>Subscribe to feed...</h1>";
-                               }
 
-                               if (subscribe_to_feed($link, $feed_url, $cat_id, $auth_login, $auth_pass)) {
-                                       print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
-                               } else {
-                                       print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
-                               }
+                       $feed_url = db_escape_string(trim($_REQUEST["feed_url"]));
+                       $cat_id = db_escape_string($_REQUEST["cat_id"]);
+                       $p_from = db_escape_string($_REQUEST["from"]);
 
-                               if ($p_from != 'tt-rss') {
-                                       $tt_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'tt-rss.php', $_SERVER["REQUEST_URI"]);
+                       /* only read authentication information from POST */
 
+                       $auth_login = db_escape_string(trim($_POST["auth_login"]));
+                       $auth_pass = db_escape_string(trim($_POST["auth_pass"]));
 
-                                       $tp_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'prefs.php', $_SERVER["REQUEST_URI"]);
+                       if ($p_from != 'tt-rss') {
+                               print "<html>
+                                       <head>
+                                               <title>Tiny Tiny RSS</title>
+                                               <link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\">
+                                       </head>
+                                       <body>
+                                       <img class=\"floatingLogo\" src=\"images/ttrss_logo.png\"
+                                               alt=\"Tiny Tiny RSS\"/> 
+                                       <h1>Subscribe to feed...</h1>";
+                       }
 
-                                       $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
-                                               feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
+                       $rc = subscribe_to_feed($link, $feed_url, $cat_id, $auth_login, $auth_pass);
+
+                       switch ($rc) {
+                       case 1: 
+                               print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
+                               break;
+                       case 2:
+                               print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
+                               break;
+                       case 0:
+                               print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
+                               break;
+                       }
 
-                                       $feed_id = db_fetch_result($result, 0, "id");
+                       if ($p_from != 'tt-rss') {
+                               $tt_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'tt-rss.php', $_SERVER["REQUEST_URI"]);
 
-                                       print "<p>";
 
-                                       if ($feed_id) {
-                                               print "<form method=\"GET\" style='display: inline' 
-                                                       action=\"$tp_uri\">
-                                                       <input type=\"hidden\" name=\"tab\" value=\"feedConfig\">
-                                                       <input type=\"hidden\" name=\"subop\" value=\"editFeed\">
-                                                       <input type=\"hidden\" name=\"subopparam\" value=\"$feed_id\">
-                                                       <input type=\"submit\" value=\"".__("Edit subscription options")."\">
-                                                       </form>";
-                                       }
+                               $tp_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'prefs.php', $_SERVER["REQUEST_URI"]);
+
+                               $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
+                                       feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
 
-                                       print "<form style='display: inline' method=\"GET\" action=\"$tt_uri\">
-                                               <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
-                                               </form></p>";
+                               $feed_id = db_fetch_result($result, 0, "id");
 
-                                       print "</body></html>";
-                                       return;
+                               print "<p>";
+
+                               if ($feed_id) {
+                                       print "<form method=\"GET\" style='display: inline' 
+                                               action=\"$tp_uri\">
+                                               <input type=\"hidden\" name=\"tab\" value=\"feedConfig\">
+                                               <input type=\"hidden\" name=\"subop\" value=\"editFeed\">
+                                               <input type=\"hidden\" name=\"subopparam\" value=\"$feed_id\">
+                                               <input type=\"submit\" value=\"".__("Edit subscription options")."\">
+                                               </form>";
                                }
 
+                               print "<form style='display: inline' method=\"GET\" action=\"$tt_uri\">
+                                       <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
+                                       </form></p>";
+
+                               print "</body></html>";
+                               return;
                        }
                }
 
                if ($subop == "categorize") {
 
-                       if (!WEB_DEMO_MODE) {
 
-                               $ids = split(",", db_escape_string($_REQUEST["ids"]));
+                       $ids = split(",", db_escape_string($_REQUEST["ids"]));
 
-                               $cat_id = db_escape_string($_REQUEST["cat_id"]);
+                       $cat_id = db_escape_string($_REQUEST["cat_id"]);
 
-                               if ($cat_id == 0) {
-                                       $cat_id_qpart = 'NULL';
-                               } else {
-                                       $cat_id_qpart = "'$cat_id'";
-                               }
-
-                               db_query($link, "BEGIN");
+                       if ($cat_id == 0) {
+                               $cat_id_qpart = 'NULL';
+                       } else {
+                               $cat_id_qpart = "'$cat_id'";
+                       }
 
-                               foreach ($ids as $id) {
-                               
-                                       db_query($link, "UPDATE ttrss_feeds SET cat_id = $cat_id_qpart
-                                               WHERE id = '$id' AND parent_feed IS NULL
-                                               AND owner_uid = " . $_SESSION["uid"]);
+                       db_query($link, "BEGIN");
 
-                                       # update linked feed categories
-                                       db_query($link, "UPDATE ttrss_feeds SET
-                                               cat_id = $cat_id_qpart WHERE parent_feed = '$id' AND 
-                                               owner_uid = " . $_SESSION["uid"]);
+                       foreach ($ids as $id) {
+                       
+                               db_query($link, "UPDATE ttrss_feeds SET cat_id = $cat_id_qpart
+                                       WHERE id = '$id' AND parent_feed IS NULL
+                                       AND owner_uid = " . $_SESSION["uid"]);
 
-                               }
+                               # update linked feed categories
+                               db_query($link, "UPDATE ttrss_feeds SET
+                                       cat_id = $cat_id_qpart WHERE parent_feed = '$id' AND 
+                                       owner_uid = " . $_SESSION["uid"]);
 
-                               db_query($link, "COMMIT");
                        }
 
+                       db_query($link, "COMMIT");
+
                }
 
                if ($subop == "editCats") {
 
                        if ($action == "add") {
 
-                               if (!WEB_DEMO_MODE) {
-       
-                                       $feed_cat = db_escape_string(trim($_REQUEST["cat"]));
        
+                               $feed_cat = db_escape_string(trim($_REQUEST["cat"]));
+
+                               $result = db_query($link,
+                                       "SELECT id FROM ttrss_feed_categories
+                                       WHERE title = '$feed_cat' AND owner_uid = ".$_SESSION["uid"]);
+
+                               if (db_num_rows($result) == 0) {
+                                       
                                        $result = db_query($link,
-                                               "SELECT id FROM ttrss_feed_categories
-                                               WHERE title = '$feed_cat' AND owner_uid = ".$_SESSION["uid"]);
-       
-                                       if (db_num_rows($result) == 0) {
-                                               
-                                               $result = db_query($link,
-                                                       "INSERT INTO ttrss_feed_categories (owner_uid,title) 
-                                                       VALUES ('".$_SESSION["uid"]."', '$feed_cat')");
-       
-                                       } else {
-       
-                                               print_warning(T_sprintf("Category <b>$%s</b> already exists in the database.", 
-                                                       $feed_cat));
-                                       }
+                                               "INSERT INTO ttrss_feed_categories (owner_uid,title) 
+                                               VALUES ('".$_SESSION["uid"]."', '$feed_cat')");
 
+                               } else {
+
+                                       print_warning(T_sprintf("Category <b>$%s</b> already exists in the database.", 
+                                               $feed_cat));
                                }
+
                        }
 
                        if ($action == "remove") {
                                }
                        }
 
-                       print "<div class=\"prefGenericAddBox\">
+                       print "<div>
                                <input id=\"fadd_cat\" 
                                        onkeypress=\"return filterCR(event, addFeedCat)\"
                                        size=\"40\">
                                __('Search')."</button>
                        </div>";
                
-               print "<button onclick=\"javascript:displayDlg('quickAddFeed')\">"
+               print "<button onclick=\"quickAddFeed()\">"
                        .__('Subscribe to feed')."</button> ";
 
-               print "<button onclick=\"javascript:editSelectedFeed()\">".
+               print "<button onclick=\"editSelectedFeed()\">".
                        __('Edit feeds')."</button> ";
 
                if (get_pref($link, 'ENABLE_FEED_CATS')) {
                print "<button onclick=\"javascript:removeSelectedFeeds()\">"
                        .__('Unsubscribe')."</button> ";
 
-/*             print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
-                       <option value=\"facDefault\" selected>".__('Other actions...')."</option>";
-
-               if (FORCE_ARTICLE_PURGE == 0) {
-                       print 
-                               "<option value=\"facPurge\">".__('Manual purge')."</option>";
-               }
+               if (defined('_ENABLE_FEED_DEBUGGING')) {
 
-               print "
-                       <option value=\"facClear\">".__('Clear feed data')."</option>
-                       <option value=\"facRescore\">".__('Rescore articles')."</option>
-                       <option value=\"facUnsubscribe\">".__('Unsubscribe')."</option>";
-
-               print "</select>"; */
+                       print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
+                               <option value=\"facDefault\" selected>".__('More actions...')."</option>";
+       
+                       if (FORCE_ARTICLE_PURGE == 0) {
+                               print 
+                                       "<option value=\"facPurge\">".__('Manual purge')."</option>";
+                       }
+       
+                       print "
+                               <option value=\"facClear\">".__('Clear feed data')."</option>
+                               <option value=\"facRescore\">".__('Rescore articles')."</option>";
+       
+                       print "</select>";
 
-/*             if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) {
-                       print " <input type=\"submit\" class=\"button\"
-                               id=\"top25_feeds_btn\"
-                               onclick=\"javascript:browseFeeds()\" value=\"".__('More feeds')."\">";
-               } */
+               }
 
                $feeds_sort = db_escape_string($_REQUEST["sort"]);
 
 
                        print "<p>";
 
-/*                     print "<div id=\"feedOpToolbar\">";
-
-                       if (get_pref($link, 'ENABLE_FEED_CATS')) {
-
-                               print __('Selection:') . " ";
-
-                               print_feed_cat_select($link, "sfeed_set_fcat", "", "disabled");
-
-                               print " <input type=\"submit\" class=\"button\" disabled=\"true\"
-                                       onclick=\"javascript:categorizeSelectedFeeds()\" value=\"".
-                                       __('Recategorize')."\">";
-                       }
-                               
-                       print "</div>"; */
-
                } else {
 
                        print "<p>";
 
                }
 
-               print "<h3>".__('OPML')."</h3>
+               print "<h3>".__('OPML')."</h3>";
 
-               <div style='float : left'>
+/*             print "<div style='float : left'>
                <form   enctype=\"multipart/form-data\" method=\"POST\" action=\"opml.php\">
                ".__('File:')." <input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp;
                        <input type=\"hidden\" name=\"op\" value=\"Import\">
                                type=\"submit\">".__('Import')."</button>
                                </form></div>";
 
-               print "&nbsp;";
+               print "&nbsp;"; */
+
+               print "<p>" . __("Using OPML you can export and import your feeds and Tiny Tiny RSS settings.");
+
+               print "<div class=\"insensitive\">" . __("Note: Only main settings profile can be migrated using OPML.") . "</div>";
+
+               print "</p>";
+
+               print "<iframe name=\"upload_iframe\"
+                       style=\"width: 400px; height: 100px; display: none;\"></iframe>";
+
+               print "<div style='float : left'>";
+               print "<form style='display : block' target=\"upload_iframe\"
+                       enctype=\"multipart/form-data\" method=\"POST\" 
+                               action=\"backend.php\">
+                       <input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp;
+                       <input type=\"hidden\" name=\"op\" value=\"dlg\">
+                       <input type=\"hidden\" name=\"id\" value=\"importOpml\">
+                       <button onclick=\"return opmlImport();\"
+                               type=\"submit\">".__('Import')."</button>
+                       </form>";
+               print "</div>&nbsp;";
 
                print "<button onclick=\"gotoExportOpml()\">".
                        __('Export OPML')."</button>";
 
+               if (!get_pref($link, "_PREFS_OPML_PUBLISH_KEY")){
+                       set_pref($link, "_PREFS_OPML_PUBLISH_KEY", generate_publish_key());
+               }
+
+               print "<p>".__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.');
+
+               print "<div class=\"insensitive\">" . __("Note: Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") .                  "</div>" . "</p>";
 
-               print "<h3>" . __("Firefox Integration") . "</h3>";
+               print "<button onclick=\"return displayDlg('pubOPMLUrl')\">".
+                       __('Display URL')."</button> ";
+
+
+               if (strpos($_SERVER['HTTP_USER_AGENT'], "Firefox") !== false) {
+       
+                       print "<h3>" . __("Firefox Integration") . "</h3>";
                 
-               print "<p>" . __('This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below.') . "</p>";
+                       print "<p>" . __('This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below.') . "</p>";
 
-               print "<p";
+                       print "<p";
 
-               print "<button onclick='window.navigator.registerContentHandler(" .
+                       print "<button onclick='window.navigator.registerContentHandler(" .
                       "\"application/vnd.mozilla.maybe.feed\", " .
                       "\"" . add_feed_url() . "\", " . " \"Tiny Tiny RSS\")'>" .
                                                         __('Click here to register this site as a feed reader.') . 
                                "</button>";
 
-               print "</p>";
+                       print "</p>";
+               }
+
+               print "<h3>".__("Subscribing via bookmarklet")."</h3>";
+
+               print "<p>" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "</p>";
+
+               $bm_subscribe_url = str_replace('%s', '', add_feed_url());
+
+               $confirm_str = __('Subscribe to %s in Tiny Tiny RSS?');
+
+               $bm_url = htmlspecialchars("javascript:{if(confirm('$confirm_str'.replace('%s',window.location.href)))window.location.href='$bm_subscribe_url'+window.location.href}");
+
+               print "<a href=\"$bm_url\" class='visibleLink'>" . __('Subscribe in Tiny Tiny RSS'). "</a>";
 
                print "<h3>".__("Published articles")."</h3>";
 
 
                print "<button onclick=\"return displayDlg('pubUrl')\">".
                        __('Display URL')."</button> ";
-
+               
 
        }
 
                                        AND owner_uid = '$owner_uid') $search_qpart 
                                        ORDER BY subscribers DESC LIMIT $limit");
                        } else if ($mode == 2) {
-                               $result = db_query($link, "SELECT * FROM
-                                       ttrss_archived_feeds WHERE 
+                               $result = db_query($link, "SELECT *,
+                                       (SELECT COUNT(*) FROM ttrss_user_entries WHERE
+                                               orig_feed_id = ttrss_archived_feeds.id) AS articles_archived
+                                       FROM
+                                               ttrss_archived_feeds
+                                       WHERE 
                                        (SELECT COUNT(*) FROM ttrss_feeds 
                                                WHERE ttrss_feeds.feed_url = ttrss_archived_feeds.feed_url AND
                                                        owner_uid = '$owner_uid') = 0   AND                                     
 
                                        $feed_url = $line["feed_url"];
                                        $subscribers = $line["subscribers"];
-       
+
                                        $det_result = db_query($link, "SELECT site_url,title,id 
                                                FROM ttrss_feeds WHERE feed_url = '$feed_url' LIMIT 1");
        
                                                $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
                                        }
        
-                                       $check_box = "<input onclick='toggleSelectListRow(this)' class='feedBrowseCB' 
+                                       $check_box = "<input onclick='toggleSelectListRow(this)' 
+                                               class='feedBrowseCB' 
                                                type=\"checkbox\" id=\"FBCHK-" . $details["id"] . "\">";
        
                                        $class = ($feedctr % 2) ? "even" : "odd";
        
+                                       $feed_url = htmlspecialchars($line["feed_url"]);
+
                                        if ($details["site_url"]) {
-                                               $site_url = "<a target=\"_blank\" href=\"".$details["site_url"]."\">
+                                               $site_url = "<a target=\"_blank\" href=\"".
+                                                       htmlspecialchars($details["site_url"])."\">
                                                        <img style='border-width : 0px' src='images/www.png' alt='www'></a>";
                                        } else {
                                                $site_url = "";
                                        }
-       
-                                       print "<li class='$class' id=\"FBROW-".$details["id"]."\">$check_box".
-                                               "$feed_icon " . $details["title"] . 
+
+                                       $feed_url = "<a target=\"_blank\" href=\"$feed_url\"><img 
+                                               style='border-width : 0px; vertical-align : middle' 
+                                               src='images/feed-icon-12x12.png'></a>";
+
+                                       print "<li title=\"".htmlspecialchars($details["site_url"])."\" 
+                                               class='$class' id=\"FBROW-".$details["id"]."\">$check_box".
+                                               "$feed_icon $feed_url " . htmlspecialchars($details["title"]) . 
                                                "&nbsp;<span class='subscribers'>($subscribers)</span>
-                                               $site_url
-                                               </li>";
+                                               $site_url</li>";
        
                                } else if ($mode == 2) {
-                                       $feed_url = $line["feed_url"];
+                                       $feed_url = htmlspecialchars($line["feed_url"]);
+                                       $site_url = htmlspecialchars($line["site_url"]); 
+                                       $title = htmlspecialchars($line["title"]);
 
                                        $icon_file = ICONS_DIR . "/" . $line["id"] . ".ico";
        
                                                type=\"checkbox\" id=\"FBCHK-" . $line["id"] . "\">";
        
                                        $class = ($feedctr % 2) ? "even" : "odd";
-       
+
+                                       if ($line['articles_archived'] > 0) {
+                                               $archived = sprintf(__("%d archived articles"), $line['articles_archived']);
+                                               $archived = "&nbsp;<span class='subscribers'>($archived)</span>";
+                                       } else {
+                                               $archived = '';
+                                       }
+
                                        if ($line["site_url"]) {
-                                               $site_url = "<a target=\"_blank\" href=\"".$line["site_url"]."\">
+                                               $site_url = "<a target=\"_blank\" href=\"$site_url\">
                                                        <img style='border-width : 0px' src='images/www.png' alt='www'></a>";
                                        } else {
                                                $site_url = "";
                                        }
-       
-                                       print "<li class='$class' id=\"FBROW-".$line["id"]."\">$check_box".
-                                               "$feed_icon " . $line["title"] . $site_url . "</li>";
+
+                                       $feed_url = "<a target=\"_blank\" href=\"$feed_url\"><img 
+                                               style='border-width : 0px; vertical-align : middle' 
+                                               src='images/feed-icon-12x12.png'></a>";
+
+                                       print "<li title='".$line['site_url']."' class='$class' 
+                                               id=\"FBROW-".$line["id"]."\">".
+                                               $check_box . "$feed_icon $feed_url " . $title . 
+                                               $archived . $site_url . "</li>";
 
 
                                }
                return $feedctr;
 
        }
+
 ?>