remove dialogNotice; tweak dialog appearance a bit

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

diff --git a/classes/dlg.php b/classes/dlg.php
index 3bb2caba4633ff8e6b69f4228eec6104c9a94d52..e03489505a8bab301ad8af2f73c37196d1a6e1e7 100644 (file)
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -5,7 +5,7 @@ class Dlg extends Handler_Protected {
        function before($method) {
                if (parent::before($method)) {
                        header("Content-Type: text/xml; charset=utf-8");
-                       $this->param = db_escape_string($_REQUEST["param"]);
+                       $this->param = db_escape_string($this->link, $_REQUEST["param"]);
                        print "<dlg>";
                        return true;
                }
@@ -302,7 +302,7 @@ class Dlg extends Handler_Protected {
        function feedBrowser() {
                if (defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER) return;
 
-               $browser_search = db_escape_string($_REQUEST["search"]);
+               $browser_search = db_escape_string($this->link, $_REQUEST["search"]);
 
                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=\"updateFeedBrowser\">";
@@ -350,7 +350,7 @@ class Dlg extends Handler_Protected {
        }
 
        function search() {
-               $this->params = explode(":", db_escape_string($_REQUEST["param"]), 2);
+               $this->params = explode(":", db_escape_string($this->link, $_REQUEST["param"]), 2);
 
                $active_feed_id = sprintf("%d", $this->params[0]);
                $is_cat = $this->params[1] != "false";
@@ -550,14 +550,14 @@ class Dlg extends Handler_Protected {
                print "<content><![CDATA[";
 
                $this->params = explode(":", $this->param, 3);
-               $feed_id = db_escape_string($this->params[0]);
+               $feed_id = db_escape_string($this->link, $this->params[0]);
                $is_cat = (bool) $this->params[1];
 
                $key = get_feed_access_key($this->link, $feed_id, $is_cat);
 
                $url_path = htmlspecialchars($this->params[2]) . "&key=" . $key;
 
-               print "<div class=\"dialogNotice\">" .  __("You can view this feed as RSS using the following URL:") . "</div>";
+               print "<h2>".__("You can view this feed as RSS using the following URL:")."</h2>";
 
                print "<div class=\"tagCloudContainer\">";
                print "<a id='gen_feed_url' href='$url_path' target='_blank'>$url_path</a>";
@@ -598,7 +598,7 @@ class Dlg extends Handler_Protected {
 
                        print "<div style='text-align : center'>";
                        print "<button dojoType=\"dijit.form.Button\"
-                               onclick=\"return window.open('$details')\">".__("Details")."</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\"
@@ -628,9 +628,7 @@ class Dlg extends Handler_Protected {
 
                $value = str_replace("<br/>", "\n", $value);
 
-               print "<div class=\"dialogNotice\">";
-               print T_sprintf("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline.", "tt-rss.css");
-               print "</div>";
+               print_notice(T_sprintf("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline.", "tt-rss.css"));
 
                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=\"setpref\">";