rework OPML import to use popup dialog

1 files changed, 71 insertions, 76 deletions

diff --git a/modules/opml_domxml.php b/modules/opml_domxml.php
index 9364145b1..1cc1467a8 100644
--- a/modules/opml_domxml.php
+++ b/modules/opml_domxml.php
@@ -24,123 +24,118 @@
 
 					$outlines = $body->get_elements_by_tagname('outline');
 
-					print "<table>";
+				foreach ($outlines as $outline) {
 
-					foreach ($outlines as $outline) {
+					$feed_title = db_escape_string($outline->get_attribute('text'));
 
-						$feed_title = db_escape_string($outline->get_attribute('text'));
-
-						if (!$feed_title) {
-							$feed_title = db_escape_string($outline->get_attribute('title'));
-						}
+					if (!$feed_title) {
+						$feed_title = db_escape_string($outline->get_attribute('title'));
+					}
 
-						$cat_title = db_escape_string($outline->get_attribute('title'));
+					$cat_title = db_escape_string($outline->get_attribute('title'));
 
-						if (!$cat_title) {
-							$cat_title = db_escape_string($outline->get_attribute('text'));
-						}
-	
-						$feed_url = db_escape_string($outline->get_attribute('xmlUrl'));
-						$site_url = db_escape_string($outline->get_attribute('htmlUrl'));
+					if (!$cat_title) {
+						$cat_title = db_escape_string($outline->get_attribute('text'));
+					}
 
-						if ($cat_title && !$feed_url) {
+					$feed_url = db_escape_string($outline->get_attribute('xmlUrl'));
+					$site_url = db_escape_string($outline->get_attribute('htmlUrl'));
 
-							db_query($link, "BEGIN");
-							
-							$result = db_query($link, "SELECT id FROM
-								ttrss_feed_categories WHERE title = '$cat_title' AND
-								owner_uid = '$owner_uid' LIMIT 1");
+					if ($cat_title && !$feed_url) {
 
-							if (db_num_rows($result) == 0) {
+						db_query($link, "BEGIN");
+						
+						$result = db_query($link, "SELECT id FROM
+							ttrss_feed_categories WHERE title = '$cat_title' AND
+							owner_uid = '$owner_uid' LIMIT 1");
 
-								printf(__("Adding category <b>%s</b>."), $cat_title);
-								print "<br>";
+						if (db_num_rows($result) == 0) {
 
-								db_query($link, "INSERT INTO ttrss_feed_categories
-									(title,owner_uid) 
-								VALUES ('$cat_title', '$owner_uid')");
-							}
+							printf(__("<li>Adding category <b>%s</b>.</li>"), $cat_title);
 
-							db_query($link, "COMMIT");
+							db_query($link, "INSERT INTO ttrss_feed_categories
+								(title,owner_uid) 
+							VALUES ('$cat_title', '$owner_uid')");
 						}
 
-//						print "$active_category : $feed_title : $feed_url<br>";
+						db_query($link, "COMMIT");
+					}
 
-						if (!$feed_title || !$feed_url) continue;
+//						print "$active_category : $feed_title : $feed_url<br>";
 
-						db_query($link, "BEGIN");
+					if (!$feed_title || !$feed_url) continue;
 
-						$cat_id = null;
+					db_query($link, "BEGIN");
 
-						$parent_node = $outline->parent_node();
+					$cat_id = null;
 
-						if ($parent_node && $parent_node->node_name() == "outline") {
-							$element_category = $parent_node->get_attribute('title');
-							if (!$element_category) $element_category = $parent_node->get_attribute('text');
+					$parent_node = $outline->parent_node();
 
-						} else {
-							$element_category = '';
-						}
+					if ($parent_node && $parent_node->node_name() == "outline") {
+						$element_category = $parent_node->get_attribute('title');
+						if (!$element_category) $element_category = $parent_node->get_attribute('text');
 
-						if ($element_category) {
+					} else {
+						$element_category = '';
+					}
 
-							$element_category = db_escape_string($element_category);
+					if ($element_category) {
 
-							$result = db_query($link, "SELECT id FROM
-									ttrss_feed_categories WHERE title = '$element_category' AND
-									owner_uid = '$owner_uid' LIMIT 1");								
+						$element_category = db_escape_string($element_category);
 
-							if (db_num_rows($result) == 1) {	
-								$cat_id = db_fetch_result($result, 0, "id");
-							}
-						}								
+						$result = db_query($link, "SELECT id FROM
+								ttrss_feed_categories WHERE title = '$element_category' AND
+								owner_uid = '$owner_uid' LIMIT 1");								
 
-						$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
-							feed_url = '$feed_url'
-							AND owner_uid = '$owner_uid'");
+						if (db_num_rows($result) == 1) {	
+							$cat_id = db_fetch_result($result, 0, "id");
+						}
+					}								
 
-						print "<tr><td><a target='_blank' href='$site_url'><b>$feed_title</b></a></b> 
-							(<a target='_blank' href=\"$feed_url\">rss</a>)</td>";
+					$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
+						feed_url = '$feed_url'
+						AND owner_uid = '$owner_uid'");
 
-						if (db_num_rows($result) > 0) {
-							print "<td>".__("Already imported.")."</td>";
-						} else {
+					print "<li><a target='_blank' href='$site_url'><b>$feed_title</b></a></b> 
+						(<a target='_blank' href=\"$feed_url\">rss</a>)&nbsp;";
 
-							if ($cat_id) {
-								$add_query = "INSERT INTO ttrss_feeds 
-									(title, feed_url, owner_uid, cat_id, site_url) VALUES
-									('$feed_title', '$feed_url', '$owner_uid', 
-										'$cat_id', '$site_url')";
+					if (db_num_rows($result) > 0) {
+						print __("is already imported.");
+					} else {
 
-							} else {
-								$add_query = "INSERT INTO ttrss_feeds 
-									(title, feed_url, owner_uid, cat_id, site_url) VALUES
-									('$feed_title', '$feed_url', '$owner_uid', '$default_cat_id',
-										'$site_url')";
+						if ($cat_id) {
+							$add_query = "INSERT INTO ttrss_feeds 
+								(title, feed_url, owner_uid, cat_id, site_url) VALUES
+								('$feed_title', '$feed_url', '$owner_uid', 
+									'$cat_id', '$site_url')";
 
-							}
+						} else {
+							$add_query = "INSERT INTO ttrss_feeds 
+								(title, feed_url, owner_uid, cat_id, site_url) VALUES
+								('$feed_title', '$feed_url', '$owner_uid', '$default_cat_id',
+									'$site_url')";
 
-							db_query($link, $add_query);
-							
-							print "<td><b>".__('Done.')."</b></td>";
 						}
 
-						print "</tr>";
+						db_query($link, $add_query);
 						
-						db_query($link, "COMMIT");
+						print __('OK');
 					}
 
-					print "</table>";
+					print "</li>";
+					
+					db_query($link, "COMMIT");
+				}
 
 				} else {
-					print "<div class=\"error\">".__("Error: can't find body element.")."</div>";
+					print_error(__("Error: can't find body element."));
 				}
 			} else {
-				print "<div class=\"error\">".__("Error while parsing document.")."</div>";
+				print_error(__("Error while parsing document."));
 			}
 
 		} else {
-			print "<div class=\"error\">".__("Error: please upload OPML file.")."</div>";
+			print_error(__("Error: please upload OPML file."));
 		}
 
 	}