subscribe: verify XML before adding to the database; fetch: try to work around entity problems if initial parsing fails

1 files changed, 5 insertions, 33 deletions

diff --git a/js/functions.js b/js/functions.js
index e02767504..04be58bf7 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -816,39 +816,6 @@ function quickAddFeed() {
 									alert(__("Specified URL doesn't seem to contain any feeds."));
 									break;
 								case 4:
-									/* notify_progress("Searching for feed urls...", true);
-
-									new Ajax.Request("backend.php", {
-										parameters: 'op=rpc&method=extractfeedurls&url=' + param_escape(feed_url),
-										onComplete: function(transport, dialog, feed_url) {
-
-											notify('');
-
-											var reply = JSON.parse(transport.responseText);
-
-											var feeds = reply['urls'];
-
-											console.log(transport.responseText);
-
-											var select = dijit.byId("feedDlg_feedContainerSelect");
-
-											while (select.getOptions().length > 0)
-												select.removeOption(0);
-
-											var count = 0;
-											for (var feedUrl in feeds) {
-												select.addOption({value: feedUrl, label: feeds[feedUrl]});
-												count++;
-											}
-
-//											if (count > 5) count = 5;
-//											select.size = count;
-
-											Effect.Appear('feedDlg_feedsContainer', {duration : 0.5});
-										}
-									});
-									break; */
-
 									feeds = rc['feeds'];
 
 									var select = dijit.byId("feedDlg_feedContainerSelect");
@@ -871,6 +838,11 @@ function quickAddFeed() {
 									alert(__("Couldn't download the specified URL: %s").
 											replace("%s", rc['message']));
 									break;
+								case 6:
+									alert(__("XML validation failed: %s").
+											replace("%s", rc['message']));
+									break;
+									break;
 								case 0:
 									alert(__("You are already subscribed to this feed."));
 									break;