title in opml head

[tt-rss.git] / opml.php
diff --git a/opml.php b/opml.php

index 63f64a670f02abca950fcbceedc1ac7665b44eb5..9609af1d29d9e1981dc3a608001915f01f347106 100644 (file)
--- a/opml.php
+++ b/opml.php
@@ -25,7 +25,10 @@
  
         if ($op == "Export") {
                 print "<opml version=\"1.0\">";
-               print "<head><dateCreated>" . date("r", time()) . "</dateCreated></head>"; 
+               print "<head>
+                       <dateCreated>" . date("r", time()) . "</dateCreated>
+                       <title>Tiny Tiny RSS Feed Export</title>
+               </head>"; 
                 print "<body>";
  
                 $cat_mode = false;
@@ -37,10 +40,12 @@
                                         ttrss_feeds.title AS title,
                                         (SELECT title FROM ttrss_feed_categories WHERE id = cat_id) as cat_title
                                         FROM ttrss_feeds
+                               WHERE
+                                       owner_uid = '$owner_uid'
                                 ORDER BY cat_title,title");
                 } else {
                         $result = db_query($link, "SELECT * FROM ttrss_feeds 
-                               ORDER BY title");
+                               ORDER BY title WHERE owner_uid = '$owner_uid'");
                 }
  
                 $old_cat_title = "";
@@ -54,20 +59,22 @@
  
                                 if ($old_cat_title != $cat_title) {
                                         if ($old_cat_title) {
-                                               print "</outline>";     
+                                               print "</outline>\n";   
                                         }
  
-                                       print "<outline title=\"$cat_title\">";
+                                       if ($cat_title) {
+                                               print "<outline title=\"$cat_title\">\n";
+                                       }
  
                                         $old_cat_title = $cat_title;
                                 }
                         }
  
-                       print "<outline text=\"$title\" xmlUrl=\"$url\"/>";
+                       print "<outline text=\"$title\" xmlUrl=\"$url\"/>\n";
                 }
  
                 if ($cat_mode && $old_cat_title) {
-                       print "</outline>";     
+                       print "</outline>\n";   
                 }
  
                 print "</body></opml>";
@@ -79,8 +86,9 @@
                         <head>
                                 <link rel=\"stylesheet\" href=\"opml.css\" type=\"text/css\">
                         </head>
-                       <body><h1>Importing OPML...</h1>
-                       <div>";
+                       <body>
+                       <h1>Importing OPML...</h1>
+                       <div class=\"opmlBody\">";
  
                 if (WEB_DEMO_MODE) {
                         print "OPML import is disabled in demo-mode.";
@@ -103,15 +111,12 @@
  
                                         $outlines = $body->get_elements_by_tagname('outline');
  
-                                       $active_category = '';
-
                                         foreach ($outlines as $outline) {
-                                               $feed_title = $outline->get_attribute('text');
-                                               $cat_title = $outline->get_attribute('title');
-                                               $feed_url = $outline->get_attribute('xmlUrl');
+                                               $feed_title = db_escape_string($outline->get_attribute('text'));
+                                               $cat_title = db_escape_string($outline->get_attribute('title'));
+                                               $feed_url = db_escape_string($outline->get_attribute('xmlUrl'));
  
                                                 if ($cat_title) {
-                                                       $active_category = $cat_title;
  
                                                         db_query($link, "BEGIN");
                                                         
@@ -138,10 +143,18 @@
  
                                                 $cat_id = null;
  
-                                               if ($active_category) {
+                                               $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 = '$active_category' AND
+                                                                       ttrss_feed_categories WHERE title = '$element_category' AND
                                                                         owner_uid = '$owner_uid' LIMIT 1");                                                             
  
                                                         if (db_num_rows($result) == 1) {        
@@ -170,7 +183,7 @@
                                                                         ('$feed_title', '$feed_url', '$owner_uid')";
  
                                                         }
-                                                       
+
                                                         db_query($link, $add_query);
                                                         
                                                         print "<b>Done.</b><br>";
@@ -180,14 +193,14 @@
                                         }
  
                                 } else {
-                                       print "Error: can't find body element.";
+                                       print "<div class=\"error\">Error: can't find body element.</div>";
                                 }
                         } else {
-                               print "Error while parsing document.";
+                               print "<div class=\"error\">Error while parsing document.</div>";
                         }
  
                 } else {
-                       print "Error: please upload OPML file.";
+                       print "<div class=\"error\">Error: please upload OPML file.</div>";
                 }
  
                 print "<p><a class=\"button\" href=\"prefs.php\">