]> git.wh0rd.org - tt-rss.git/blobdiff - classes/dlg.php
remove $link
[tt-rss.git] / classes / dlg.php
index 36f3ee07590f451919ce2415b9c9e599a8f5d63b..99cd7cffa7545de47446bd06b1226e47ef5b7298 100644 (file)
@@ -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>";
@@ -42,124 +42,8 @@ class Dlg extends Handler_Protected {
                //return;
        }
 
-       function editPrefProfiles() {
-               print "<div dojoType=\"dijit.Toolbar\">";
-
-               print "<div dojoType=\"dijit.form.DropDownButton\">".
-                               "<span>" . __('Select')."</span>";
-               print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-               print "<div onclick=\"selectTableRows('prefFeedProfileList', 'all')\"
-                       dojoType=\"dijit.MenuItem\">".__('All')."</div>";
-               print "<div onclick=\"selectTableRows('prefFeedProfileList', 'none')\"
-                       dojoType=\"dijit.MenuItem\">".__('None')."</div>";
-               print "</div></div>";
-
-               print "<div style=\"float : right\">";
-
-               print "<input name=\"newprofile\" dojoType=\"dijit.form.ValidationTextBox\"
-                               required=\"1\">
-                       <button dojoType=\"dijit.form.Button\"
-                       onclick=\"dijit.byId('profileEditDlg').addProfile()\">".
-                               __('Create profile')."</button></div>";
-
-               print "</div>";
-
-               $result = db_query($this->link, "SELECT title,id FROM ttrss_settings_profiles
-                       WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
-
-               print "<div class=\"prefProfileHolder\">";
-
-               print "<form id=\"profile_edit_form\" onsubmit=\"return false\">";
-
-               print "<table width=\"100%\" class=\"prefFeedProfileList\"
-                       cellspacing=\"0\" id=\"prefFeedProfileList\">";
-
-               print "<tr class=\"placeholder\" id=\"FCATR-0\">"; #odd
-
-               print "<td width='5%' align='center'><input
-                       id='FCATC-0'
-                       onclick='toggleSelectRow2(this);'
-                       dojoType=\"dijit.form.CheckBox\"
-                       type=\"checkbox\"></td>";
-
-               if (!$_SESSION["profile"]) {
-                       $is_active = __("(active)");
-               } else {
-                       $is_active = "";
-               }
-
-               print "<td><span>" .
-                       __("Default profile") . " $is_active</span></td>";
-
-               print "</tr>";
-
-               $lnum = 1;
-
-               while ($line = db_fetch_assoc($result)) {
-
-                       $class = ($lnum % 2) ? "even" : "odd";
-
-                       $profile_id = $line["id"];
-                       $this_row_id = "id=\"FCATR-$profile_id\"";
-
-                       print "<tr class=\"placeholder\" $this_row_id>";
-
-                       $edit_title = htmlspecialchars($line["title"]);
-
-                       print "<td width='5%' align='center'><input
-                               onclick='toggleSelectRow2(this);'
-                               id='FCATC-$profile_id'
-                               dojoType=\"dijit.form.CheckBox\"
-                               type=\"checkbox\"></td>";
-
-                       if ($_SESSION["profile"] == $line["id"]) {
-                               $is_active = __("(active)");
-                       } else {
-                               $is_active = "";
-                       }
-
-                       print "<td><span dojoType=\"dijit.InlineEditBox\"
-                               width=\"300px\" autoSave=\"false\"
-                               profile-id=\"$profile_id\">" . $edit_title .
-                               "<script type=\"dojo/method\" event=\"onChange\" args=\"item\">
-                                       var elem = this;
-                                       dojo.xhrPost({
-                                               url: 'backend.php',
-                                               content: {op: 'rpc', method: 'saveprofile',
-                                                       value: this.value,
-                                                       id: this.srcNodeRef.getAttribute('profile-id')},
-                                                       load: function(response) {
-                                                               elem.attr('value', response);
-                                               }
-                                       });
-                               </script>
-                       </span> $is_active</td>";
-
-                       print "</tr>";
-
-                       ++$lnum;
-               }
-
-               print "</table>";
-               print "</form>";
-               print "</div>";
-
-               print "<div class='dlgButtons'>
-                       <div style='float : left'>
-                       <button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').removeSelected()\">".
-                       __('Remove selected profiles')."</button>
-                       <button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').activateProfile()\">".
-                       __('Activate profile')."</button>
-                       </div>";
-
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').hide()\">".
-                       __('Close this window')."</button>";
-               print "</div>";
-
-       }
-
        function pubOPMLUrl() {
-               $url_path = Opml::opml_publish_url($this->link);
+               $url_path = Opml::opml_publish_url();
 
                print __("Your Public OPML URL is:");
 
@@ -222,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();
 
@@ -287,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)) {
@@ -311,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;
 
@@ -339,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'];
 
@@ -383,103 +267,6 @@ class Dlg extends Handler_Protected {
 
        }
 
-       function addInstance() {
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"op\" value=\"pref-instances\">";
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"method\" value=\"add\">";
-
-               print "<div class=\"dlgSec\">".__("Instance")."</div>";
-
-               print "<div class=\"dlgSecCont\">";
-
-               /* URL */
-
-               print __("URL:") . " ";
-
-               print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
-                       placeHolder=\"".__("Instance URL")."\"
-                       regExp='^(http|https)://.*'
-                       style=\"font-size : 16px; width: 20em\" name=\"access_url\">";
-
-               print "<hr/>";
-
-               $access_key = sha1(uniqid(rand(), true));
-
-               /* Access key */
-
-               print __("Access key:") . " ";
-
-               print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
-                       placeHolder=\"".__("Access key")."\" regExp='\w{40}'
-                       style=\"width: 20em\" name=\"access_key\" id=\"instance_add_key\"
-                       value=\"$access_key\">";
-
-               print "<p class='insensitive'>" . __("Use one access key for both linked instances.");
-
-               print "</div>";
-
-               print "<div class=\"dlgButtons\">
-                       <div style='float : left'>
-                               <button dojoType=\"dijit.form.Button\"
-                                       onclick=\"return dijit.byId('instanceAddDlg').regenKey()\">".
-                                       __('Generate new key')."</button>
-                       </div>
-                       <button dojoType=\"dijit.form.Button\"
-                               onclick=\"return dijit.byId('instanceAddDlg').execute()\">".
-                               __('Create link')."</button>
-                       <button dojoType=\"dijit.form.Button\"
-                               onclick=\"return dijit.byId('instanceAddDlg').hide()\"\">".
-                               __('Cancel')."</button></div>";
-
-               return;
-       }
-
-       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>";
-       }
 
 }
 ?>