X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ftheme-manager.php;h=5a3f843988c85669372c6ec052b5f12a8c1d195f;hb=672960ce174197d184887e6bd280f9174cf76050;hp=81e2fadfbc9a7dfdbd23ae7c4361de23cd47baa9;hpb=b5912168d72ae511eb623c3d92540c82d31b93c5;p=mailer.git diff --git a/inc/theme-manager.php b/inc/theme-manager.php index 81e2fadfbc..5a3f843988 100644 --- a/inc/theme-manager.php +++ b/inc/theme-manager.php @@ -38,6 +38,9 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) require($INC); } +// Always make sure the session management is initialized first +require_once(PATH."inc/session.php"); + // function GET_CURR_THEME() { global $INC_POOL, $_CONFIG, $CSS; @@ -48,39 +51,37 @@ function GET_CURR_THEME() { // Load default theme if not empty from configuration if (!empty($_CONFIG['default_theme'])) $ret = $_CONFIG['default_theme']; - if (empty($_SESSION['mxchange_theme'])) { + if (!isSessionVariableSet('mxchange_theme')) { // Set default theme - 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")) { + set_session("mxchange_theme", $ret); + } elseif ((isSessionVariableSet('mxchange_theme')) && (GET_EXT_VERSION("sql_patches") >= "0.1.4")) { // Get theme from cookie - $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_themes WHERE theme_path='%s' LIMIT 1", array($_SESSION['mxchange_theme']), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_themes WHERE theme_path='%s' LIMIT 1", array(get_session('mxchange_theme')), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Design is valid! - $ret = $_SESSION['mxchange_theme']; + $ret = get_session('mxchange_theme'); } // 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 - set_session("mxchange_theme", $_GET['theme'], (time() + 60*60*24*365), COOKIE_PATH); - $_SESSION['mxchange_theme'] = $_GET['theme']; + set_session("mxchange_theme", $_GET['theme']); } elseif (file_exists(PATH."theme/".$_POST['theme']."/theme.php")) { // Set cookie from posted data - set_session("mxchange_theme", $_POST['theme'], (time() + 60*60*24*365), COOKIE_PATH); - $_SESSION['mxchange_theme'] = $_POST['theme']; + set_session("mxchange_theme", $_POST['theme']); } // Set return value - $ret = $_SESSION['mxchange_theme']; + $ret = get_session('mxchange_theme'); } else { // Invalid design, reset cookie - set_session("mxchange_theme", $ret, (time() + 60*60*24*365), COOKIE_PATH); + set_session("mxchange_theme", $ret); } // Add (maybe) found theme.php file to inclusion list @@ -93,10 +94,9 @@ function GET_CURR_THEME() { return $ret; } -function THEME_SELECTION_BOX($mod, $act, $wht, $result) -{ +function THEME_SELECTION_BOX($mod, $act, $wht, $result) { // Construction URL - global $CurrTheme; + global $currTheme; $FORM = URL."/modules.php?module=".$mod; if (!empty($act)) $FORM .= "&action=".$act; if (!empty($wht)) $FORM .= "&what=".$wht; @@ -109,30 +109,27 @@ function THEME_SELECTION_BOX($mod, $act, $wht, $result) ); // Load all themes - while(list($theme) = SQL_FETCHROW($result)) - { + while(list($theme) = SQL_FETCHROW($result)) { // Load it's theme.php file - $INC = PATH."theme/".$theme."/theme.php"; - if (file_exists($INC)) - { + $INC = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($theme)); + if ((file_exists($INC)) && (is_readable($INC))) { // And save all data in array - include($INC); + require($INC); $THEMES['theme_unix'][] = $theme; $THEMES['theme_name'][] = $THEME_NAME; - } - } + } // END - if + } // END - while // Sort whole array by title array_pk_sort($THEMES, array("theme_name")); // Construct selection form for the box template $OUT = ""; - foreach ($THEMES['theme_unix'] as $key=>$theme) - { + foreach ($THEMES['theme_unix'] as $key => $theme) { $OUT .= "