diff --git a/classes/dlg.php b/classes/dlg.php index f62a42b4d..4240ad222 100644 --- a/classes/dlg.php +++ b/classes/dlg.php @@ -13,28 +13,6 @@ class Dlg extends Handler_Protected { return false; } - function importOpml() { - print_notice("If you have imported labels and/or filters, you might need to reload preferences to see your new data."); - - print "
"; - - $opml = new OPML($_REQUEST); - - $opml->opml_import($_SESSION["uid"]); - - print "
"; - - print ""; - - print ""; - - //return; - } - function printTagCloud() { print "
"; diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 949b23c20..5fcafeaae 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1194,6 +1194,11 @@ class Pref_Feeds extends Handler_Protected { Feeds::add_feed_category($feed_cat); } + function importOpml() { + $opml = new OPML($_REQUEST); + $opml->opml_import($_SESSION["uid"]); + } + function index() { print "
"; @@ -1340,17 +1345,11 @@ class Pref_Feeds extends Handler_Protected { print_notice("Only main settings profile can be migrated using OPML."); - print ""; - - print "
+ print " - + + + ` + }); + + dialog.show(); + }; + + xhr.send(new FormData($("opml_import_form"))); + + return false; } }, onImportComplete: function(iframe) {