opml export: specify encoding

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

index b3707df75be492ae06552f622687c23790e50928..b1a62ab8c739365452112ddbffea9bf51d967a71 100644 (file)
--- a/opml.php
+++ b/opml.php
@@ -1,4 +1,6 @@
  <?php
+       error_reporting(E_ERROR | E_WARNING | E_PARSE);
+
         require_once "sessions.php";
         require_once "sanity_check.php";
         require_once "functions.php";
@@ -17,9 +19,9 @@
  
         $owner_uid = $_SESSION["uid"];
  
-       function opml_export($link) {
+       function opml_export($link, $owner_uid) {
                 header("Content-type: application/xml+opml");
-               print "<?phpxml version=\"1.0\"?>";
+               print "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
  
                 print "<opml version=\"1.0\">";
                 print "<head>
@@ -90,31 +92,34 @@
         if (!$op) $op = "Export";
         
         if ($op == "Export") {
-               return opml_export($link);
+               return opml_export($link, $owner_uid);
         }
  
         if ($op == "Import") {
  
                 print "<html>
                         <head>
-                               <link rel=\"stylesheet\" href=\"opml.css\" type=\"text/css\">
+                               <link rel=\"stylesheet\" href=\"utility.css\" type=\"text/css\">
+                               <title>".__("OPML Utility")."</title>
                         </head>
                         <body>
-                       <div style='float : right'><img src=\"images/ttrss_logo.png\"></div>
-                       <h1>"._('OPML Import')."</h1>";
+                       <div class=\"floatingLogo\"><img src=\"images/ttrss_logo.png\"></div>
+                       <h1>".__('OPML Utility')."</h1>";
  
                 if (function_exists('domxml_open_file')) {
-                       print "<p class='insensitive'>Using DOMXML library</p>";
+                       print "<p>".__("Importing OPML (using DOMXML extension)...")."</p>";
                         require_once "modules/opml_domxml.php";
                         opml_import_domxml($link, $owner_uid);
-               } else {
-                       print "<p class='insensitive'>Using DOMDocument library (PHP5)</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>";