X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=plugins%2Fimport_export%2Finit.php;h=981a2b58151f9839a5a29badaef698d1b9a8409d;hb=6322ac79a020ab584d412d782d62b2ee77d7c6cf;hp=61b9a439f5f3f57b4c2d52c92d72fef1bbbeac42;hpb=3972bf598195efba3e73ae1fef3faceabeb50308;p=tt-rss.git

diff --git a/plugins/import_export/init.php b/plugins/import_export/init.php
index 61b9a439..981a2b58 100644
--- a/plugins/import_export/init.php
+++ b/plugins/import_export/init.php
@@ -1,15 +1,12 @@
 <?php
 class Import_Export extends Plugin implements IHandler {
-
-	private $link;
 	private $host;
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_PREFS_TAB, $this);
-		$host->add_command("xml-import", "USER FILE: import articles from XML", $this);
+		$host->add_command("xml-import", "import articles from XML", $this, ":", "FILE");
 	}
 
 	function about() {
@@ -19,24 +16,21 @@ class Import_Export extends Plugin implements IHandler {
 	}
 
 	function xml_import($args) {
-		array_shift($args);
-
-		$username = $args[count($args) - 2];
-		$filename = $args[count($args) - 1];
 
-		if (!$username) {
-			print "error: please specify username.\n";
-			return;
-		}
+		$filename = $args['xml_import'];
 
 		if (!is_file($filename)) {
 			print "error: input filename ($filename) doesn't exist.\n";
 			return;
 		}
 
+		_debug("please enter your username:");
+
+		$username = db_escape_string( trim(read_stdin()));
+
 		_debug("importing $filename for user $username...\n");
 
-		$result = db_query($this->link, "SELECT id FROM ttrss_users WHERE login = '$username'");
+		$result = db_query( "SELECT id FROM ttrss_users WHERE login = '$username'");
 
 		if (db_num_rows($result) == 0) {
 			print "error: could not find user $username.\n";
@@ -45,11 +39,11 @@ class Import_Export extends Plugin implements IHandler {
 
 		$owner_uid = db_fetch_result($result, 0, "id");
 
-		$this->perform_data_import($this->link, $filename, $owner_uid);
+		$this->perform_data_import( $filename, $owner_uid);
 	}
 
 	function save() {
-		$example_value = db_escape_string($this->link, $_POST["example_value"]);
+		$example_value = db_escape_string( $_POST["example_value"]);
 
 		echo "Value set to $example_value (not really)";
 	}
@@ -86,6 +80,7 @@ class Import_Export extends Plugin implements IHandler {
 			<button dojoType=\"dijit.form.Button\" onclick=\"return importData();\" type=\"submit\">" .
 			__('Import') . "</button>";
 
+		print "</form>";
 
 		print "</div>"; # pane
 	}
@@ -122,12 +117,12 @@ class Import_Export extends Plugin implements IHandler {
 	}
 
 	function exportrun() {
-		$offset = (int) db_escape_string($this->link, $_REQUEST['offset']);
+		$offset = (int) db_escape_string( $_REQUEST['offset']);
 		$exported = 0;
 		$limit = 250;
 
 		if ($offset < 10000 && is_writable(CACHE_DIR . "/export")) {
-			$result = db_query($this->link, "SELECT
+			$result = db_query( "SELECT
 					ttrss_entries.guid,
 					ttrss_entries.title,
 					content,
@@ -165,6 +160,7 @@ class Import_Export extends Plugin implements IHandler {
 					fputs($fp, "<article>");
 
 					foreach ($line as $k => $v) {
+						$v = str_replace("]]>", "]]]]><![CDATA[>", $v);
 						fputs($fp, "<$k><![CDATA[$v]]></$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'] . "<br/>";
 
 								++$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,8 +378,10 @@ class Import_Export extends Plugin implements IHandler {
 			}
 
 			print "<p>" .
-				T_sprintf("Finished: %d articles processed, %d imported, %d feeds created.",
-					$num_processed, $num_imported, $num_feeds_created) .
+				__("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).
 					"</p>";
 
 		} else {
@@ -416,14 +414,35 @@ class Import_Export extends Plugin implements IHandler {
 
 		print "<div style='text-align : center'>";
 
-		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 "<p>" . 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.</p>";
+			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 "<button dojoType=\"dijit.form.Button\"