X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ftheme-manager.php;h=2ba2d28b774bd4dc01662d21847721661fb3fa47;hb=9709e0653e1a90fd65e6308b97a6fabb586a32a1;hp=f463d232337774b46a661166e748d46e9e9eae86;hpb=0e899620c7a065952d6787c236fb2b33ae337d6a;p=mailer.git
diff --git a/inc/theme-manager.php b/inc/theme-manager.php
index f463d23233..2ba2d28b77 100644
--- a/inc/theme-manager.php
+++ b/inc/theme-manager.php
@@ -32,15 +32,17 @@
************************************************************************/
// Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
require($INC);
}
-//
+// Always make sure the session management is initialized first
+require_once(PATH."inc/session.php");
+
+// Get current theme name
function GET_CURR_THEME() {
- global $INC_POOL, $_CONFIG, $CSS;
+ global $INC_POOL, $_CONFIG, $CSS, $cacheArray;
// The default theme is 'default'... ;-)
$ret = "default";
@@ -50,51 +52,49 @@ function GET_CURR_THEME() {
if (!isSessionVariableSet('mxchange_theme')) {
// Set default theme
- set_session("mxchange_theme", $ret, (time() + 60*60*24*365), COOKIE_PATH);
+ set_session("mxchange_theme", $ret);
} elseif ((isSessionVariableSet('mxchange_theme')) && (GET_EXT_VERSION("sql_patches") >= "0.1.4")) {
+ //die("
".print_r($cacheArray['themes'], true)."
");
// Get theme from cookie
- $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 = get_session('mxchange_theme');
- }
+ $ret = get_session('mxchange_theme');
- // Free memory
- SQL_FREERESULT($result);
+ // Is it valid?
+ if (THEME_GET_ID($ret) == 0) {
+ // Fix it to default
+ $ret = "default";
+ } // END - if
} 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']);
+ $theme = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($_GET['theme']));
// Installation mode active
- if ((!empty($_GET['theme'])) && (file_exists($theme)) && (is_readable($theme))) {
+ if ((!empty($_GET['theme'])) && (FILE_READABLE($theme))) {
// Set cookie from URL data
- set_session("mxchange_theme", $_GET['theme'], (time() + 60*60*24*365), COOKIE_PATH);
- } elseif (file_exists(PATH."theme/".$_POST['theme']."/theme.php")) {
+ set_session("mxchange_theme", $_GET['theme']);
+ } elseif (FILE_READABLE(sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($_POST['theme'])))) {
// Set cookie from posted data
- set_session("mxchange_theme", $_POST['theme'], (time() + 60*60*24*365), COOKIE_PATH);
+ set_session("mxchange_theme", $_POST['theme']);
}
// Set return value
$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
$theme = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($ret));
// Try to load the requested include file
- if ((@file_exists($theme)) && (is_readable($theme))) $INC_POOL[] = $theme;
+ if (FILE_READABLE($theme)) $INC_POOL[] = $theme;
// Return theme value
return $ret;
}
-function THEME_SELECTION_BOX($mod, $act, $wht, $result)
-{
+function THEME_SELECTION_BOX($mod, $act, $wht, $result) {
// Construction URL
- global $CurrTheme;
$FORM = URL."/modules.php?module=".$mod;
if (!empty($act)) $FORM .= "&action=".$act;
if (!empty($wht)) $FORM .= "&what=".$wht;
@@ -107,30 +107,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_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 .= "