]> git.wh0rd.org - tt-rss.git/blobdiff - classes/handler/public.php
move counter cache to a separate class
[tt-rss.git] / classes / handler / public.php
index 12f1624732c097d5fd56f52420d74359eb0e1ca2..d525bc54c001405ac565233c9db842c9a126ad5f 100644 (file)
@@ -2,8 +2,8 @@
 class Handler_Public extends Handler {
 
        private function generate_syndicated_feed($owner_uid, $feed, $is_cat,
-               $limit, $offset, $search, $search_mode,
-               $view_mode = false, $format = 'atom', $order = false) {
+               $limit, $offset, $search,
+               $view_mode = false, $format = 'atom', $order = false, $orig_guid = false, $start_ts = false) {
 
                require_once "lib/MiniTemplator.class.php";
 
@@ -15,11 +15,15 @@ class Handler_Public extends Handler {
                if (!$limit) $limit = 60;
 
                $date_sort_field = "date_entered DESC, updated DESC";
+               $date_check_field = "date_entered";
 
-               if ($feed == -2)
+               if ($feed == -2 && !$is_cat) {
                        $date_sort_field = "last_published DESC";
-               else if ($feed == -1)
+                       $date_check_field = "last_published";
+               } else if ($feed == -1 && !$is_cat) {
                        $date_sort_field = "last_marked DESC";
+                       $date_check_field = "last_marked";
+               }
 
                switch ($order) {
                case "title":
@@ -33,15 +37,27 @@ class Handler_Public extends Handler {
                        break;
                }
 
-               $qfh_ret = queryFeedHeadlines($feed,
-                       1, $view_mode, $is_cat, $search, $search_mode,
-                       $date_sort_field, $offset, $owner_uid,
-                       false, 0, false, true);
+               $params = array(
+                       "owner_uid" => $owner_uid,
+                       "feed" => $feed,
+                       "limit" => 1,
+                       "view_mode" => $view_mode,
+                       "cat_view" => $is_cat,
+                       "search" => $search,
+                       "override_order" => $date_sort_field,
+                       "include_children" => true,
+                       "ignore_vfeed_group" => true,
+                       "offset" => $offset,
+                       "start_ts" => $start_ts
+               );
+
+               $qfh_ret = Feeds::queryFeedHeadlines($params);
 
                $result = $qfh_ret[0];
 
                if ($this->dbh->num_rows($result) != 0) {
-                       $ts = strtotime($this->dbh->fetch_result($result, 0, "date_entered"));
+
+                       $ts = strtotime($this->dbh->fetch_result($result, 0, $date_check_field));
 
                        if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) &&
                                        strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= $ts) {
@@ -53,20 +69,30 @@ class Handler_Public extends Handler {
                        header("Last-Modified: $last_modified", true);
                }
 
-               $qfh_ret = queryFeedHeadlines($feed,
-                       $limit, $view_mode, $is_cat, $search, $search_mode,
-                       $date_sort_field, $offset, $owner_uid,
-                       false, 0, false, true);
-
+               $params = array(
+                       "owner_uid" => $owner_uid,
+                       "feed" => $feed,
+                       "limit" => $limit,
+                       "view_mode" => $view_mode,
+                       "cat_view" => $is_cat,
+                       "search" => $search,
+                       "override_order" => $date_sort_field,
+                       "include_children" => true,
+                       "ignore_vfeed_group" => true,
+                       "offset" => $offset,
+                       "start_ts" => $start_ts
+               );
+
+               $qfh_ret = Feeds::queryFeedHeadlines($params);
 
                $result = $qfh_ret[0];
                $feed_title = htmlspecialchars($qfh_ret[1]);
                $feed_site_url = $qfh_ret[2];
-               $last_error = $qfh_ret[3];
+               /* $last_error = $qfh_ret[3]; */
 
                $feed_self_url = get_self_url_prefix() .
-                       "/public.php?op=rss&id=-2&key=" .
-                       get_feed_access_key(-2, false, $owner_uid);
+                       "/public.php?op=rss&id=$feed&key=" .
+                       get_feed_access_key($feed, false, $owner_uid);
 
                if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
 
@@ -85,16 +111,27 @@ class Handler_Public extends Handler {
                        }
 
                        $tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
-
                        while ($line = $this->dbh->fetch_assoc($result)) {
 
-                               $tpl->setVariable('ARTICLE_ID', htmlspecialchars($line['link']), true);
+                               $line["content_preview"] = sanitize(truncate_string(strip_tags($line["content"]), 100, '...'));
+
+                               foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+                                       $line = $p->hook_query_headlines($line);
+                               }
+
+                               foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
+                                       $line = $p->hook_article_export_feed($line, $feed, $is_cat);
+                               }
+
+                               $tpl->setVariable('ARTICLE_ID',
+                                       htmlspecialchars($orig_guid ? $line['link'] :
+                                                       $this->make_article_tag_uri($line['id'], $line['date_entered'])), true);
                                $tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
                                $tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
-                               $tpl->setVariable('ARTICLE_EXCERPT',
-                                       truncate_string(strip_tags($line["content_preview"]), 100, '...'), true);
+                               $tpl->setVariable('ARTICLE_EXCERPT', $line["content_preview"], true);
 
-                               $content = sanitize($line["content_preview"], false, $owner_uid);
+                               $content = sanitize($line["content"], false, $owner_uid,
+                                       $feed_site_url, false, $line["id"]);
 
                                if ($line['note']) {
                                        $content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .
@@ -111,19 +148,22 @@ class Handler_Public extends Handler {
 
                                $tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
 
-                               $tags = get_article_tags($line["id"], $owner_uid);
+                               $tpl->setVariable('ARTICLE_SOURCE_LINK', htmlspecialchars($line['site_url'] ? $line["site_url"] : get_self_url_prefix()), true);
+                               $tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title'] ? $line['feed_title'] : $feed_title), true);
+
+                               $tags = Article::get_article_tags($line["id"], $owner_uid);
 
                                foreach ($tags as $tag) {
                                        $tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag), true);
                                        $tpl->addBlock('category');
                                }
 
-                               $enclosures = get_article_enclosures($line["id"]);
+                               $enclosures = Article::get_article_enclosures($line["id"]);
 
                                foreach ($enclosures as $e) {
                                        $type = htmlspecialchars($e['content_type']);
                                        $url = htmlspecialchars($e['content_url']);
-                                       $length = $e['duration'];
+                                       $length = $e['duration'] ? $e['duration'] : 1;
 
                                        $tpl->setVariable('ARTICLE_ENCLOSURE_URL', $url, true);
                                        $tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', $type, true);
@@ -164,19 +204,30 @@ class Handler_Public extends Handler {
                        $feed['articles'] = array();
 
                        while ($line = $this->dbh->fetch_assoc($result)) {
+
+                               $line["content_preview"] = sanitize(truncate_string(strip_tags($line["content_preview"]), 100, '...'));
+
+                               foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+                                       $line = $p->hook_query_headlines($line, 100);
+                               }
+
+                               foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
+                                       $line = $p->hook_article_export_feed($line, $feed, $is_cat);
+                               }
+
                                $article = array();
 
                                $article['id'] = $line['link'];
                                $article['link']        = $line['link'];
                                $article['title'] = $line['title'];
-                               $article['excerpt'] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
-                               $article['content'] = sanitize($line["content_preview"], false, $owner_uid);
+                               $article['excerpt'] = $line["content_preview"];
+                               $article['content'] = sanitize($line["content"], false, $owner_uid, $feed_site_url, false, $line["id"]);
                                $article['updated'] = date('c', strtotime($line["updated"]));
 
                                if ($line['note']) $article['note'] = $line['note'];
                                if ($article['author']) $article['author'] = $line['author'];
 
-                               $tags = get_article_tags($line["id"], $owner_uid);
+                               $tags = Article::get_article_tags($line["id"], $owner_uid);
 
                                if (count($tags) > 0) {
                                        $article['tags'] = array();
@@ -186,7 +237,7 @@ class Handler_Public extends Handler {
                                        }
                                }
 
-                               $enclosures = get_article_enclosures($line["id"]);
+                               $enclosures = Article::get_article_enclosures($line["id"]);
 
                                if (count($enclosures) > 0) {
                                        $article['enclosures'] = array();
@@ -221,11 +272,11 @@ class Handler_Public extends Handler {
                if ($this->dbh->num_rows($result) == 1) {
                        $uid = $this->dbh->fetch_result($result, 0, "id");
 
-                       print getGlobalUnread($uid);
+                       print Feeds::getGlobalUnread($uid);
 
                        if ($fresh) {
                                print ";";
-                               print getFeedArticles(-3, false, true, $uid);
+                               print Feeds::getFeedArticles(-3, false, true, $uid);
                        }
 
                } else {
@@ -237,7 +288,7 @@ class Handler_Public extends Handler {
        function getProfiles() {
                $login = $this->dbh->escape_string($_REQUEST["login"]);
 
-               $result = $this->dbh->query("SELECT * FROM ttrss_settings_profiles,ttrss_users
+               $result = $this->dbh->query("SELECT ttrss_settings_profiles.* FROM ttrss_settings_profiles,ttrss_users
                        WHERE ttrss_users.id = ttrss_settings_profiles.owner_uid AND login = '$login' ORDER BY title");
 
                print "<select dojoType='dijit.form.Select' style='width : 220px; margin : 0px' name='profile'>";
@@ -256,16 +307,22 @@ class Handler_Public extends Handler {
 
        function pubsub() {
                $mode = $this->dbh->escape_string($_REQUEST['hub_mode']);
+               if (!$mode) $mode = $this->dbh->escape_string($_REQUEST['hub.mode']);
+
                $feed_id = (int) $this->dbh->escape_string($_REQUEST['id']);
                $feed_url = $this->dbh->escape_string($_REQUEST['hub_topic']);
 
+               if (!$feed_url) $feed_url = $this->dbh->escape_string($_REQUEST['hub.topic']);
+
                if (!PUBSUBHUBBUB_ENABLED) {
                        header('HTTP/1.0 404 Not Found');
-                       echo "404 Not found";
+                       echo "404 Not found (Disabled by server)";
                        return;
                }
 
                // TODO: implement hub_verifytoken checking
+               // TODO: store requested rel=self or whatever for verification
+               // (may be different from stored feed url) e.g. http://url/ or http://url
 
                $result = $this->dbh->query("SELECT feed_url FROM ttrss_feeds
                        WHERE id = '$feed_id'");
@@ -274,7 +331,8 @@ class Handler_Public extends Handler {
 
                        $check_feed_url = $this->dbh->fetch_result($result, 0, "feed_url");
 
-                       if ($check_feed_url && ($check_feed_url == $feed_url || !$feed_url)) {
+                       // ignore url checking for the time being
+                       if ($check_feed_url && (true || $check_feed_url == $feed_url || !$feed_url)) {
                                if ($mode == "subscribe") {
 
                                        $this->dbh->query("UPDATE ttrss_feeds SET pubsub_state = 2
@@ -303,11 +361,11 @@ class Handler_Public extends Handler {
                                }
                        } else {
                                header('HTTP/1.0 404 Not Found');
-                               echo "404 Not found";
+                               echo "404 Not found (URL check failed)";
                        }
                } else {
                        header('HTTP/1.0 404 Not Found');
-                       echo "404 Not found";
+                       echo "404 Not found (Feed not found)";
                }
 
        }
@@ -329,7 +387,7 @@ class Handler_Public extends Handler {
                        $id = $this->dbh->fetch_result($result, 0, "ref_id");
                        $owner_uid = $this->dbh->fetch_result($result, 0, "owner_uid");
 
-                       $article = format_article($id, false, true, $owner_uid);
+                       $article = Article::format_article($id, false, true, $owner_uid);
 
                        print_r($article['content']);
 
@@ -342,16 +400,17 @@ class Handler_Public extends Handler {
        function rss() {
                $feed = $this->dbh->escape_string($_REQUEST["id"]);
                $key = $this->dbh->escape_string($_REQUEST["key"]);
-               $is_cat = $_REQUEST["is_cat"] != false;
+               $is_cat = sql_bool_to_bool($_REQUEST["is_cat"]);
                $limit = (int)$this->dbh->escape_string($_REQUEST["limit"]);
                $offset = (int)$this->dbh->escape_string($_REQUEST["offset"]);
 
                $search = $this->dbh->escape_string($_REQUEST["q"]);
-               $search_mode = $this->dbh->escape_string($_REQUEST["smode"]);
                $view_mode = $this->dbh->escape_string($_REQUEST["view-mode"]);
                $order = $this->dbh->escape_string($_REQUEST["order"]);
+               $start_ts = $this->dbh->escape_string($_REQUEST["ts"]);
 
                $format = $this->dbh->escape_string($_REQUEST['format']);
+               $orig_guid = sql_bool_to_bool($_REQUEST["orig_guid"]);
 
                if (!$format) $format = 'atom';
 
@@ -371,20 +430,24 @@ class Handler_Public extends Handler {
 
                if ($owner_id) {
                        $this->generate_syndicated_feed($owner_id, $feed, $is_cat, $limit,
-                               $offset, $search, $search_mode, $view_mode, $format, $order);
+                               $offset, $search, $view_mode, $format, $order, $orig_guid, $start_ts);
                } else {
                        header('HTTP/1.1 403 Forbidden');
                }
        }
 
-       function globalUpdateFeeds() {
-               include "rssfuncs.php";
-               // Update all feeds needing a update.
-               update_daemon_common(0, true, false);
-               housekeeping_common(false);
+       function updateTask() {
+               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
+       }
 
-               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
+       function housekeepingTask() {
+               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", false);
+       }
+
+       function globalUpdateFeeds() {
+               RPC::updaterandomfeed_real($this->dbh);
 
+               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
        }
 
        function sharepopup() {
@@ -393,11 +456,14 @@ class Handler_Public extends Handler {
                }
 
                header('Content-Type: text/html; charset=utf-8');
-               print "<html><head><title>Tiny Tiny RSS</title>";
-
-               stylesheet_tag("css/utility.css");
-               javascript_tag("lib/prototype.js");
-               javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls");
+               print "<html><head><title>Tiny Tiny RSS</title>
+               <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
+               <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">";
+
+               echo stylesheet_tag("css/utility.css");
+               echo stylesheet_tag("css/dijit.css");
+               echo javascript_tag("lib/prototype.js");
+               echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls");
                print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
                        </head><body id='sharepopup'>";
 
@@ -463,7 +529,7 @@ class Handler_Public extends Handler {
                                        </div>
                                        <button type="submit"><?php echo __('Share') ?></button>
                                        <button onclick="return window.close()"><?php echo __('Cancel') ?></button>
-                                       </div>
+                                       </td>
 
                                </form>
                                </td></tr></table>
@@ -543,6 +609,7 @@ class Handler_Public extends Handler {
                                }
                        } else {
                                $_SESSION["login_error_msg"] = __("Incorrect username or password");
+                               user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
                        }
 
                        if ($_REQUEST['return']) {
@@ -553,6 +620,18 @@ class Handler_Public extends Handler {
                }
        }
 
+       /* function subtest() {
+               header("Content-type: text/plain; charset=utf-8");
+
+               $url = $_REQUEST["url"];
+
+               print "$url\n\n";
+
+
+               print_r(get_feeds_from_html($url, fetch_file_contents($url)));
+
+       } */
+
        function subscribe() {
                if (SINGLE_USER_MODE) {
                        login_sequence();
@@ -568,13 +647,16 @@ class Handler_Public extends Handler {
                                        <title>Tiny Tiny RSS</title>
                                        <link rel=\"stylesheet\" type=\"text/css\" href=\"css/utility.css\">
                                        <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
+                                       <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
+                                       <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">
+
                                </head>
                                <body>
                                <img class=\"floatingLogo\" src=\"images/logo_small.png\"
                                        alt=\"Tiny Tiny RSS\"/>
                                        <h1>".__("Subscribe to feed...")."</h1><div class='content'>";
 
-                       $rc = subscribe_to_feed($feed_url);
+                       $rc = Feeds::subscribe_to_feed($feed_url);
 
                        switch ($rc['code']) {
                        case 0:
@@ -652,106 +734,23 @@ class Handler_Public extends Handler {
                }
        }
 
-       function subscribe2() {
-               $feed_url = $this->dbh->escape_string(trim($_REQUEST["feed_url"]));
-               $cat_id = $this->dbh->escape_string($_REQUEST["cat_id"]);
-               $from = $this->dbh->escape_string($_REQUEST["from"]);
-               $feed_urls = array();
-
-               /* only read authentication information from POST */
-
-               $auth_login = $this->dbh->escape_string(trim($_POST["auth_login"]));
-               $auth_pass = $this->dbh->escape_string(trim($_POST["auth_pass"]));
-
-               $rc = subscribe_to_feed($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 3:
-                       print_error(T_sprintf("No feeds found in <b>%s</b>.", $feed_url));
-                       break;
-               case 0:
-                       print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
-                       break;
-               case 4:
-                       print_notice(__("Multiple feed URLs found."));
-                       $contents = @fetch_file_contents($url, false, $auth_login, $auth_pass);
-                       if (is_html($contents)) {
-                               $feed_urls = get_feeds_from_html($url, $contents);
-                       }
-                       break;
-               case 5:
-                       print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
-                       break;
-               }
-
-               if ($feed_urls) {
-                       print "<form action=\"backend.php\">";
-                       print "<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">";
-                       print "<input type=\"hidden\" name=\"quiet\" value=\"1\">";
-                       print "<input type=\"hidden\" name=\"method\" value=\"add\">";
-
-                       print "<select name=\"feed_url\">";
-
-                       foreach ($feed_urls as $url => $name) {
-                               $url = htmlspecialchars($url);
-                               $name = htmlspecialchars($name);
-                               print "<option value=\"$url\">$name</option>";
-                       }
-
-                       print "<input type=\"submit\" value=\"".__("Subscribe to selected feed")."\">";
-                       print "</form>";
-               }
-
-               $tp_uri = get_self_url_prefix() . "/prefs.php";
-               $tt_uri = get_self_url_prefix();
-
-               if ($rc <= 2){
-                       $result = $this->dbh->query("SELECT id FROM ttrss_feeds WHERE
-                               feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
-
-                       $feed_id = $this->dbh->fetch_result($result, 0, "id");
-               } else {
-                       $feed_id = 0;
-               }
-
-               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=\"method\" value=\"editFeed\">
-                               <input type=\"hidden\" name=\"methodparam\" 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>";
-       }
-
        function index() {
                header("Content-Type: text/plain");
-               print json_encode(array("error" => array("code" => 7)));
+               print error_json(13);
        }
 
        function forgotpass() {
                startup_gettext();
 
+               @$hash = $_REQUEST["hash"];
+
                header('Content-Type: text/html; charset=utf-8');
-               print "<html><head><title>Tiny Tiny RSS</title>";
+               print "<html><head><title>Tiny Tiny RSS</title>
+               <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
+               <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">";
 
-               stylesheet_tag("css/utility.css");
-               javascript_tag("lib/prototype.js");
+               echo stylesheet_tag("css/utility.css");
+               echo javascript_tag("lib/prototype.js");
 
                print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
                        </head><body id='forgotpass'>";
@@ -762,8 +761,45 @@ class Handler_Public extends Handler {
 
                @$method = $_POST['method'];
 
-               if (!$method) {
-                       print_notice(__("You will need to provide valid account name and email. New password will be sent on your email address."));
+               if ($hash) {
+                       $login = $_REQUEST["login"];
+
+                       if ($login) {
+                               $result = $this->dbh->query("SELECT id, resetpass_token FROM ttrss_users
+                                       WHERE login = '$login'");
+
+                               if ($this->dbh->num_rows($result) != 0) {
+                                       $id = $this->dbh->fetch_result($result, 0, "id");
+                                       $resetpass_token_full = $this->dbh->fetch_result($result, 0, "resetpass_token");
+                                       list($timestamp, $resetpass_token) = explode(":", $resetpass_token_full);
+
+                                       if ($timestamp && $resetpass_token &&
+                                               $timestamp >= time() - 15*60*60 &&
+                                               $resetpass_token == $hash) {
+
+                                                       $result = $this->dbh->query("UPDATE ttrss_users SET resetpass_token = NULL
+                                                               WHERE id = $id");
+
+                                                       Pref_Users::resetUserPassword($id, true);
+
+                                                       print "<p>"."Completed."."</p>";
+
+                                       } else {
+                                               print_error("Some of the information provided is missing or incorrect.");
+                                       }
+                               } else {
+                                       print_error("Some of the information provided is missing or incorrect.");
+                               }
+                       } else {
+                               print_error("Some of the information provided is missing or incorrect.");
+                       }
+
+                       print "<form method=\"GET\" action=\"index.php\">
+                               <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
+                               </form>";
+
+               } else if (!$method) {
+                       print_notice(__("You will need to provide valid account name and email. A password reset link will be sent to your email address."));
 
                        print "<form method='POST' action='public.php'>";
                        print "<input type='hidden' name='method' value='do'>";
@@ -804,17 +840,57 @@ class Handler_Public extends Handler {
 
                        } else {
 
+                               print_notice("Password reset instructions are being sent to your email address.");
+
                                $result = $this->dbh->query("SELECT id FROM ttrss_users
                                        WHERE login = '$login' AND email = '$email'");
 
                                if ($this->dbh->num_rows($result) != 0) {
                                        $id = $this->dbh->fetch_result($result, 0, "id");
 
-                                       Pref_Users::resetUserPassword($id, false);
+                                       if ($id) {
+                                               $resetpass_token = sha1(get_random_bytes(128));
+                                               $resetpass_link = get_self_url_prefix() . "/public.php?op=forgotpass&hash=" . $resetpass_token .
+                                                       "&login=" . urlencode($login);
+
+                                               require_once 'classes/ttrssmailer.php';
+                                               require_once "lib/MiniTemplator.class.php";
+
+                                               $tpl = new MiniTemplator;
+
+                                               $tpl->readTemplateFromFile("templates/resetpass_link_template.txt");
+
+                                               $tpl->setVariable('LOGIN', $login);
+                                               $tpl->setVariable('RESETPASS_LINK', $resetpass_link);
+
+                                               $tpl->addBlock('message');
+
+                                               $message = "";
+
+                                               $tpl->generateOutputToString($message);
+
+                                               $mail = new ttrssMailer();
+
+                                               $rc = $mail->quickMail($email, $login,
+                                                       __("[tt-rss] Password reset request"),
+                                                       $message, false);
+
+                                               if (!$rc) print_error($mail->ErrorInfo);
+
+                                               $resetpass_token_full = $this->dbh->escape_string(time() . ":" . $resetpass_token);
 
-                                       print "<p>";
+                                               $result = $this->dbh->query("UPDATE ttrss_users
+                                                       SET resetpass_token = '$resetpass_token_full'
+                                                       WHERE login = '$login' AND email = '$email'");
 
-                                       print "<p>"."Completed."."</p>";
+                                               //Pref_Users::resetUserPassword($id, false);
+
+                                               print "<p>";
+
+                                               print "<p>"."Completed."."</p>";
+                                       } else {
+                                               print_error("User ID not found.");
+                                       }
 
                                        print "<form method=\"GET\" action=\"index.php\">
                                                <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
@@ -853,6 +929,8 @@ class Handler_Public extends Handler {
                        <title>Database Updater</title>
                        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
                        <link rel="stylesheet" type="text/css" href="css/utility.css"/>
+                       <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
+                       <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">
                        </head>
                        <style type="text/css">
                                span.ok { color : #009000; font-weight : bold; }
@@ -887,7 +965,7 @@ class Handler_Public extends Handler {
                                                for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
                                                        print "<li>Performing update up to version $i...";
 
-                                                       $result = $updater->performUpdateTo($i);
+                                                       $result = $updater->performUpdateTo($i, true);
 
                                                        if (!$result) {
                                                                print "<span class='err'>FAILED!</span></li></ul>";
@@ -897,7 +975,7 @@ class Handler_Public extends Handler {
                                                                <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
                                                                </form>";
 
-                                                               break;
+                                                               return;
                                                        } else {
                                                                print "<span class='ok'>OK!</span></li>";
                                                        }
@@ -923,10 +1001,10 @@ class Handler_Public extends Handler {
 
                                                print "<h2>Database update required</h2>";
 
-                                               print "<h3>";
-                                               printf("Your Tiny Tiny RSS database needs update to the latest version: %d to %d.",
-                                                       $updater->getSchemaVersion(), SCHEMA_VERSION);
-                                               print "</h3>";
+                                               print_notice("<h4>".
+                                               sprintf("Your Tiny Tiny RSS database needs update to the latest version: %d to %d.",
+                                                       $updater->getSchemaVersion(), SCHEMA_VERSION).
+                                               "</h4>");
 
                                                print_warning("Please backup your database before proceeding.");
 
@@ -953,5 +1031,80 @@ class Handler_Public extends Handler {
                <?php
        }
 
+       function cached_url() {
+               @$hash = basename($_GET['hash']);
+
+               // we don't need an extension to find the file, hash is a complete URL
+               $hash = preg_replace("/\.[^\.]*$/", "", $hash);
+
+               if ($hash) {
+
+                       $filename = CACHE_DIR . '/images/' . $hash;
+
+                       if (file_exists($filename)) {
+                               header("Content-Disposition: inline; filename=\"$hash\"");
+                               $mimetype = mime_content_type($filename);
+
+                               /* See if we can use X-Sendfile */
+                               $xsendfile = false;
+                               if (function_exists('apache_get_modules') &&
+                                   array_search('mod_xsendfile', apache_get_modules()))
+                                       $xsendfile = true;
+
+                               if ($xsendfile) {
+                                       header("X-Sendfile: $filename");
+                                       header("Content-type: $mimetype");
+                                       header('Content-Disposition: inline; filename="' . basename($filename) . '"');
+                               } else {
+                                       header("Content-type: $mimetype");
+                                       $stamp = gmdate("D, d M Y H:i:s", filemtime($filename)). " GMT";
+                                       header("Last-Modified: $stamp", true);
+                                       readfile($filename);
+                               }
+                       } else {
+                               header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+                               echo "File not found.";
+                       }
+               }
+       }
+
+       private function make_article_tag_uri($id, $timestamp) {
+
+               $timestamp = date("Y-m-d", strtotime($timestamp));
+
+               return "tag:" . parse_url(get_self_url_prefix(), PHP_URL_HOST) . ",$timestamp:/$id";
+       }
+
+       // this should be used very carefully because this endpoint is exposed to unauthenticated users
+       // plugin data is not loaded because there's no user context and owner_uid/session may or may not be available
+       // in general, don't do anything user-related in here and do not modify $_SESSION
+       public function pluginhandler() {
+               $host = new PluginHost();
+
+               $plugin = basename($_REQUEST["plugin"]);
+               $method = $_REQUEST["pmethod"];
+
+               $host->load($plugin, PluginHost::KIND_USER, 0);
+               $host->load_data();
+
+               $pclass = $host->get_plugin($plugin);
+
+               if ($pclass) {
+                       if (method_exists($pclass, $method)) {
+                               if ($pclass->is_public_method($method)) {
+                                       $pclass->$method();
+                               } else {
+                                       header("Content-Type: text/json");
+                                       print error_json(6);
+                               }
+                       } else {
+                               header("Content-Type: text/json");
+                               print error_json(13);
+                       }
+               } else {
+                       header("Content-Type: text/json");
+                       print error_json(14);
+               }
+       }
 }
-?>
+?>
\ No newline at end of file