update_daemon2: check for dead children before spawning

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

index fd93acd2d208840eb9e5a63754a62fab3a3baa28..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>
@@ -100,24 +105,44 @@
                 print "<html>
                         <head>
                                 <link rel=\"stylesheet\" href=\"utility.css\" type=\"text/css\">
-                               <title>OPML Utility</title>
+                               <title>".__("OPML Utility")."</title>
                         </head>
                         <body>
                         <div class=\"floatingLogo\"><img src=\"images/ttrss_logo.png\"></div>
-                       <h1>"._('OPML Utility')."</h1>";
+                       <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>";
+                       print "<p>".__("Importing OPML (using DOMXML extension)...")."</p>";
                         require_once "modules/opml_domxml.php";
                         opml_import_domxml($link, $owner_uid);
-               } else {
-                       print "<p>Importing OPML (using DOMDocument extension)...</p>";
+               } 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 "<br><form method=\"GET\" action=\"prefs.php\">
-                       <input type=\"submit\" value=\"Return to preferences\">
+                       <input type=\"submit\" value=\"".__("Return to preferences")."\">
                         </form>";
  
                 print "</body></html>";