first stage of headline element handling refactoring

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

diff --git a/classes/dlg.php b/classes/dlg.php
index 60c5265bf1dce14072e137ceb717180bf601c4d5..9ac5cd12fef16f8a1bcec52a7ab24edec59aa239 100644 (file)
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -7,7 +7,7 @@ class Dlg extends Handler_Protected {
                if (parent::before($method)) {
                        header("Content-Type: text/html"); # required for iframe
 
-                       $this->param = $this->dbh->escape_string($_REQUEST["param"]);
+                       $this->param = $_REQUEST["param"];
                        return true;
                }
                return false;
@@ -18,16 +18,12 @@ class Dlg extends Handler_Protected {
 
                print "<div class=\"prefFeedOPMLHolder\">";
 
-               $this->dbh->query("BEGIN");
-
                print "<ul class='nomarks'>";
 
                $opml = new Opml($_REQUEST);
 
                $opml->opml_import($_SESSION["uid"]);
 
-               $this->dbh->query("COMMIT");
-
                print "</ul>";
                print "</div>";
 
@@ -102,15 +98,14 @@ class Dlg extends Handler_Protected {
 
                // from here: http://www.roscripts.com/Create_tag_cloud-71.html
 
-               $query = "SELECT tag_name, COUNT(post_int_id) AS count
-                       FROM ttrss_tags WHERE owner_uid = ".$_SESSION["uid"]."
-                       GROUP BY tag_name ORDER BY count DESC LIMIT 50";
-
-               $result = $this->dbh->query($query);
+               $sth = $this->pdo->prepare("SELECT tag_name, COUNT(post_int_id) AS count
+                       FROM ttrss_tags WHERE owner_uid = ?
+                       GROUP BY tag_name ORDER BY count DESC LIMIT 50");
+               $sth->execute([$_SESSION['uid']]);
 
                $tags = array();
 
-               while ($line = $this->dbh->fetch_assoc($result)) {
+               while ($line = $sth->fetch()) {
                        $tags[$line["tag_name"]] = $line["count"];
                }
 
@@ -164,7 +159,7 @@ class Dlg extends Handler_Protected {
        function generatedFeed() {
 
                $this->params = explode(":", $this->param, 3);
-               $feed_id = $this->dbh->escape_string($this->params[0]);
+               $feed_id = $this->params[0];
                $is_cat = (bool) $this->params[1];
 
                $key = get_feed_access_key($feed_id, $is_cat);
@@ -190,5 +185,16 @@ class Dlg extends Handler_Protected {
                //return;
        }
 
-}
-?>
+       function defaultPasswordWarning() {
+
+       print_warning(__("You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."));
+
+               print "<div align='center'>";
+               print "<button dojoType=\"dijit.form.Button\" onclick=\"gotoPreferences()\">".
+                       __('Open Preferences')."</button> ";
+               print "<button dojoType=\"dijit.form.Button\"
+                       onclick=\"return closeInfoBox()\">".
+                       __('Close this window')."</button>";
+               print "</div>";
+       }
+}
\ No newline at end of file