");
// Get theme from cookie
- $ret = getSession('mxchange_theme');
+ $ret = getSession('mailer_theme');
// Is it valid?
if ((!isExtensionActive('theme')) || (getThemeId($ret) == '0')) {
// Fix it to default
$ret = 'default';
} // END - if
- } elseif ((!isInstalled()) && ((isInstalling()) || (getOutputMode() == true)) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
+ } elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
// Prepare filename for checking
$themeFile = sprintf("theme/%s/theme.php", getRequestParameter('theme'));
@@ -248,13 +248,13 @@ function getActualTheme () {
if ((isGetRequestParameterSet('theme')) && (isIncludeReadable($theme))) {
// Set cookie from URL data
setTheme(getRequestParameter('theme'));
- } elseif (isIncludeReadable(sprintf("theme/%s/theme.php", secureString(postRequestParameter('theme'))))) {
+ } elseif (isIncludeReadable(sprintf("theme/%s/theme.php", postRequestParameter('theme')))) {
// Set cookie from posted data
- setTheme(secureString(postRequestParameter('theme')));
+ setTheme(postRequestParameter('theme'));
}
// Set return value
- $ret = getSession('mxchange_theme');
+ $ret = getSession('mailer_theme');
} else {
// Invalid design, reset cookie
setTheme($ret);
@@ -264,9 +264,12 @@ function getActualTheme () {
return $ret;
}
-// Setter for theme in session
+/**
+ * Setter for theme in session (This setter does return the success of
+ * setSession() which is required e.g. for destroySponsorSession().
+ */
function setTheme ($newTheme) {
- setSession('mxchange_theme', $newTheme);
+ return setSession('mailer_theme', $newTheme);
}
// Get id from theme
@@ -300,39 +303,5 @@ function getThemeId ($name) {
return $id;
}
-///////////////////////////////////////////////////////////////////////////////
-// Only filter functions
-///////////////////////////////////////////////////////////////////////////////
-
-// Filter for generic handling of theme change
-function FILTER_HANDLE_THEME_CHANGE () {
- // Check if new theme is selcted
- if ((isPostRequestParameterSet('new_theme')) && (postRequestParameter('new_theme') != getCurrentTheme())) {
- // Set new theme for guests
- $newTheme = postRequestParameter('new_theme');
-
- // Change to new theme
- setTheme($newTheme);
-
- // Remove current from array
- removeIncludeFromPool('theme', sprintf("theme/%s/theme.php", getCurrentTheme()));
-
- // Add new theme
- addIncludeToPool('theme', sprintf("theme/%s/theme.php", $newTheme));
- } // END - if
-}
-
-// Filter for settings theme from user profile, must be executed only if FILTER_FETCH_USER_DATA() ran before
-function FILTER_SET_USERS_THEME () {
- // Is the user data valid?
- if (!isMember()) {
- // Do only run for logged in members
- debug_report_bug('Please only run this filter for logged in users.');
- } // END - if
-
- // Change to new theme
- setTheme(getUserData('curr_theme'));
-}
-
// [EOF]
?>