]> git.wh0rd.org - tt-rss.git/blobdiff - plugins/import_export/init.php
import_export: various bugfixes
[tt-rss.git] / plugins / import_export / init.php
index ab47288b3c9e971cb945833a71b544d39232b441..7c628909ff11de71df78981d4ec696df35495d73 100644 (file)
@@ -1,11 +1,8 @@
 <?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);
@@ -29,11 +26,11 @@ class Import_Export extends Plugin implements IHandler {
 
                _debug("please enter your username:");
 
-               $username = db_escape_string($this->link, trim(read_stdin()));
+               $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";
@@ -42,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)";
        }
@@ -60,9 +57,9 @@ class Import_Export extends Plugin implements IHandler {
 
                print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Import and export')."\">";
 
-               print "<h3>" . __("Article archive") . "</h3>";
+               print_notice(__("You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."));
 
-               print "<p>" . __("You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances.") . "</p>";
+               print "<p>";
 
                print "<button dojoType=\"dijit.form.Button\" onclick=\"return exportData()\">".
                        __('Export my data')."</button> ";
@@ -83,6 +80,9 @@ class Import_Export extends Plugin implements IHandler {
                        <button dojoType=\"dijit.form.Button\" onclick=\"return importData();\" type=\"submit\">" .
                        __('Import') . "</button>";
 
+               print "</form>";
+
+               print "</p>";
 
                print "</div>"; # pane
        }
@@ -106,11 +106,13 @@ class Import_Export extends Plugin implements IHandler {
                if (file_exists($exportname)) {
                        header("Content-type: text/xml");
 
+                       $timestamp_suffix = date("Y-m-d", filemtime($exportname));
+
                        if (function_exists('gzencode')) {
-                               header("Content-Disposition: attachment; filename=TinyTinyRSS_exported.xml.gz");
+                               header("Content-Disposition: attachment; filename=TinyTinyRSS_exported_${timestamp_suffix}.xml.gz");
                                echo gzencode(file_get_contents($exportname));
                        } else {
-                               header("Content-Disposition: attachment; filename=TinyTinyRSS_exported.xml");
+                               header("Content-Disposition: attachment; filename=TinyTinyRSS_exported_${timestamp_suffix}.xml");
                                echo file_get_contents($exportname);
                        }
                } else {
@@ -119,12 +121,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,
@@ -162,6 +164,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>");
                                        }
 
@@ -182,12 +185,14 @@ 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;
                $num_feeds_created = 0;
 
+               libxml_disable_entity_loader(false);
+
                $doc = @DOMDocument::load($filename);
 
                if (!$doc) {
@@ -205,6 +210,8 @@ class Import_Export extends Plugin implements IHandler {
                                $doc = DOMDocument::loadXML($data);
                }
 
+               libxml_disable_entity_loader(true);
+
                if ($doc) {
 
                        $xpath = new DOMXpath($doc);
@@ -234,10 +241,13 @@ class Import_Export extends Plugin implements IHandler {
                                        $article = array();
 
                                        foreach ($article_node->childNodes as $child) {
-                                               if ($child->nodeName != 'label_cache')
-                                                       $article[$child->nodeName] = db_escape_string($this->link, $child->nodeValue);
-                                               else
+                                               if ($child->nodeName == 'content') {
+                                                       $article[$child->nodeName] = db_escape_string($child->nodeValue, false);
+                                               } else if ($child->nodeName == 'label_cache') {
                                                        $article[$child->nodeName] = $child->nodeValue;
+                                               } else {
+                                                       $article[$child->nodeName] = db_escape_string($child->nodeValue);
+                                               }
                                        }
 
                                        //print_r($article);
@@ -246,16 +256,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,
@@ -283,7 +293,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) {
@@ -304,7 +314,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) {
@@ -312,10 +322,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) {
@@ -333,7 +343,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) {
@@ -343,35 +353,34 @@ 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']);
                                                                $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)
                                                                        VALUES ($ref_id, $owner_uid, $feed, false,
                                                                                NULL, $marked, $published, $score, '$tag_cache',
-                                                                                       '$label_cache', '', '$note')");
+                                                                                       '', '', '$note')");
 
-                                                               $label_cache = json_decode($label_cache, true);
+                                                               $label_cache = json_decode($article['label_cache'], true);
 
                                                                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");
                                                        }
                                                }
                                        }
@@ -380,9 +389,9 @@ class Import_Export extends Plugin implements IHandler {
 
                        print "<p>" .
                                __("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).
+                               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 {
@@ -415,13 +424,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\"
@@ -432,6 +463,9 @@ class Import_Export extends Plugin implements IHandler {
 
        }
 
+       function api_version() {
+               return 2;
+       }
 
 }
 ?>