X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Fhandler%2Fpublic.php;h=79ed9d0aed74331cfd583b6d8a57cc9ecbfa7068;hb=1ffe3391f902c4baa984982f19e61a0e45de21ff;hp=5dce6bc6b0bcc54b466c68cbbac1b8517d34197b;hpb=50b8b50355daed08fe6c409452c38b332482b220;p=tt-rss.git
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 5dce6bc6..79ed9d0a 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -2,7 +2,8 @@
class Handler_Public extends Handler {
private function generate_syndicated_feed($owner_uid, $feed, $is_cat,
- $limit, $search, $search_mode, $match_on, $view_mode = false) {
+ $limit, $offset, $search, $search_mode,
+ $view_mode = false, $format = 'atom') {
require_once "lib/MiniTemplator.class.php";
@@ -11,17 +12,40 @@ class Handler_Public extends Handler {
"padding : 5px; border-style : dashed; border-color : #e7d796;".
"margin-bottom : 1em; color : #9a8c59;";
- if (!$limit) $limit = 30;
+ if (!$limit) $limit = 60;
- if (get_pref($this->link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) {
- $date_sort_field = "updated";
- } else {
- $date_sort_field = "date_entered";
+ $date_sort_field = "date_entered DESC, updated DESC";
+
+ if ($feed == -2)
+ $date_sort_field = "last_published DESC";
+ else if ($feed == -1)
+ $date_sort_field = "last_marked DESC";
+
+ $qfh_ret = queryFeedHeadlines($feed,
+ 1, $view_mode, $is_cat, $search, $search_mode,
+ $date_sort_field, $offset, $owner_uid,
+ false, 0, false, true);
+
+ $result = $qfh_ret[0];
+
+ if ($this->dbh->num_rows($result) != 0) {
+ $ts = strtotime($this->dbh->fetch_result($result, 0, "date_entered"));
+
+ if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) &&
+ strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= $ts) {
+ header('HTTP/1.0 304 Not Modified');
+ return;
+ }
+
+ $last_modified = gmdate("D, d M Y H:i:s", $ts) . " GMT";
+ header("Last-Modified: $last_modified", true);
}
- $qfh_ret = queryFeedHeadlines($this->link, $feed,
+ $qfh_ret = queryFeedHeadlines($feed,
$limit, $view_mode, $is_cat, $search, $search_mode,
- $match_on, "$date_sort_field DESC", 0, $owner_uid);
+ $date_sort_field, $offset, $owner_uid,
+ false, 0, false, true);
+
$result = $qfh_ret[0];
$feed_title = htmlspecialchars($qfh_ret[1]);
@@ -30,94 +54,166 @@ class Handler_Public extends Handler {
$feed_self_url = get_self_url_prefix() .
"/public.php?op=rss&id=-2&key=" .
- get_feed_access_key($this->link, -2, false, $owner_uid);
+ get_feed_access_key(-2, false, $owner_uid);
if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
- $tpl = new MiniTemplator;
+ if ($format == 'atom') {
+ $tpl = new MiniTemplator;
- $tpl->readTemplateFromFile("templates/generated_feed.txt");
+ $tpl->readTemplateFromFile("templates/generated_feed.txt");
- $tpl->setVariable('FEED_TITLE', $feed_title, true);
- $tpl->setVariable('VERSION', VERSION, true);
- $tpl->setVariable('FEED_URL', htmlspecialchars($feed_self_url), true);
+ $tpl->setVariable('FEED_TITLE', $feed_title, true);
+ $tpl->setVariable('VERSION', VERSION, true);
+ $tpl->setVariable('FEED_URL', htmlspecialchars($feed_self_url), true);
- if (PUBSUBHUBBUB_HUB && $feed == -2) {
- $tpl->setVariable('HUB_URL', htmlspecialchars(PUBSUBHUBBUB_HUB), true);
- $tpl->addBlock('feed_hub');
- }
+ if (PUBSUBHUBBUB_HUB && $feed == -2) {
+ $tpl->setVariable('HUB_URL', htmlspecialchars(PUBSUBHUBBUB_HUB), true);
+ $tpl->addBlock('feed_hub');
+ }
- $tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
+ $tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
- while ($line = db_fetch_assoc($result)) {
- $tpl->setVariable('ARTICLE_ID', htmlspecialchars($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);
+ while ($line = $this->dbh->fetch_assoc($result)) {
- $content = sanitize($this->link, $line["content_preview"], false, $owner_uid);
+ $tpl->setVariable('ARTICLE_ID', htmlspecialchars($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);
- if ($line['note']) {
- $content = "
Article note: " . $line['note'] . "
" .
- $content;
- }
+ $content = sanitize($line["content_preview"], false, $owner_uid);
+
+ if ($line['note']) {
+ $content = "Article note: " . $line['note'] . "
" .
+ $content;
+ $tpl->setVariable('ARTICLE_NOTE', htmlspecialchars($line['note']), true);
+ }
+
+ $tpl->setVariable('ARTICLE_CONTENT', $content, true);
+
+ $tpl->setVariable('ARTICLE_UPDATED_ATOM',
+ date('c', strtotime($line["updated"])), true);
+ $tpl->setVariable('ARTICLE_UPDATED_RFC822',
+ date(DATE_RFC822, strtotime($line["updated"])), true);
+
+ $tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
+
+ $tags = get_article_tags($line["id"], $owner_uid);
+
+ foreach ($tags as $tag) {
+ $tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag), true);
+ $tpl->addBlock('category');
+ }
- $tpl->setVariable('ARTICLE_CONTENT', $content, true);
+ $enclosures = get_article_enclosures($line["id"]);
- $tpl->setVariable('ARTICLE_UPDATED_ATOM',
- date('c', strtotime($line["updated"])), true);
- $tpl->setVariable('ARTICLE_UPDATED_RFC822',
- date(DATE_RFC822, strtotime($line["updated"])), true);
+ foreach ($enclosures as $e) {
+ $type = htmlspecialchars($e['content_type']);
+ $url = htmlspecialchars($e['content_url']);
+ $length = $e['duration'];
- $tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
+ $tpl->setVariable('ARTICLE_ENCLOSURE_URL', $url, true);
+ $tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', $type, true);
+ $tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', $length, true);
- $tags = get_article_tags($this->link, $line["id"], $owner_uid);
+ $tpl->addBlock('enclosure');
+ }
- foreach ($tags as $tag) {
- $tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag), true);
- $tpl->addBlock('category');
+ $tpl->addBlock('entry');
}
- $enclosures = get_article_enclosures($this->link, $line["id"]);
+ $tmp = "";
+
+ $tpl->addBlock('feed');
+ $tpl->generateOutputToString($tmp);
- foreach ($enclosures as $e) {
- $type = htmlspecialchars($e['content_type']);
- $url = htmlspecialchars($e['content_url']);
- $length = $e['duration'];
+ if (@!$_REQUEST["noxml"]) {
+ header("Content-Type: text/xml; charset=utf-8");
+ } else {
+ header("Content-Type: text/plain; charset=utf-8");
+ }
- $tpl->setVariable('ARTICLE_ENCLOSURE_URL', $url, true);
- $tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', $type, true);
- $tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', $length, true);
+ print $tmp;
+ } else if ($format == 'json') {
- $tpl->addBlock('enclosure');
+ $feed = array();
+
+ $feed['title'] = $feed_title;
+ $feed['version'] = VERSION;
+ $feed['feed_url'] = $feed_self_url;
+
+ if (PUBSUBHUBBUB_HUB && $feed == -2) {
+ $feed['hub_url'] = PUBSUBHUBBUB_HUB;
}
- $tpl->addBlock('entry');
- }
+ $feed['self_url'] = get_self_url_prefix();
- $tmp = "";
+ $feed['articles'] = array();
- $tpl->addBlock('feed');
- $tpl->generateOutputToString($tmp);
+ while ($line = $this->dbh->fetch_assoc($result)) {
+ $article = array();
- print $tmp;
+ $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['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);
+
+ if (count($tags) > 0) {
+ $article['tags'] = array();
+
+ foreach ($tags as $tag) {
+ array_push($article['tags'], $tag);
+ }
+ }
+
+ $enclosures = get_article_enclosures($line["id"]);
+
+ if (count($enclosures) > 0) {
+ $article['enclosures'] = array();
+
+ foreach ($enclosures as $e) {
+ $type = $e['content_type'];
+ $url = $e['content_url'];
+ $length = $e['duration'];
+
+ array_push($article['enclosures'], array("url" => $url, "type" => $type, "length" => $length));
+ }
+ }
+
+ array_push($feed['articles'], $article);
+ }
+
+ header("Content-Type: text/json; charset=utf-8");
+ print json_encode($feed);
+
+ } else {
+ header("Content-Type: text/plain; charset=utf-8");
+ print json_encode(array("error" => array("message" => "Unknown format")));
+ }
}
function getUnread() {
- $login = db_escape_string($_REQUEST["login"]);
+ $login = $this->dbh->escape_string($_REQUEST["login"]);
$fresh = $_REQUEST["fresh"] == "1";
- $result = db_query($this->link, "SELECT id FROM ttrss_users WHERE login = '$login'");
+ $result = $this->dbh->query("SELECT id FROM ttrss_users WHERE login = '$login'");
- if (db_num_rows($result) == 1) {
- $uid = db_fetch_result($result, 0, "id");
+ if ($this->dbh->num_rows($result) == 1) {
+ $uid = $this->dbh->fetch_result($result, 0, "id");
- print getGlobalUnread($this->link, $uid);
+ print getGlobalUnread($uid);
if ($fresh) {
print ";";
- print getFeedArticles($this->link, -3, false, true, $uid);
+ print getFeedArticles(-3, false, true, $uid);
}
} else {
@@ -127,34 +223,29 @@ class Handler_Public extends Handler {
}
function getProfiles() {
- $login = db_escape_string($_REQUEST["login"]);
- $password = db_escape_string($_REQUEST["password"]);
+ $login = $this->dbh->escape_string($_REQUEST["login"]);
- if (authenticate_user($this->link, $login, $password)) {
- $result = db_query($this->link, "SELECT * FROM ttrss_settings_profiles
- WHERE owner_uid = " . $_SESSION["uid"] . " ORDER BY title");
+ $result = $this->dbh->query("SELECT * FROM ttrss_settings_profiles,ttrss_users
+ WHERE ttrss_users.id = ttrss_settings_profiles.owner_uid AND login = '$login' ORDER BY title");
- print "";
}
function pubsub() {
- $mode = db_escape_string($_REQUEST['hub_mode']);
- $feed_id = (int) db_escape_string($_REQUEST['id']);
- $feed_url = db_escape_string($_REQUEST['hub_topic']);
+ $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 (!PUBSUBHUBBUB_ENABLED) {
header('HTTP/1.0 404 Not Found');
@@ -164,17 +255,17 @@ class Handler_Public extends Handler {
// TODO: implement hub_verifytoken checking
- $result = db_query($this->link, "SELECT feed_url FROM ttrss_feeds
+ $result = $this->dbh->query("SELECT feed_url FROM ttrss_feeds
WHERE id = '$feed_id'");
- if (db_num_rows($result) != 0) {
+ if ($this->dbh->num_rows($result) != 0) {
- $check_feed_url = db_fetch_result($result, 0, "feed_url");
+ $check_feed_url = $this->dbh->fetch_result($result, 0, "feed_url");
if ($check_feed_url && ($check_feed_url == $feed_url || !$feed_url)) {
if ($mode == "subscribe") {
- db_query($this->link, "UPDATE ttrss_feeds SET pubsub_state = 2
+ $this->dbh->query("UPDATE ttrss_feeds SET pubsub_state = 2
WHERE id = '$feed_id'");
print $_REQUEST['hub_challenge'];
@@ -182,7 +273,7 @@ class Handler_Public extends Handler {
} else if ($mode == "unsubscribe") {
- db_query($this->link, "UPDATE ttrss_feeds SET pubsub_state = 0
+ $this->dbh->query("UPDATE ttrss_feeds SET pubsub_state = 0
WHERE id = '$feed_id'");
print $_REQUEST['hub_challenge'];
@@ -191,9 +282,9 @@ class Handler_Public extends Handler {
} else if (!$mode) {
// Received update ping, schedule feed update.
- //update_rss_feed($this->link, $feed_id, true, true);
+ //update_rss_feed($feed_id, true, true);
- db_query($this->link, "UPDATE ttrss_feeds SET
+ $this->dbh->query("UPDATE ttrss_feeds SET
last_update_started = '1970-01-01',
last_updated = '1970-01-01' WHERE id = '$feed_id'");
@@ -214,49 +305,19 @@ class Handler_Public extends Handler {
header("Location: index.php");
}
- function fbexport() {
-
- $access_key = db_escape_string($_POST["key"]);
-
- // TODO: rate limit checking using last_connected
- $result = db_query($this->link, "SELECT id FROM ttrss_linked_instances
- WHERE access_key = '$access_key'");
-
- if (db_num_rows($result) == 1) {
-
- $instance_id = db_fetch_result($result, 0, "id");
-
- $result = db_query($this->link, "SELECT feed_url, site_url, title, subscribers
- FROM ttrss_feedbrowser_cache ORDER BY subscribers DESC LIMIT 100");
-
- $feeds = array();
-
- while ($line = db_fetch_assoc($result)) {
- array_push($feeds, $line);
- }
-
- db_query($this->link, "UPDATE ttrss_linked_instances SET
- last_status_in = 1 WHERE id = '$instance_id'");
-
- print json_encode(array("feeds" => $feeds));
- } else {
- print json_encode(array("error" => array("code" => 6)));
- }
- }
-
function share() {
- $uuid = db_escape_string($_REQUEST["key"]);
+ $uuid = $this->dbh->escape_string($_REQUEST["key"]);
- $result = db_query($this->link, "SELECT ref_id, owner_uid FROM ttrss_user_entries WHERE
+ $result = $this->dbh->query("SELECT ref_id, owner_uid FROM ttrss_user_entries WHERE
uuid = '$uuid'");
- if (db_num_rows($result) != 0) {
+ if ($this->dbh->num_rows($result) != 0) {
header("Content-Type: text/html");
- $id = db_fetch_result($result, 0, "ref_id");
- $owner_uid = db_fetch_result($result, 0, "owner_uid");
+ $id = $this->dbh->fetch_result($result, 0, "ref_id");
+ $owner_uid = $this->dbh->fetch_result($result, 0, "owner_uid");
- $article = format_article($this->link, $id, false, true, $owner_uid);
+ $article = format_article($id, false, true, $owner_uid);
print_r($article['content']);
@@ -267,35 +328,37 @@ class Handler_Public extends Handler {
}
function rss() {
- header("Content-Type: text/xml; charset=utf-8");
-
- $feed = db_escape_string($_REQUEST["id"]);
- $key = db_escape_string($_REQUEST["key"]);
+ $feed = $this->dbh->escape_string($_REQUEST["id"]);
+ $key = $this->dbh->escape_string($_REQUEST["key"]);
$is_cat = $_REQUEST["is_cat"] != false;
- $limit = (int)db_escape_string($_REQUEST["limit"]);
+ $limit = (int)$this->dbh->escape_string($_REQUEST["limit"]);
+ $offset = (int)$this->dbh->escape_string($_REQUEST["offset"]);
- $search = db_escape_string($_REQUEST["q"]);
- $match_on = db_escape_string($_REQUEST["m"]);
- $search_mode = db_escape_string($_REQUEST["smode"]);
- $view_mode = db_escape_string($_REQUEST["view-mode"]);
+ $search = $this->dbh->escape_string($_REQUEST["q"]);
+ $search_mode = $this->dbh->escape_string($_REQUEST["smode"]);
+ $view_mode = $this->dbh->escape_string($_REQUEST["view-mode"]);
+
+ $format = $this->dbh->escape_string($_REQUEST['format']);
+
+ if (!$format) $format = 'atom';
if (SINGLE_USER_MODE) {
- authenticate_user($this->link, "admin", null);
+ authenticate_user("admin", null);
}
$owner_id = false;
if ($key) {
- $result = db_query($this->link, "SELECT owner_uid FROM
+ $result = $this->dbh->query("SELECT owner_uid FROM
ttrss_access_keys WHERE access_key = '$key' AND feed_id = '$feed'");
- if (db_num_rows($result) == 1)
- $owner_id = db_fetch_result($result, 0, "owner_uid");
+ if ($this->dbh->num_rows($result) == 1)
+ $owner_id = $this->dbh->fetch_result($result, 0, "owner_uid");
}
if ($owner_id) {
$this->generate_syndicated_feed($owner_id, $feed, $is_cat, $limit,
- $search, $search_mode, $match_on, $view_mode);
+ $offset, $search, $search_mode, $view_mode, $format);
} else {
header('HTTP/1.1 403 Forbidden');
}
@@ -304,78 +367,582 @@ class Handler_Public extends Handler {
function globalUpdateFeeds() {
include "rssfuncs.php";
// Update all feeds needing a update.
- update_daemon_common($this->link, 0, true, false);
+ update_daemon_common(0, true, false);
+
+ // Update feedbrowser
+ update_feedbrowser_cache();
+
+ // Purge orphans and cleanup tags
+ purge_orphans();
+
+ cleanup_tags(14, 50000);
+
+ PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
+
}
function sharepopup() {
+ if (SINGLE_USER_MODE) {
+ login_sequence();
+ }
+
header('Content-Type: text/html; charset=utf-8');
- print "
-
- Tiny Tiny RSS
-
-
-
-
- ";
+ print "Tiny Tiny RSS";
+
+ print stylesheet_tag("utility.css");
+ print javascript_tag("lib/prototype.js");
+ print javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls");
+ print "
+ ";
$action = $_REQUEST["action"];
if ($_SESSION["uid"]) {
- if (!$action) {
+ if ($action == 'share') {
- print "";
+ }
+
+ $tp_uri = get_self_url_prefix() . "/prefs.php";
+ $tt_uri = get_self_url_prefix();
- print "";
+ if ($rc['code'] <= 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 "
";
+ }
- $title = db_escape_string(strip_tags($_REQUEST["title"]));
- $url = db_escape_string(strip_tags($_REQUEST["url"]));
- $content = db_escape_string(strip_tags($_REQUEST["content"]));
+ print "";
- create_published_article($this->link, $title, $url, $content, $_SESSION["uid"]);
+ print "";
- print "";
+ } else {
+ render_login_form();
+ }
+ }
+
+ 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"]);
+
+ /* 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."));
+
+ $feed_urls = get_feeds_from_html($feed_url);
+ 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 "