remove $link

[tt-rss.git] / plugins / digest / init.php

diff --git a/plugins/digest/init.php b/plugins/digest/init.php
index e65ae13d72c309be647aa5844c9e9e0c37b5eabc..5b84fec16bc02ca1ca714acf507badf6cfd298f3 100644 (file)
--- a/plugins/digest/init.php
+++ b/plugins/digest/init.php
@@ -1,8 +1,6 @@
 <?php
 // TODO: digest should register digest specific hotkey actions within tt-rss
 class Digest extends Plugin implements IHandler {
-
-       private $link;
        private $host;
 
        function about() {
@@ -13,7 +11,6 @@ class Digest extends Plugin implements IHandler {
        }
 
        function init($host) {
-               $this->link = $host->get_link();
                $this->host = $host;
 
                $host->add_handler("digest", "*", $this);
@@ -22,10 +19,7 @@ class Digest extends Plugin implements IHandler {
        function index() {
                header("Content-type: text/html; charset=utf-8");
 
-               login_sequence($this->link);
-
-               global $link;
-               $link = $this->link;
+               login_sequence();
 
                require_once dirname(__FILE__) . "/digest_body.php";
        }
@@ -47,13 +41,13 @@ class Digest extends Plugin implements IHandler {
        }
 
        function digestgetcontents() {
-               $article_id = db_escape_string($this->link, $_REQUEST['article_id']);
+               $article_id = db_escape_string( $_REQUEST['article_id']);
 
-               $result = db_query($this->link, "SELECT content,title,link,marked,published
+               $result = db_query( "SELECT content,title,link,marked,published
                        FROM ttrss_entries, ttrss_user_entries
                        WHERE id = '$article_id' AND ref_id = id AND owner_uid = ".$_SESSION['uid']);
 
-               $content = sanitize($this->link, db_fetch_result($result, 0, "content"));
+               $content = sanitize( db_fetch_result($result, 0, "content"));
                $title = strip_tags(db_fetch_result($result, 0, "title"));
                $article_url = htmlspecialchars(db_fetch_result($result, 0, "link"));
                $marked = sql_bool_to_bool(db_fetch_result($result, 0, "marked"));
@@ -61,15 +55,15 @@ class Digest extends Plugin implements IHandler {
 
                print json_encode(array("article" =>
                        array("id" => $article_id, "url" => $article_url,
-                               "tags" => get_article_tags($this->link, $article_id),
+                               "tags" => get_article_tags( $article_id),
                                "marked" => $marked, "published" => $published,
                                "title" => $title, "content" => $content)));
        }
 
        function digestupdate() {
-               $feed_id = db_escape_string($this->link, $_REQUEST['feed_id']);
-               $offset = db_escape_string($this->link, $_REQUEST['offset']);
-               $seq = db_escape_string($this->link, $_REQUEST['seq']);
+               $feed_id = db_escape_string( $_REQUEST['feed_id']);
+               $offset = db_escape_string( $_REQUEST['offset']);
+               $seq = db_escape_string( $_REQUEST['seq']);
 
                if (!$feed_id) $feed_id = -4;
                if (!$offset) $offset = 0;
@@ -78,18 +72,18 @@ class Digest extends Plugin implements IHandler {
 
                $reply['seq'] = $seq;
 
-               $headlines = API::api_get_headlines($this->link, $feed_id, 30, $offset,
+               $headlines = API::api_get_headlines( $feed_id, 30, $offset,
                                '', ($feed_id == -4), true, false, "unread", "updated DESC", 0, 0);
 
                $reply['headlines'] = array();
-               $reply['headlines']['title'] = getFeedTitle($this->link, $feed_id);
+               $reply['headlines']['title'] = getFeedTitle( $feed_id);
                $reply['headlines']['content'] = $headlines;
 
                print json_encode($reply);
        }
 
        function digestinit() {
-               $tmp_feeds = API::api_get_feeds($this->link, -4, true, false, 0);
+               $tmp_feeds = API::api_get_feeds( -4, true, false, 0);
 
                $params = array();
                $feeds = array();
@@ -99,7 +93,7 @@ class Digest extends Plugin implements IHandler {
                }
 
                if ($_REQUEST["init"] == 1) {
-                       $params["hotkeys"] = get_hotkeys_map($this->link);
+                       $params["hotkeys"] = get_hotkeys_map();
                }
                $params["feeds"] = $feeds;