");
foreach ($line as $k => $v) {
+ $v = str_replace("]]>", "]]]]>", $v);
fputs($fp, "<$k>$k>");
}
@@ -185,7 +181,7 @@ class Import_Export extends Plugin implements IHandler {
print json_encode(array("exported" => $exported));
}
- function perform_data_import($link, $filename, $owner_uid) {
+ function perform_data_import( $filename, $owner_uid) {
$num_imported = 0;
$num_processed = 0;
@@ -238,7 +234,7 @@ class Import_Export extends Plugin implements IHandler {
foreach ($article_node->childNodes as $child) {
if ($child->nodeName != 'label_cache')
- $article[$child->nodeName] = db_escape_string($this->link, $child->nodeValue);
+ $article[$child->nodeName] = db_escape_string( $child->nodeValue);
else
$article[$child->nodeName] = $child->nodeValue;
}
@@ -249,16 +245,16 @@ class Import_Export extends Plugin implements IHandler {
++$num_processed;
- //db_query($link, "BEGIN");
+ //db_query( "BEGIN");
//print 'GUID:' . $article['guid'] . "\n";
- $result = db_query($link, "SELECT id FROM ttrss_entries
+ $result = db_query( "SELECT id FROM ttrss_entries
WHERE guid = '".$article['guid']."'");
if (db_num_rows($result) == 0) {
- $result = db_query($link,
+ $result = db_query(
"INSERT INTO ttrss_entries
(title,
guid,
@@ -286,7 +282,7 @@ class Import_Export extends Plugin implements IHandler {
'0',
'')");
- $result = db_query($link, "SELECT id FROM ttrss_entries
+ $result = db_query( "SELECT id FROM ttrss_entries
WHERE guid = '".$article['guid']."'");
if (db_num_rows($result) != 0) {
@@ -307,7 +303,7 @@ class Import_Export extends Plugin implements IHandler {
$feed = 'NULL';
if ($feed_url && $feed_title) {
- $result = db_query($link, "SELECT id FROM ttrss_feeds
+ $result = db_query( "SELECT id FROM ttrss_feeds
WHERE feed_url = '$feed_url' AND owner_uid = '$owner_uid'");
if (db_num_rows($result) != 0) {
@@ -315,10 +311,10 @@ class Import_Export extends Plugin implements IHandler {
} else {
// try autocreating feed in Uncategorized...
- $result = db_query($link, "INSERT INTO ttrss_feeds (owner_uid,
+ $result = db_query( "INSERT INTO ttrss_feeds (owner_uid,
feed_url, title) VALUES ($owner_uid, '$feed_url', '$feed_title')");
- $result = db_query($link, "SELECT id FROM ttrss_feeds
+ $result = db_query( "SELECT id FROM ttrss_feeds
WHERE feed_url = '$feed_url' AND owner_uid = '$owner_uid'");
if (db_num_rows($result) != 0) {
@@ -336,7 +332,7 @@ class Import_Export extends Plugin implements IHandler {
//print "$ref_id / $feed / " . $article['title'] . "\n";
- $result = db_query($link, "SELECT int_id FROM ttrss_user_entries
+ $result = db_query( "SELECT int_id FROM ttrss_user_entries
WHERE ref_id = '$ref_id' AND owner_uid = '$owner_uid' AND $feed_qpart");
if (db_num_rows($result) == 0) {
@@ -346,14 +342,14 @@ class Import_Export extends Plugin implements IHandler {
$score = (int) $article['score'];
$tag_cache = $article['tag_cache'];
- $label_cache = db_escape_string($this->link, $article['label_cache']);
+ $label_cache = db_escape_string( $article['label_cache']);
$note = $article['note'];
//print "Importing " . $article['title'] . " ";
++$num_imported;
- $result = db_query($link,
+ $result = db_query(
"INSERT INTO ttrss_user_entries
(ref_id, owner_uid, feed_id, unread, last_read, marked,
published, score, tag_cache, label_cache, uuid, note)
@@ -366,15 +362,15 @@ class Import_Export extends Plugin implements IHandler {
if (is_array($label_cache) && $label_cache["no-labels"] != 1) {
foreach ($label_cache as $label) {
- label_create($link, $label[1],
+ label_create( $label[1],
$label[2], $label[3], $owner_uid);
- label_add_article($link, $ref_id, $label[1], $owner_uid);
+ label_add_article( $ref_id, $label[1], $owner_uid);
}
}
- //db_query($link, "COMMIT");
+ //db_query( "COMMIT");
}
}
}
@@ -382,7 +378,7 @@ class Import_Export extends Plugin implements IHandler {
}
print "" .
- vsprintf(__("Finished: ")).
+ __("Finished: ").
vsprintf(ngettext("%d article processed, ", "%d articles processed, ", $num_processed), $num_processed).
vsprintf(ngettext("%d imported, ", "%d imported, ", $num_imported), $num_imported).
vsprintf(ngettext("%d feed created.", "%d feeds created.", $num_feeds_created), $num_feeds_created).
@@ -418,13 +414,35 @@ class Import_Export extends Plugin implements IHandler {
print "
";
- if (is_file($_FILES['export_file']['tmp_name'])) {
+ if ($_FILES['export_file']['error'] != 0) {
+ print_error(T_sprintf("Upload failed with error code %d",
+ $_FILES['export_file']['error']));
+ return;
+ }
+
+ $tmp_file = false;
+
+ if (is_uploaded_file($_FILES['export_file']['tmp_name'])) {
+ $tmp_file = tempnam(CACHE_DIR . '/upload', 'export');
- $this->perform_data_import($this->link, $_FILES['export_file']['tmp_name'], $_SESSION['uid']);
+ $result = move_uploaded_file($_FILES['export_file']['tmp_name'],
+ $tmp_file);
+ if (!$result) {
+ print_error(__("Unable to move uploaded file."));
+ return;
+ }
} else {
- print "
" . T_sprintf("Could not upload file. You might need to adjust upload_max_filesize in PHP.ini (current value = %s)", ini_get("upload_max_filesize")) . " or use CLI import tool.
";
+ print_error(__('Error: please upload OPML file.'));
+ return;
+ }
+ if (is_file($tmp_file)) {
+ $this->perform_data_import( $tmp_file, $_SESSION['uid']);
+ unlink($tmp_file);
+ } else {
+ print_error(__('No file uploaded.'));
+ return;
}
print "