X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftheme_functions.php;h=5fbcfb2edd6f6ef4d396a519eedb2ebbf284ed98;hb=023d240bd9154811e5ebca23892ed06fefc72c08;hp=64dbda3d65b4058763a5f26b5be92403f0e144e2;hpb=205769111aba361c7aa76a6b9791bffed1372241;p=mailer.git

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 64dbda3d65..5fbcfb2edd 100644
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -1,10 +1,10 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 12/03/2004 *
- * ===============                              Last change: 12/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 12/03/2004 *
+ * ===================                          Last change: 12/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
- * File              : theme-manager.php                                *
+ * File              : theme manager.php                                *
  * -------------------------------------------------------------------- *
  * Short description : Theme manager                                    *
  * -------------------------------------------------------------------- *
@@ -14,11 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -39,20 +38,17 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-}
+} // END - if
 
 // Create a selection box with installed and activated themes or all if admin
 function generateThemeSelectionBox () {
 	// Init variables and fill them if set
-	$what = '';
+	$what = getWhat();
 	$mod = getModule();
-	if (isWhatSet()) {
-		$what = getWhat();
-	} // END - if
 
 	// Construction URL
-	$formAction = "{?URL?}/modules.php?module=" . $mod;
-	if (!empty($what)) $formAction .= "&amp;what=" . $what;
+	$formAction = 'modules.php?module='. $mod;
+	if (!empty($what)) $formAction .= '&amp;what=' . $what;
 
 	// Initialize array
 	$themesArray = array(
@@ -63,23 +59,33 @@ function generateThemeSelectionBox () {
 	// Only activated themes for the user
 	$add = " WHERE `theme_active`='Y'";
 
-	// Do we have admin?
-	if (isAdmin()) $add = '';
+	// Is there admin?
+	if (isAdmin()) {
+		// Then display all themes
+		$add = '';
+	} // END - if
 
 	// Select all themes we want
-	$result = SQL_QUERY("SELECT `theme_path`, `theme_name` FROM `{?_MYSQL_PREFIX?}_themes`".$add." ORDER BY `theme_name` ASC", __FILE__, __LINE__);
+	$result = SQL_QUERY('SELECT
+	`theme_path`,
+	`theme_name`
+FROM
+	`{?_MYSQL_PREFIX?}_themes`
+' . $add . '
+ORDER BY
+	`theme_name` ASC', __FUNCTION__, __LINE__);
 
 	// Load all themes
-	while ($content = SQL_FETCHARRAY($result)) {
+	while ($row = SQL_FETCHARRAY($result)) {
 		// Construct relative include file name
-		$inc = sprintf("theme/%s/theme.php", SQL_ESCAPE($content['theme_path']));
+		$inc = sprintf("theme/%s/theme.php", secureString($row['theme_path']));
 
 		// Load it's theme.php file if found
 		if (isIncludeReadable($inc)) {
 			// And save all data in array
 			loadInclude($inc);
-			$themesArray['theme_unix'][] = $content['theme_path'];
-			$themesArray['theme_name'][] = $GLOBALS['theme_data']['name'];
+			array_push($themesArray['theme_unix'], $row['theme_path']);
+			array_push($themesArray['theme_name'], $row['theme_name']);
 		} // END - if
 	} // END - while
 
@@ -87,11 +93,12 @@ function generateThemeSelectionBox () {
 	SQL_FREERESULT($result);
 
 	// Construct selection form for the box template
+	// @TODO Can't this be rewritten to an API function?
 	$OUT = '';
 	foreach ($themesArray['theme_unix'] as $key => $theme) {
-		$OUT .= "  <option value=\"".$theme."\"";
+		$OUT .= '  <option value="' . $theme . '"';
 		if ($theme == getCurrentTheme()) $OUT .= ' selected="selected"';
-		$OUT .= ">".$themesArray['theme_name'][$key]."</option>\n";
+		$OUT .= '>' . $themesArray['theme_name'][$key] . '</option>';
 	} // END - foreach
 
 	// Remember content
@@ -100,8 +107,11 @@ function generateThemeSelectionBox () {
 		'selection'   => $OUT
 	);
 
+	// Load template
+	$out = loadTemplate('theme_select_form', TRUE, $content);
+
 	// Return generated selection
-	return loadTemplate('theme_select_form', true, $content);
+	return $out;
 }
 
 // Get version from name
@@ -116,13 +126,13 @@ function getThemeVersion ($name) {
 	$cver = '?.?';
 
 	// Is the cache entry there?
-	if (isset($GLOBALS['cache_array']['themes']['theme_ver'][$name])) {
+	if (isset($GLOBALS['cache_array']['themes']['theme_version'][$name])) {
 		// Get the version from cache
-		$cver = $GLOBALS['cache_array']['themes']['theme_ver'][$name];
+		$cver = $GLOBALS['cache_array']['themes']['theme_version'][$name];
 
 		// Count up
 		incrementStatsEntry('cache_hits');
-	} elseif (getExtensionVersion('cache') != '0.1.8') {
+	} elseif (isExtensionInstalledAndNewer('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), __FUNCTION__, __LINE__);
@@ -141,10 +151,10 @@ function getThemeVersion ($name) {
 	return $cver;
 }
 
-// Checks wether a theme is found in db
+// Checks whether a theme is found in db
 function ifThemeExists ($name) {
 	// Get theme and is it not nul?
-	return (getThemeId($name) > 0);
+	return (((isExtensionActive('theme')) || (getModule() == 'admin')) && (getThemeId($name) > 0));
 }
 
 // Checks if a theme is active
@@ -152,11 +162,11 @@ function isThemeActive ($name) {
 	// Is the extension 'theme' installed?
 	if (!isExtensionActive('theme')) {
 		// Then abort here
-		return false;
+		return FALSE;
 	} // END - if
 
 	// Default is nothing active
-	$active = false;
+	$active = FALSE;
 
 	// Is the cache entry there?
 	if (isset($GLOBALS['cache_array']['themes']['theme_active'][$name])) {
@@ -165,7 +175,7 @@ function isThemeActive ($name) {
 
 		// Count up
 		incrementStatsEntry('cache_hits');
-	} elseif (getExtensionVersion('cache') != '0.1.8') {
+	} elseif (isExtensionInstalledAndNewer('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), __FUNCTION__, __LINE__);
@@ -199,7 +209,7 @@ function getCurrentThemeName () {
 
 		// Count up
 		incrementStatsEntry('cache_hits');
-	} elseif (getExtensionVersion('cache') != '0.1.8') {
+	} elseif (isExtensionInstalledAndNewer('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), __FUNCTION__, __LINE__);
@@ -215,21 +225,83 @@ function getCurrentThemeName () {
 	return $name;
 }
 
-// @TODO Move this code block into a filter and register it with 'init'
-// Check if new theme is selcted
-if ((isPostRequestElementSet('new_theme')) && (postRequestElement('new_theme') != getCurrentTheme())) {
-	// Set new theme for guests
-	$newTheme = postRequestElement('new_theme');
+// Get current theme name
+function getActualTheme () {
+	// The default theme is 'default'... ;-)
+	$ret = 'default';
 
-	// Change to new theme
-	setTheme($newTheme);
+	// Load default theme if not empty from configuration
+	if ((isConfigEntrySet('default_theme')) && (getConfig('default_theme') != '')) {
+		$ret = getConfig('default_theme');
+	} // END - if
 
-	// Remove current from array
-	removeIncludeFromPool('theme', sprintf("theme/%s/theme.php", getCurrentTheme()));
+	if (!isMailerThemeSet()) {
+		// Set default theme
+		setMailerTheme($ret);
+	} elseif ((isMailerThemeSet()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {
+		//die("<pre>".print_r($GLOBALS['cache_array']['themes'], TRUE)."</pre>");
+		// Get theme from cookie
+		$ret = getSession('mailer_theme');
+
+		// Is it valid?
+		if ((!isExtensionActive('theme')) || (getThemeId($ret) == '0')) {
+			// Fix it to default
+			$ret = 'default';
+		} // END - if
+	} elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequestElementSet('theme')) || (isPostRequestElementSet('theme')))) {
+		// Prepare filename for checking
+		$themeFile = sprintf("theme/%s/theme.php", getRequestElement('theme'));
+
+		// Installation mode active
+		if ((isGetRequestElementSet('theme')) && (isIncludeReadable($theme))) {
+			// Set cookie from URL data
+			setMailerTheme(getRequestElement('theme'));
+		} elseif (isIncludeReadable(sprintf("theme/%s/theme.php", postRequestElement('theme')))) {
+			// Set cookie from posted data
+			setMailerTheme(postRequestElement('theme'));
+		}
+
+		// Set return value
+		$ret = getSession('mailer_theme');
+	} else {
+		// Invalid design, reset cookie
+		setMailerTheme($ret);
+	}
 
-	// Add new theme
-	addIncludeToPool('theme', sprintf("theme/%s/theme.php", $newTheme));
-} // END - if
+	// Return theme value
+	return $ret;
+}
+
+// Get id from theme
+function getThemeId ($name) {
+	// Default id
+	$id = '0';
+
+	// Is the cache entry there?
+	if (isset($GLOBALS['cache_array']['themes']['id'][$name])) {
+		// Get the version from cache
+		$id = $GLOBALS['cache_array']['themes']['id'][$name];
+
+		// Count up
+		incrementStatsEntry('cache_hits');
+	} elseif (isExtensionInstalledAndNewer('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), __FUNCTION__, __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;
+}
 
 // [EOF]
 ?>