remove opml_domdoc separate module

modules/opml_domdoc.php

@@ -1,166 +0,0 @@
-<?php
-	function opml_import_domdoc($link, $owner_uid) {
-
-		if (is_file($_FILES['opml_file']['tmp_name'])) {
-			$doc = DOMDocument::load($_FILES['opml_file']['tmp_name']);
-
-			$result = db_query($link, "SELECT id FROM
-				ttrss_feed_categories WHERE title = 'Imported feeds' AND
-				owner_uid = '$owner_uid' LIMIT 1");
-
-			if (db_num_rows($result) == 1) {
-				$default_cat_id = db_fetch_result($result, 0, "id");
-			} else {
-				$default_cat_id = 0;
-			}
-
-			if ($doc) {
-				$body = $doc->getElementsByTagName('body');
-
-				$xpath = new DOMXpath($doc);
-				$query = "/opml/body//outline";
-
-				$outlines = $xpath->query($query);
-
-				foreach ($outlines as $outline) {
-
-					$feed_title = db_escape_string($outline->attributes->getNamedItem('text')->nodeValue);
-
-					if (!$feed_title) {
-						$feed_title = db_escape_string($outline->attributes->getNamedItem('title')->nodeValue);
-					}
-
-					$cat_title = db_escape_string($outline->attributes->getNamedItem('title')->nodeValue);
-
-					if (!$cat_title) {
-						$cat_title = db_escape_string($outline->attributes->getNamedItem('text')->nodeValue);
-					}
-
-					$feed_url = db_escape_string($outline->attributes->getNamedItem('xmlUrl')->nodeValue);
-
-					if (!$feed_url) 
-						$feed_url = db_escape_string($outline->attributes->getNamedItem('xmlURL')->nodeValue);
-
-					$site_url = db_escape_string($outline->attributes->getNamedItem('htmlUrl')->nodeValue);
-
-					$pref_name = db_escape_string($outline->attributes->getNamedItem('pref-name')->nodeValue);
-
-					if ($cat_title && !$feed_url) {
-
-						if ($cat_title != "tt-rss-prefs") {
-
-							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 (db_num_rows($result) == 0) {
-	
-								printf(__("<li>Adding category <b>%s</b>.</li>"), $cat_title);
-	
-								db_query($link, "INSERT INTO ttrss_feed_categories
-										(title,owner_uid) 
-										VALUES ('$cat_title', '$owner_uid')");
-							}
-	
-							db_query($link, "COMMIT");
-						}
-					}
-
-					//						print "$active_category : $feed_title : $feed_url<br>";
-
-					if ($pref_name) {
-						$parent_node = $outline->parentNode;
-
-						if ($parent_node && $parent_node->nodeName == "outline") {
-							$cat_check = $parent_node->attributes->getNamedItem('title')->nodeValue;
-							if ($cat_check == "tt-rss-prefs") {
-								$pref_value = db_escape_string($outline->attributes->getNamedItem('value')->nodeValue);
-
-								printf("<li>".
-									__("Setting preference key %s to %s")."</li>", 
-										$pref_name, $pref_value);
-
-								set_pref($link, $pref_name, $pref_value);	
-
-							}
-						}
-					}
-
-					if (!$feed_title || !$feed_url) continue;
-
-					db_query($link, "BEGIN");
-
-					$cat_id = null;
-
-					$parent_node = $outline->parentNode;
-
-					if ($parent_node && $parent_node->nodeName == "outline") {
-						$element_category = $parent_node->attributes->getNamedItem('title')->nodeValue;
-						if (!$element_category) $element_category = $parent_node->attributes->getNamedItem('text')->nodeValue;
-
-					} else {
-						$element_category = '';
-					}
-
-					if ($element_category) {
-
-						$element_category = db_escape_string($element_category);
-
-						$result = db_query($link, "SELECT id FROM
-								ttrss_feed_categories WHERE title = '$element_category' AND
-								owner_uid = '$owner_uid' LIMIT 1");								
-
-							if (db_num_rows($result) == 1) {	
-								$cat_id = db_fetch_result($result, 0, "id");
-							}
-					}								
-
-					$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
-							feed_url = '$feed_url'
-							AND owner_uid = '$owner_uid'");
-
-					print "<li><a target='_blank' href='$site_url'><b>$feed_title</b></a></b> 
-						(<a target='_blank' href=\"$feed_url\">rss</a>)&nbsp;";
-
-					if (db_num_rows($result) > 0) {
-						print __('is already imported.');
-					} else {
-
-						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')";
-
-						}
-
-						//print $add_query;
-						db_query($link, $add_query);
-
-						print __('OK');
-					}
-
-					print "</li>";
-
-					db_query($link, "COMMIT");
-				}
-
-			} else {
-				print_error(__('Error while parsing document.'));
-			}
-
-		} else {
-			print_error(__('Error: please upload OPML file.'));
-		}
-
-
-	}
-?>

opml.php

@@ -12,6 +12,171 @@
 
 	if (!init_connection($link)) return;
 
+	function opml_import_domdoc($link, $owner_uid) {
+
+		if (is_file($_FILES['opml_file']['tmp_name'])) {
+			$doc = DOMDocument::load($_FILES['opml_file']['tmp_name']);
+
+			$result = db_query($link, "SELECT id FROM
+				ttrss_feed_categories WHERE title = 'Imported feeds' AND
+				owner_uid = '$owner_uid' LIMIT 1");
+
+			if (db_num_rows($result) == 1) {
+				$default_cat_id = db_fetch_result($result, 0, "id");
+			} else {
+				$default_cat_id = 0;
+			}
+
+			if ($doc) {
+				$body = $doc->getElementsByTagName('body');
+
+				$xpath = new DOMXpath($doc);
+				$query = "/opml/body//outline";
+
+				$outlines = $xpath->query($query);
+
+				foreach ($outlines as $outline) {
+
+					$feed_title = db_escape_string($outline->attributes->getNamedItem('text')->nodeValue);
+
+					if (!$feed_title) {
+						$feed_title = db_escape_string($outline->attributes->getNamedItem('title')->nodeValue);
+					}
+
+					$cat_title = db_escape_string($outline->attributes->getNamedItem('title')->nodeValue);
+
+					if (!$cat_title) {
+						$cat_title = db_escape_string($outline->attributes->getNamedItem('text')->nodeValue);
+					}
+
+					$feed_url = db_escape_string($outline->attributes->getNamedItem('xmlUrl')->nodeValue);
+
+					if (!$feed_url)
+						$feed_url = db_escape_string($outline->attributes->getNamedItem('xmlURL')->nodeValue);
+
+					$site_url = db_escape_string($outline->attributes->getNamedItem('htmlUrl')->nodeValue);
+
+					$pref_name = db_escape_string($outline->attributes->getNamedItem('pref-name')->nodeValue);
+
+					if ($cat_title && !$feed_url) {
+
+						if ($cat_title != "tt-rss-prefs") {
+
+							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 (db_num_rows($result) == 0) {
+
+								printf(__("<li>Adding category <b>%s</b>.</li>"), $cat_title);
+
+								db_query($link, "INSERT INTO ttrss_feed_categories
+										(title,owner_uid)
+										VALUES ('$cat_title', '$owner_uid')");
+							}
+
+							db_query($link, "COMMIT");
+						}
+					}
+
+					//						print "$active_category : $feed_title : $feed_url<br>";
+
+					if ($pref_name) {
+						$parent_node = $outline->parentNode;
+
+						if ($parent_node && $parent_node->nodeName == "outline") {
+							$cat_check = $parent_node->attributes->getNamedItem('title')->nodeValue;
+							if ($cat_check == "tt-rss-prefs") {
+								$pref_value = db_escape_string($outline->attributes->getNamedItem('value')->nodeValue);
+
+								printf("<li>".
+									__("Setting preference key %s to %s")."</li>",
+										$pref_name, $pref_value);
+
+								set_pref($link, $pref_name, $pref_value);
+
+							}
+						}
+					}
+
+					if (!$feed_title || !$feed_url) continue;
+
+					db_query($link, "BEGIN");
+
+					$cat_id = null;
+
+					$parent_node = $outline->parentNode;
+
+					if ($parent_node && $parent_node->nodeName == "outline") {
+						$element_category = $parent_node->attributes->getNamedItem('title')->nodeValue;
+						if (!$element_category) $element_category = $parent_node->attributes->getNamedItem('text')->nodeValue;
+
+					} else {
+						$element_category = '';
+					}
+
+					if ($element_category) {
+
+						$element_category = db_escape_string($element_category);
+
+						$result = db_query($link, "SELECT id FROM
+								ttrss_feed_categories WHERE title = '$element_category' AND
+								owner_uid = '$owner_uid' LIMIT 1");
+
+							if (db_num_rows($result) == 1) {
+								$cat_id = db_fetch_result($result, 0, "id");
+							}
+					}
+
+					$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
+							feed_url = '$feed_url'
+							AND owner_uid = '$owner_uid'");
+
+					print "<li><a target='_blank' href='$site_url'><b>$feed_title</b></a></b>
+						(<a target='_blank' href=\"$feed_url\">rss</a>)&nbsp;";
+
+					if (db_num_rows($result) > 0) {
+						print __('is already imported.');
+					} else {
+
+						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')";
+
+						}
+
+						//print $add_query;
+						db_query($link, $add_query);
+
+						print __('OK');
+					}
+
+					print "</li>";
+
+					db_query($link, "COMMIT");
+				}
+
+			} else {
+				print_error(__('Error while parsing document.'));
+			}
+
+		} else {
+			print_error(__('Error: please upload OPML file.'));
+		}
+
+
+	}
+
 	function opml_export($link, $name, $owner_uid, $hide_private_feeds=false, $include_settings=true) {
 		if (!$_REQUEST["debug"]) {
 			header("Content-type: application/xml+opml");
@@ -186,7 +351,6 @@
 		db_query($link, "COMMIT");
 
 		print "<p>".__("Importing OPML...")."</p>";
-		require_once "modules/opml_domdoc.php";
 		opml_import_domdoc($link, $owner_uid);
 
 		print "<br><form method=\"GET\" action=\"prefs.php\">