Way more usage of EL code:

[mailer.git] / inc / libs / theme_functions.php

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 6ee3384fd709d32502068dd8e68ad13d65ce48e7..58d1fec2c24e0f9c9180e0dcf84dd6abeced686a 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -227,13 +227,13 @@ function getActualTheme () {
        // Load default theme if not empty from configuration
        if ((isConfigEntrySet('default_theme')) && (getConfig('default_theme') != '')) $ret = getConfig('default_theme');
 
-       if (!isSessionVariableSet('mxchange_theme')) {
+       if (!isSessionVariableSet('mailer_theme')) {
                // Set default theme
                setTheme($ret);
-       } elseif ((isSessionVariableSet('mxchange_theme')) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {
+       } elseif ((isSessionVariableSet('mailer_theme')) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {
                //die("<pre>".print_r($GLOBALS['cache_array']['themes'], true)."</pre>");
                // Get theme from cookie
-               $ret = getSession('mxchange_theme');
+               $ret = getSession('mailer_theme');
 
                // Is it valid?
                if ((!isExtensionActive('theme')) || (getThemeId($ret) == '0')) {
@@ -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);
@@ -269,7 +269,7 @@ function getActualTheme () {
  * setSession() which is required e.g. for destroySponsorSession().
  */
 function setTheme ($newTheme) {
-       return setSession('mxchange_theme', $newTheme);
+       return setSession('mailer_theme', $newTheme);
 }
 
 // Get id from theme