pngcrush.sh

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

diff --git a/classes/dlg.php b/classes/dlg.php
index cfa960d9aecc04f375abe5eb4a739841d1e45610..9ac5cd12fef16f8a1bcec52a7ab24edec59aa239 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 = $this->dbh->escape_string($_REQUEST["param"]);
+                       $this->param = $_REQUEST["param"];
                        return true;
                }
                return false;
@@ -16,9 +17,6 @@ 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"];
-
-               $this->dbh->query("BEGIN");
 
                print "<ul class='nomarks'>";
 
@@ -26,8 +24,6 @@ class Dlg extends Handler_Protected {
 
                $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"];
                }
 
@@ -144,7 +139,7 @@ class Dlg extends Handler_Protected {
 
                        $key_escaped = str_replace("'", "\\'", $key);
 
-                       echo "<a href=\"javascript:viewfeed('$key_escaped') \" style=\"font-size: " .
+                       echo "<a href=\"javascript:viewfeed({feed:'$key_escaped'}) \" style=\"font-size: " .
                                $size . "px\" title=\"$value articles tagged with " .
                                $key . '">' . $key . '</a> ';
                }
@@ -161,41 +156,10 @@ class Dlg extends Handler_Protected {
 
        }
 
-       function printTagSelect() {
-
-               print __("Match:"). "&nbsp;" .
-                       "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\" type=\"radio\" checked value=\"any\" name=\"tag_mode\" id=\"tag_mode_any\">";
-               print "<label for=\"tag_mode_any\">".__("Any")."</label>";
-               print "&nbsp;";
-               print "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\" type=\"radio\" value=\"all\" name=\"tag_mode\" id=\"tag_mode_all\">";
-               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 = $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 = $this->dbh->fetch_assoc($result)) {
-                       $tmp = htmlspecialchars($row["tag_name"]);
-                       print "<option value=\"" . str_replace(" ", "%20", $tmp) . "\">$tmp</option>";
-               }
-
-               print "</select>";
-
-               print "<div align='right'>";
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"viewfeed(get_all_tags($('all_tags')),
-                       get_radio_checked($('tag_mode')));\">" . __('Display entries') . "</button>";
-               print "&nbsp;";
-               print "<button dojoType=\"dijit.form.Button\"
-               onclick=\"return closeInfoBox()\">" .
-                       __('Close this window') . "</button>";
-               print "</div>";
-
-       }
-
        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);
@@ -221,52 +185,16 @@ 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'>";
+       function defaultPasswordWarning() {
 
-                       print T_sprintf("New version of Tiny Tiny RSS is available (%s).",
-                               "<b>$version</b>");
+       print_warning(__("You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."));
 
-                       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 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