default headline sort order by date_entered instead of updated

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

index d808c8f9e3a45d109710eac626e9bb7431a74e0f..35e36d24a351035e95a29ec8b000493620d3d172 100644 (file)
--- a/opml.php
+++ b/opml.php
@@ -12,8 +12,12 @@
  
         init_connection($link);
  
-       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\">";
@@ -29,7 +33,8 @@
                  $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 = ''";
                 }
  
  
@@ -88,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>";
         }
  
@@ -103,7 +130,8 @@
                 $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 
@@ -114,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>";
                 }
@@ -125,10 +153,13 @@
                 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>