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

Merge branch 'master' of bah.org.ru:public_html/testbox/tt-rss

This commit is contained in:
Andrew Dolgov 2010-01-28 18:49:54 +03:00
parent 4d50f419ee 0b9751cd65
commit e8f2df110d
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
functions.php
View File

@ -2047,7 +2047,7 @@
function get_user_theme($link) {
if (get_schema_version($link) >= 63) {
if (get_schema_version($link) >= 63 && $_SESSION["uid"]) {
$theme_name = get_pref($link, "_THEME_ID");
if (is_dir("themes/$theme_name")) {
return $theme_name;
@ -2062,7 +2062,7 @@
function get_user_theme_path($link) {
if (get_schema_version($link) >= 63) {
if (get_schema_version($link) >= 63 && $_SESSION["uid"]) {
$theme_name = get_pref($link, "_THEME_ID");
if ($theme_name && is_dir("themes/$theme_name")) {
@ -3751,7 +3751,7 @@
$res = preg_replace('/<img[^>]+>/is', '', $res);
}
if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW', $owner)) {
if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
$res = preg_replace("/href=/i", "target=\"_blank\" href=", $res);
}

5
modules/popup-dialog.php
View File

@ -575,8 +575,9 @@
print "<div align='center'>";
print "<button onclick=\"return closeInfoBox()\">".
__('Close this window')."</button>";
print "<input class=\"button\"
type=\"submit\" onclick=\"return closeInfoBox()\"
value=\"".__('Close')."\">";
print "</div>";

33
modules/pref-feeds.php
View File

@ -1192,24 +1192,27 @@
print "<button onclick=\"javascript:removeSelectedFeeds()\">"
.__('Unsubscribe')."</button> ";
if (defined('_ENABLE_FEED_DEBUGGING')) {
print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
<option value=\"facDefault\" selected>".__('More actions...')."</option>";
if (FORCE_ARTICLE_PURGE == 0) {
print
"<option value=\"facPurge\">".__('Manual purge')."</option>";
}
print "
<option value=\"facClear\">".__('Clear feed data')."</option>
<option value=\"facRescore\">".__('Rescore articles')."</option>";
print "</select>";
/* print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
<option value=\"facDefault\" selected>".__('Other actions...')."</option>";
if (FORCE_ARTICLE_PURGE == 0) {
print
"<option value=\"facPurge\">".__('Manual purge')."</option>";
}
print "
<option value=\"facClear\">".__('Clear feed data')."</option>
<option value=\"facRescore\">".__('Rescore articles')."</option>
<option value=\"facUnsubscribe\">".__('Unsubscribe')."</option>";
print "</select>"; */
/* if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) {
print " <input type=\"submit\" class=\"button\"
id=\"top25_feeds_btn\"
onclick=\"javascript:browseFeeds()\" value=\"".__('More feeds')."\">";
} */
$feeds_sort = db_escape_string($_REQUEST["sort"]);
if (!$feeds_sort || $feeds_sort == "undefined") {

6
modules/pref-filters.php
View File

@ -215,8 +215,6 @@
}
if ($subop == "remove") {
if ($memcache) $memcache->flush();
$ids = split(",", db_escape_string($_REQUEST["ids"]));
@ -226,9 +224,7 @@
}
if ($subop == "add") {
if ($memcache) $memcache->flush();
$regexp = db_escape_string(trim($_REQUEST["reg_exp"]));
$filter_type = db_escape_string(trim($_REQUEST["filter_type"]));
$feed_id = db_escape_string($_REQUEST["feed_id"]);