From 30f782a278a9f1f44402ea5ecf8efef1894b813c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 2 Mar 2007 14:58:51 +0100 Subject: [PATCH] opml fixes --- modules/opml_domdoc.php | 127 ++++++++++++++++++++++++++++++++ modules/opml_domxml.php | 132 +++++++++++++++++++++++++++++++++ opml.css | 33 ++------- opml.php | 158 ++++++---------------------------------- update.css | 4 + 5 files changed, 290 insertions(+), 164 deletions(-) create mode 100644 modules/opml_domdoc.php create mode 100644 modules/opml_domxml.php diff --git a/modules/opml_domdoc.php b/modules/opml_domdoc.php new file mode 100644 index 000000000..459841022 --- /dev/null +++ b/modules/opml_domdoc.php @@ -0,0 +1,127 @@ +getElementsByTagName('body'); + + $xpath = new DOMXpath($doc); + $query = "/opml/body//outline"; + + $outlines = $xpath->query($query); + + print ""; + + 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); + $site_url = db_escape_string($outline->attributes->getNamedItem('htmlUrl')->nodeValue); + + if ($cat_title && !$feed_url) { + + 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) { + + print "Adding category $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
"; + + 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; + } else { + $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"); + + if (db_num_rows($result) == 1) { + $cat_id = db_fetch_result($result, 0, "id"); + } + } + + $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE + (title = '$feed_title' OR feed_url = '$feed_url') + AND owner_uid = '$owner_uid'"); + + print ""; + + if (db_num_rows($result) > 0) { + print ""; + } 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, site_url) VALUES + ('$feed_title', '$feed_url', '$owner_uid', '$site_url')"; + + } + + db_query($link, $add_query); + + print ""; + } + + print ""; + + db_query($link, "COMMIT"); + } + + print "
$feed_title + (rss)Already imported.Done.
"; + + } else { + print "
Error while parsing document.
"; + } + + } else { + print "
Error: please upload OPML file.
"; + } + + + } +?> diff --git a/modules/opml_domxml.php b/modules/opml_domxml.php new file mode 100644 index 000000000..2a140f325 --- /dev/null +++ b/modules/opml_domxml.php @@ -0,0 +1,132 @@ +document_element(); + + $body = $root->get_elements_by_tagname('body'); + + if ($body[0]) { + $body = $body[0]; + + $outlines = $body->get_elements_by_tagname('outline'); + + print ""; + + foreach ($outlines as $outline) { + + $feed_title = db_escape_string($outline->get_attribute('text')); + + if (!$feed_title) { + $feed_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 && !$feed_url) { + + 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(_("Adding category %s."), $cat_title); + print "
"; + + 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
"; + + if (!$feed_title || !$feed_url) continue; + + db_query($link, "BEGIN"); + + $cat_id = null; + + $parent_node = $outline->parent_node(); + + if ($parent_node && $parent_node->node_name() == "outline") { + $element_category = $parent_node->get_attribute('title'); + } else { + $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"); + + if (db_num_rows($result) == 1) { + $cat_id = db_fetch_result($result, 0, "id"); + } + } + + $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE + (title = '$feed_title' OR feed_url = '$feed_url') + AND owner_uid = '$owner_uid'"); + + print ""; + + if (db_num_rows($result) > 0) { + print ""; + } 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, site_url) VALUES + ('$feed_title', '$feed_url', '$owner_uid', '$site_url')"; + + } + + db_query($link, $add_query); + + print ""; + } + + print ""; + + db_query($link, "COMMIT"); + } + + print "
$feed_title + (rss)"._("Already imported.").""._('Done.')."
"; + + } else { + print "
"._("Error: can't find body element.")."
"; + } + } else { + print "
"._("Error while parsing document.")."
"; + } + + } else { + print "
"._("Error: please upload OPML file.")."
"; + } + + } +?> diff --git a/opml.css b/opml.css index a061a73af..e6d7612b6 100644 --- a/opml.css +++ b/opml.css @@ -6,17 +6,12 @@ body { } h1 { - font-size : 21pt; + font-size : 16pt; font-weight : bold; - padding : 10px 0px 10px 30px; - color : black; border-width : 0px 0px 1px 0px; - border-color : #c0c0c0; + border-color : #88b0f0; border-style : solid; - background-color : white; - background-image : url("images/vgrad_light.png"); - background-position : bottom left; - background-repeat : repeat-x; + margin-top : 2em; } h2 { @@ -42,24 +37,6 @@ a { text-decoration : none; } -.button { - font-family : tahoma, sans-serif; - border : 1px solid #d0d0d0; - background-image : url("images/button.png"); - background-position : top; - background-repeat : repeat-x; - background-color : white; - color : black; - padding : 2px 10px 2px 10px; - font-size : small; -} - -.button:hover { - background : white; - text-decoration : none; - color : black; -} - a { color : black; text-decoration : none; @@ -75,4 +52,6 @@ ul { padding : 10px; } - +.insensitive { + color : gray; +} diff --git a/opml.php b/opml.php index 5b0d7fe62..b3707df75 100644 --- a/opml.php +++ b/opml.php @@ -17,18 +17,10 @@ $owner_uid = $_SESSION["uid"]; - // FIXME there are some brackets issues here - - $op = $_REQUEST["op"]; - - if (!$op) $op = "Export"; - - if ($op == "Export") { + function opml_export($link) { header("Content-type: application/xml+opml"); print ""; - } - if ($op == "Export") { print ""; print " " . date("r", time()) . " @@ -91,6 +83,16 @@ print ""; } + // FIXME there are some brackets issues here + + $op = $_REQUEST["op"]; + + if (!$op) $op = "Export"; + + if ($op == "Export") { + return opml_export($link); + } + if ($op == "Import") { print " @@ -98,142 +100,24 @@ -

