From ab10707facb7e338b2f6ed6a98865b9c754c5f32 Mon Sep 17 00:00:00 2001 From: shibuya246 Date: Mon, 1 Jul 2013 19:53:27 +0900 Subject: add to feed rss output --- classes/handler/public.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'classes') diff --git a/classes/handler/public.php b/classes/handler/public.php index f05beafd2..205853eae 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -110,6 +110,8 @@ class Handler_Public extends Handler { date(DATE_RFC822, strtotime($line["updated"])), true); $tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true); + + $tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title']), true); $tags = get_article_tags($line["id"], $owner_uid); -- cgit v1.2.3 From e9687f67e0196c063536c8e7770094129a42f2ef Mon Sep 17 00:00:00 2001 From: Andrew Dolgov <fox@madoka.volgo-balt.ru> Date: Sat, 6 Jul 2013 12:03:01 +0400 Subject: date_reverse view mode: take scoring into account --- classes/api.php | 2 +- classes/feeds.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/api.php b/classes/api.php index 23866072f..334f5fdc9 100644 --- a/classes/api.php +++ b/classes/api.php @@ -203,7 +203,7 @@ class API extends Handler { $override_order = false; switch ($_REQUEST["order_by"]) { case "date_reverse": - $override_order = "date_entered, updated"; + $override_order = "score DESC, date_entered, updated"; break; case "feed_dates": $override_order = "updated DESC"; diff --git a/classes/feeds.php b/classes/feeds.php index 33f239ee6..aeadcf257 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -863,7 +863,7 @@ class Feeds extends Handler_Protected { $override_order = "ttrss_entries.title"; break; case "date_reverse": - $override_order = "date_entered, updated"; + $override_order = "score DESC, date_entered, updated"; break; case "feed_dates": $override_order = "updated DESC"; -- cgit v1.2.3 From 4b7ebe93a8a59a3bd2e7fb820795314be3db51ce Mon Sep 17 00:00:00 2001 From: Andrew Dolgov <fox@madoka.volgo-balt.ru> Date: Sat, 6 Jul 2013 12:34:58 +0400 Subject: fix broken highlighting of high-scored rows --- classes/feeds.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'classes') diff --git a/classes/feeds.php b/classes/feeds.php index aeadcf257..b15875bd3 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -377,9 +377,9 @@ class Feeds extends Handler_Protected { title=\"$score\">"; if ($score > 500) { - $hlc_suffix = "H"; + $hlc_suffix = "high"; } else if ($score < -100) { - $hlc_suffix = "L"; + $hlc_suffix = "low"; } else { $hlc_suffix = ""; } @@ -448,8 +448,8 @@ class Feeds extends Handler_Protected { $reply['content'] .= "</div>"; $reply['content'] .= "<div onclick='return hlClicked(event, $id)' - class=\"hlTitle\"><span class='hlContent$hlc_suffix'>"; - $reply['content'] .= "<a id=\"RTITLE-$id\" class=\"title\" + class=\"hlTitle\"><span class='hlContent $hlc_suffix'>"; + $reply['content'] .= "<a id=\"RTITLE-$id\" class=\"title $hlc_suffix\" href=\"" . htmlspecialchars($line["link"]) . "\" onclick=\"\">" . truncate_string($line["title"], 200); @@ -539,7 +539,7 @@ class Feeds extends Handler_Protected { $expanded_class = $expand_cdm ? "expanded" : "expandable"; - $reply['content'] .= "<div class=\"cdm $expanded_class $class\" + $reply['content'] .= "<div class=\"cdm $hlc_suffix $expanded_class $class\" id=\"RROW-$id\" $mouseover_attrs>"; $reply['content'] .= "<div class=\"cdmHeader\" style=\"$row_background\">"; @@ -556,8 +556,8 @@ class Feeds extends Handler_Protected { $reply['content'] .= "<span id=\"RTITLE-$id\" onclick=\"return cdmClicked(event, $id);\" - class=\"titleWrap$hlc_suffix\"> - <a class=\"title\" + class=\"titleWrap $hlc_suffix\"> + <a class=\"title $hlc_suffix\" target=\"_blank\" href=\"". htmlspecialchars($line["link"])."\">". $line["title"] . -- cgit v1.2.3 From c4cab4ecf476d3db6e62126541abb5f318ff2188 Mon Sep 17 00:00:00 2001 From: guillaume-uH57J9 <guillaume@atto.be> Date: Sat, 6 Jul 2013 15:34:42 +0200 Subject: Report failed login attemps using user_error --- classes/handler/public.php | 1 + 1 file changed, 1 insertion(+) (limited to 'classes') diff --git a/classes/handler/public.php b/classes/handler/public.php index 205853eae..f67c4fb9a 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -545,6 +545,7 @@ class Handler_Public extends Handler { } } else { $_SESSION["login_error_msg"] = __("Incorrect username or password"); + user_error("Failed login attempt from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING); } if ($_REQUEST['return']) { -- cgit v1.2.3 From fcf6bfba328fb7774e8f1c8da2b4d62577c959c1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov <fox@madoka.volgo-balt.ru> Date: Sun, 7 Jul 2013 00:59:23 +0400 Subject: syndicated feeds: add orig_guid to optionally alter item id to workaround duplicate checking for syndicated content; add <link> element to <source> --- classes/handler/public.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'classes') diff --git a/classes/handler/public.php b/classes/handler/public.php index 205853eae..1be322006 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) { + $view_mode = false, $format = 'atom', $order = false, $orig_guid = false) { require_once "lib/MiniTemplator.class.php"; @@ -88,7 +88,10 @@ class Handler_Public extends Handler { while ($line = $this->dbh->fetch_assoc($result)) { - $tpl->setVariable('ARTICLE_ID', htmlspecialchars($line['link']), true); + $tpl->setVariable('ARTICLE_ID', + htmlspecialchars($orig_guid ? $line['link'] : + get_self_url_prefix() . + "/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', @@ -110,7 +113,8 @@ class Handler_Public extends Handler { date(DATE_RFC822, strtotime($line["updated"])), true); $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); $tags = get_article_tags($line["id"], $owner_uid); @@ -344,7 +348,7 @@ 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 = $_REQUEST["is_cat"] != "false"; $limit = (int)$this->dbh->escape_string($_REQUEST["limit"]); $offset = (int)$this->dbh->escape_string($_REQUEST["offset"]); @@ -354,6 +358,7 @@ class Handler_Public extends Handler { $order = $this->dbh->escape_string($_REQUEST["order"]); $format = $this->dbh->escape_string($_REQUEST['format']); + $orig_guid = $_REQUEST["orig_guid"] != "false"; if (!$format) $format = 'atom'; @@ -373,7 +378,7 @@ 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, $search_mode, $view_mode, $format, $order, $orig_guid); } else { header('HTTP/1.1 403 Forbidden'); } -- cgit v1.2.3 From 356e13b161cabf9e116a3d057c527b0eeee5b25a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov <fox@madoka.volgo-balt.ru> Date: Sun, 7 Jul 2013 01:03:45 +0400 Subject: rename orig_guid to no_orig_guid --- classes/handler/public.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/handler/public.php b/classes/handler/public.php index 1be322006..810fce78d 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -348,7 +348,7 @@ 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"]); @@ -358,7 +358,7 @@ class Handler_Public extends Handler { $order = $this->dbh->escape_string($_REQUEST["order"]); $format = $this->dbh->escape_string($_REQUEST['format']); - $orig_guid = $_REQUEST["orig_guid"] != "false"; + $orig_guid = !sql_bool_to_bool($_REQUEST["no_orig_guid"]); if (!$format) $format = 'atom'; -- cgit v1.2.3 From 39119f02167454a44025b4a15c09553e5c221938 Mon Sep 17 00:00:00 2001 From: Julien Tardot <julien.tardot@gmail.com> Date: Sun, 7 Jul 2013 11:55:06 +0200 Subject: Correct feed ID in feeds self URL. --- classes/handler/public.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/handler/public.php b/classes/handler/public.php index 0d6ef11c0..b15463564 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -65,8 +65,8 @@ class Handler_Public extends Handler { $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(); -- cgit v1.2.3 From 47fecba235400e0d7a5a7c54c9ff201c0840deec Mon Sep 17 00:00:00 2001 From: justauser <justausr@hotmail.com> Date: Sun, 7 Jul 2013 13:53:23 -0400 Subject: changes to add hook_query_headlines --- classes/pluginhost.php | 1 + 1 file changed, 1 insertion(+) (limited to 'classes') diff --git a/classes/pluginhost.php b/classes/pluginhost.php index 53adf01f9..a1bd1b364 100644 --- a/classes/pluginhost.php +++ b/classes/pluginhost.php @@ -37,6 +37,7 @@ class PluginHost { const HOOK_PREFS_EDIT_FEED = 20; const HOOK_PREFS_SAVE_FEED = 21; const HOOK_FETCH_FEED = 22; + const HOOK_QUERY_HEADLINES = 23; const KIND_ALL = 1; const KIND_SYSTEM = 2; -- cgit v1.2.3