Commit 4aa037ae authored by Sebastian Reichel's avatar Sebastian Reichel

Imported Upstream version 1.7.5+dfsg

parent e23f81d2

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -9,3 +9,4 @@ lock/*
tags
cache/htmlpurifier/*/*ser
lib/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/*/*ser
web.config
......@@ -22,6 +22,9 @@ div.cdmHeader > span {
div.cdmHeader span.updated {
color : gray;
font-weight : normal;
font-size : 11px;
white-space : nowrap;
vertical-align : middle;
}
div.cdmHeader input {
......@@ -42,10 +45,6 @@ div.cdmHeader img, div.cdmFooter img {
margin : 0px 2px 0px 2px;
}
div.cdmContent, div.cdmContentInner * {
font-weight : normal;
}
div.cdmContent a {
color : #4684ff;
}
......@@ -55,7 +54,7 @@ div.cdmContent a:hover {
}
div.cdmContentInner {
margin : 0px 10px 10px 10px;
margin : 10px;
}
div.cdmContentInner img {
......@@ -64,7 +63,8 @@ div.cdmContentInner img {
}
div.cdmFooter {
background : #f9f9f9;
background-color : #f0f0f0;
background-image : url("images/cdm_footer_tile.png");
padding : 5px;
font-weight : normal;
color : gray;
......@@ -72,7 +72,8 @@ div.cdmFooter {
}
.Selected div.cdmFooter {
background-color : #FFF2BF;
background-color : #FFE587;
background-image : url("images/cdm_footer_selected.png");
}
span.cdmExcerpt {
......@@ -96,6 +97,19 @@ div.cdmFeedTitle {
background-repeat : repeat-x;
}
div.cdmFeedTitle a.title {
color : gray;
font-style : italic;
font-weight : bold;
}
div.cdmFeedTitle a {
color : gray;
}
div.cdmFeedTitle a:hover {
color : #4684ff;
}
div.articleNote {
border-style : dashed none dashed none;
}
......@@ -103,4 +117,60 @@ div.articleNote {
div.cdmHeader span.hlFeed {
float : right;
font-weight : normal;
font-style : italic;
}
div.cdm.expanded .cdmHeader {
background : #EEF6FD;
}
div.cdm.expanded.Unread div.cdmHeader {
background : #DCECFB;
}
div.cdm.expanded.Unread.Selected div.cdmHeader, div.cdm.expanded.Selected div.cdmHeader {
background : #FFEA9E;
}
div.cdm.active.Selected div.cdmHeader {
background : #FFEA9E;
}
div.cdm.expanded.even.Unread, div.cdm.expanded.odd.Unread {
background : white;
}
div.cdm.expanded.even, div.cdm.expanded.odd {
background : #f9f9f9;
}
div.cdmHeader div.hlFeed, div.cdmHeader div.hlFeed a {
vertical-align : middle;
color : gray;
font-weight : normal;
font-style : italic;
font-size : 11px;
}
div.cdmContentInner p {
max-width : 650px;
}
.Unread div.cdmHeader {
font-weight : bold;
}
div.cdmContentInner iframe {
min-width : 50%;
}
div.cdmHeader span.author {
color : gray;
font-size : 11px;
font-weight : normal;
}
div.cdm.expanded div.cdmHeader a.title, div.cdm.active div.cdmHeader a.title {
font-size : 13px;
}
This diff is collapsed.
......@@ -8,7 +8,7 @@ class Article extends Handler_Protected {
}
function redirect() {
$id = db_escape_string($_REQUEST['id']);
$id = db_escape_string($this->link, $_REQUEST['id']);
$result = db_query($this->link, "SELECT link FROM ttrss_entries, ttrss_user_entries
WHERE id = '$id' AND id = ref_id AND owner_uid = '".$_SESSION['uid']."'
......@@ -27,10 +27,10 @@ class Article extends Handler_Protected {
}
function view() {
$id = db_escape_string($_REQUEST["id"]);
$cids = explode(",", db_escape_string($_REQUEST["cids"]));
$mode = db_escape_string($_REQUEST["mode"]);
$omode = db_escape_string($_REQUEST["omode"]);
$id = db_escape_string($this->link, $_REQUEST["id"]);
$cids = explode(",", db_escape_string($this->link, $_REQUEST["cids"]));
$mode = db_escape_string($this->link, $_REQUEST["mode"]);
$omode = db_escape_string($this->link, $_REQUEST["omode"]);
// in prefetch mode we only output requested cids, main article
// just gets marked as read (it already exists in client cache)
......
......@@ -21,7 +21,7 @@ class Auth_Base {
$user_id = $this->find_user_by_login($login);
if (!$user_id) {
$login = db_escape_string($login);
$login = db_escape_string($this->link, $login);
$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
$pwd_hash = encrypt_password($password, $salt, true);
......@@ -42,7 +42,7 @@ class Auth_Base {
}
function find_user_by_login($login) {
$login = db_escape_string($login);
$login = db_escape_string($this->link, $login);
$result = db_query($this->link, "SELECT id FROM ttrss_users WHERE
login = '$login'");
......
......@@ -45,6 +45,28 @@ class Backend extends Handler {
$sequence = substr($sequence,
strpos($sequence, "|")+1,
strlen($sequence));
} else {
$keys = explode(" ", $sequence);
for ($i = 0; $i < count($keys); $i++) {
if (strlen($keys[$i]) > 1) {
$tmp = '';
foreach (str_split($keys[$i]) as $c) {
switch ($c) {
case '*':
$tmp .= __('Shift') . '+';
break;
case '^':
$tmp .= __('Ctrl') . '+';
break;
default:
$tmp .= $c;
}
}
$keys[$i] = $tmp;
}
}
$sequence = join(" ", $keys);
}
print "<li>";
......
......@@ -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;
}
......@@ -236,8 +236,7 @@ class Dlg extends Handler_Protected {
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")."\"
......@@ -303,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\">";
......@@ -311,8 +310,7 @@ class Dlg extends Handler_Protected {
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>
......@@ -352,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";
......@@ -552,7 +550,7 @@ 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);
..