]> git.wh0rd.org - tt-rss.git/commitdiff
refactor opml import/export code
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Wed, 15 Aug 2012 11:03:40 +0000 (15:03 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Wed, 15 Aug 2012 11:03:40 +0000 (15:03 +0400)
fix opml to properly handle nested categories
allow creating categories with same name in different parent categories

include/functions.php
opml.php

index 91f3b900eaa68db7c10cb660446d96dd56dd41cb..41f6c9db5e9052643305751fea4bd480ea0f3338 100644 (file)
                }
        }
 
-       function add_feed_category($link, $feed_cat) {
+       function get_feed_category($link, $feed_cat, $parent_cat_id = false) {
+               if ($parent_cat_id) {
+                       $parent_qpart = "parent_cat = '$parent_cat_id'";
+                       $parent_insert = "'$parent_cat_id'";
+               } else {
+                       $parent_qpart = "parent_cat IS NULL";
+                       $parent_insert = "NULL";
+               }
+
+               $result = db_query($link,
+                       "SELECT id FROM ttrss_feed_categories
+                       WHERE $parent_qpart AND title = '$feed_cat' AND owner_uid = ".$_SESSION["uid"]);
+
+               if (db_num_rows($result) == 0) {
+                       return false;
+               } else {
+                       return db_fetch_result($result, 0, "id");
+               }
+       }
+
+       function add_feed_category($link, $feed_cat, $parent_cat_id = false) {
 
                if (!$feed_cat) return false;
 
                db_query($link, "BEGIN");
 
+               if ($parent_cat_id) {
+                       $parent_qpart = "parent_cat = '$parent_cat_id'";
+                       $parent_insert = "'$parent_cat_id'";
+               } else {
+                       $parent_qpart = "parent_cat IS NULL";
+                       $parent_insert = "NULL";
+               }
+
                $result = db_query($link,
                        "SELECT id FROM ttrss_feed_categories
-                       WHERE title = '$feed_cat' AND owner_uid = ".$_SESSION["uid"]);
+                       WHERE $parent_qpart AND title = '$feed_cat' AND owner_uid = ".$_SESSION["uid"]);
 
                if (db_num_rows($result) == 0) {
 
                        $result = db_query($link,
-                               "INSERT INTO ttrss_feed_categories (owner_uid,title)
-                               VALUES ('".$_SESSION["uid"]."', '$feed_cat')");
+                               "INSERT INTO ttrss_feed_categories (owner_uid,title,parent_cat)
+                               VALUES ('".$_SESSION["uid"]."', '$feed_cat', $parent_insert)");
 
                        db_query($link, "COMMIT");
 
index 8ddc9dcaff8cfb3705d91c4c1e618e4e73d5ee7d..64bf76cde126ff2f2f3c60604a73e356d860c1df 100644 (file)
--- a/opml.php
+++ b/opml.php
 
        if (!init_connection($link)) return;
 
-       function opml_import_domdoc($link, $owner_uid) {
+       function opml_import_feed($link, $doc, $node, $cat_id, $owner_uid) {
+               $attrs = $node->attributes;
 
-               if (is_file($_FILES['opml_file']['tmp_name'])) {
-                       $doc = DOMDocument::load($_FILES['opml_file']['tmp_name']);
+               $feed_title = db_escape_string($attrs->getNamedItem('text')->nodeValue);
+               if (!$feed_title) $feed_title = db_escape_string($attrs->getNamedItem('title')->nodeValue);
 
-                       $result = db_query($link, "SELECT id FROM
-                               ttrss_feed_categories WHERE title = 'Imported feeds' AND
-                               owner_uid = '$owner_uid' LIMIT 1");
+               $feed_url = db_escape_string($attrs->getNamedItem('xmlUrl')->nodeValue);
+               if (!$feed_url) $feed_url = db_escape_string($attrs->getNamedItem('xmlURL')->nodeValue);
 
-                       if (db_num_rows($result) == 1) {
-                               $default_cat_id = db_fetch_result($result, 0, "id");
-                       } else {
-                               $default_cat_id = 0;
-                       }
+               $site_url = db_escape_string($attrs->getNamedItem('htmlUrl')->nodeValue);
 
-                       // Keep imported categories in order, after any pre-existing ones.
-                       $new_cat_order_id = 0;
-                       // Get the highest category order_id in use.
-                       $result = db_query($link, "SELECT order_id FROM
-                               ttrss_feed_categories WHERE owner_uid = '$owner_uid'
-                               ORDER BY order_id DESC LIMIT 1");
-                       if (db_num_rows($result) == 1) {
-                               $new_cat_order_id = db_fetch_result($result, 0, "order_id");
-                       }
-
-                       if ($doc) {
-                               $body = $doc->getElementsByTagName('body');
+               if ($feed_url && $feed_title) {
+                       $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
+                               feed_url = '$feed_url' AND owner_uid = '$owner_uid'");
 
-                               $xpath = new DOMXpath($doc);
-                               $query = "/opml/body//outline";
+                       if (db_num_rows($result) == 0) {
+                               #opml_notice("[FEED] [$feed_title/$feed_url] dst_CAT=$cat_id");
+                               opml_notice(T_sprintf("Adding feed: %s", $feed_title));
 
-                               $outlines = $xpath->query($query);
+                               $query = "INSERT INTO ttrss_feeds
+                                       (title, feed_url, owner_uid, cat_id, site_url, order_id) VALUES
+                                       ('$feed_title', '$feed_url', '$owner_uid',
+                                       '$cat_id', '$site_url', 0)";
+                               db_query($link, $query);
 
-                               foreach ($outlines as $outline) {
-
-                                       $attributes = $outline->attributes;
+                       } else {
+                               opml_notice(T_sprintf("Duplicate feed: %s", $feed_title));
+                       }
+               }
+       }
 
-                                       $feed_title = db_escape_string($attributes->getNamedItem('text')->nodeValue);
-                                       if (!$feed_title) $feed_title = db_escape_string($attributes->getNamedItem('title')->nodeValue);
+       function opml_import_label($link, $doc, $node, $owner_uid) {
+               $attrs = $node->attributes;
+               $label_name = db_escape_string($attrs->getNamedItem('label-name')->nodeValue);
 
-                                       $cat_title = db_escape_string($attributes->getNamedItem('title')->nodeValue);
-                                       if (!$cat_title) $cat_title = db_escape_string($attributes->getNamedItem('text')->nodeValue);
+               if ($label_name) {
+                       $fg_color = db_escape_string($attrs->getNamedItem('label-fg-color')->nodeValue);
+                       $bg_color = db_escape_string($attrs->getNamedItem('label-bg-color')->nodeValue);
 
-                                       $feed_url = db_escape_string($attributes->getNamedItem('xmlUrl')->nodeValue);
-                                       if (!$feed_url) $feed_url = db_escape_string($attributes->getNamedItem('xmlURL')->nodeValue);
+                       if (!label_find_id($link, $label_name, $_SESSION['uid'])) {
+                               opml_notice(T_sprintf("Adding label %s", htmlspecialchars($label_name)));
+                               label_create($link, $label_name, $fg_color, $bg_color);
+                       } else {
+                               opml_notice(T_sprintf("Duplicate label: %s", htmlspecialchars($label_name)));
+                       }
+               }
+       }
 
-                                       $site_url = db_escape_string($attributes->getNamedItem('htmlUrl')->nodeValue);
+       function opml_import_preference($link, $doc, $node, $owner_uid) {
+               $attrs = $node->attributes;
+               $pref_name = db_escape_string($attrs->getNamedItem('pref-name')->nodeValue);
 
-                                       $pref_name = db_escape_string($attributes->getNamedItem('pref-name')->nodeValue);
-                                       $label_name = db_escape_string($attributes->getNamedItem('label-name')->nodeValue);
-                                       $filter_name = db_escape_string($attributes->getNamedItem('filter-name')->nodeValue);
+               if ($pref_name) {
+                       $pref_value = db_escape_string($attrs->getNamedItem('value')->nodeValue);
 
-                                       if ($cat_title && !$feed_url) {
+                       opml_notice(T_sprintf("Setting preference key %s to %s",
+                               $pref_name, $pref_value));
 
-                                               if ($cat_title != "tt-rss-prefs" && $cat_title != 'tt-rss-labels' && $cat_title != 'tt-rss-filters') {
+                       set_pref($link, $pref_name, $pref_value);
+               }
+       }
 
-                                                       db_query($link, "BEGIN");
+       function opml_import_filter($link, $doc, $node, $owner_uid) {
+               $attrs = $node->attributes;
 
-                                                       $result = db_query($link, "SELECT id FROM
-                                                                       ttrss_feed_categories WHERE title = '$cat_title' AND
-                                                                       owner_uid = '$owner_uid' LIMIT 1");
+               $filter_name = db_escape_string($attrs->getNamedItem('filter-name')->nodeValue);
 
-                                                       if (db_num_rows($result) == 0) {
-                                                               $cat_order_id = ++$new_cat_order_id;
+               if ($filter_name) {
 
-                                                               printf(__("<li>Adding category <b>%s</b>.</li>"), $cat_title);
+               $filter = json_decode($node->nodeValue, true);
 
-                                                               db_query($link, "INSERT INTO ttrss_feed_categories
-                                                                               (title,owner_uid,order_id)
-                                                                               VALUES ('$cat_title', '$owner_uid', '$cat_order_id')");
-                                                       }
+                       if ($filter) {
+                               $reg_exp = db_escape_string($filter['reg_exp']);
+                               $filter_type = (int)$filter['filter_type'];
+                               $action_id = (int)$filter['action_id'];
 
-                                                       db_query($link, "COMMIT");
-                                               }
-                                       }
+                               $result = db_query($link, "SELECT id FROM ttrss_filters WHERE
+                                       reg_exp = '$reg_exp' AND
+                                       filter_type = '$filter_type' AND
+                                       action_id = '$action_id' AND
+                                       owner_uid = " .$_SESSION['uid']);
 
-                                       //                                              print "$active_category : $feed_title : $feed_url<br>";
+                               if (db_num_rows($result) == 0) {
+                                       $enabled = bool_to_sql_bool($filter['enabled']);
+                                       $action_param = db_escape_string($filter['action_param']);
+                                       $inverse = bool_to_sql_bool($filter['inverse']);
+                                       $filter_param = db_escape_string($filter['filter_param']);
+                                       $cat_filter = bool_to_sql_bool($filter['cat_filter']);
 
-                                       if ($pref_name) {
-                                               $parent_node = $outline->parentNode;
+                                       $feed_url = db_escape_string($filter['feed_url']);
+                                       $cat_title = db_escape_string($filter['cat_title']);
 
-                                               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);
+                                       $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
+                                               feed_url = '$feed_url' AND owner_uid = ".$_SESSION['uid']);
 
-                                                               printf("<li>".
-                                                                       __("Setting preference key %s to %s")."</li>",
-                                                                               $pref_name, $pref_value);
+                                       if (db_num_rows($result) != 0) {
+                                               $feed_id = db_fetch_result($result, 0, "id");
+                                       } else {
+                                               $feed_id = "NULL";
+                                       }
 
-                                                               set_pref($link, $pref_name, $pref_value);
+                                       $result = db_query($link, "SELECT id FROM ttrss_feed_categories WHERE
+                                               title = '$cat_title' AND  owner_uid = ".$_SESSION['uid']);
 
-                                                       }
-                                               }
+                                       if (db_num_rows($result) != 0) {
+                                               $cat_id = db_fetch_result($result, 0, "id");
+                                       } else {
+                                               $cat_id = "NULL";
                                        }
 
-                                       if ($label_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-labels") {
-
-                                                               $fg_color = db_escape_string($attributes->getNamedItem('label-fg-color')->nodeValue);
-                                                               $bg_color = db_escape_string($attributes->getNamedItem('label-bg-color')->nodeValue);
-
-                                                               if (!label_find_id($link, $label_name, $_SESSION['uid'])) {
-                                                                       printf("<li>".__("Adding label %s")."</li>", htmlspecialchars($label_name));
-                                                                       label_create($link, $label_name, $fg_color, $bg_color);
-                                                               } else {
-                                                                       printf("<li>".__("Duplicate label: %s")."</li>",
-                                                                               htmlspecialchars($label_name));
-                                                               }
-                                                       }
-                                               }
-                                       }
+                                       opml_notice(T_sprintf("Adding filter %s", htmlspecialchars($reg_exp)));
 
-                                       if ($filter_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-filters") {
-                                                               $filter = json_decode($outline->nodeValue, true);
-
-                                                               if ($filter) {
-                                                                       $reg_exp = db_escape_string($filter['reg_exp']);
-                                                                       $filter_type = (int)$filter['filter_type'];
-                                                                       $action_id = (int)$filter['action_id'];
-
-                                                                       $result = db_query($link, "SELECT id FROM ttrss_filters WHERE
-                                                                               reg_exp = '$reg_exp' AND
-                                                                               filter_type = '$filter_type' AND
-                                                                               action_id = '$action_id' AND
-                                                                               owner_uid = " .$_SESSION['uid']);
-
-                                                                       if (db_num_rows($result) == 0) {
-                                                                               $enabled = bool_to_sql_bool($filter['enabled']);
-                                                                               $action_param = db_escape_string($filter['action_param']);
-                                                                               $inverse = bool_to_sql_bool($filter['inverse']);
-                                                                               $filter_param = db_escape_string($filter['filter_param']);
-                                                                               $cat_filter = bool_to_sql_bool($filter['cat_filter']);
-
-                                                                               $feed_url = db_escape_string($filter['feed_url']);
-                                                                               $cat_title = db_escape_string($filter['cat_title']);
-
-                                                                               $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
-                                                                                       feed_url = '$feed_url' AND owner_uid = ".$_SESSION['uid']);
-
-                                                                               if (db_num_rows($result) != 0) {
-                                                                                       $feed_id = db_fetch_result($result, 0, "id");
-                                                                               } else {
-                                                                                       $feed_id = "NULL";
-                                                                               }
-
-                                                                               $result = db_query($link, "SELECT id FROM ttrss_feed_categories WHERE
-                                                                                       title = '$cat_title' AND  owner_uid = ".$_SESSION['uid']);
-
-                                                                               if (db_num_rows($result) != 0) {
-                                                                                       $cat_id = db_fetch_result($result, 0, "id");
-                                                                               } else {
-                                                                                       $cat_id = "NULL";
-                                                                               }
-
-                                                                               printf("<li>".__("Adding filter %s")."</li>", htmlspecialchars($reg_exp));
-
-                                                                               $query = "INSERT INTO ttrss_filters (filter_type, action_id,
-                                                                                               enabled, inverse, action_param, filter_param,
-                                                                                               cat_filter, feed_id,
-                                                                                               cat_id, reg_exp,
-                                                                                               owner_uid)
-                                                                                       VALUES ($filter_type, $action_id,
-                                                                                               $enabled, $inverse, '$action_param', '$filter_param',
-                                                                                               $cat_filter, $feed_id,
-                                                                                               $cat_id, '$reg_exp', ".
-                                                                                               $_SESSION['uid'].")";
-
-                                                                               db_query($link, $query);
-
-                                                                       } else {
-                                                                               printf("<li>".__("Duplicate filter %s")."</li>", htmlspecialchars($reg_exp));
-
-                                                                       }
-                                                               }
-                                                       }
-                                               }
-                                       }
+                                       $query = "INSERT INTO ttrss_filters (filter_type, action_id,
+                                                       enabled, inverse, action_param, filter_param,
+                                                       cat_filter, feed_id,
+                                                       cat_id, reg_exp,
+                                                       owner_uid)
+                                               VALUES ($filter_type, $action_id,
+                                                       $enabled, $inverse, '$action_param', '$filter_param',
+                                                       $cat_filter, $feed_id,
+                                                       $cat_id, '$reg_exp', ".
+                                                       $_SESSION['uid'].")";
 
-                                       if (!$feed_title || !$feed_url) continue;
+                                       db_query($link, $query);
 
-                                       db_query($link, "BEGIN");
+                               } else {
+                                       opml_notice(T_sprintf("Duplicate filter %s", htmlspecialchars($reg_exp)));
+                               }
+                       }
+               }
+       }
 
-                                       $cat_id = null;
+       function opml_import_category($link, $doc, $root_node, $owner_uid, $parent_id) {
+               $body = $doc->getElementsByTagName('body');
 
-                                       $parent_node = $outline->parentNode;
+               $default_cat_id = (int) get_feed_category($link, 'Imported feeds', false);
 
-                                       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;
+               if ($root_node) {
+                       $cat_title = db_escape_string($root_node->attributes->getNamedItem('title')->nodeValue);
 
-                                       } else {
-                                               $element_category = '';
-                                       }
+                       if (!in_array($cat_title, array("tt-rss-filters", "tt-rss-labels", "tt-rss-prefs"))) {
+                               $cat_id = get_feed_category($link, $cat_title, $parent_id);
+                               db_query($link, "BEGIN");
+                               if ($cat_id === false) {
+                                       add_feed_category($link, $cat_title, $parent_id);
+                                       $cat_id = get_feed_category($link, $cat_title, $parent_id);
+                               }
+                               db_query($link, "COMMIT");
+                       } else {
+                               $cat_id = 0;
+                       }
 
-                                       if ($element_category) {
+                       $outlines = $root_node->childNodes;
 
-                                               $element_category = db_escape_string($element_category);
+               } else {
+                       $xpath = new DOMXpath($doc);
+                       $outlines = $xpath->query("//opml/body/outline");
 
-                                               $result = db_query($link, "SELECT id FROM
-                                                               ttrss_feed_categories WHERE title = '$element_category' AND
-                                                               owner_uid = '$owner_uid' LIMIT 1");
+                       $cat_id = 0;
+               }
 
-                                                       if (db_num_rows($result) == 1) {
-                                                               $cat_id = db_fetch_result($result, 0, "id");
-                                                       }
-                                       }
+               #opml_notice("[CAT] $cat_title id: $cat_id P_id: $parent_id");
+               opml_notice(T_sprintf("Processing category: %s", $cat_title ? $cat_title : __("Uncategorized")));
 
-                                       $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
-                                                       feed_url = '$feed_url'
-                                                       AND owner_uid = '$owner_uid'");
+               foreach ($outlines as $node) {
+                       if ($node->hasAttributes() && strtolower($node->tagName) == "outline") {
+                               $attrs = $node->attributes;
+                               $node_cat_title = db_escape_string($attrs->getNamedItem('title')->nodeValue);
 
-                                       print "<li><a target='_blank' href='$site_url'><b>$feed_title</b></a></b>
-                                               (<a target='_blank' href=\"$feed_url\">rss</a>)&nbsp;";
+                               if ($node->hasChildNodes() && $node_cat_title) {
+                                       opml_import_category($link, $doc, $node, $owner_uid, $cat_id);
+                               } else {
 
-                                       if (db_num_rows($result) > 0) {
-                                               print __('is already imported.');
+                                       if (!$cat_id) {
+                                               $dst_cat_id = $default_cat_id;
                                        } else {
-                                               // Get max order_id already in use. Increment.
-                                               $new_feed_order_id = 0; // these start at zero
-                                               $cat_id_qpart = $cat_id ? "cat_id = '$cat_id'" : "cat_id = '$default_cat_id'";
-                                               $result = db_query($link, "SELECT order_id FROM
-                                                       ttrss_feeds WHERE owner_uid = '$owner_uid' AND $cat_id_qpart
-                                                       ORDER BY order_id DESC LIMIT 1");
-                                               if (db_num_rows($result) == 1) {
-                                                       $new_feed_order_id = db_fetch_result($result, 0, "order_id");
-                                                       $new_feed_order_id++;
-                                               }
-
-                                               if ($cat_id) {
-                                                       $add_query = "INSERT INTO ttrss_feeds
-                                                               (title, feed_url, owner_uid, cat_id, site_url, order_id) VALUES
-                                                               ('$feed_title', '$feed_url', '$owner_uid',
-                                                                '$cat_id', '$site_url', '$new_feed_order_id')";
-
-                                               } else {
-                                                       $add_query = "INSERT INTO ttrss_feeds
-                                                               (title, feed_url, owner_uid, cat_id, site_url, order_id) VALUES
-                                                               ('$feed_title', '$feed_url', '$owner_uid', '$default_cat_id',
-                                                                       '$site_url', '$new_feed_order_id')";
-
-                                               }
-
-                                               //print $add_query;
-                                               db_query($link, $add_query);
-
-                                               print __('OK');
+                                               $dst_cat_id = $cat_id;
                                        }
 
-                                       print "</li>";
-
-                                       db_query($link, "COMMIT");
+                                       switch ($cat_title) {
+                                       case "tt-rss-prefs":
+                                               opml_import_preference($link, $doc, $node, $owner_uid);
+                                               break;
+                                       case "tt-rss-labels":
+                                               opml_import_label($link, $doc, $node, $owner_uid);
+                                               break;
+                                       case "tt-rss-filters":
+                                               opml_import_filter($link, $doc, $node, $owner_uid);
+                                               break;
+                                       default:
+                                               opml_import_feed($link, $doc, $node, $dst_cat_id, $owner_uid);
+                                       }
                                }
-
-                       } else {
-                               print_error(__('Error while parsing document.'));
                        }
+               }
+       }
 
-               } else {
+       function opml_import_domdoc($link, $owner_uid) {
+
+               $debug = isset($_REQUEST["debug"]);
+               $doc = false;
+
+               if ($debug) $doc = DOMDocument::load("/tmp/test.opml");
+
+               if (is_file($_FILES['opml_file']['tmp_name'])) {
+                       $doc = DOMDocument::load($_FILES['opml_file']['tmp_name']);
+               } else if (!$doc) {
                        print_error(__('Error: please upload OPML file.'));
+                       return;
                }
 
-
+               if ($doc) {
+                       opml_import_category($link, $doc, false, $owner_uid);
+               } else {
+                       print_error(__('Error while parsing document.'));
+               }
        }
 
        function opml_export_category($link, $owner_uid, $cat_id, $hide_private_feeds=false) {
 
-               if ($cat_id)
+               if ($cat_id) {
                        $cat_qpart = "parent_cat = '$cat_id'";
-               else
+                       $feed_cat_qpart = "cat_id = '$cat_id'";
+               } else {
                        $cat_qpart = "parent_cat IS NULL";
+                       $feed_cat_qpart = "cat_id IS NULL";
+               }
 
                if ($hide_private_feeds)
                        $hide_qpart = "(private IS false AND auth_login = '' AND auth_pass = '')";
 
                $out = "";
 
-               $query = "SELECT
-                       ttrss_feeds.title, feed_url, site_url, ttrss_feeds.order_id,
-                               ttrss_feed_categories.id AS cat_id,
-                               ttrss_feed_categories.title AS cat_title,
-                               ttrss_feed_categories.order_id AS cat_order_id
-                       FROM ttrss_feeds LEFT JOIN ttrss_feed_categories ON (ttrss_feed_categories.id = ttrss_feeds.cat_id)
-                       WHERE ttrss_feeds.owner_uid = '$owner_uid' AND $hide_qpart AND $cat_qpart
-                       ORDER BY cat_order_id, cat_title, ttrss_feeds.order_id, title";
-
-               #$out .= "<!-- $query -->";
+               if ($cat_id) {
+                       $result = db_query($link, "SELECT title FROM ttrss_feed_categories WHERE id = '$cat_id'
+                               AND owner_uid = '$owner_uid'");
+                       $cat_title = db_fetch_result($result, 0, "title");
+               }
 
-               $result = db_query($link, $query);
+               if ($cat_title) $out .= "<outline title=\"$cat_title\">\n";
 
-               $old_cat_title = "";
+               $result = db_query($link, "SELECT id,title
+                       FROM ttrss_feed_categories WHERE
+                       $cat_qpart AND owner_uid = '$owner_uid' ORDER BY order_id, title");
 
                while ($line = db_fetch_assoc($result)) {
                        $title = htmlspecialchars($line["title"]);
-                       $url = htmlspecialchars($line["feed_url"]);
-                       $site_url = htmlspecialchars($line["site_url"]);
+                       $out .= opml_export_category($link, $owner_uid, $line["id"], $hide_private_feeds);
+               }
 
-                       $cat_title = htmlspecialchars($line["cat_title"]);
+               $feeds_result = db_query($link, "select title, feed_url, site_url
+                               from ttrss_feeds where $feed_cat_qpart AND owner_uid = '$owner_uid' AND $hide_qpart
+                               order by order_id, title");
 
-                       if ($old_cat_title != $cat_title) {
-                               if ($old_cat_title) {
-                                       $out .= "</outline>\n";
-                               }
+                       while ($fline = db_fetch_assoc($feeds_result)) {
+                               $title = htmlspecialchars($fline["title"]);
+                               $url = htmlspecialchars($fline["feed_url"]);
+                               $site_url = htmlspecialchars($fline["site_url"]);
 
-                               if ($cat_title) {
-                                       $out .= "<outline title=\"$cat_title\" text=\"$cat_title\" >\n";
+                               if ($site_url) {
+                                       $html_url_qpart = "htmlUrl=\"$site_url\"";
+                               } else {
+                                       $html_url_qpart = "";
                                }
-                               $old_cat_title = $cat_title;
-
-                               $cat_id = (int) $line["cat_id"];
-
-                               if ($cat_id > 0)
-                                       $out .= opml_export_category($link, $owner_uid, $cat_id, $hide_private_feeds);
-                       }
 
-                       if ($site_url) {
-                               $html_url_qpart = "htmlUrl=\"$site_url\"";
-                       } else {
-                               $html_url_qpart = "";
+                               $out .= "<outline text=\"$title\" xmlUrl=\"$url\" $html_url_qpart/>\n";
                        }
 
-                       $out .= "<outline text=\"$title\" xmlUrl=\"$url\" $html_url_qpart/>\n";
-
-               }
-
-               if ($old_cat_title) {
-                       $out .= "</outline>\n";
-               }
+               if ($cat_title) $out .= "</outline>\n";
 
                return $out;
        }
 
                db_query($link, "COMMIT");
 
-               print "<p>".__("Importing OPML...")."</p>";
+               opml_notice(__("Importing OPML..."));
+
                opml_import_domdoc($link, $owner_uid);
 
                print "<br><form method=\"GET\" action=\"prefs.php\">
 
 //     if ($link) db_close($link);
 
+       function opml_notice($msg) {
+               print "$msg<br/>";
+       }
+
 ?>