public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 22:45:56 +00:00
Code Issues Releases Wiki Activity

rpc/updateFeedBrowser: use JSON

Browse Source
This commit is contained in:
Andrew Dolgov
2010-11-29 16:19:32 +03:00
parent da661d71db
commit 4a16bda3d0
4 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
functions.js
View File

@@ -1417,12 +1417,6 @@ function feedBrowser() {
new Ajax.Request("backend.php", { new Ajax.Request("backend.php", {
parameters: query, parameters: query,
onComplete: function(transport) { onComplete: function(transport) {
var nf = transport.responseXML.getElementsByTagName('num-feeds')[0];
var nf_value = nf.getAttribute("value");
notify_info(__("Subscribed to %d feed(s).").replace("%d", nf_value));
if (inPreferences()) { if (inPreferences()) {
updateFeedList(); updateFeedList();
} }
@@ -1446,17 +1440,19 @@ function feedBrowser() {
Element.hide('feed_browser_spinner'); Element.hide('feed_browser_spinner');
var c = $("browseFeedList"); var c = $("browseFeedList");
var r = transport.responseXML.getElementsByTagName("content")[0];
var nr = transport.responseXML.getElementsByTagName("num-results")[0]; var reply = JSON.parse(transport.responseText);
var mode = transport.responseXML.getElementsByTagName("mode")[0];
var r = reply['content'];
var mode = reply['mode'];
if (c && r) { if (c && r) {
c.innerHTML = r.firstChild.nodeValue; c.innerHTML = r;
} }
dojo.parser.parse("browseFeedList"); dojo.parser.parse("browseFeedList");
if (parseInt(mode.getAttribute("value")) == 2) { if (mode == 2) {
Element.show(dijit.byId('feed_archive_remove').domNode); Element.show(dijit.byId('feed_archive_remove').domNode);
} else { } else {
Element.hide(dijit.byId('feed_archive_remove').domNode); Element.hide(dijit.byId('feed_archive_remove').domNode);

23
modules/backend-rpc.php
View File

@@ -551,25 +551,18 @@
} }
if ($subop == "updateFeedBrowser") { if ($subop == "updateFeedBrowser") {
header("Content-Type: text/plain");
$search = db_escape_string($_REQUEST["search"]); $search = db_escape_string($_REQUEST["search"]);
$limit = db_escape_string($_REQUEST["limit"]); $limit = db_escape_string($_REQUEST["limit"]);
$mode = db_escape_string($_REQUEST["mode"]); $mode = (int) db_escape_string($_REQUEST["mode"]);
print "<rpc-reply>";
print "<content>";
print "<![CDATA[";
$ctr = print_feed_browser($link, $search, $limit, $mode);
print "]]>";
print "</content>";
print "<num-results value=\"$ctr\"/>";
print "<mode value=\"$mode\"/>";
print "</rpc-reply>";
print json_encode(array("content" =>
make_feed_browser($link, $search, $limit, $mode),
"mode" => $mode));
return; return;
} }
if ($subop == "massSubscribe") { if ($subop == "massSubscribe") {
$ids = split(",", db_escape_string($_REQUEST["ids"])); $ids = split(",", db_escape_string($_REQUEST["ids"]));
@@ -611,12 +604,6 @@
} }
} }
$num_feeds = count($subscribed);
print "<rpc-reply>";
print "<num-feeds value='$num_feeds'/>";
print "</rpc-reply>";
return; return;
} }

2
modules/popup-dialog.php
View File

@@ -345,7 +345,7 @@
$owner_uid = $_SESSION["uid"]; $owner_uid = $_SESSION["uid"];
print "<ul class='browseFeedList' id='browseFeedList'>"; print "<ul class='browseFeedList' id='browseFeedList'>";
print_feed_browser($link, $search, 25); print make_feed_browser($link, $search, 25);
print "</ul>"; print "</ul>";
print "<div align='center'> print "<div align='center'>

13
modules/pref-feeds.php
View File

@@ -1362,9 +1362,10 @@
} }
function print_feed_browser($link, $search, $limit, $mode = 1) { function make_feed_browser($link, $search, $limit, $mode = 1) {
$owner_uid = $_SESSION["uid"]; $owner_uid = $_SESSION["uid"];
$rv = '';
if ($search) { if ($search) {
$search_qpart = "AND (UPPER(feed_url) LIKE UPPER('%$search%') OR $search_qpart = "AND (UPPER(feed_url) LIKE UPPER('%$search%') OR
@@ -1436,7 +1437,7 @@
style='border-width : 0px; vertical-align : middle' style='border-width : 0px; vertical-align : middle'
src='images/feed-icon-12x12.png'></a>"; src='images/feed-icon-12x12.png'></a>";
print "<li title=\"".htmlspecialchars($details["site_url"])."\" $rv .= "<li title=\"".htmlspecialchars($details["site_url"])."\"
id=\"FBROW-".$details["id"]."\">$check_box". id=\"FBROW-".$details["id"]."\">$check_box".
"$feed_icon $feed_url " . htmlspecialchars($details["title"]) . "$feed_icon $feed_url " . htmlspecialchars($details["title"]) .
"&nbsp;<span class='subscribers'>($subscribers)</span> "&nbsp;<span class='subscribers'>($subscribers)</span>
@@ -1479,7 +1480,7 @@
style='border-width : 0px; vertical-align : middle' style='border-width : 0px; vertical-align : middle'
src='images/feed-icon-12x12.png'></a>"; src='images/feed-icon-12x12.png'></a>";
print "<li title='".$line['site_url']."' class='$class' $rv .= "<li title='".$line['site_url']."' class='$class'
id=\"FBROW-".$line["id"]."\">". id=\"FBROW-".$line["id"]."\">".
$check_box . "$feed_icon $feed_url " . $title . $check_box . "$feed_icon $feed_url " . $title .
$archived . $site_url . "</li>"; $archived . $site_url . "</li>";
@@ -1491,10 +1492,10 @@
} }
if ($feedctr == 0) { if ($feedctr == 0) {
print "<li style=\"text-align : center\"><p>".__('No feeds found.')."</p></li>"; $rv .= "<li style=\"text-align : center\"><p>".__('No feeds found.')."</p></li>";
} }
return $feedctr; return $rv;
} }