valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some minor typos and stuff

This commit is contained in:
Andrew Dolgov 2015-06-07 18:41:18 +03:00
parent ca5d39e866
commit 415a3b50c9
5 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
classes/db/pdo.php
View File

@ -88,6 +88,7 @@ class Db_PDO implements IDb {
$this->query("set client_encoding = 'UTF-8'"); $this->query("set client_encoding = 'UTF-8'");
$this->query("set datestyle = 'ISO, european'"); $this->query("set datestyle = 'ISO, european'");
$this->query("set TIME ZONE 0"); $this->query("set TIME ZONE 0");
return;
case "mysql": case "mysql":
$this->query("SET time_zone = '+0:0'"); $this->query("SET time_zone = '+0:0'");
return; return;

3
classes/dlg.php
View File

@ -1,8 +1,9 @@
<?php <?php
class Dlg extends Handler_Protected { class Dlg extends Handler_Protected {
private $param; private $param;
private $params;
function before($method) { function before($method) {
if (parent::before($method)) { if (parent::before($method)) {
header("Content-Type: text/html"); # required for iframe header("Content-Type: text/html"); # required for iframe

4
classes/feeds.php
View File

@ -3,7 +3,9 @@ require_once "colors.php";
class Feeds extends Handler_Protected { class Feeds extends Handler_Protected {
function csrf_ignore($method) { private $params;
function csrf_ignore($method) {
$csrf_ignored = array("index", "feedbrowser", "quickaddfeed", "search"); $csrf_ignored = array("index", "feedbrowser", "quickaddfeed", "search");
return array_search($method, $csrf_ignored) !== false; return array_search($method, $csrf_ignored) !== false;

15
classes/pref/prefs.php
View File

@ -127,21 +127,6 @@ class Pref_Prefs extends Handler_Protected {
} }
} }
function getHelp() {
$pref_name = $this->dbh->escape_string($_REQUEST["pn"]);
$result = $this->dbh->query("SELECT help_text FROM ttrss_prefs
WHERE pref_name = '$pref_name'");
if ($this->dbh->num_rows($result) > 0) {
$help_text = $this->dbh->fetch_result($result, 0, "help_text");
print $help_text;
} else {
printf(__("Unknown option: %s"), $pref_name);
}
}
function changeemail() { function changeemail() {
$email = $this->dbh->escape_string($_POST["email"]); $email = $this->dbh->escape_string($_POST["email"]);

4
js/tt-rss.js
View File

@ -767,7 +767,7 @@ function parse_runtime_info(data) {
} }
if (k == "daemon_is_running" && v != 1) { if (k == "daemon_is_running" && v != 1) {
notify_error("<span onclick=\"javascript:explainError(1)\">Update daemon is not running.</span>", true); notify_error("<span onclick=\"explainError(1)\">Update daemon is not running.</span>", true);
return; return;
} }
@ -782,7 +782,7 @@ function parse_runtime_info(data) {
} }
if (k == "daemon_stamp_ok" && v != 1) { if (k == "daemon_stamp_ok" && v != 1) {
notify_error("<span onclick=\"javascript:explainError(3)\">Update daemon is not updating feeds.</span>", true); notify_error("<span onclick=\"explainError(3)\">Update daemon is not updating feeds.</span>", true);
return; return;
} }