From b6a6e262bebfdcea6b9523e63c287f94b4ffcff6 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Wed, 13 Jan 2010 23:59:02 +0300
Subject: rework OPML import to use popup dialog

---
 modules/pref-feeds.php | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'modules/pref-feeds.php')

diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 05c796bb3..e724125ec 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -719,6 +719,8 @@
 			foreach ($ids as $id) {
 				remove_feed($link, $id, $_SESSION["uid"]);
 			}
+
+			return;
 		}
 
 		if ($subop == "clear") {
@@ -1377,9 +1379,9 @@
 
 		}
 
-		print "<h3>".__('OPML')."</h3>
+		print "<h3>".__('OPML')."</h3>";
 
-		<div style='float : left'>
+/*		print "<div style='float : left'>
 		<form	enctype=\"multipart/form-data\" method=\"POST\" action=\"opml.php\">
 		".__('File:')." <input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp;
 			<input type=\"hidden\" name=\"op\" value=\"Import\">
@@ -1387,7 +1389,22 @@
 				type=\"submit\">".__('Import')."</button>
 				</form></div>";
 
-		print "&nbsp;";
+		print "&nbsp;"; */
+
+		print "<iframe name=\"upload_iframe\" onchange=\"opml_import_handler(this)\"
+			style=\"width: 400px; height: 100px; display: none;\"></iframe>";
+
+		print "<div style='float : left'>";
+		print "<form style='display : block' target=\"upload_iframe\"
+			enctype=\"multipart/form-data\" method=\"POST\" 
+				action=\"backend.php\">
+			<input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp;
+			<input type=\"hidden\" name=\"op\" value=\"dlg\">
+			<input type=\"hidden\" name=\"id\" value=\"importOpml\">
+			<button onclick=\"return opmlImport();\"
+				type=\"submit\">".__('Import')."</button>
+			</form>";
+		print "</div>&nbsp;";
 
 		print "<button onclick=\"gotoExportOpml()\">".
 			__('Export OPML')."</button>";
-- 
cgit v1.2.3