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;
}
print "</dlg>";
}
- function exportData() {
-
- print "<p style='text-align : center' id='export_status_message'>You need to prepare exported data first by clicking the button below.</p>";
-
- print "<div align='center'>";
- print "<button dojoType=\"dijit.form.Button\"
- onclick=\"dijit.byId('dataExportDlg').prepare()\">".
- __('Prepare data')."</button>";
-
- print "<button dojoType=\"dijit.form.Button\"
- onclick=\"dijit.byId('dataExportDlg').hide()\">".
- __('Close this window')."</button>";
-
- print "</div>";
-
-
- }
-
function importOpml() {
header("Content-Type: text/html"); # required for iframe
print "<title>".__('Public OPML URL')."</title>";
print "<content><![CDATA[";
- $url_path = opml_publish_url($this->link);
+ $url_path = Opml::opml_publish_url($this->link);
print __("Your Public OPML URL is:");
print "<div style='float : right'>
<img style='display : none'
- id='feed_add_spinner' src='".
- theme_image($this->link, 'images/indicator_white.gif')."'></div>";
+ id='feed_add_spinner' src='images/indicator_white.gif'></div>";
print "<input style=\"font-size : 16px; width : 20em;\"
placeHolder=\"".__("Feed or site URL")."\"
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\">";
print "<div dojoType=\"dijit.Toolbar\">
<div style='float : right'>
<img style='display : none'
- id='feed_browser_spinner' src='".
- theme_image($this->link, 'images/indicator_white.gif')."'>
+ id='feed_browser_spinner' src='images/indicator_white.gif'>
<input name=\"search\" dojoType=\"dijit.form.TextBox\" size=\"20\" type=\"search\"
onchange=\"dijit.byId('feedBrowserDlg').update()\" value=\"$browser_search\">
<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('feedBrowserDlg').update()\">".__('Search')."</button>
$owner_uid = $_SESSION["uid"];
+ require_once "feedbrowser.php";
+
print "<ul class='browseFeedList' id='browseFeedList'>";
print make_feed_browser($this->link, $search, 25);
print "</ul>";
}
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";
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>";
$version = $version_data['version'];
$id = $version_data['version_id'];
- print "<div class='tagCloudContainer'>";
+ if ($version && $id) {
+ print "<div class='tagCloudContainer'>";
- print T_sprintf("New version of Tiny Tiny RSS is available (%s).",
- "<b>$version</b>");
+ print T_sprintf("New version of Tiny Tiny RSS is available (%s).",
+ "<b>$version</b>");
- print "</div>";
+ print "</div>";
- $details = "http://tt-rss.org/redmine/versions/$id";
- $download = "http://tt-rss.org/#Download";
+ $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 "<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')\">".__("Details")."</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>";
+ 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>";
}
$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\">";
return;
}
- function dataImport() {
- header("Content-Type: text/html"); # required for iframe
-
- print "<div style='text-align : center'>";
-
- if (is_file($_FILES['export_file']['tmp_name'])) {
-
- perform_data_import($this->link, $_FILES['export_file']['tmp_name'], $_SESSION['uid']);
-
- } else {
- print "<p>" . T_sprintf("Could not upload file. You might need to adjust upload_max_filesize
- in PHP.ini (current value = %s)", ini_get("upload_max_filesize")) . " or use CLI import tool.</p>";
-
- }
-
- print "<button dojoType=\"dijit.form.Button\"
- onclick=\"dijit.byId('dataImportDlg').hide()\">".
- __('Close this window')."</button>";
-
- print "</div>";
-
- }
-
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\">";
git.wh0rd.org / tt-rss.git / blobdiff