handling of boolean constants improved (not fully)

[mailer.git] / inc / theme-manager.php

diff --git a/inc/theme-manager.php b/inc/theme-manager.php
index c188a19663ec6eddfa515822c669825101e61147..d591bbbfcd76967a8e51d270b1afa5f332df1e4b 100644 (file)
--- a/inc/theme-manager.php
+++ b/inc/theme-manager.php
@@ -48,39 +48,39 @@ function GET_CURR_THEME() {
        // Load default theme if not empty from configuration
        if (!empty($_CONFIG['default_theme'])) $ret = $_CONFIG['default_theme'];
 
        // Load default theme if not empty from configuration
        if (!empty($_CONFIG['default_theme'])) $ret = $_CONFIG['default_theme'];
 

-       if (empty($_COOKIE['mxchange_theme'])) {
+       if (empty($_SESSION['mxchange_theme'])) {

                // Set default theme
                // Set default theme

-               @setcookie("mxchange_theme", $ret, (time() + 60*60*24*365), COOKIE_PATH);
-       } elseif ((!empty($_COOKIE['mxchange_theme'])) && (GET_EXT_VERSION("sql_patches") >= "0.1.4")) {
+               set_session("mxchange_theme", $ret, (time() + 60*60*24*365), COOKIE_PATH);
+       } elseif ((!empty($_SESSION['mxchange_theme'])) && (GET_EXT_VERSION("sql_patches") >= "0.1.4")) {

                // Get theme from cookie
                // Get theme from cookie

-               $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_themes WHERE theme_path='%s' LIMIT 1", array($_COOKIE['mxchange_theme']), __FILE__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_themes WHERE theme_path='%s' LIMIT 1", array($_SESSION['mxchange_theme']), __FILE__, __LINE__);

                if (SQL_NUMROWS($result) == 1) {
                        // Design is valid!
                if (SQL_NUMROWS($result) == 1) {
                        // Design is valid!

-                       $ret = $_COOKIE['mxchange_theme'];
+                       $ret = $_SESSION['mxchange_theme'];

                }
 
                // Free memory
                SQL_FREERESULT($result);
                }
 
                // Free memory
                SQL_FREERESULT($result);

-       } elseif ((!mxchange_installed) && ((mxchange_installing) || ($CSS == true)) && ((!empty($_GET['theme'])) || (!empty($_POST['theme'])))) {
+       } elseif ((!isBooleanConstantAndTrue('mxchange_installed')) && ((isBooleanConstantAndTrue('mxchange_installing')) || ($CSS == true)) && ((!empty($_GET['theme'])) || (!empty($_POST['theme'])))) {

                // Prepare FQFN for checking
                $theme = sprintf("%stheme/%s/theme.php", PATH, $_GET['theme']);
 
                // Installation mode active
                if ((!empty($_GET['theme'])) && (file_exists($theme)) && (is_readable($theme))) {
                        // Set cookie from URL data
                // Prepare FQFN for checking
                $theme = sprintf("%stheme/%s/theme.php", PATH, $_GET['theme']);
 
                // Installation mode active
                if ((!empty($_GET['theme'])) && (file_exists($theme)) && (is_readable($theme))) {
                        // Set cookie from URL data

-                       @setcookie("mxchange_theme", $_GET['theme'], (time() + 60*60*24*365), COOKIE_PATH);
-                       $_COOKIE['mxchange_theme'] = $_GET['theme'];
+                       set_session("mxchange_theme", $_GET['theme'], (time() + 60*60*24*365), COOKIE_PATH);
+                       $_SESSION['mxchange_theme'] = $_GET['theme'];

                } elseif (file_exists(PATH."theme/".$_POST['theme']."/theme.php")) {
                        // Set cookie from posted data
                } elseif (file_exists(PATH."theme/".$_POST['theme']."/theme.php")) {
                        // Set cookie from posted data

-                       @setcookie("mxchange_theme", $_POST['theme'], (time() + 60*60*24*365), COOKIE_PATH);
-                       $_COOKIE['mxchange_theme'] = $_POST['theme'];
+                       set_session("mxchange_theme", $_POST['theme'], (time() + 60*60*24*365), COOKIE_PATH);
+                       $_SESSION['mxchange_theme'] = $_POST['theme'];

                }
 
                // Set return value
                }
 
                // Set return value

-               $ret = $_COOKIE['mxchange_theme'];
+               $ret = $_SESSION['mxchange_theme'];

        } else {
                // Invalid design, reset cookie
        } else {
                // Invalid design, reset cookie

-               @setcookie("mxchange_theme", $ret, (time() + 60*60*24*365), COOKIE_PATH);
+               set_session("mxchange_theme", $ret, (time() + 60*60*24*365), COOKIE_PATH);

        }
 
        // Add (maybe) found theme.php file to inclusion list
        }
 
        // Add (maybe) found theme.php file to inclusion list


@@ -151,7 +151,7 @@ if ((!empty($_POST['new_theme'])) && ($_POST['new_theme'] != $CurrTheme))
        $NewTheme = $_POST['new_theme'];
 
        // Change to new theme
        $NewTheme = $_POST['new_theme'];
 
        // Change to new theme

-       @setcookie("mxchange_theme", $NewTheme, (time() + 60*60*24*365), COOKIE_PATH);
+       set_session("mxchange_theme", $NewTheme, (time() + 60*60*24*365), COOKIE_PATH);

 
        // Remove current from array and set new
        $theme = PATH."theme/".$CurrTheme."/theme.php";
 
        // Remove current from array and set new
        $theme = PATH."theme/".$CurrTheme."/theme.php";