]> git.wh0rd.org - tt-rss.git/blobdiff - include/functions.php
add hack to support arbitrary key descriptions for hotkeys
[tt-rss.git] / include / functions.php
index 507a4271790db6120a9c4faf051534e68f3c5680..ac3a8861e0cc33c633ca60f9d330e118dc3b2e3e 100644 (file)
@@ -1,6 +1,6 @@
 <?php
        define('EXPECTED_CONFIG_VERSION', 26);
-       define('SCHEMA_VERSION', 99);
+       define('SCHEMA_VERSION', 102);
 
        $fetch_last_error = false;
        $pluginhost = false;
                if (!SINGLE_USER_MODE) {
 
                        $user_id = false;
-                       $modules = explode(",", AUTH_MODULES);
 
-                       foreach ($modules as $module) {
-                               $module_class = "auth_$module";
-                               if (class_exists($module_class)) {
-                                       $authenticator = new $module_class($link);
+                       global $pluginhost;
+                       foreach ($pluginhost->get_hooks($pluginhost::HOOK_AUTH_USER) as $plugin) {
 
-                                       $user_id = (int) $authenticator->authenticate($login, $password);
+                               $user_id = (int) $plugin->authenticate($login, $password);
 
-                                       if ($user_id) {
-                                               $_SESSION["auth_module"] = $module;
-                                               break;
-                                       }
-
-                               } else {
-                                       print T_sprintf("Fatal: authentication module %s not found.", $module);
-                                       die;
+                               if ($user_id) {
+                                       $_SESSION["auth_module"] = strtolower(get_class($plugin));
+                                       break;
                                }
                        }
 
                return true;
        }
 
+       function load_user_plugins($link, $owner_uid) {
+               if ($owner_uid) {
+                       $plugins = get_pref($link, "_ENABLED_PLUGINS", $owner_uid);
+
+                       global $pluginhost;
+                       $pluginhost->load($plugins, $pluginhost::KIND_USER, $owner_uid);
+
+                       if (get_schema_version($link) > 100) {
+                               $pluginhost->load_data();
+                       }
+               }
+       }
+
        function login_sequence($link, $login_form = 0) {
                if (SINGLE_USER_MODE) {
-                       return authenticate_user($link, "admin", null);
+                       authenticate_user($link, "admin", null);
+                       load_user_plugins($link, $_SESSION["uid"]);
                } else {
                        if (!$_SESSION["uid"] || !validate_session($link)) {
 
                                setcookie("ttrss_lang", $_SESSION["language"],
                                        time() + SESSION_COOKIE_LIFETIME);
                        }
+
+                       if ($_SESSION["uid"]) {
+                               load_user_plugins($link, $_SESSION["uid"]);
+                       }
                }
        }
 
                        return "images/archive.png";
                        break;
                case -1:
-                       return "images/mark_set.png";
+                       return "images/mark_set.svg";
                        break;
                case -2:
-                       return "images/pub_set.png";
+                       return "images/pub_set.svg";
                        break;
                case -3:
                        return "images/fresh.png";
 
                $params["sign_progress"] = theme_image($link, "images/indicator_white.gif");
                $params["sign_progress_tiny"] = theme_image($link, "images/indicator_tiny.gif");
-               $params["sign_excl"] = theme_image($link, "images/sign_excl.png");
-               $params["sign_info"] = theme_image($link, "images/sign_info.png");
+               $params["sign_excl"] = theme_image($link, "images/sign_excl.svg");
+               $params["sign_info"] = theme_image($link, "images/sign_info.svg");
 
                foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
                        "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
                $params["num_feeds"] = (int) $num_feeds;
 
                $params["collapsed_feedlist"] = (int) get_pref($link, "_COLLAPSED_FEEDLIST");
+               $params["hotkeys"] = get_hotkeys_map($link);
 
                $params["csrf_token"] = $_SESSION["csrf_token"];
+               $params["widescreen"] = (int) $_SESSION["widescreen"];
 
                return $params;
        }
 
+       function get_hotkeys_info($link) {
+               $hotkeys = array(
+                       __("Navigation") => array(
+                               "next_feed" => __("Open next feed"),
+                               "prev_feed" => __("Open previous feed"),
+                               "next_article" => __("Open next article"),
+                               "prev_article" => __("Open previous article"),
+                               "search_dialog" => __("Show search dialog")),
+                       __("Article") => array(
+                               "toggle_mark" => __("Toggle starred"),
+                               "toggle_publ" => __("Toggle published"),
+                               "toggle_unread" => __("Toggle unread"),
+                               "edit_tags" => __("Edit tags"),
+                               "dismiss_selected" => __("Dismiss selected"),
+                               "dismiss_read" => __("Dismiss read"),
+                               "open_in_new_window" => __("Open in new window"),
+                               "catchup_below" => __("Mark below as read"),
+                               "catchup_above" => __("Mark above as read"),
+                               "article_scroll_down" => __("Scroll down"),
+                               "article_scroll_up" => __("Scroll up"),
+                               "select_article_cursor" => __("Select article under cursor"),
+                               "email_article" => __("Email article"),
+                               "toggle_widescreen" => __("Toggle widescreen mode")),
+                       __("Article selection") => array(
+                               "select_all" => __("Select all articles"),
+                               "select_unread" => __("Select unread"),
+                               "select_marked" => __("Select starred"),
+                               "select_published" => __("Select published"),
+                               "select_invert" => __("Invert selection"),
+                               "select_none" => __("Deselect everything")),
+                       __("Feed") => array(
+                               "feed_refresh" => __("Refresh current feed"),
+                               "feed_unhide_read" => __("Un/hide read feeds"),
+                               "feed_subscribe" => __("Subscribe to feed"),
+                               "feed_edit" => __("Edit feed"),
+                               "feed_catchup" => __("Mark as read"),
+                               "feed_reverse" => __("Reverse headlines"),
+                               "feed_debug_update" => __("Debug feed update"),
+                               "catchup_all" => __("Mark all feeds as read"),
+                               "cat_toggle_collapse" => __("Un/collapse current category")),
+                       __("Go to") => array(
+                               "goto_all" => __("All articles"),
+                               "goto_fresh" => __("Fresh"),
+                               "goto_marked" => __("Starred"),
+                               "goto_published" => __("Published"),
+                               "goto_tagcloud" => __("Tag cloud"),
+                               "goto_prefs" => __("Preferences")),
+                       __("Other") => array(
+                               "create_label" => __("Create label"),
+                               "create_filter" => __("Create filter"),
+                               "collapse_sidebar" => __("Un/collapse sidebar"),
+                               "help_dialog" => __("Show help dialog"))
+                       );
+
+               return $hotkeys;
+       }
+
+       function get_hotkeys_map($link) {
+               $hotkeys = array(
+//                     "navigation" => array(
+                               "k" => "next_feed",
+                               "j" => "prev_feed",
+                               "n" => "next_article",
+                               "p" => "prev_article",
+                               "(38)|up" => "prev_article",
+                               "(40)|down" => "next_article",
+                               "(191)|/" => "search_dialog",
+//                     "article" => array(
+                               "s" => "toggle_mark",
+                               "S" => "toggle_publ",
+                               "u" => "toggle_unread",
+                               "T" => "edit_tags",
+                               "D" => "dismiss_selected",
+                               "X" => "dismiss_read",
+                               "o" => "open_in_new_window",
+                               "c p" => "catchup_below",
+                               "c n" => "catchup_above",
+                               "N" => "article_scroll_down",
+                               "P" => "article_scroll_up",
+                               "a W" => "toggle_widescreen",
+                               "e" => "email_article",
+//                     "article_selection" => array(
+                               "a a" => "select_all",
+                               "a u" => "select_unread",
+                               "a U" => "select_marked",
+                               "a p" => "select_published",
+                               "a i" => "select_invert",
+                               "a n" => "select_none",
+//                     "feed" => array(
+                               "f r" => "feed_refresh",
+                               "f a" => "feed_unhide_read",
+                               "f s" => "feed_subscribe",
+                               "f e" => "feed_edit",
+                               "f q" => "feed_catchup",
+                               "f x" => "feed_reverse",
+                               "f D" => "feed_debug_update",
+                               "Q" => "catchup_all",
+                               "x" => "cat_toggle_collapse",
+//                     "goto" => array(
+                               "g a" => "goto_all",
+                               "g f" => "goto_fresh",
+                               "g s" => "goto_marked",
+                               "g p" => "goto_published",
+                               "g t" => "goto_tagcloud",
+                               "g P" => "goto_prefs",
+//                     "other" => array(
+                               "(9)|tab" => "select_article_cursor", // tab
+                               "c l" => "create_label",
+                               "c f" => "create_filter",
+                               "c s" => "collapse_sidebar",
+                       );
+
+               global $pluginhost;
+               foreach ($pluginhost->get_hooks($pluginhost::HOOK_HOTKEY_MAP) as $plugin) {
+                       $hotkeys = $plugin->hook_hotkey_map($hotkeys);
+               }
+
+               $prefixes = array();
+
+               foreach (array_keys($hotkeys) as $hotkey) {
+                       $pair = explode(" ", $hotkey, 2);
+
+                       if (count($pair) > 1 && !in_array($pair[0], $prefixes)) {
+                               array_push($prefixes, $pair[0]);
+                       }
+               }
+
+               return array($prefixes, $hotkeys);
+       }
+
        function make_runtime_info($link) {
                $data = array();
 
                                $filter_query_part = filter_to_sql($link, $filter, $owner_uid);
 
                                // Try to check if SQL regexp implementation chokes on a valid regexp
-                               $result = db_query($link, "SELECT true AS true FROM ttrss_entries,
+                               $result = db_query($link, "SELECT true AS true_val FROM ttrss_entries,
                                        ttrss_user_entries, ttrss_feeds, ttrss_feed_categories
                                        WHERE $filter_query_part LIMIT 1", false);
 
-                               $test = db_fetch_result($result, 0, "true");
+                               $test = db_fetch_result($result, 0, "true_val");
 
                                if (!$test) {
                                        $filter_query_part = "false AND";
 
                $res = trim($str); if (!$res) return '';
 
-               $config = array('safe' => 1, 'deny_attribute' => 'style, width, height, class, id', 'comment' => 1, 'cdata' => 1);
+               $config = array('safe' => 1, 'deny_attribute' => 'style, width, height, class, id', 'comment' => 1, 'cdata' => 1, 'balance' => 0);
                $res = htmLawed($res, $config);
 
                if (get_pref($link, "STRIP_IMAGES", $owner)) {
 
                $node = $doc->getElementsByTagName('body')->item(0);
 
+               // http://tt-rss.org/redmine/issues/357
                return $doc->saveXML($node, LIBXML_NOEMPTYTAG);
        }
 
-       /**
-        * Send by mail a digest of last articles.
-        *
-        * @param mixed $link The database connection.
-        * @param integer $limit The maximum number of articles by digest.
-        * @return boolean Return false if digests are not enabled.
-        */
-       function send_headlines_digests($link, $debug = false) {
-
-               require_once 'lib/phpmailer/class.phpmailer.php';
-
-               $user_limit = 15; // amount of users to process (e.g. emails to send out)
-               $limit = 1000; // maximum amount of headlines to include
-
-               if ($debug) _debug("Sending digests, batch of max $user_limit users, headline limit = $limit");
-
-               if (DB_TYPE == "pgsql") {
-                       $interval_query = "last_digest_sent < NOW() - INTERVAL '1 days'";
-               } else if (DB_TYPE == "mysql") {
-                       $interval_query = "last_digest_sent < DATE_SUB(NOW(), INTERVAL 1 DAY)";
-               }
-
-               $result = db_query($link, "SELECT id,email FROM ttrss_users
-                               WHERE email != '' AND (last_digest_sent IS NULL OR $interval_query)");
-
-               while ($line = db_fetch_assoc($result)) {
-
-                       if (get_pref($link, 'DIGEST_ENABLE', $line['id'], false)) {
-                               $preferred_ts = strtotime(get_pref($link, 'DIGEST_PREFERRED_TIME', $line['id'], '00:00'));
-
-                               // try to send digests within 2 hours of preferred time
-                               if ($preferred_ts && time() >= $preferred_ts &&
-                                               time() - $preferred_ts <= 7200) {
-
-                                       if ($debug) print "Sending digest for UID:" . $line['id'] . " - " . $line["email"] . " ... ";
-
-                                       $do_catchup = get_pref($link, 'DIGEST_CATCHUP', $line['id'], false);
-
-                                       global $tz_offset;
-
-                                       // reset tz_offset global to prevent tz cache clash between users
-                                       $tz_offset = -1;
-
-                                       $tuple = prepare_headlines_digest($link, $line["id"], 1, $limit);
-                                       $digest = $tuple[0];
-                                       $headlines_count = $tuple[1];
-                                       $affected_ids = $tuple[2];
-                                       $digest_text = $tuple[3];
-
-                                       if ($headlines_count > 0) {
-
-                                               $mail = new PHPMailer();
-
-                                               $mail->PluginDir = "lib/phpmailer/";
-                                               $mail->SetLanguage("en", "lib/phpmailer/language/");
-
-                                               $mail->CharSet = "UTF-8";
-
-                                               $mail->From = SMTP_FROM_ADDRESS;
-                                               $mail->FromName = SMTP_FROM_NAME;
-                                               $mail->AddAddress($line["email"], $line["login"]);
-
-                                               if (SMTP_HOST) {
-                                                       $mail->Host = SMTP_HOST;
-                                                       $mail->Mailer = "smtp";
-                                                       $mail->SMTPAuth = SMTP_LOGIN != '';
-                                                       $mail->Username = SMTP_LOGIN;
-                                                       $mail->Password = SMTP_PASSWORD;
-                                               }
-
-                                               $mail->IsHTML(true);
-                                               $mail->Subject = DIGEST_SUBJECT;
-                                               $mail->Body = $digest;
-                                               $mail->AltBody = $digest_text;
-
-                                               $rc = $mail->Send();
-
-                                               if (!$rc && $debug) print "ERROR: " . $mail->ErrorInfo;
-
-                                               if ($debug) print "RC=$rc\n";
-
-                                               if ($rc && $do_catchup) {
-                                                       if ($debug) print "Marking affected articles as read...\n";
-                                                       catchupArticlesById($link, $affected_ids, 0, $line["id"]);
-                                               }
-                                       } else {
-                                               if ($debug) print "No headlines\n";
-                                       }
-
-                                       db_query($link, "UPDATE ttrss_users SET last_digest_sent = NOW()
-                                               WHERE id = " . $line["id"]);
-
-                               }
-                       }
-               }
-
-               if ($debug) _debug("All done.");
-
-       }
-
-       function prepare_headlines_digest($link, $user_id, $days = 1, $limit = 1000) {
-
-               require_once "lib/MiniTemplator.class.php";
-
-               $tpl = new MiniTemplator;
-               $tpl_t = new MiniTemplator;
-
-               $tpl->readTemplateFromFile("templates/digest_template_html.txt");
-               $tpl_t->readTemplateFromFile("templates/digest_template.txt");
-
-               $user_tz_string = get_pref($link, 'USER_TIMEZONE', $user_id);
-               $local_ts = convert_timestamp(time(), 'UTC', $user_tz_string);
-
-               $tpl->setVariable('CUR_DATE', date('Y/m/d', $local_ts));
-               $tpl->setVariable('CUR_TIME', date('G:i', $local_ts));
-
-               $tpl_t->setVariable('CUR_DATE', date('Y/m/d', $local_ts));
-               $tpl_t->setVariable('CUR_TIME', date('G:i', $local_ts));
-
-               $affected_ids = array();
-
-               if (DB_TYPE == "pgsql") {
-                       $interval_query = "ttrss_entries.date_updated > NOW() - INTERVAL '$days days'";
-               } else if (DB_TYPE == "mysql") {
-                       $interval_query = "ttrss_entries.date_updated > DATE_SUB(NOW(), INTERVAL $days DAY)";
-               }
-
-               $result = db_query($link, "SELECT ttrss_entries.title,
-                               ttrss_feeds.title AS feed_title,
-                               COALESCE(ttrss_feed_categories.title, '".__('Uncategorized')."') AS cat_title,
-                               date_updated,
-                               ttrss_user_entries.ref_id,
-                               link,
-                               score,
-                               content,
-                               ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
-                       FROM
-                               ttrss_user_entries,ttrss_entries,ttrss_feeds
-                       LEFT JOIN
-                               ttrss_feed_categories ON (cat_id = ttrss_feed_categories.id)
-                       WHERE
-                               ref_id = ttrss_entries.id AND feed_id = ttrss_feeds.id
-                               AND include_in_digest = true
-                               AND $interval_query
-                               AND ttrss_user_entries.owner_uid = $user_id
-                               AND unread = true
-                               AND score >= 0
-                       ORDER BY ttrss_feed_categories.title, ttrss_feeds.title, score DESC, date_updated DESC
-                       LIMIT $limit");
-
-               $cur_feed_title = "";
-
-               $headlines_count = db_num_rows($result);
-
-               $headlines = array();
-
-               while ($line = db_fetch_assoc($result)) {
-                       array_push($headlines, $line);
-               }
-
-               for ($i = 0; $i < sizeof($headlines); $i++) {
-
-                       $line = $headlines[$i];
-
-                       array_push($affected_ids, $line["ref_id"]);
-
-                       $updated = make_local_datetime($link, $line['last_updated'], false,
-                               $user_id);
-
-/*                     if ($line["score"] != 0) {
-                               if ($line["score"] > 0) $line["score"] = '+' . $line["score"];
-
-                               $line["title"] .= " (".$line['score'].")";
-                       } */
-
-                       if (get_pref($link, 'ENABLE_FEED_CATS', $user_id)) {
-                               $line['feed_title'] = $line['cat_title'] . " / " . $line['feed_title'];
-                       }
-
-                       $tpl->setVariable('FEED_TITLE', $line["feed_title"]);
-                       $tpl->setVariable('ARTICLE_TITLE', $line["title"]);
-                       $tpl->setVariable('ARTICLE_LINK', $line["link"]);
-                       $tpl->setVariable('ARTICLE_UPDATED', $updated);
-                       $tpl->setVariable('ARTICLE_EXCERPT',
-                               truncate_string(strip_tags($line["content"]), 300));
-//                     $tpl->setVariable('ARTICLE_CONTENT',
-//                             strip_tags($article_content));
-
-                       $tpl->addBlock('article');
-
-                       $tpl_t->setVariable('FEED_TITLE', $line["feed_title"]);
-                       $tpl_t->setVariable('ARTICLE_TITLE', $line["title"]);
-                       $tpl_t->setVariable('ARTICLE_LINK', $line["link"]);
-                       $tpl_t->setVariable('ARTICLE_UPDATED', $updated);
-//                     $tpl_t->setVariable('ARTICLE_EXCERPT',
-//                             truncate_string(strip_tags($line["excerpt"]), 100));
-
-                       $tpl_t->addBlock('article');
-
-                       if ($headlines[$i]['feed_title'] != $headlines[$i+1]['feed_title']) {
-                               $tpl->addBlock('feed');
-                               $tpl_t->addBlock('feed');
-                       }
-
-               }
-
-               $tpl->addBlock('digest');
-               $tpl->generateOutputToString($tmp);
-
-               $tpl_t->addBlock('digest');
-               $tpl_t->generateOutputToString($tmp_t);
-
-               return array($tmp, $headlines_count, $affected_ids, $tmp_t);
-       }
-
        function check_for_update($link) {
                if (CHECK_FOR_NEW_VERSION && $_SESSION['access_level'] >= 10) {
                        $version_url = "http://tt-rss.org/version.php?ver=" . VERSION;
        function format_warning($msg, $id = "") {
                global $link;
                return "<div class=\"warning\" id=\"$id\">
-                       <img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>";
+                       <img src=\"".theme_image($link, "images/sign_excl.svg")."\">$msg</div>";
        }
 
        function format_notice($msg, $id = "") {
                global $link;
                return "<div class=\"notice\" id=\"$id\">
-                       <img src=\"".theme_image($link, "images/sign_info.png")."\">$msg</div>";
+                       <img src=\"".theme_image($link, "images/sign_info.svg")."\">$msg</div>";
        }
 
        function format_error($msg, $id = "") {
                global $link;
                return "<div class=\"error\" id=\"$id\">
-                       <img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>";
+                       <img src=\"".theme_image($link, "images/sign_excl.svg")."\">$msg</div>";
        }
 
        function print_notice($msg) {
 
                                $id = 'AUDIO-' . uniqid();
 
-                               $entry .= "<audio id=\"$id\"\">
-                                       <source src=\"$url\"></source>
+                               $entry .= "<audio id=\"$id\"\" controls>
+                                       <source type=\"$ctype\" src=\"$url\"></source>
                                        </audio>";
 
                                $entry .= "<span onclick=\"player(this)\"
                                                value=\"lib/button/musicplayer.swf?song_url=$url\" />
                                        </object>";
                        }
+
+                       if ($entry) $entry .= "&nbsp;" . basename($url);
+
+                       return $entry;
+
                }
 
-               $filename = substr($url, strrpos($url, "/")+1);
+               return "";
+
+/*             $filename = substr($url, strrpos($url, "/")+1);
 
                $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
-                       $filename . " (" . $ctype . ")" . "</a>";
+                       $filename . " (" . $ctype . ")" . "</a>"; */
 
-               return $entry;
        }
 
        function format_article($link, $id, $mark_as_read = true, $zoom_mode = false, $owner_uid = false) {
                                        $rv['content'] .= "&nbsp;";
 
                                        $rv['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
-                                       $rv['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.png'></a>";
+                                       $rv['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.svg'></a>";
 
                                        $rv['content'] .= "</div>";
                                }
                        global $pluginhost;
 
                        $pluginhost = new PluginHost($link);
-                       $pluginhost->load(PLUGINS);
+                       $pluginhost->load(PLUGINS, $pluginhost::KIND_ALL);
 
                        return true;
                } else {
 
                        $entries_html = array();
                        $entries = array();
+                       $entries_inline = array();
 
                        foreach ($result as $line) {
 
 
                                $filename = substr($url, strrpos($url, "/")+1);
 
-#                              $player = format_inline_player($link, $url, $ctype);
+                               $player = format_inline_player($link, $url, $ctype);
+
+                               if ($player) array_push($entries_inline, $player);
 
 #                              $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
 #                                      $filename . " (" . $ctype . ")" . "</a>";
                                }
                        }
 
+                       if (count($entries_inline) > 0) {
+                               $rv .= "<hr clear='both'/>";
+                               foreach ($entries_inline as $entry) { $rv .= $entry; };
+                               $rv .= "<hr clear='both'/>";
+                       }
+
                        $rv .= "<br/><div dojoType=\"dijit.form.DropDownButton\">".
                                "<span>" . __('Attachments')."</span>";
                        $rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 
        }
 
-/*     function rewrite_urls($line) {
-               global $url_regex;
-
-               $urls = null;
-
-               $result = preg_replace("/((?<!=.)((http|https|ftp)+):\/\/[^ ,!]+)/i",
-                       "<a target=\"_blank\" href=\"\\1\">\\1</a>", $line);
-
-               return $result;
-       } */
-
        function rewrite_urls($html) {
                libxml_use_internal_errors(true);
 
                }
        }
 
-       function make_feed_browser($link, $search, $limit, $mode = 1) {
-
-               $owner_uid = $_SESSION["uid"];
-               $rv = '';
-
-               if ($search) {
-                       $search_qpart = "AND (UPPER(feed_url) LIKE UPPER('%$search%') OR
-                                               UPPER(title) LIKE UPPER('%$search%'))";
-               } else {
-                       $search_qpart = "";
-               }
-
-               if ($mode == 1) {
-                       /* $result = db_query($link, "SELECT feed_url, subscribers FROM
-                        ttrss_feedbrowser_cache WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
-                       WHERE tf.feed_url = ttrss_feedbrowser_cache.feed_url
-                       AND owner_uid = '$owner_uid') $search_qpart
-                       ORDER BY subscribers DESC LIMIT $limit"); */
-
-                       $result = db_query($link, "SELECT feed_url, site_url, title, SUM(subscribers) AS subscribers FROM
-                                               (SELECT feed_url, site_url, title, subscribers FROM ttrss_feedbrowser_cache UNION ALL
-                                                       SELECT feed_url, site_url, title, subscribers FROM ttrss_linked_feeds) AS qqq
-                                               WHERE
-                                                       (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
-                                                               WHERE tf.feed_url = qqq.feed_url
-                                                                       AND owner_uid = '$owner_uid') $search_qpart
-                                               GROUP BY feed_url, site_url, title ORDER BY subscribers DESC LIMIT $limit");
-
-               } else if ($mode == 2) {
-                       $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
-                                               owner_uid = '$owner_uid' $search_qpart
-                                               ORDER BY id DESC LIMIT $limit");
-               }
-
-               $feedctr = 0;
-
-               while ($line = db_fetch_assoc($result)) {
-
-                       if ($mode == 1) {
-
-                               $feed_url = htmlspecialchars($line["feed_url"]);
-                               $site_url = htmlspecialchars($line["site_url"]);
-                               $subscribers = $line["subscribers"];
-
-                               $check_box = "<input onclick='toggleSelectListRow2(this)'
-                                                       dojoType=\"dijit.form.CheckBox\"
-                                                       type=\"checkbox\" \">";
-
-                               $class = ($feedctr % 2) ? "even" : "odd";
-
-                               $site_url = "<a target=\"_blank\"
-                                                       href=\"$site_url\">
-                                                       <span class=\"fb_feedTitle\">".
-                               htmlspecialchars($line["title"])."</span></a>";
-
-                               $feed_url = "<a target=\"_blank\" class=\"fb_feedUrl\"
-                                                       href=\"$feed_url\"><img src='images/feed-icon-12x12.png'
-                                                       style='vertical-align : middle'></a>";
-
-                               $rv .= "<li>$check_box $feed_url $site_url".
-                                                       "&nbsp;<span class='subscribers'>($subscribers)</span></li>";
-
-                       } else if ($mode == 2) {
-                               $feed_url = htmlspecialchars($line["feed_url"]);
-                               $site_url = htmlspecialchars($line["site_url"]);
-                               $title = htmlspecialchars($line["title"]);
-
-                               $check_box = "<input onclick='toggleSelectListRow2(this)' dojoType=\"dijit.form.CheckBox\"
-                                                       type=\"checkbox\">";
-
-                               $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 = '';
-                               }
-
-                               $site_url = "<a target=\"_blank\"
-                                                       href=\"$site_url\">
-                                                       <span class=\"fb_feedTitle\">".
-                               htmlspecialchars($line["title"])."</span></a>";
-
-                               $feed_url = "<a target=\"_blank\" class=\"fb_feedUrl\"
-                                                       href=\"$feed_url\"><img src='images/feed-icon-12x12.png'
-                                                       style='vertical-align : middle'></a>";
-
-
-                               $rv .= "<li id=\"FBROW-".$line["id"]."\">".
-                                                       "$check_box $feed_url $site_url $archived</li>";
-                       }
-
-                       ++$feedctr;
-               }
-
-               if ($feedctr == 0) {
-                       $rv .= "<li style=\"text-align : center\"><p>".__('No feeds found.')."</p></li>";
-               }
-
-               return $rv;
-       }
-
        if (!function_exists('gzdecode')) {
                function gzdecode($string) { // no support for 2nd argument
                        return file_get_contents('compress.zlib://data:who/cares;base64,'.