X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ftheme-manager.php;h=44b82d17ddaae68eac654c5f3efdb598ce073d55;hb=497d9d8fcda61391c149af3747118bb2772c7c26;hp=0ee37962e4c86e77643b4776632f04970bf243ed;hpb=4ef4c88fc481335dc0631b223111c15a84cccb51;p=mailer.git
diff --git a/inc/theme-manager.php b/inc/theme-manager.php
index 0ee37962e4..44b82d17dd 100644
--- a/inc/theme-manager.php
+++ b/inc/theme-manager.php
@@ -32,8 +32,7 @@
************************************************************************/
// 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);
}
@@ -43,7 +42,7 @@ 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";
@@ -55,24 +54,24 @@ function GET_CURR_THEME() {
// Set default theme
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_READABLE($theme))) {
// Set cookie from URL data
set_session("mxchange_theme", $_GET['theme']);
- } elseif (FILE_READABLE(PATH."theme/".$_POST['theme']."/theme.php")) {
+ } elseif (FILE_READABLE(sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($_POST['theme'])))) {
// Set cookie from posted data
set_session("mxchange_theme", $_POST['theme']);
}
@@ -96,7 +95,6 @@ function GET_CURR_THEME() {
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;
@@ -127,7 +125,7 @@ function THEME_SELECTION_BOX($mod, $act, $wht, $result) {
$OUT = "";
foreach ($THEMES['theme_unix'] as $key => $theme) {
$OUT .= "