fix some minor typos and stuff

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

diff --git a/classes/dlg.php b/classes/dlg.php
index 5e14690c4c03a35dc4166782912a6ef7b1876144..eee720ed40a25c271c706e26790d9a400b90d1dd 100644 (file)
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -1,12 +1,13 @@
 <?php
 class Dlg extends Handler_Protected {
        private $param;
+    private $params;
 
-       function before($method) {
+    function before($method) {
                if (parent::before($method)) {
                        header("Content-Type: text/html"); # required for iframe
 
-                       $this->param = db_escape_string($_REQUEST["param"]);
+                       $this->param = $this->dbh->escape_string($_REQUEST["param"]);
                        return true;
                }
                return false;
@@ -16,9 +17,8 @@ class Dlg extends Handler_Protected {
                print __("If you have imported labels and/or filters, you might need to reload preferences to see your new data.") . "</p>";
 
                print "<div class=\"prefFeedOPMLHolder\">";
-               $owner_uid = $_SESSION["uid"];
 
-               db_query("BEGIN");
+               $this->dbh->query("BEGIN");
 
                print "<ul class='nomarks'>";
 
@@ -26,7 +26,7 @@ class Dlg extends Handler_Protected {
 
                $opml->opml_import($_SESSION["uid"]);
 
-               db_query("COMMIT");
+               $this->dbh->query("COMMIT");
 
                print "</ul>";
                print "</div>";
@@ -106,11 +106,11 @@ 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($query);
+               $result = $this->dbh->query($query);
 
                $tags = array();
 
-               while ($line = db_fetch_assoc($result)) {
+               while ($line = $this->dbh->fetch_assoc($result)) {
                        $tags[$line["tag_name"]] = $line["count"];
                }
 
@@ -171,12 +171,12 @@ 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("SELECT DISTINCT tag_name FROM ttrss_tags WHERE owner_uid = ".$_SESSION['uid']."
+               $result = $this->dbh->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)) {
+               while ($row = $this->dbh->fetch_assoc($result)) {
                        $tmp = htmlspecialchars($row["tag_name"]);
-                       print "<option value=\"" . str_replace(" ", "%20", $tmp) . "\">$tmp</option>";
+                       print "<option value=\"$tmp\">$tmp</option>";
                }
 
                print "</select>";
@@ -195,7 +195,7 @@ class Dlg extends Handler_Protected {
        function generatedFeed() {
 
                $this->params = explode(":", $this->param, 3);
-               $feed_id = db_escape_string($this->params[0]);
+               $feed_id = $this->dbh->escape_string($this->params[0]);
                $is_cat = (bool) $this->params[1];
 
                $key = get_feed_access_key($feed_id, $is_cat);
@@ -221,52 +221,5 @@ class Dlg extends Handler_Protected {
                //return;
        }
 
-       function newVersion() {
-
-               $version_data = check_for_update();
-               $version = $version_data['version'];
-               $id = $version_data['version_id'];
-
-               if ($version && $id) {
-                       print "<div class='tagCloudContainer'>";
-
-                       print T_sprintf("New version of Tiny Tiny RSS is available (%s).",
-                               "<b>$version</b>");
-
-                       print "</div>";
-
-                       $details = "http://tt-rss.org/redmine/versions/$id";
-                       $download = "http://tt-rss.org/#Download";
-
-                       print "<p align='center'>".__("You can update using built-in updater in the Preferences or by using update.php")."</p>";
-
-                       print "<div style='text-align : center'>";
-                       print "<button dojoType=\"dijit.form.Button\"
-                               onclick=\"return window.open('$details')\">".__("See the release notes")."</button>";
-                       print "<button dojoType=\"dijit.form.Button\"
-                               onclick=\"return window.open('$download')\">".__("Download")."</button>";
-                       print "<button dojoType=\"dijit.form.Button\"
-                               onclick=\"return dijit.byId('newVersionDlg').hide()\">".
-                               __('Close this window')."</button>";
-
-               } else {
-                       print "<div class='tagCloudContainer'>";
-
-                       print "<p align='center'>".__("Error receiving version information or no new version available.")."</p>";
-
-                       print "</div>";
-
-                       print "<div style='text-align : center'>";
-                       print "<button dojoType=\"dijit.form.Button\"
-                               onclick=\"return dijit.byId('newVersionDlg').hide()\">".
-                               __('Close this window')."</button>";
-                       print "</div>";
-
-               }
-               print "</div>";
-
-       }
-
-
 }
 ?>