public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-15 05:55:55 +00:00
Code Issues Releases Wiki Activity

getArticleLink: add escaping; open_article_in_new_window: add error notifications (closes #202)

Browse Source
This commit is contained in:
Andrew Dolgov
2008-04-18 06:13:00 +01:00
parent ae56f76274
commit 06925d9e85
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
functions.js
View File

@@ -68,10 +68,15 @@ function open_article_callback(transport) {
try { try {
if (transport.responseXML) { if (transport.responseXML) {
var link = transport.responseXML.getElementsByTagName("link")[0]; var link = transport.responseXML.getElementsByTagName("link")[0];
var id = transport.responseXML.getElementsByTagName("id")[0]; var id = transport.responseXML.getElementsByTagName("id")[0];
debug("open_article_callback, received link: " + link);
if (link) { if (link) {
debug("link url: " + link.firstChild.nodeValue);
window.open(link.firstChild.nodeValue, "_blank"); window.open(link.firstChild.nodeValue, "_blank");
if (id) { if (id) {
@@ -80,7 +85,11 @@ function open_article_callback(transport) {
window.setTimeout("toggleUnread(" + id + ", 0)", 100); window.setTimeout("toggleUnread(" + id + ", 0)", 100);
} }
} }
} else {
notify_error("Can't open article: received invalid article link");
} }
} else {
notify_error("Can't open article: received invalid XML");
} }
} catch (e) { } catch (e) {

2
modules/backend-rpc.php
View File

@@ -279,7 +279,7 @@
WHERE id = '$id' AND id = ref_id AND owner_uid = '".$_SESSION['uid']."'"); WHERE id = '$id' AND id = ref_id AND owner_uid = '".$_SESSION['uid']."'");
if (db_num_rows($result) == 1) { if (db_num_rows($result) == 1) {
$link = strip_tags(db_fetch_result($result, 0, "link")); $link = htmlspecialchars(strip_tags(db_fetch_result($result, 0, "link")));
print "<rpc-reply><link>$link</link><id>$id</id></rpc-reply>"; print "<rpc-reply><link>$link</link><id>$id</id></rpc-reply>";
} else { } else {
print "<rpc-reply><error>Article not found</error></rpc-reply>"; print "<rpc-reply><error>Article not found</error></rpc-reply>";