]> git.wh0rd.org Git - tt-rss.git/commitdiff
rename google reader import plugin; fix owner_uid being 0
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Thu, 28 Mar 2013 15:37:34 +0000 (19:37 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Thu, 28 Mar 2013 15:37:34 +0000 (19:37 +0400)
plugins/googlereaderimport/init.js [new file with mode: 0644]
plugins/googlereaderimport/init.php [new file with mode: 0644]
plugins/greaderstarredimport/init.js [deleted file]
plugins/greaderstarredimport/init.php [deleted file]

diff --git a/plugins/googlereaderimport/init.js b/plugins/googlereaderimport/init.js
new file mode 100644 (file)
index 0000000..e7057d8
--- /dev/null
@@ -0,0 +1,53 @@
+function starredImportComplete(iframe) {
+       try {
+               if (!iframe.contentDocument.body.innerHTML) return false;
+
+               Element.show(iframe);
+
+               notify('');
+
+               if (dijit.byId('starredImportDlg'))
+                       dijit.byId('starredImportDlg').destroyRecursive();
+
+               var content = iframe.contentDocument.body.innerHTML;
+
+               if (content) Element.hide(iframe);
+
+               dialog = new dijit.Dialog({
+                       id: "starredImportDlg",
+                       title: __("OPML Import"),
+                       style: "width: 600px",
+                       onCancel: function() {
+                               Element.hide(iframe);
+                               this.hide();
+                       },
+                       execute: function() {
+                               Element.hide(iframe);
+                               this.hide();
+                       },
+                       content: content});
+
+               dialog.show();
+
+       } catch (e) {
+               exception_error("starredImportComplete", e);
+       }
+}
+
+function starredImport() {
+
+       var starred_file = $("starred_file");
+
+       if (starred_file.value.length == 0) {
+               alert(__("Please choose a file first."));
+               return false;
+       } else {
+               notify_progress("Importing, please wait...", true);
+
+               Element.show("starred_upload_iframe");
+
+               return true;
+       }
+}
+
+
diff --git a/plugins/googlereaderimport/init.php b/plugins/googlereaderimport/init.php
new file mode 100644 (file)
index 0000000..77219e1
--- /dev/null
@@ -0,0 +1,218 @@
+<?php
+class GoogleReaderImport extends Plugin {
+
+
+       private $link;
+       private $host;
+
+       function about() {
+               return array(1.0,
+                       "Import Starred or Shared items from Google Reader takeout",
+                       "fox",
+                       false,
+                       "");
+       }
+
+       function init($host) {
+               $this->link = $host->get_link();
+               $this->host = $host;
+
+               $host->add_command("greader-import",
+                       "import data in Google Reader JSON format",
+                       $this, ":", "FILE");
+
+               $host->add_hook($host::HOOK_PREFS_TAB, $this);
+       }
+
+       function greader_import($args) {
+               $file = $args['greader_import'];
+
+               if (!file_exists($file)) {
+                       _debug("file not found: $file");
+                       return;
+               }
+
+               _debug("please enter your username:");
+
+               $username = db_escape_string($this->link, trim(read_stdin()));
+
+               _debug("looking up user: $username...");
+
+               $result = db_query($this->link, "SELECT id FROM ttrss_users
+                       WHERE login = '$username'");
+
+               if (db_num_rows($result) == 0) {
+                       _debug("user not found.");
+                       return;
+               }
+
+               $owner_uid = db_fetch_result($result, 0, "id");
+
+               _debug("processing: $file (owner_uid: $owner_uid)");
+
+               $this->import($file, $owner_uid);
+       }
+
+       function get_prefs_js() {
+               return file_get_contents(dirname(__FILE__) . "/init.js");
+       }
+
+       function import($file = false, $owner_uid = 0) {
+
+               if (!$file) {
+                       header("Content-Type: text/html");
+
+                       $owner_uid = $_SESSION["uid"];
+
+                       if (is_file($_FILES['starred_file']['tmp_name'])) {
+                               $doc = json_decode(file_get_contents($_FILES['starred_file']['tmp_name']), true);
+                       } else {
+                               print_error(__('No file uploaded.'));
+                               return;
+                       }
+               } else {
+                       $doc = json_decode(file_get_contents($file), true);
+               }
+
+               if ($file) {
+                       $sql_set_marked = strtolower(basename($file)) == 'starred.json' ? 'true' : 'false';
+                       _debug("will set articles as starred: $sql_set_marked");
+
+               } else {
+                       $sql_set_marked = strtolower($_FILES['starred_file']['name']) == 'starred.json' ? 'true' : 'false';
+               }
+
+               if ($doc) {
+                       if (isset($doc['items'])) {
+                               $processed = 0;
+
+                               foreach ($doc['items'] as $item) {
+//                                     print_r($item);
+
+                                       $guid = db_escape_string($this->link, $item['id']);
+                                       $title = db_escape_string($this->link, $item['title']);
+                                       $updated = date('Y-m-d h:i:s', $item['updated']);
+                                       $link = '';
+                                       $content = '';
+                                       $author = db_escape_string($this->link, $item['author']);
+
+                                       if (is_array($item['alternate'])) {
+                                               foreach ($item['alternate'] as $alt) {
+                                                       if (isset($alt['type']) && $alt['type'] == 'text/html') {
+                                                               $link = db_escape_string($this->link, $alt['href']);
+                                                       }
+                                               }
+                                       }
+
+                                       if (is_array($item['content'])) {
+                                               $content = db_escape_string($this->link,
+                                                       $item['content']['content'], false);
+                                       }
+
+                                       $processed++;
+
+                                       $imported += (int) $this->create_article($owner_uid, $guid, $title,
+                                               $updated, $link, $content, $author, $sql_set_marked);
+
+                               }
+
+                               if ($file) {
+                                       _debug(sprintf("All done. %d of %d articles imported.", $imported, $processed));
+                               } else {
+                                       print "<p style='text-align : center'>" . T_sprintf("All done. %d out of %d articles imported.", $imported, $processed) . "</p>";
+                               }
+
+                       } else {
+                               print_error(__('The document has incorrect format.'));
+                       }
+
+               } else {
+                       print_error(__('Error while parsing document.'));
+               }
+
+               if (!$file) {
+                       print "<div align='center'>";
+                       print "<button dojoType=\"dijit.form.Button\"
+                               onclick=\"dijit.byId('starredImportDlg').execute()\">".
+                               __('Close this window')."</button>";
+                       print "</div>";
+               }
+       }
+
+       // expects ESCAPED data
+       private function create_article($owner_uid, $guid, $title, $updated, $link, $content, $author, $marked) {
+
+               if (!$guid) $guid = sha1($link);
+
+               $guid = "$owner_uid,$guid";
+
+               $content_hash = sha1($content);
+
+               if (filter_var($link, FILTER_VALIDATE_URL) === FALSE) return false;
+
+               db_query($this->link, "BEGIN");
+
+               // only check for our user data here, others might have shared this with different content etc
+               $result = db_query($this->link, "SELECT id FROM ttrss_entries, ttrss_user_entries WHERE
+                       guid = '$guid' AND ref_id = id AND owner_uid = '$owner_uid' LIMIT 1");
+
+               if (db_num_rows($result) == 0) {
+                       $result = db_query($this->link, "INSERT INTO ttrss_entries
+                               (title, guid, link, updated, content, content_hash, date_entered, date_updated, author)
+                               VALUES
+                               ('$title', '$guid', '$link', '$updated', '$content', '$content_hash', NOW(), NOW(), '$author')");
+
+                       $result = db_query($this->link, "SELECT id FROM ttrss_entries WHERE guid = '$guid'");
+
+                       if (db_num_rows($result) != 0) {
+                               $ref_id = db_fetch_result($result, 0, "id");
+
+                               db_query($this->link, "INSERT INTO ttrss_user_entries
+                                       (ref_id, uuid, feed_id, orig_feed_id, owner_uid, marked, tag_cache, label_cache,
+                                               last_read, note, unread, last_marked)
+                                       VALUES
+                                       ('$ref_id', '', NULL, NULL, $owner_uid, $marked, '', '', NOW(), '', false, NOW())");
+
+                               if (count($labels) != 0) {
+                                       foreach ($labels as $label) {
+                                               label_add_article($link, $ref_id, trim($label), $owner_uid);
+                                       }
+                               }
+
+                               $rc = true;
+                       }
+               }
+
+               db_query($this->link, "COMMIT");
+
+               return $rc;
+       }
+
+       function hook_prefs_tab($args) {
+               if ($args != "prefFeeds") return;
+
+               print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__("Import starred or shared items from Google Reader")."\">";
+
+               print_notice("Your imported articles will appear in Starred (in file is named starred.json) and Archived feeds.");
+
+               print "<p>".__("Paste your starred.json or shared.json into the form below."). "</p>";
+
+               print "<iframe id=\"starred_upload_iframe\"
+                       name=\"starred_upload_iframe\" onload=\"starredImportComplete(this)\"
+                       style=\"width: 400px; height: 100px; display: none;\"></iframe>";
+
+               print "<form name=\"starred_form\" style='display : block' target=\"starred_upload_iframe\"
+                       enctype=\"multipart/form-data\" method=\"POST\"
+                       action=\"backend.php\">
+                       <input id=\"starred_file\" name=\"starred_file\" type=\"file\">&nbsp;
+                       <input type=\"hidden\" name=\"op\" value=\"pluginhandler\">
+                       <input type=\"hidden\" name=\"method\" value=\"import\">
+                       <input type=\"hidden\" name=\"plugin\" value=\"googlereaderimport\">
+                       <button dojoType=\"dijit.form.Button\" onclick=\"return starredImport();\" type=\"submit\">" .
+                       __('Import my Starred items') . "</button>";
+
+
+               print "</div>"; #pane
+       }
+}
+?>
diff --git a/plugins/greaderstarredimport/init.js b/plugins/greaderstarredimport/init.js
deleted file mode 100644 (file)
index e7057d8..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-function starredImportComplete(iframe) {
-       try {
-               if (!iframe.contentDocument.body.innerHTML) return false;
-
-               Element.show(iframe);
-
-               notify('');
-
-               if (dijit.byId('starredImportDlg'))
-                       dijit.byId('starredImportDlg').destroyRecursive();
-
-               var content = iframe.contentDocument.body.innerHTML;
-
-               if (content) Element.hide(iframe);
-
-               dialog = new dijit.Dialog({
-                       id: "starredImportDlg",
-                       title: __("OPML Import"),
-                       style: "width: 600px",
-                       onCancel: function() {
-                               Element.hide(iframe);
-                               this.hide();
-                       },
-                       execute: function() {
-                               Element.hide(iframe);
-                               this.hide();
-                       },
-                       content: content});
-
-               dialog.show();
-
-       } catch (e) {
-               exception_error("starredImportComplete", e);
-       }
-}
-
-function starredImport() {
-
-       var starred_file = $("starred_file");
-
-       if (starred_file.value.length == 0) {
-               alert(__("Please choose a file first."));
-               return false;
-       } else {
-               notify_progress("Importing, please wait...", true);
-
-               Element.show("starred_upload_iframe");
-
-               return true;
-       }
-}
-
-
diff --git a/plugins/greaderstarredimport/init.php b/plugins/greaderstarredimport/init.php
deleted file mode 100644 (file)
index 9c2d33d..0000000
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-class GreaderStarredImport extends Plugin {
-
-
-       private $link;
-       private $host;
-
-       function about() {
-               return array(1.0,
-                       "Import Starred or Shared items from Google Reader takeout",
-                       "fox",
-                       false,
-                       "");
-       }
-
-       function init($host) {
-               $this->link = $host->get_link();
-               $this->host = $host;
-
-               $host->add_command("greader-import",
-                       "import data in Google Reader JSON format",
-                       $this, ":", "FILE");
-
-               $host->add_hook($host::HOOK_PREFS_TAB, $this);
-       }
-
-       function greader_import($args) {
-               $file = $args['greader_import'];
-
-               if (!file_exists($file)) {
-                       _debug("file not found: $file");
-                       return;
-               }
-
-               _debug("please enter your username:");
-
-               $username = db_escape_string($this->link, trim(read_stdin()));
-
-               _debug("looking up user: $username...");
-
-               $result = db_query($this->link, "SELECT id FROM ttrss_users
-                       WHERE login = '$username'");
-
-               if (db_num_rows($result) == 0) {
-                       _debug("user not found.");
-                       return;
-               }
-
-               $owner_uid = db_fetch_result($result, 0, "id");
-
-               _debug("processing: $file (owner_uid: $owner_uid)");
-
-               $this->import($file, $owner_uid);
-       }
-
-       function get_prefs_js() {
-               return file_get_contents(dirname(__FILE__) . "/init.js");
-       }
-
-       function import($file = false, $owner_uid = 0) {
-
-               if (!$file) {
-                       header("Content-Type: text/html");
-
-                       if (is_file($_FILES['starred_file']['tmp_name'])) {
-                               $doc = json_decode(file_get_contents($_FILES['starred_file']['tmp_name']), true);
-                       } else {
-                               print_error(__('No file uploaded.'));
-                               return;
-                       }
-               } else {
-                       $doc = json_decode(file_get_contents($file), true);
-               }
-
-               if ($file) {
-                       $sql_set_marked = strtolower(basename($file)) == 'starred.json' ? 'true' : 'false';
-                       _debug("will set articles as starred: $sql_set_marked");
-
-               } else {
-                       $sql_set_marked = strtolower($_FILES['starred_file']['name']) == 'starred.json' ? 'true' : 'false';
-               }
-
-               if ($doc) {
-                       if (isset($doc['items'])) {
-                               $processed = 0;
-
-                               foreach ($doc['items'] as $item) {
-//                                     print_r($item);
-
-                                       $guid = db_escape_string($this->link, $item['id']);
-                                       $title = db_escape_string($this->link, $item['title']);
-                                       $updated = date('Y-m-d h:i:s', $item['updated']);
-                                       $link = '';
-                                       $content = '';
-                                       $author = db_escape_string($this->link, $item['author']);
-
-                                       if (is_array($item['alternate'])) {
-                                               foreach ($item['alternate'] as $alt) {
-                                                       if (isset($alt['type']) && $alt['type'] == 'text/html') {
-                                                               $link = db_escape_string($this->link, $alt['href']);
-                                                       }
-                                               }
-                                       }
-
-                                       if (is_array($item['content'])) {
-                                               $content = db_escape_string($this->link,
-                                                       $item['content']['content'], false);
-                                       }
-
-                                       $processed++;
-
-                                       $imported += (int) $this->create_article($owner_uid, $guid, $title,
-                                               $updated, $link, $content, $author, $sql_set_marked);
-
-                               }
-
-                               if ($file) {
-                                       _debug(sprintf("All done. %d of %d articles imported.", $imported, $processed));
-                               } else {
-                                       print "<p style='text-align : center'>" . T_sprintf("All done. %d out of %d articles imported.", $imported, $processed) . "</p>";
-                               }
-
-                       } else {
-                               print_error(__('The document has incorrect format.'));
-                       }
-
-               } else {
-                       print_error(__('Error while parsing document.'));
-               }
-
-               if (!$file) {
-                       print "<div align='center'>";
-                       print "<button dojoType=\"dijit.form.Button\"
-                               onclick=\"dijit.byId('starredImportDlg').execute()\">".
-                               __('Close this window')."</button>";
-                       print "</div>";
-               }
-       }
-
-       // expects ESCAPED data
-       private function create_article($owner_uid, $guid, $title, $updated, $link, $content, $author, $marked) {
-
-               if (!$guid) $guid = sha1($link);
-
-               $guid = "$owner_uid,$guid";
-
-               $content_hash = sha1($content);
-
-               if (filter_var($link, FILTER_VALIDATE_URL) === FALSE) return false;
-
-               db_query($this->link, "BEGIN");
-
-               // only check for our user data here, others might have shared this with different content etc
-               $result = db_query($this->link, "SELECT id FROM ttrss_entries, ttrss_user_entries WHERE
-                       guid = '$guid' AND ref_id = id AND owner_uid = '$owner_uid' LIMIT 1");
-
-               if (db_num_rows($result) == 0) {
-                       $result = db_query($this->link, "INSERT INTO ttrss_entries
-                               (title, guid, link, updated, content, content_hash, date_entered, date_updated, author)
-                               VALUES
-                               ('$title', '$guid', '$link', '$updated', '$content', '$content_hash', NOW(), NOW(), '$author')");
-
-                       $result = db_query($this->link, "SELECT id FROM ttrss_entries WHERE guid = '$guid'");
-
-                       if (db_num_rows($result) != 0) {
-                               $ref_id = db_fetch_result($result, 0, "id");
-
-                               db_query($this->link, "INSERT INTO ttrss_user_entries
-                                       (ref_id, uuid, feed_id, orig_feed_id, owner_uid, marked, tag_cache, label_cache,
-                                               last_read, note, unread, last_marked)
-                                       VALUES
-                                       ('$ref_id', '', NULL, NULL, $owner_uid, $marked, '', '', NOW(), '', false, NOW())");
-
-                               if (count($labels) != 0) {
-                                       foreach ($labels as $label) {
-                                               label_add_article($link, $ref_id, trim($label), $owner_uid);
-                                       }
-                               }
-
-                               $rc = true;
-                       }
-               }
-
-               db_query($this->link, "COMMIT");
-
-               return $rc;
-       }
-
-       function hook_prefs_tab($args) {
-               if ($args != "prefFeeds") return;
-
-               print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__("Import starred or shared items from Google Reader")."\">";
-
-               print_notice("Your imported articles will appear in Starred (in file is named starred.json) and Archived feeds.");
-
-               print "<p>".__("Paste your starred.json or shared.json into the form below."). "</p>";
-
-               print "<iframe id=\"starred_upload_iframe\"
-                       name=\"starred_upload_iframe\" onload=\"starredImportComplete(this)\"
-                       style=\"width: 400px; height: 100px; display: none;\"></iframe>";
-
-               print "<form name=\"starred_form\" style='display : block' target=\"starred_upload_iframe\"
-                       enctype=\"multipart/form-data\" method=\"POST\"
-                       action=\"backend.php\">
-                       <input id=\"starred_file\" name=\"starred_file\" type=\"file\">&nbsp;
-                       <input type=\"hidden\" name=\"op\" value=\"pluginhandler\">
-                       <input type=\"hidden\" name=\"method\" value=\"import\">
-                       <input type=\"hidden\" name=\"plugin\" value=\"greaderstarredimport\">
-                       <button dojoType=\"dijit.form.Button\" onclick=\"return starredImport();\" type=\"submit\">" .
-                       __('Import my Starred items') . "</button>";
-
-
-               print "</div>"; #pane
-       }
-}
-?>