fix OPML import

diff --git a/classes/dlg.php b/classes/dlg.php
index b0cfe4451c3b95814fed49509d6f1c654129cc2d..a72683ef37cb5dbb49b9a9e450d37d83e830a219 100644 (file)
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -40,22 +40,11 @@ class Dlg extends Protected_Handler {
 
                /* Handle OPML import by DOMXML/DOMDocument */
 
-               if (function_exists('domxml_open_file')) {
-                       print "<ul class='nomarks'>";
-                       print "<li>".__("Importing using DOMXML.")."</li>";
-                       require_once "opml_domxml.php";
-                       opml_import_domxml($this->link, $owner_uid);
-                       print "</ul>";
-               } else if (PHP_VERSION >= 5) {
-                       print "<ul class='nomarks'>";
-                       print "<li>".__("Importing using DOMDocument.")."</li>";
-                       require_once "opml_domdoc.php";
-                       opml_import_domdoc($this->link, $owner_uid);
-                       print "</ul>";
-               } else {
-                       print_error(__("DOMXML extension is not found. It is required for PHP versions below 5."));
-               }
-
+               print "<ul class='nomarks'>";
+               print "<li>".__("Importing using DOMDocument.")."</li>";
+               require_once "opml.php";
+               opml_import_domdoc($this->link, $owner_uid);
+               print "</ul>";
                print "</div>";
 
                print "<div align='center'>";

diff --git a/classes/pref_feeds.php b/classes/pref_feeds.php
index eebd25c69a2631cf90d61fb68128f11de38c40f7..5df5eb939ebc0933ccc8f787d6421ffb86b59727 100644 (file)
--- a/classes/pref_feeds.php
+++ b/classes/pref_feeds.php
@@ -1419,7 +1419,7 @@ class Pref_Feeds extends Protected_Handler {
                                action=\"backend.php\">
                        <input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp;
                        <input type=\"hidden\" name=\"op\" value=\"dlg\">
-                       <input type=\"hidden\" name=\"id\" value=\"importOpml\">
+                       <input type=\"hidden\" name=\"method\" value=\"importOpml\">
                        <button dojoType=\"dijit.form.Button\" onclick=\"return opmlImport();\" type=\"submit\">" .
                        __('Import') . "</button>";
 

diff --git a/include/login_form.php b/include/login_form.php
index 04ca3e6d0c1a1ca3aa1dc2fa3b172704777a91a7..2650a46cca8c5e7bb399114d074eff2e0147297a 100644 (file)
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -8,7 +8,7 @@
        <script type="text/javascript" src="lib/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
        <script type="text/javascript" src="lib/prototype.js"></script>
        <script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>
-       <script type="text/javascript" src="functions.js"></script>
+       <script type="text/javascript" src="js/functions.js"></script>
        <script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script>
 </head>