-
-

"._('Importing OPML...')."

"; - - if (is_file($_FILES['opml_file']['tmp_name'])) { - $dom = domxml_open_file($_FILES['opml_file']['tmp_name']); - - if ($dom) { - $root = $dom->document_element(); - - $body = $root->get_elements_by_tagname('body'); - - if ($body[0]) { - $body = $body[0]; - - $outlines = $body->get_elements_by_tagname('outline'); - - print ""; - - foreach ($outlines as $outline) { - - $feed_title = db_escape_string($outline->get_attribute('text')); - - if (!$feed_title) { - $feed_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 && !$feed_url) { - - 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(_("Adding category %s..."), $cat_title); - print "
"; - - 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
"; - - if (!$feed_title || !$feed_url) continue; - - db_query($link, "BEGIN"); - - $cat_id = null; - - $parent_node = $outline->parent_node(); - - if ($parent_node && $parent_node->node_name() == "outline") { - $element_category = $parent_node->get_attribute('title'); - } else { - $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"); - - if (db_num_rows($result) == 1) { - $cat_id = db_fetch_result($result, 0, "id"); - } - } - - $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE - (title = '$feed_title' OR feed_url = '$feed_url') - AND owner_uid = '$owner_uid'"); - - print ""; - - if (db_num_rows($result) > 0) { - print ""; - } 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, site_url) VALUES - ('$feed_title', '$feed_url', '$owner_uid', '$site_url')"; - - } - - db_query($link, $add_query); - - print ""; - } - - print ""; - - db_query($link, "COMMIT"); - } - - print "
$feed_title - (rss)"._("Already imported.").""._('Done.')."
"; - - } else { - print "
"._("Error: can't find body element.")."
"; - } - } else { - print "
"._("Error while parsing document.")."
"; - } +
+

"._('OPML Import')."

"; + if (function_exists('domxml_open_file')) { + print "

Using DOMXML library

"; + require_once "modules/opml_domxml.php"; + opml_import_domxml($link, $owner_uid); } else { - print "
"._("Error: please upload OPML file.")."
"; + print "

Using DOMDocument library (PHP5)

"; + require_once "modules/opml_domdoc.php"; + opml_import_domdoc($link, $owner_uid); } print "
"; - print "
"; + print ""; } diff --git a/update.css b/update.css index d3c2890fc..f4b9da36c 100644 --- a/update.css +++ b/update.css @@ -5,3 +5,7 @@ p.warning { p.query { color : green; } + +p.insensitive { + color : gray; +}