daemon2: check proper lockfile location in reap_children()

[tt-rss.git] / opml.php

diff --git a/opml.php b/opml.php
index 0de5dd33da16a4280574d3e7ba0111108e964447..35e36d24a351035e95a29ec8b000493620d3d172 100644 (file)
--- a/opml.php
+++ b/opml.php
@@ -11,12 +11,13 @@
        $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
 
        init_connection($link);
-       login_sequence($link);
 
-       $owner_uid = $_SESSION["uid"];
-
-       function opml_export($link, $owner_uid, $hide_private_feeds=False) {
-               header("Content-type: application/xml+opml");
+       function opml_export($link, $owner_uid, $hide_private_feeds=false, $include_settings=true) {
+               if (!$_REQUEST["debug"]) {
+                       header("Content-type: application/xml+opml");
+               } else {
+                       header("Content-type: text/xml");
+               }
                print "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 
                print "<opml version=\"1.0\">";
@@ -32,10 +33,13 @@
                 $where = "WHERE owner_uid = '$owner_uid'";
                 $orderby = "ORDER BY title";
                if ($hide_private_feeds){
-                       $where = "WHERE owner_uid = '$owner_uid' AND private IS false";
+                       $where = "WHERE owner_uid = '$owner_uid' AND private IS false AND 
+                               auth_login = '' AND auth_pass = ''";
                }
 
-               if (get_pref($link, 'ENABLE_FEED_CATS')) {
+
+
+               if (get_pref($link, 'ENABLE_FEED_CATS', $owner_uid) == true) {
                        $cat_mode = true;
                         $select = "SELECT 
                                title, feed_url, site_url,
@@ -43,6 +47,13 @@
                        $orderby = "ORDER BY cat_title, title";
 
                }
+               else{
+                       $cat_feed = get_pref($link, 'ENABLE_FEED_CATS');
+                       print "<!-- feeding cats is not enabled -->";
+                       print "<!-- $cat_feed -->";
+
+               }
+
 
                $result = db_query($link, $select." FROM ttrss_feeds ".$where." ".$orderby);
 
@@ -62,7 +73,7 @@
                                        }
 
                                        if ($cat_title) {
-                                               print "<outline title=\"$cat_title\">\n";
+                                               print "<outline title=\"$cat_title\" text=\"$cat_title\" >\n";
                                        }
 
                                        $old_cat_title = $cat_title;
@@ -82,6 +93,28 @@
                        print "</outline>\n";   
                }
 
+               # export tt-rss settings
+
+               if ($include_settings) {
+                       print "<outline title=\"tt-rss-prefs\" schema-version=\"".SCHEMA_VERSION."\">";
+
+                       $result = db_query($link, "SELECT pref_name, value FROM ttrss_user_prefs WHERE
+                          profile IS NULL AND owner_uid = " . $_SESSION["uid"]);
+
+                       while ($line = db_fetch_assoc($result)) {
+
+                               $name = $line["pref_name"];
+                               $value = htmlspecialchars($line["value"]);
+               
+                               print "<outline pref-name=\"$name\" value=\"$value\">";
+
+                               print "</outline>";
+
+                       }               
+
+                       print "</outline>";
+               }
+
                print "</body></opml>";
        }
 
@@ -92,9 +125,13 @@
        if (!$op) $op = "Export";
        
        if ($op == "Export") {
+               
+               login_sequence($link);
+               $owner_uid = $_SESSION["uid"];
                return opml_export($link, $owner_uid);
        }
-        if ($op == "publish"){
+ 
+       if ($op == "publish"){
                $key = db_escape_string($_REQUEST["key"]);
 
                $result = db_query($link, "SELECT login, owner_uid 
@@ -105,7 +142,7 @@
 
                if (db_num_rows($result) == 1) {
                        $owner = db_fetch_result($result, 0, "owner_uid");
-                       return opml_export($link, $owner, True);
+                       return opml_export($link, $owner, true, false);
                } else {
                        print "<error>User not found</error>";
                }
@@ -113,10 +150,16 @@
 
        if ($op == "Import") {
 
+               login_sequence($link);
+               $owner_uid = $_SESSION["uid"];
+
+               header('Content-Type: text/html; charset=utf-8');
+
                print "<html>
                        <head>
                                <link rel=\"stylesheet\" href=\"utility.css\" type=\"text/css\">
                                <title>".__("OPML Utility")."</title>
+                               <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
                        </head>
                        <body>
                        <div class=\"floatingLogo\"><img src=\"images/ttrss_logo.png\"></div>