" .
@@ -114,8 +124,8 @@ class Handler_Public extends Handler {
$tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
- $tpl->setVariable('ARTICLE_SOURCE_LINK', htmlspecialchars($line['site_url']), true);
- $tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title']), true);
+ $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 = get_article_tags($line["id"], $owner_uid);
@@ -129,7 +139,7 @@ class Handler_Public extends Handler {
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);
@@ -170,13 +180,17 @@ class Handler_Public extends Handler {
$feed['articles'] = array();
while ($line = $this->dbh->fetch_assoc($result)) {
+ $line["content_preview"] = 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);
+ }
$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);
$article['updated'] = date('c', strtotime($line["updated"]));
if ($line['note']) $article['note'] = $line['note'];
@@ -262,16 +276,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'");
@@ -280,7 +300,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
@@ -309,11 +330,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)";
}
}
@@ -356,9 +377,10 @@ class Handler_Public extends Handler {
$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["no_orig_guid"]);
+ $orig_guid = sql_bool_to_bool($_REQUEST["orig_guid"]);
if (!$format) $format = 'atom';
@@ -378,20 +400,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, $orig_guid);
+ $offset, $search, $search_mode, $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);
+ }
+
+ function housekeepingTask() {
+ PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", false);
+ }
- PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
+ function globalUpdateFeeds() {
+ RPC::updaterandomfeed_real($this->dbh);
+ PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
}
function sharepopup() {
@@ -400,11 +426,14 @@ class Handler_Public extends Handler {
}
header('Content-Type: text/html; charset=utf-8');
- print "Tiny Tiny RSS";
-
- stylesheet_tag("css/utility.css");
- javascript_tag("lib/prototype.js");
- javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls");
+ print "Tiny Tiny RSS
+
+ ";
+
+ 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 "
";
@@ -550,6 +579,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']) {
@@ -560,6 +590,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();
@@ -575,6 +617,9 @@ class Handler_Public extends Handler {
Tiny Tiny RSS
+
+
+
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 %s.", $feed_url));
- break;
- case 2:
- print_error(T_sprintf("Could not subscribe to %s.", $feed_url));
- break;
- case 3:
- print_error(T_sprintf("No feeds found in %s.", $feed_url));
- break;
- case 0:
- print_warning(T_sprintf("Already subscribed to %s.", $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 %s. Can't download the Feed URL.", $feed_url));
- break;
- }
-
- if ($feed_urls) {
- print "";
- }
-
- $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 "
";
-
- if ($feed_id) {
- print "
";
- }
-
- print "";
-
- print "";
- }
-
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 "Tiny Tiny RSS";
+ print "Tiny Tiny RSS
+
+ ";
- stylesheet_tag("css/utility.css");
- javascript_tag("lib/prototype.js");
+ echo stylesheet_tag("css/utility.css");
+ echo javascript_tag("lib/prototype.js");
print "
";
@@ -769,8 +731,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 "
"."Completed."."
";
+
+ } 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 "";
+
+ } 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 "