]> git.wh0rd.org Git - tt-rss.git/commitdiff
remove domxml OPML import path
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Tue, 5 Apr 2011 15:07:19 +0000 (19:07 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Tue, 5 Apr 2011 15:07:19 +0000 (19:07 +0400)
modules/opml_domxml.php [deleted file]
opml.php

diff --git a/modules/opml_domxml.php b/modules/opml_domxml.php
deleted file mode 100644 (file)
index 8262c30..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-       function opml_import_domxml($link, $owner_uid) {
-
-               if (is_file($_FILES['opml_file']['tmp_name'])) {
-                       $dom = domxml_open_file($_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 ($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');
-
-                               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'));
-
-                                       if (!$feed_url)
-                                               $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(__("<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 (!$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');
-                                               if (!$element_category) $element_category = $parent_node->get_attribute('text');
-
-                                       } 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')";
-
-                                               }
-
-                                               db_query($link, $add_query);
-                                               
-                                               print __('OK');
-                                       }
-
-                                       print "</li>";
-                                       
-                                       db_query($link, "COMMIT");
-                               }
-
-                               } else {
-                                       print_error(__("Error: can't find body element."));
-                               }
-                       } else {
-                               print_error(__("Error while parsing document."));
-                       }
-
-               } else {
-                       print_error(__("Error: please upload OPML file."));
-               }
-
-       }
-?>
index 296f43bed1693901328a9ef267daf4bf42e7582e..66856497689451fcbe24f646f66079c5d9c1e714 100644 (file)
--- a/opml.php
+++ b/opml.php
@@ -6,7 +6,7 @@
        require_once "db.php";
        require_once "db-prefs.php";
 
-       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
+       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
        init_connection($link);
 
                print "<head>
                        <dateCreated>" . date("r", time()) . "</dateCreated>
                        <title>Tiny Tiny RSS Feed Export</title>
-               </head>"; 
+               </head>";
                print "<body>";
 
                $cat_mode = false;
-                
+
                 $select = "SELECT * ";
                 $where = "WHERE owner_uid = '$owner_uid'";
                 $orderby = "ORDER BY title";
                if ($hide_private_feeds){
-                       $where = "WHERE owner_uid = '$owner_uid' AND private IS false AND 
+                       $where = "WHERE owner_uid = '$owner_uid' AND private IS false AND
                                auth_login = '' AND auth_pass = ''";
                }
 
@@ -39,7 +39,7 @@
 
                if (get_pref($link, 'ENABLE_FEED_CATS', $owner_uid) == true) {
                        $cat_mode = true;
-                        $select = "SELECT 
+                        $select = "SELECT
                                title, feed_url, site_url,
                                (SELECT title FROM ttrss_feed_categories WHERE id = cat_id) as cat_title";
                        $orderby = "ORDER BY cat_title, title";
@@ -67,7 +67,7 @@
 
                                if ($old_cat_title != $cat_title) {
                                        if ($old_cat_title) {
-                                               print "</outline>\n";   
+                                               print "</outline>\n";
                                        }
 
                                        if ($cat_title) {
@@ -88,7 +88,7 @@
                }
 
                if ($cat_mode && $old_cat_title) {
-                       print "</outline>\n";   
+                       print "</outline>\n";
                }
 
                # export tt-rss settings
 
                                $name = $line["pref_name"];
                                $value = htmlspecialchars($line["value"]);
-               
+
                                print "<outline pref-name=\"$name\" value=\"$value\">";
 
                                print "</outline>";
 
-                       }               
+                       }
 
                        print "</outline>";
                }
        // FIXME there are some brackets issues here
 
        $op = $_REQUEST["op"];
-       
+
        if (!$op) $op = "Export";
-       
+
        if ($op == "Export") {
-               
+
                login_sequence($link);
                $owner_uid = $_SESSION["uid"];
                return opml_export($link, $owner_uid);
        }
+
        if ($op == "publish"){
                $key = db_escape_string($_REQUEST["key"]);
 
 
                if (db_num_rows($result) == 0) {
                                db_query($link, "INSERT INTO ttrss_feed_categories
-                                       (title,owner_uid) 
+                                       (title,owner_uid)
                                                VALUES ('Imported feeds', '$owner_uid')");
                }
 
                db_query($link, "COMMIT");
 
-               /* Handle OPML import by DOMXML/DOMDocument */
-
-               if (function_exists('domxml_open_file')) {
-                       print "<p>".__("Importing OPML (using DOMXML extension)...")."</p>";
-                       require_once "modules/opml_domxml.php";
-                       opml_import_domxml($link, $owner_uid);
-               } else if (PHP_VERSION >= 5) {
-                       print "<p>".__("Importing OPML (using DOMDocument extension)...")."</p>";
-                       require_once "modules/opml_domdoc.php";
-                       opml_import_domdoc($link, $owner_uid);
-               } else {
-                       print_error(__("DOMXML extension is not found. It is required for PHP versions below 5."));
-               }
+               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\">
                        <input type=\"submit\" value=\"".__("Return to preferences")."\">