valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix OPML import

This commit is contained in:
Andrew Dolgov 2011-12-22 16:45:19 +04:00
parent f0143d4ef9
commit c4c74732db
3 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
classes/dlg.php
View File

@ -40,22 +40,11 @@ class Dlg extends Protected_Handler {
/* Handle OPML import by DOMXML/DOMDocument */ /* Handle OPML import by DOMXML/DOMDocument */
if (function_exists('domxml_open_file')) { print "<ul class='nomarks'>";
print "<ul class='nomarks'>"; print "<li>".__("Importing using DOMDocument.")."</li>";
print "<li>".__("Importing using DOMXML.")."</li>"; require_once "opml.php";
require_once "opml_domxml.php"; opml_import_domdoc($this->link, $owner_uid);
opml_import_domxml($this->link, $owner_uid); print "</ul>";
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 "</div>"; print "</div>";
print "<div align='center'>"; print "<div align='center'>";

2
classes/pref_feeds.php
View File

@ -1419,7 +1419,7 @@ class Pref_Feeds extends Protected_Handler {
action=\"backend.php\"> action=\"backend.php\">
<input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp; <input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp;
<input type=\"hidden\" name=\"op\" value=\"dlg\"> <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\">" . <button dojoType=\"dijit.form.Button\" onclick=\"return opmlImport();\" type=\"submit\">" .
__('Import') . "</button>"; __('Import') . "</button>";

2
include/login_form.php
View File

@ -8,7 +8,7 @@
<script type="text/javascript" src="lib/dojo/dojo.js" djConfig="parseOnLoad: true"></script> <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/prototype.js"></script>
<script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></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> <script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script>
</head> </head>