X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Fhandler%2Fpublic.php;h=46c74041c85c33a6de6b1036552ce2a8bac5ee80;hb=27f7b59353a076120407d8873ea86f5eea7d1dcf;hp=31376ff60333e967cbc77ceb7eb33f0f445f9cc8;hpb=fd94d63122b8919ddf6b146ebe9ef01dde655acd;p=tt-rss.git
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 31376ff6..46c74041 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -3,7 +3,7 @@ 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, $orig_guid = false) {
+ $view_mode = false, $format = 'atom', $order = false, $orig_guid = false, $start_ts = false) {
require_once "lib/MiniTemplator.class.php";
@@ -37,10 +37,12 @@ class Handler_Public extends Handler {
break;
}
+ //function queryFeedHeadlines($feed, $limit, $view_mode, $cat_view, $search, $search_mode, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false, $override_strategy = false, $override_vfeed = false, $start_ts = false) {
+
$qfh_ret = queryFeedHeadlines($feed,
1, $view_mode, $is_cat, $search, $search_mode,
$date_sort_field, $offset, $owner_uid,
- false, 0, false, true);
+ false, 0, true, true, false, false, $start_ts);
$result = $qfh_ret[0];
@@ -61,13 +63,13 @@ class Handler_Public extends Handler {
$qfh_ret = queryFeedHeadlines($feed,
$limit, $view_mode, $is_cat, $search, $search_mode,
$date_sort_field, $offset, $owner_uid,
- false, 0, false, true);
+ false, 0, true, true, false, false, $start_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=" .
@@ -99,13 +101,13 @@ class Handler_Public extends Handler {
$tpl->setVariable('ARTICLE_ID',
htmlspecialchars($orig_guid ? $line['link'] :
- get_self_url_prefix() .
- "/public.php?url=" . urlencode($line['link'])), true);
+ $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', $line["content_preview"], true);
- $content = sanitize($line["content"], false, $owner_uid);
+ $content = sanitize($line["content"], false, $owner_uid,
+ $feed_site_url);
if ($line['note']) {
$content = "
Article note: " . $line['note'] . "
" .
@@ -122,7 +124,7 @@ 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_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);
@@ -137,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);
@@ -375,6 +377,7 @@ 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["orig_guid"]);
@@ -397,24 +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 updateTask() {
- PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
+ 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", $op);
+ 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", $op);
+ PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
}
function sharepopup() {
@@ -427,9 +430,10 @@ class Handler_Public extends Handler {
";
- stylesheet_tag("css/utility.css");
- javascript_tag("lib/prototype.js");
- javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls");
+ 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 "
";
@@ -586,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();
@@ -688,108 +704,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 %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 "