X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftheme_functions.php;h=e97d76721ca2f9bea56e84ff8791296f7cd38a78;hb=b7aada7890a3c7d1c1da4d2b36d8d7683fa61c06;hp=ebdaf6ee52ae855eb4059d4986015a9986250c49;hpb=deb4293fa309b70be72d66b394e7253c8ea7d351;p=mailer.git

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index ebdaf6ee52..e97d76721c 100644
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -81,8 +81,6 @@ function THEME_SELECTION_BOX($mod, $act, $wht, $result) {
 
 // Get version from name
 function THEME_GET_VERSION ($name) {
-	global $cacheArray;
-
 	// Is the extension "theme" installed?
 	if (!EXT_IS_ACTIVE("theme")) {
 		// Then abort here
@@ -93,16 +91,16 @@ function THEME_GET_VERSION ($name) {
 	$cver = "?.?";
 
 	// Is the cache entry there?
-	if (isset($cacheArray['themes']['theme_ver'][$name])) {
+	if (isset($GLOBALS['cache_array']['themes']['theme_ver'][$name])) {
 		// Get the version from cache
-		$cver = $cacheArray['themes']['theme_ver'][$name];
+		$cver = $GLOBALS['cache_array']['themes']['theme_ver'][$name];
 
 		// Count up
 		incrementConfigEntry('cache_hits');
 	} elseif (GET_EXT_VERSION("cache") != "0.1.8") {
 		// Load version from database
 		$result = SQL_QUERY_ESC("SELECT theme_ver FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' LIMIT 1",
-			array($name), __FILE__, __LINE__);
+			array($name), __FUNCTION__, __LINE__);
 
 		// Entry found?
 		if (SQL_NUMROWS($result) == 1) {
@@ -126,8 +124,6 @@ function THEME_CHECK_EXIST ($name) {
 
 // Checks if a theme is active
 function THEME_IS_ACTIVE ($name) {
-	global $cacheArray;
-
 	// Is the extension "theme" installed?
 	if (!EXT_IS_ACTIVE("theme")) {
 		// Then abort here
@@ -138,16 +134,16 @@ function THEME_IS_ACTIVE ($name) {
 	$active = false;
 
 	// Is the cache entry there?
-	if (isset($cacheArray['themes']['theme_active'][$name])) {
+	if (isset($GLOBALS['cache_array']['themes']['theme_active'][$name])) {
 		// Get the version from cache
-		$active = ($cacheArray['themes']['theme_active'][$name] == "Y");
+		$active = ($GLOBALS['cache_array']['themes']['theme_active'][$name] == "Y");
 
 		// Count up
 		incrementConfigEntry('cache_hits');
 	} elseif (GET_EXT_VERSION("cache") != "0.1.8") {
 		// Check if current theme is already imported or not
 		$result = SQL_QUERY_ESC("SELECT theme_active FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' AND theme_active='Y' LIMIT 1",
-			array($name), __FILE__, __LINE__);
+			array($name), __FUNCTION__, __LINE__);
 
 		// Is the theme active and installed?
 		$active = (SQL_NUMROWS($result) == 1);
@@ -162,8 +158,6 @@ function THEME_IS_ACTIVE ($name) {
 
 // Gets current human-readable theme name
 function GET_CURR_THEME_NAME () {
-	global $cacheArray;
-
 	// Is the extension "theme" installed?
 	if (!EXT_IS_ACTIVE("theme")) {
 		// Then abort here
@@ -174,16 +168,16 @@ function GET_CURR_THEME_NAME () {
 	$name = GET_CURR_THEME();
 
 	// Is the cache entry there?
-	if (isset($cacheArray['themes']['theme_name'][$name])) {
+	if (isset($GLOBALS['cache_array']['themes']['theme_name'][$name])) {
 		// Get the version from cache
-		$name = $cacheArray['themes']['theme_name'][$name];
+		$name = $GLOBALS['cache_array']['themes']['theme_name'][$name];
 
 		// Count up
 		incrementConfigEntry('cache_hits');
 	} elseif (GET_EXT_VERSION("cache") != "0.1.8") {
 		// Check if current theme is already imported or not
 		$result = SQL_QUERY_ESC("SELECT theme_name FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' AND theme_active='Y' LIMIT 1",
-			array($name), __FILE__, __LINE__);
+			array($name), __FUNCTION__, __LINE__);
 
 		// Load theme name
 		list($name) = SQL_FETCHROW($result);
@@ -197,18 +191,18 @@ function GET_CURR_THEME_NAME () {
 }
 
 // Initialize variables
-$currTheme = GET_CURR_THEME();
+$GLOBALS['curr_theme'] = GET_CURR_THEME();
 
 // Check if new theme is selcted
-if ((!empty($_POST['new_theme'])) && ($_POST['new_theme'] != $currTheme)) {
+if ((REQUEST_ISSET_POST(('new_theme'))) && (REQUEST_POST('new_theme') != $GLOBALS['curr_theme'])) {
 	// Set new theme for guests
-	$newTheme = $_POST['new_theme'];
+	$newTheme = REQUEST_POST('new_theme');
 
 	// Change to new theme
 	set_session('mxchange_theme', $newTheme);
 
 	// Remove current from array and set new
-	$theme = sprintf("%stheme/%s/theme.php", constant('PATH'), $currTheme);
+	$theme = sprintf("%stheme/%s/theme.php", constant('PATH'), $GLOBALS['curr_theme']);
 	unset($INC_POOL[array_search($theme, $INC_POOL)]);
 	$INC_POOL[] = sprintf("%stheme/%s/theme.php", constant('PATH'), $newTheme);
 } // END - if