remove $link

[tt-rss.git] / classes / dlg.php

diff --git a/classes/dlg.php b/classes/dlg.php
index 32a3b230afbbb7d6d48663bf42e7ec691001ce93..99cd7cffa7545de47446bd06b1226e47ef5b7298 100644 (file)
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -6,7 +6,7 @@ class Dlg extends Handler_Protected {
                if (parent::before($method)) {
                        header("Content-Type: text/html"); # required for iframe
 
-                       $this->param = db_escape_string($this->link, $_REQUEST["param"]);
+                       $this->param = db_escape_string( $_REQUEST["param"]);
                        return true;
                }
                return false;
@@ -18,15 +18,15 @@ class Dlg extends Handler_Protected {
                print "<div class=\"prefFeedOPMLHolder\">";
                $owner_uid = $_SESSION["uid"];
 
-               db_query($this->link, "BEGIN");
+               db_query( "BEGIN");
 
                print "<ul class='nomarks'>";
 
-               $opml = new Opml($this->link, $_REQUEST);
+               $opml = new Opml( $_REQUEST);
 
                $opml->opml_import($_SESSION["uid"]);
 
-               db_query($this->link, "COMMIT");
+               db_query( "COMMIT");
 
                print "</ul>";
                print "</div>";
@@ -43,7 +43,7 @@ class Dlg extends Handler_Protected {
        }
 
        function pubOPMLUrl() {
-               $url_path = Opml::opml_publish_url($this->link);
+               $url_path = Opml::opml_publish_url();
 
                print __("Your Public OPML URL is:");
 
@@ -106,7 +106,7 @@ class Dlg extends Handler_Protected {
                        FROM ttrss_tags WHERE owner_uid = ".$_SESSION["uid"]."
                        GROUP BY tag_name ORDER BY count DESC LIMIT 50";
 
-               $result = db_query($this->link, $query);
+               $result = db_query( $query);
 
                $tags = array();
 
@@ -171,7 +171,7 @@ class Dlg extends Handler_Protected {
                print "<label for=\"tag_mode_all\">".__("All tags.")."</input>";
 
                print "<select id=\"all_tags\" name=\"all_tags\" title=\"" . __('Which Tags?') . "\" multiple=\"multiple\" size=\"10\" style=\"width : 100%\">";
-               $result = db_query($this->link, "SELECT DISTINCT tag_name FROM ttrss_tags WHERE owner_uid = ".$_SESSION['uid']."
+               $result = db_query( "SELECT DISTINCT tag_name FROM ttrss_tags WHERE owner_uid = ".$_SESSION['uid']."
                        AND LENGTH(tag_name) <= 30 ORDER BY tag_name ASC");
 
                while ($row = db_fetch_assoc($result)) {
@@ -195,10 +195,10 @@ class Dlg extends Handler_Protected {
        function generatedFeed() {
 
                $this->params = explode(":", $this->param, 3);
-               $feed_id = db_escape_string($this->link, $this->params[0]);
+               $feed_id = db_escape_string( $this->params[0]);
                $is_cat = (bool) $this->params[1];
 
-               $key = get_feed_access_key($this->link, $feed_id, $is_cat);
+               $key = get_feed_access_key( $feed_id, $is_cat);
 
                $url_path = htmlspecialchars($this->params[2]) . "&key=" . $key;
 
@@ -223,7 +223,7 @@ class Dlg extends Handler_Protected {
 
        function newVersion() {
 
-               $version_data = check_for_update($this->link);
+               $version_data = check_for_update();
                $version = $version_data['version'];
                $id = $version_data['version_id'];
 
@@ -268,53 +268,5 @@ class Dlg extends Handler_Protected {
        }
 
 
-       function batchSubscribe() {
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"batchaddfeeds\">";
-
-               print "<table width='100%'><tr><td>
-                       ".__("Add one valid RSS feed per line (no feed detection is done)")."
-               </td><td align='right'>";
-               if (get_pref($this->link, 'ENABLE_FEED_CATS')) {
-                       print __('Place in category:') . " ";
-                       print_feed_cat_select($this->link, "cat", false, 'dojoType="dijit.form.Select"');
-               }
-               print "</td></tr><tr><td colspan='2'>";
-               print "<textarea
-                       style='font-size : 12px; width : 100%; height: 200px;'
-                       placeHolder=\"".__("Feeds to subscribe, One per line")."\"
-                       dojoType=\"dijit.form.SimpleTextarea\" required=\"1\" name=\"feeds\"></textarea>";
-
-               print "</td></tr><tr><td colspan='2'>";
-
-               print "<div id='feedDlg_loginContainer' style='display : none'>
-                               " .
-                               " <input dojoType=\"dijit.form.TextBox\" name='login'\"
-                                       placeHolder=\"".__("Login")."\"
-                                       style=\"width : 10em;\"> ".
-                               " <input
-                                       placeHolder=\"".__("Password")."\"
-                                       dojoType=\"dijit.form.TextBox\" type='password'
-                                       style=\"width : 10em;\" name='pass'\">".
-                               "</div>";
-
-               print "</td></tr><tr><td colspan='2'>";
-
-               print "<div style=\"clear : both\">
-                       <input type=\"checkbox\" name=\"need_auth\" dojoType=\"dijit.form.CheckBox\" id=\"feedDlg_loginCheck\"
-                                       onclick='checkboxToggleElement(this, \"feedDlg_loginContainer\")'>
-                               <label for=\"feedDlg_loginCheck\">".
-                               __('Feeds require authentication.')."</div>";
-
-               print "</form>";
-
-               print "</td></tr></table>";
-
-               print "<div class=\"dlgButtons\">
-                       <button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('batchSubDlg').execute()\">".__('Subscribe')."</button>
-                       <button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('batchSubDlg').hide()\">".__('Cancel')."</button>
-                       </div>";
-       }
-
 }
 ?>