]> git.wh0rd.org - tt-rss.git/blobdiff - plugins/googlereaderimport/init.php
remove $link
[tt-rss.git] / plugins / googlereaderimport / init.php
index d25d3288f4cebc423db34e6b7f431f2338174853..8986f469c99927f5f5c6fec0699da405ccd06176 100644 (file)
@@ -1,8 +1,5 @@
 <?php
 class GoogleReaderImport extends Plugin {
-
-
-       private $link;
        private $host;
 
        function about() {
@@ -14,7 +11,6 @@ class GoogleReaderImport extends Plugin {
        }
 
        function init($host) {
-               $this->link = $host->get_link();
                $this->host = $host;
 
                $host->add_command("greader-import",
@@ -34,11 +30,11 @@ class GoogleReaderImport extends Plugin {
 
                _debug("please enter your username:");
 
-               $username = db_escape_string($this->link, trim(read_stdin()));
+               $username = db_escape_string( trim(read_stdin()));
 
                _debug("looking up user: $username...");
 
-               $result = db_query($this->link, "SELECT id FROM ttrss_users
+               $result = db_query( "SELECT id FROM ttrss_users
                        WHERE login = '$username'");
 
                if (db_num_rows($result) == 0) {
@@ -59,7 +55,7 @@ class GoogleReaderImport extends Plugin {
 
        function import($file = false, $owner_uid = 0) {
 
-               purge_orphans($this->link);
+               purge_orphans();
 
                if (!$file) {
                        header("Content-Type: text/html");
@@ -115,30 +111,30 @@ class GoogleReaderImport extends Plugin {
                                foreach ($doc['items'] as $item) {
 //                                     print_r($item);
 
-                                       $guid = db_escape_string($this->link, mb_substr($item['id'], 0, 250));
-                                       $title = db_escape_string($this->link, $item['title']);
+                                       $guid = db_escape_string( mb_substr($item['id'], 0, 250));
+                                       $title = db_escape_string( $item['title']);
                                        $updated = date('Y-m-d h:i:s', $item['updated']);
                                        $link = '';
                                        $content = '';
-                                       $author = db_escape_string($this->link, $item['author']);
+                                       $author = db_escape_string( $item['author']);
                                        $tags = array();
                                        $orig_feed_data = array();
 
                                        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']);
+                                                               $link = db_escape_string( $alt['href']);
                                                        }
                                                }
                                        }
 
                                        if (is_array($item['summary'])) {
-                                               $content = db_escape_string($this->link,
+                                               $content = db_escape_string(
                                                        $item['summary']['content'], false);
                                        }
 
                                        if (is_array($item['content'])) {
-                                               $content = db_escape_string($this->link,
+                                               $content = db_escape_string(
                                                        $item['content']['content'], false);
                                        }
 
@@ -153,14 +149,14 @@ class GoogleReaderImport extends Plugin {
                                        if (is_array($item['origin'])) {
                                                if (strpos($item['origin']['streamId'], 'feed/') === 0) {
 
-                                                       $orig_feed_data['feed_url'] = db_escape_string($this->link,
+                                                       $orig_feed_data['feed_url'] = db_escape_string(
                                                                mb_substr(preg_replace("/^feed\//",
                                                                        "", $item['origin']['streamId']), 0, 200));
 
-                                                       $orig_feed_data['title'] = db_escape_string($this->link,
+                                                       $orig_feed_data['title'] = db_escape_string(
                                                                mb_substr($item['origin']['title'], 0, 200));
 
-                                                       $orig_feed_data['site_url'] = db_escape_string($this->link,
+                                                       $orig_feed_data['site_url'] = db_escape_string(
                                                                mb_substr($item['origin']['htmlUrl'], 0, 200));
                                                }
                                        }
@@ -168,7 +164,7 @@ class GoogleReaderImport extends Plugin {
                                        $processed++;
 
                                        $imported += (int) $this->create_article($owner_uid, $guid, $title,
-                                               $updated, $link, $content, $author, $sql_set_marked, $tags,
+                                               $updated,  $content, $author, $sql_set_marked, $tags,
                                                $orig_feed_data);
 
                                        if ($file && $processed % 25 == 0) {
@@ -200,7 +196,7 @@ class GoogleReaderImport extends Plugin {
        }
 
        // expects ESCAPED data
-       private function create_article($owner_uid, $guid, $title, $updated, $link, $content, $author, $marked, $tags, $orig_feed_data) {
+       private function create_article($owner_uid, $guid, $title, $updated,  $content, $author, $marked, $tags, $orig_feed_data) {
 
                if (!$guid) $guid = sha1($link);
 
@@ -210,9 +206,9 @@ class GoogleReaderImport extends Plugin {
 
                $content_hash = sha1($content);
 
-               if (filter_var($link, FILTER_VALIDATE_URL) === FALSE) return false;
+               if (filter_var( FILTER_VALIDATE_URL) === FALSE) return false;
 
-               db_query($this->link, "BEGIN");
+               db_query( "BEGIN");
 
                $feed_id = 'NULL';
 
@@ -223,7 +219,7 @@ class GoogleReaderImport extends Plugin {
                // before dealing with archived feeds we must check ttrss_feeds to maintain id consistency
 
                if ($orig_feed_data['feed_url'] && $create_archived_feeds) {
-                               $result = db_query($this->link,
+                               $result = db_query(
                                        "SELECT id FROM ttrss_feeds WHERE feed_url = '".$orig_feed_data['feed_url']."'
                                                AND owner_uid = $owner_uid");
 
@@ -234,7 +230,7 @@ class GoogleReaderImport extends Plugin {
 
                                if (!$orig_feed_data['title']) $orig_feed_data['title'] = '[Unknown]';
 
-                               $result = db_query($this->link,
+                               $result = db_query(
                                        "INSERT INTO ttrss_feeds
                                                (owner_uid,feed_url,site_url,title,cat_id,auth_login,auth_pass,update_method)
                                                VALUES ($owner_uid,
@@ -243,7 +239,7 @@ class GoogleReaderImport extends Plugin {
                                                '".$orig_feed_data['title']."',
                                                NULL, '', '', 0)");
 
-                               $result = db_query($this->link,
+                               $result = db_query(
                                        "SELECT id FROM ttrss_feeds WHERE feed_url = '".$orig_feed_data['feed_url']."'
                                                AND owner_uid = $owner_uid");
 
@@ -258,18 +254,18 @@ class GoogleReaderImport extends Plugin {
                        // locate archived entry to file entries in, we don't want to file them in actual feeds because of purging
                        // maybe file marked in real feeds because eh
 
-                       $result = db_query($this->link, "SELECT id FROM ttrss_archived_feeds WHERE
+                       $result = db_query( "SELECT id FROM ttrss_archived_feeds WHERE
                                feed_url = '".$orig_feed_data['feed_url']."' AND owner_uid = $owner_uid");
 
                        if (db_num_rows($result) != 0) {
                                $orig_feed_id = db_fetch_result($result, 0, "id");
                        } else {
-                               db_query($this->link, "INSERT INTO ttrss_archived_feeds
+                               db_query( "INSERT INTO ttrss_archived_feeds
                                                (id, owner_uid, title, feed_url, site_url)
                                                SELECT id, owner_uid, title, feed_url, site_url from ttrss_feeds
                                                        WHERE id = '$feed_id'");
 
-                               $result = db_query($this->link, "SELECT id FROM ttrss_archived_feeds WHERE
+                               $result = db_query( "SELECT id FROM ttrss_archived_feeds WHERE
                                        feed_url = '".$orig_feed_data['feed_url']."' AND owner_uid = $owner_uid");
 
                                if (db_num_rows($result) != 0) {
@@ -280,32 +276,32 @@ class GoogleReaderImport extends Plugin {
 
                // delete temporarily inserted feed
                if ($feed_id && $feed_inserted) {
-                               db_query($this->link, "DELETE FROM ttrss_feeds WHERE id = $feed_id");
+                               db_query( "DELETE FROM ttrss_feeds WHERE id = $feed_id");
                }
 
                if (!$orig_feed_id) $orig_feed_id = 'NULL';
 
-               $result = db_query($this->link, "SELECT id FROM ttrss_entries, ttrss_user_entries WHERE
+               $result = db_query( "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
+                       $result = db_query( "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'");
+                       $result = db_query( "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
+                               db_query( "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, $orig_feed_id, $owner_uid, $marked, '', '', NOW(), '', false, NOW())");
 
-                               $result = db_query($this->link, "SELECT int_id FROM ttrss_user_entries, ttrss_entries
+                               $result = db_query( "SELECT int_id FROM ttrss_user_entries, ttrss_entries
                                        WHERE owner_uid = $owner_uid AND ref_id = id AND ref_id = $ref_id");
 
                                if (db_num_rows($result) != 0 && is_array($tags)) {
@@ -315,16 +311,16 @@ class GoogleReaderImport extends Plugin {
 
                                        foreach ($tags as $tag) {
 
-                                               $tag = db_escape_string($this->link, sanitize_tag($tag));
+                                               $tag = db_escape_string( sanitize_tag($tag));
 
                                                if (!tag_is_valid($tag)) continue;
 
-                                               $result = db_query($this->link, "SELECT id FROM ttrss_tags
+                                               $result = db_query( "SELECT id FROM ttrss_tags
                                                        WHERE tag_name = '$tag' AND post_int_id = '$entry_int_id' AND
                                                        owner_uid = '$owner_uid' LIMIT 1");
 
                                                        if ($result && db_num_rows($result) == 0) {
-                                                               db_query($this->link, "INSERT INTO ttrss_tags
+                                                               db_query( "INSERT INTO ttrss_tags
                                                                        (owner_uid,tag_name,post_int_id)
                                                                        VALUES ('$owner_uid','$tag', '$entry_int_id')");
                                                        }
@@ -335,9 +331,9 @@ class GoogleReaderImport extends Plugin {
                                        /* update the cache */
 
                                        $tags_to_cache = array_unique($tags_to_cache);
-                                       $tags_str = db_escape_string($this->link, join(",", $tags_to_cache));
+                                       $tags_str = db_escape_string( join(",", $tags_to_cache));
 
-                                       db_query($this->link, "UPDATE ttrss_user_entries
+                                       db_query( "UPDATE ttrss_user_entries
                                                SET tag_cache = '$tags_str' WHERE ref_id = '$ref_id'
                                                AND owner_uid = $owner_uid");
                                }
@@ -346,7 +342,7 @@ class GoogleReaderImport extends Plugin {
                        }
                }
 
-               db_query($this->link, "COMMIT");
+               db_query( "COMMIT");
 
                return $rc;
        }