X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Ftheme_functions.php;h=f7df80bbc03d47fea0c87a5a5bd3cf64417a6942;hp=6fbcd9890409a194c3cdb3d73a69e7a9decbfb84;hb=e71e9e1380d65ccd06beef6fbc594bec10371f5f;hpb=ad851a23313d8ac6489a759a0f3d62e3bc6f4682

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 6fbcd98904..f7df80bbc0 100644
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -37,62 +37,6 @@ if (!defined('__SECURITY')) {
 	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, $cacheArray;
-
-	// The default theme is 'default'... ;-)
-	$ret = "default";
-
-	// Load default theme if not empty from configuration
-	if (!empty($_CONFIG['default_theme'])) $ret = $_CONFIG['default_theme'];
-
-	if (!isSessionVariableSet('mxchange_theme')) {
-		// Set default theme
-		set_session("mxchange_theme", $ret);
-	} elseif ((isSessionVariableSet('mxchange_theme')) && (GET_EXT_VERSION("sql_patches") >= "0.1.4")) {
-		//die("<pre>".print_r($cacheArray['themes'], true)."</pre>");
-		// Get theme from cookie
-		$ret = get_session('mxchange_theme');
-
-		// 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, 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(sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($_POST['theme'])))) {
-			// Set cookie from posted data
-			set_session("mxchange_theme", $_POST['theme']);
-		}
-
-		// Set return value
-		$ret = get_session('mxchange_theme');
-	} else {
-		// Invalid design, reset cookie
-		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_READABLE($theme)) $INC_POOL[] = $theme;
-
-	// Return theme value
-	return $ret;
-}
-
 function THEME_SELECTION_BOX($mod, $act, $wht, $result) {
 	// Construction URL
 	$FORM = URL."/modules.php?module=".$mod;
@@ -137,16 +81,16 @@ function THEME_SELECTION_BOX($mod, $act, $wht, $result) {
 
 // Get version from name
 function THEME_GET_VERSION ($name) {
-	global $cacheArray, $_CONFIG;
+	global $cacheArray;
 
 	// Is the extension "theme" installed?
 	if (!EXT_IS_ACTIVE("theme")) {
 		// Then abort here
-		return "0.0";
+		return "!.!";
 	} // END - if
 
 	// Default version "number"
-	$cver = "-.-";
+	$cver = "?.?";
 
 	// Is the cache entry there?
 	if (isset($cacheArray['themes']['theme_ver'][$name])) {
@@ -154,7 +98,7 @@ function THEME_GET_VERSION ($name) {
 		$cver = $cacheArray['themes']['theme_ver'][$name];
 
 		// Count up
-		if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+		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",
@@ -174,45 +118,6 @@ function THEME_GET_VERSION ($name) {
 	return $cver;
 }
 
-// Get id from theme
-function THEME_GET_ID ($name) {
-	global $cacheArray, $_CONFIG;
-
-	// Is the extension "theme" installed?
-	if (!EXT_IS_ACTIVE("theme")) {
-		// Then abort here
-		return 0;
-	} // END - if
-
-	// Default id
-	$id = 0;
-
-	// Is the cache entry there?
-	if (isset($cacheArray['themes']['id'][$name])) {
-		// Get the version from cache
-		$id = $cacheArray['themes']['id'][$name];
-
-		// Count up
-		if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
-	} elseif (GET_EXT_VERSION("cache") != "0.1.8") {
-		// Check if current theme is already imported or not
-		$result = SQL_QUERY_ESC("SELECT id FROM `"._MYSQL_PREFIX."_themes` WHERE theme_path='%s' LIMIT 1",
-			array($name), __FILE__, __LINE__);
-
-		// Entry found?
-		if (SQL_NUMROWS($result) == 1) {
-			// Fetch data
-			list($id) = SQL_FETCHROW($result);
-		} // END - if
-
-		// Free result
-		SQL_FREERESULT($result);
-	}
-
-	// Return id
-	return $id;
-}
-
 // Checks wether a theme is found in db
 function THEME_CHECK_EXIST ($name) {
 	// Get theme and is it not nul?
@@ -221,7 +126,7 @@ function THEME_CHECK_EXIST ($name) {
 
 // Checks if a theme is active
 function THEME_IS_ACTIVE ($name) {
-	global $cacheArray, $_CONFIG;
+	global $cacheArray;
 
 	// Is the extension "theme" installed?
 	if (!EXT_IS_ACTIVE("theme")) {
@@ -238,7 +143,7 @@ function THEME_IS_ACTIVE ($name) {
 		$active = ($cacheArray['themes']['theme_active'][$name] == "Y");
 
 		// Count up
-		if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+		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",
@@ -257,7 +162,7 @@ function THEME_IS_ACTIVE ($name) {
 
 // Gets current human-readable theme name
 function GET_CURR_THEME_NAME () {
-	global $cacheArray, $_CONFIG;
+	global $cacheArray;
 
 	// Is the extension "theme" installed?
 	if (!EXT_IS_ACTIVE("theme")) {
@@ -274,7 +179,7 @@ function GET_CURR_THEME_NAME () {
 		$name = $cacheArray['themes']['theme_name'][$name];
 
 		// Count up
-		if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+		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",
@@ -300,7 +205,7 @@ if ((!empty($_POST['new_theme'])) && ($_POST['new_theme'] != $currTheme)) {
 	$newTheme = $_POST['new_theme'];
 
 	// Change to new theme
-	set_session("mxchange_theme", $newTheme);
+	set_session('mxchange_theme', $newTheme);
 
 	// Remove current from array and set new
 	$theme = sprintf("%stheme/%s/theme.php", PATH, $currTheme);