From 0b9751cd650c917d3e7f5dc5493483f8b026bf21 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov <fox@bah.org.ru> Date: Thu, 28 Jan 2010 18:49:17 +0300 Subject: [PATCH] theme_image: do not display themed image if noone is logged in --- functions.php | 6 +++--- modules/popup-dialog.php | 5 +++-- modules/pref-feeds.php | 33 ++++++++++++++++++--------------- modules/pref-filters.php | 6 +----- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/functions.php b/functions.php index 6a18ffbf3..27c07fda8 100644 --- a/functions.php +++ b/functions.php @@ -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); } diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php index b55799ba3..a806e0c70 100644 --- a/modules/popup-dialog.php +++ b/modules/popup-dialog.php @@ -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>"; diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 591597337..0329a1298 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -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") { diff --git a/modules/pref-filters.php b/modules/pref-filters.php index 5c71fcb03..50120a2e7 100644 --- a/modules/pref-filters.php +++ b/modules/pref-filters.php @@ -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"]);