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

rework OPML import to use popup dialog

This commit is contained in:
Andrew Dolgov 2010-01-13 23:59:02 +03:00
parent cd039c0473
commit b6a6e262be
5 changed files with 205 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/opml_domdoc.php
View File

@ -22,8 +22,6 @@
$outlines = $xpath->query($query); $outlines = $xpath->query($query);
print "<table>";
foreach ($outlines as $outline) { foreach ($outlines as $outline) {
$feed_title = db_escape_string($outline->attributes->getNamedItem('text')->nodeValue); $feed_title = db_escape_string($outline->attributes->getNamedItem('text')->nodeValue);
@ -51,7 +49,7 @@
if (db_num_rows($result) == 0) { if (db_num_rows($result) == 0) {
printf(__("Adding category <b>%s</b>...<br>"), $cat_title); printf(__("<li>Adding category <b>%s</b>.</li>"), $cat_title);
db_query($link, "INSERT INTO ttrss_feed_categories db_query($link, "INSERT INTO ttrss_feed_categories
(title,owner_uid) (title,owner_uid)
@ -96,11 +94,11 @@
feed_url = '$feed_url' feed_url = '$feed_url'
AND owner_uid = '$owner_uid'"); AND owner_uid = '$owner_uid'");
print "<tr><td><a target='_blank' href='$site_url'><b>$feed_title</b></a></b> print "<li><a target='_blank' href='$site_url'><b>$feed_title</b></a></b>
(<a target='_blank' href=\"$feed_url\">rss</a>)</td>"; (<a target='_blank' href=\"$feed_url\">rss</a>)&nbsp;";
if (db_num_rows($result) > 0) { if (db_num_rows($result) > 0) {
print "<td>".__('Already imported.')."</td>"; print __('is already imported.');
} else { } else {
if ($cat_id) { if ($cat_id) {
@ -120,22 +118,20 @@
//print $add_query; //print $add_query;
db_query($link, $add_query); db_query($link, $add_query);
print "<td><b>".__('Done.')."</b></td>"; print __('OK');
} }
print "</tr>"; print "</li>";
db_query($link, "COMMIT"); db_query($link, "COMMIT");
} }
print "</table>";
} else { } else {
print "<div class=\"error\">".__('Error while parsing document.')."</div>"; print_error(__('Error while parsing document.'));
} }
} else { } else {
print "<div class=\"error\">".__('Error: please upload OPML file.')."</div>"; print_error(__('Error: please upload OPML file.'));
} }

191
modules/opml_domxml.php
View File

@ -24,123 +24,118 @@
$outlines = $body->get_elements_by_tagname('outline'); $outlines = $body->get_elements_by_tagname('outline');
print "<table>"; foreach ($outlines as $outline) {
foreach ($outlines as $outline) { $feed_title = db_escape_string($outline->get_attribute('text'));
$feed_title = db_escape_string($outline->get_attribute('text')); if (!$feed_title) {
$feed_title = db_escape_string($outline->get_attribute('title'));
}
if (!$feed_title) { $cat_title = db_escape_string($outline->get_attribute('title'));
$feed_title = db_escape_string($outline->get_attribute('title'));
}
$cat_title = db_escape_string($outline->get_attribute('title')); if (!$cat_title) {
$cat_title = db_escape_string($outline->get_attribute('text'));
}
if (!$cat_title) { $feed_url = db_escape_string($outline->get_attribute('xmlUrl'));
$cat_title = db_escape_string($outline->get_attribute('text')); $site_url = db_escape_string($outline->get_attribute('htmlUrl'));
}
$feed_url = db_escape_string($outline->get_attribute('xmlUrl'));
$site_url = db_escape_string($outline->get_attribute('htmlUrl'));
if ($cat_title && !$feed_url) { if ($cat_title && !$feed_url) {
db_query($link, "BEGIN");
$result = db_query($link, "SELECT id FROM
ttrss_feed_categories WHERE title = '$cat_title' AND
owner_uid = '$owner_uid' LIMIT 1");
if (db_num_rows($result) == 0) {
printf(__("Adding category <b>%s</b>."), $cat_title);
print "<br>";
db_query($link, "INSERT INTO ttrss_feed_categories
(title,owner_uid)
VALUES ('$cat_title', '$owner_uid')");
}
db_query($link, "COMMIT");
}
// print "$active_category : $feed_title : $feed_url<br>";
if (!$feed_title || !$feed_url) continue;
db_query($link, "BEGIN"); db_query($link, "BEGIN");
$cat_id = null;
$parent_node = $outline->parent_node();
if ($parent_node && $parent_node->node_name() == "outline") {
$element_category = $parent_node->get_attribute('title');
if (!$element_category) $element_category = $parent_node->get_attribute('text');
} else {
$element_category = '';
}
if ($element_category) {
$element_category = db_escape_string($element_category);
$result = db_query($link, "SELECT id FROM
ttrss_feed_categories WHERE title = '$element_category' AND
owner_uid = '$owner_uid' LIMIT 1");
if (db_num_rows($result) == 1) {
$cat_id = db_fetch_result($result, 0, "id");
}
}
$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
feed_url = '$feed_url'
AND owner_uid = '$owner_uid'");
print "<tr><td><a target='_blank' href='$site_url'><b>$feed_title</b></a></b>
(<a target='_blank' href=\"$feed_url\">rss</a>)</td>";
if (db_num_rows($result) > 0) {
print "<td>".__("Already imported.")."</td>";
} else {
if ($cat_id) {
$add_query = "INSERT INTO ttrss_feeds
(title, feed_url, owner_uid, cat_id, site_url) VALUES
('$feed_title', '$feed_url', '$owner_uid',
'$cat_id', '$site_url')";
} else {
$add_query = "INSERT INTO ttrss_feeds
(title, feed_url, owner_uid, cat_id, site_url) VALUES
('$feed_title', '$feed_url', '$owner_uid', '$default_cat_id',
'$site_url')";
}
db_query($link, $add_query);
print "<td><b>".__('Done.')."</b></td>";
}
print "</tr>";
$result = db_query($link, "SELECT id FROM
ttrss_feed_categories WHERE title = '$cat_title' AND
owner_uid = '$owner_uid' LIMIT 1");
if (db_num_rows($result) == 0) {
printf(__("<li>Adding category <b>%s</b>.</li>"), $cat_title);
db_query($link, "INSERT INTO ttrss_feed_categories
(title,owner_uid)
VALUES ('$cat_title', '$owner_uid')");
}
db_query($link, "COMMIT"); db_query($link, "COMMIT");
} }
print "</table>"; // print "$active_category : $feed_title : $feed_url<br>";
if (!$feed_title || !$feed_url) continue;
db_query($link, "BEGIN");
$cat_id = null;
$parent_node = $outline->parent_node();
if ($parent_node && $parent_node->node_name() == "outline") {
$element_category = $parent_node->get_attribute('title');
if (!$element_category) $element_category = $parent_node->get_attribute('text');
} else {
$element_category = '';
}
if ($element_category) {
$element_category = db_escape_string($element_category);
$result = db_query($link, "SELECT id FROM
ttrss_feed_categories WHERE title = '$element_category' AND
owner_uid = '$owner_uid' LIMIT 1");
if (db_num_rows($result) == 1) {
$cat_id = db_fetch_result($result, 0, "id");
}
}
$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
feed_url = '$feed_url'
AND owner_uid = '$owner_uid'");
print "<li><a target='_blank' href='$site_url'><b>$feed_title</b></a></b>
(<a target='_blank' href=\"$feed_url\">rss</a>)&nbsp;";
if (db_num_rows($result) > 0) {
print __("is already imported.");
} else {
if ($cat_id) {
$add_query = "INSERT INTO ttrss_feeds
(title, feed_url, owner_uid, cat_id, site_url) VALUES
('$feed_title', '$feed_url', '$owner_uid',
'$cat_id', '$site_url')";
} else {
$add_query = "INSERT INTO ttrss_feeds
(title, feed_url, owner_uid, cat_id, site_url) VALUES
('$feed_title', '$feed_url', '$owner_uid', '$default_cat_id',
'$site_url')";
}
db_query($link, $add_query);
print __('OK');
}
print "</li>";
db_query($link, "COMMIT");
}
} else { } else {
print "<div class=\"error\">".__("Error: can't find body element.")."</div>"; print_error(__("Error: can't find body element."));
} }
} else { } else {
print "<div class=\"error\">".__("Error while parsing document.")."</div>"; print_error(__("Error while parsing document."));
} }
} else { } else {
print "<div class=\"error\">".__("Error: please upload OPML file.")."</div>"; print_error(__("Error: please upload OPML file."));
} }
} }

61
modules/popup-dialog.php
View File

@ -3,6 +3,67 @@
$id = $_REQUEST["id"]; $id = $_REQUEST["id"];
$param = db_escape_string($_REQUEST["param"]); $param = db_escape_string($_REQUEST["param"]);
if ($id == "importOpml") {
print "<div id=\"infoBoxTitle\">".__('OPML Import')."</div>";
print "<div class=\"infoBoxContents\">";
print "<div class=\"prefFeedCatHolder\">";
$owner_uid = $_SESSION["uid"];
db_query($link, "BEGIN");
/* create Imported feeds category just in case */
$result = db_query($link, "SELECT id FROM
ttrss_feed_categories WHERE title = 'Imported feeds' AND
owner_uid = '$owner_uid' LIMIT 1");
if (db_num_rows($result) == 0) {
db_query($link, "INSERT INTO ttrss_feed_categories
(title,owner_uid)
VALUES ('Imported feeds', '$owner_uid')");
}
db_query($link, "COMMIT");
/* Handle OPML import by DOMXML/DOMDocument */
if (function_exists('domxml_open_file')) {
print "<ul class='nomarks'>";
print "<li>".__("Importing using DOMXML.")."</li>";
require_once "modules/opml_domxml.php";
opml_import_domxml($link, $owner_uid);
print "</ul>";
} else if (PHP_VERSION >= 5) {
print "<ul class='nomarks'>";
print "<li>".__("Importing using DOMDocument.")."</li>";
require_once "modules/opml_domdoc.php";
opml_import_domdoc($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 align='center'>";
print "<input class=\"button\"
type=\"submit\" onclick=\"return opmlImportDone()\"
value=\"".__('Close this window')."\">";
print "</div>";
print "<script type=\"text/javascript\">";
print "parent.opml_import_handler(this)";
print "</script>";
print "</div></div>";
return;
}
if ($id == "editPrefProfiles") { if ($id == "editPrefProfiles") {
print "<div id=\"infoBoxTitle\">".__('Settings Profiles')."</div>"; print "<div id=\"infoBoxTitle\">".__('Settings Profiles')."</div>";

23
modules/pref-feeds.php
View File

@ -719,6 +719,8 @@
foreach ($ids as $id) { foreach ($ids as $id) {
remove_feed($link, $id, $_SESSION["uid"]); remove_feed($link, $id, $_SESSION["uid"]);
} }
return;
} }
if ($subop == "clear") { if ($subop == "clear") {
@ -1377,9 +1379,9 @@
} }
print "<h3>".__('OPML')."</h3> print "<h3>".__('OPML')."</h3>";
<div style='float : left'> /* print "<div style='float : left'>
<form enctype=\"multipart/form-data\" method=\"POST\" action=\"opml.php\"> <form enctype=\"multipart/form-data\" method=\"POST\" action=\"opml.php\">
".__('File:')." <input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp; ".__('File:')." <input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp;
<input type=\"hidden\" name=\"op\" value=\"Import\"> <input type=\"hidden\" name=\"op\" value=\"Import\">
@ -1387,7 +1389,22 @@
type=\"submit\">".__('Import')."</button> type=\"submit\">".__('Import')."</button>
</form></div>"; </form></div>";
print "&nbsp;"; print "&nbsp;"; */
print "<iframe name=\"upload_iframe\" onchange=\"opml_import_handler(this)\"
style=\"width: 400px; height: 100px; display: none;\"></iframe>";
print "<div style='float : left'>";
print "<form style='display : block' target=\"upload_iframe\"
enctype=\"multipart/form-data\" method=\"POST\"
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\">
<button onclick=\"return opmlImport();\"
type=\"submit\">".__('Import')."</button>
</form>";
print "</div>&nbsp;";
print "<button onclick=\"gotoExportOpml()\">". print "<button onclick=\"gotoExportOpml()\">".
__('Export OPML')."</button>"; __('Export OPML')."</button>";

27
prefs.js
View File

@ -576,15 +576,17 @@ function removeSelectedFeeds() {
if (ok) { if (ok) {
notify_progress("Unsubscribing from selected feeds..."); notify_progress("Unsubscribing from selected feeds...", true);
var query = "?op=pref-feeds&subop=remove&ids="+ var query = "?op=pref-feeds&subop=remove&ids="+
param_escape(sel_rows.toString()); param_escape(sel_rows.toString());
debug(query);
new Ajax.Request("backend.php", { new Ajax.Request("backend.php", {
parameters: query, parameters: query,
onComplete: function(transport) { onComplete: function(transport) {
feedlist_callback2(transport); updateFeedList();
} }); } });
} }
@ -996,7 +998,7 @@ function piggie(enable) {
} }
} }
function validateOpmlImport() { function opmlImport() {
var opml_file = $("opml_file"); var opml_file = $("opml_file");
@ -1006,6 +1008,8 @@ function validateOpmlImport() {
} else { } else {
return true; return true;
} }
notify_progress("Importing, please wait...", true);
} }
function updateFilterList(sort_key) { function updateFilterList(sort_key) {
@ -2224,4 +2228,19 @@ function activatePrefProfile() {
return false; return false;
} }
function opmlImportDone() {
closeInfoBox();
updateFeedList();
}
function opml_import_handler(iframe) {
try {
var tmp = new Object();
tmp.responseText = iframe.document.body.innerHTML;
notify('');
infobox_callback2(tmp);
} catch (e) {
exception_error("opml_import_handler", e);
}
}