X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ftheme-manager.php;h=44b82d17ddaae68eac654c5f3efdb598ce073d55;hp=d03bbfa7c265e422b21482cb431be4ecf17f9b60;hb=64ac34f8ebcfef05d9b273dd2be693717483ba16;hpb=c45b1827a16928c65ecc1aea6a9d7a504c4874d4

diff --git a/inc/theme-manager.php b/inc/theme-manager.php
index d03bbfa7c2..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("<pre>".print_r($cacheArray['themes'], true)."</pre>");
 		// 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']);
-		} elseif (file_exists(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']);
 		}
@@ -88,7 +87,7 @@ function GET_CURR_THEME() {
 	$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;
@@ -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 .= "&amp;action=".$act;
 	if (!empty($wht))   $FORM .= "&amp;what=".$wht;
@@ -112,7 +110,7 @@ function THEME_SELECTION_BOX($mod, $act, $wht, $result) {
 	while(list($theme) = SQL_FETCHROW($result)) {
 		// Load it's theme.php file
 		$INC = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($theme));
-		if ((file_exists($INC)) && (is_readable($INC))) {
+		if (FILE_READABLE($INC)) {
 			// And save all data in array
 			require($INC);
 			$THEMES['theme_unix'][] = $theme;
@@ -127,7 +125,7 @@ function THEME_SELECTION_BOX($mod, $act, $wht, $result) {
 	$OUT = "";
 	foreach ($THEMES['theme_unix'] as $key => $theme) {
 		$OUT .= "  <OPTION value=\"".$theme."\"";
-		if ($theme == $currTheme) $OUT .= " selected=\"selected\"";
+		if ($theme == GET_CURR_THEME()) $OUT .= " selected=\"selected\"";
 		$OUT .= ">".$THEMES['theme_name'][$key]."</OPTION>\n";
 	} // END - foreach
 
@@ -137,26 +135,154 @@ function THEME_SELECTION_BOX($mod, $act, $wht, $result) {
 	return $OUT;
 }
 
+// Get version from name
+function THEME_GET_VERSION ($name) {
+	global $cacheArray, $_CONFIG;
+
+	// Default version "number"
+	$cver = "-.-";
+
+	// Is the cache entry there?
+	if (isset($cacheArray['themes']['theme_ver'][$name])) {
+		// Get the version from cache
+		$cver = $cacheArray['themes']['theme_ver'][$name];
+
+		// Count up
+		if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+	} 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__);
+
+		// Entry found?
+		if (SQL_NUMROWS($result) == 1) {
+			// Fetch data
+			list($cver) = SQL_FETCHROW($result);
+		} // END - if
+
+		// Free result
+		SQL_FREERESULT($result);
+	}
+
+	// Return version
+	return $cver;
+}
+
+// Get id from theme
+function THEME_GET_ID ($name) {
+	global $cacheArray, $_CONFIG;
+
+	// 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?
+	return (THEME_GET_ID($name) > 0);
+}
+
+// Checks if a theme is active
+function THEME_IS_ACTIVE ($name) {
+	global $cacheArray, $_CONFIG;
+
+	// Default is nothing active
+	$active = false;
+
+	// Is the cache entry there?
+	if (isset($cacheArray['themes']['theme_active'][$name])) {
+		// Get the version from cache
+		$active = ($cacheArray['themes']['theme_active'][$name] == "Y");
+
+		// 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 theme_active FROM "._MYSQL_PREFIX."_themes WHERE theme_path='%s' AND theme_active='Y' LIMIT 1",
+			array($name), __FILE__, __LINE__);
+
+		// Is the theme active and installed?
+		$active = (SQL_NUMROWS($result) == 1);
+
+		// Free result
+		SQL_FREERESULT($result);
+	}
+
+	// Return result
+	return $active;
+}
+
+// Gets current human-readable theme name
+function GET_CURR_THEME_NAME () {
+	global $cacheArray, $_CONFIG;
+
+	// Get the Uni* name
+	$name = GET_CURR_THEME();
+
+	// Is the cache entry there?
+	if (isset($cacheArray['themes']['theme_name'][$name])) {
+		// Get the version from cache
+		$name = $cacheArray['themes']['theme_name'][$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 theme_name FROM "._MYSQL_PREFIX."_themes WHERE theme_path='%s' AND theme_active='Y' LIMIT 1",
+			array($name), __FILE__, __LINE__);
+
+		// Is the theme active and installed?
+		$name = (SQL_NUMROWS($result) == 1);
+
+		// Free result
+		SQL_FREERESULT($result);
+	}
+
+	// Return name
+	return $name;
+}
+
 // Initialize variables
 $currTheme = GET_CURR_THEME();
-if (empty($_POST['new_theme'])) $_POST['new_theme'] = "";
 
 // Check if new theme is selcted
 if ((!empty($_POST['new_theme'])) && ($_POST['new_theme'] != $currTheme)) {
 	// Set new theme for guests
-	$NewTheme = $_POST['new_theme'];
+	$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);
 	unset($INC_POOL[array_search($theme, $INC_POOL)]);
-	$INC_POOL[] = sprintf("%stheme/%s/theme.php", PATH, $NewTheme);
+	$INC_POOL[] = sprintf("%stheme/%s/theme.php", PATH, $newTheme);
 } // END - if
 
-// Remove variable again
-unset($_POST['new_theme']);
-
 //
 ?>