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":
$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) {
$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=$feed&key=" .
}
$tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
-
while ($line = $this->dbh->fetch_assoc($result)) {
+ $line["content_preview"] = truncate_string(strip_tags($line["content"]), 100, '...');
+
+ foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+ $line = $p->hook_query_headlines($line);
+ }
$tpl->setVariable('ARTICLE_ID',
htmlspecialchars($orig_guid ? $line['link'] :
"/public.php?url=" . urlencode($line['link'])), 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);
if ($line['note']) {
$content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .
$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_TITLE', htmlspecialchars($line['feed_title'] ? $line['feed_title'] : $feed_title), true);
$tags = get_article_tags($line["id"], $owner_uid);
$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'];
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'");
$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
}
} 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)";
}
}
$order = $this->dbh->escape_string($_REQUEST["order"]);
$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';
}
}
- 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() {
}
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'>";
}
} else {
$_SESSION["login_error_msg"] = __("Incorrect username or password");
- user_error("Failed login attempt from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
+ user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
}
if ($_REQUEST['return']) {
<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\"
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"]);
+ /* $from = $this->dbh->escape_string($_REQUEST["from"]); */
$feed_urls = array();
/* only read authentication information from POST */
startup_gettext();
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'>";
<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; }