add multiprocess update daemon

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

index 8d3f8d62bcba2cca06a15e6a3246a1b3876a237c..35d7a070c8ae1a17896df8e52cc66a652fd6cffc 100644 (file)
--- a/opml.php
+++ b/opml.php
@@ -13,6 +13,11 @@
         if (DB_TYPE == "pgsql") {
                 pg_query($link, "set client_encoding = 'utf-8'");
                 pg_set_client_encoding("UNICODE");
+       } else {
+               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
+//                     db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
+               }
         }
  
         login_sequence($link);
@@ -21,7 +26,7 @@
  
         function opml_export($link, $owner_uid) {
                 header("Content-type: application/xml+opml");
-               print "<?xml version=\"1.0\"?>";
+               print "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
  
                 print "<opml version=\"1.0\">";
                 print "<head>
@@ -106,6 +111,24 @@
                         <div class=\"floatingLogo\"><img src=\"images/ttrss_logo.png\"></div>
                         <h1>".__('OPML Utility')."</h1>";
  
+               db_query($link, "BEGIN");
+
+               /* create Imported feeds category just in case */
+
+               $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) == 0) {
+                               db_query($link, "INSERT INTO ttrss_feed_categories
+                                       (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";