daemon: fallback automatically when pcntl_signal() is not present

[tt-rss.git] / opml.php

diff --git a/opml.php b/opml.php
index ac236a64b60d8d060ea4f7b3895a6425d517452c..44e94ee37e60bf76429650cd407d794a54f7bc98 100644 (file)
--- a/opml.php
+++ b/opml.php
@@ -10,14 +10,7 @@
 
        $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
 
-       if (DB_TYPE == "pgsql") {
-               pg_query($link, "set client_encoding = 'utf-8'");
-               pg_set_client_encoding("UNICODE");
-       } else {
-               db_query($link, "SET NAMES utf8");
-               db_query($link, "SET CHARACTER SET utf8");
-       }
-
+       init_connection($link);
        login_sequence($link);
 
        $owner_uid = $_SESSION["uid"];
@@ -109,6 +102,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";