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

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 3fc35343e4..5fbcfb2edd 100644
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * 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 *
@@ -47,9 +47,8 @@ function generateThemeSelectionBox () {
 	$mod = getModule();
 
 	// Construction URL
-	$formAction = '{%url=modules.php?module='. $mod;
+	$formAction = 'modules.php?module='. $mod;
 	if (!empty($what)) $formAction .= '&what=' . $what;
-	$formAction .= '%}';
 
 	// Initialize array
 	$themesArray = array(
@@ -60,12 +59,16 @@ 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`
+	`theme_path`,
+	`theme_name`
 FROM
 	`{?_MYSQL_PREFIX?}_themes`
 ' . $add . '
@@ -73,16 +76,16 @@ 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", secureString($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
 
@@ -104,8 +107,11 @@ ORDER BY
 		'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
@@ -145,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 ((isExtensionActive('theme')) && (getThemeId($name) > 0));
+	return (((isExtensionActive('theme')) || (getModule() == 'admin')) && (getThemeId($name) > 0));
 }
 
 // Checks if a theme is active
@@ -156,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])) {
@@ -225,13 +231,15 @@ function getActualTheme () {
 	$ret = 'default';
 
 	// Load default theme if not empty from configuration
-	if ((isConfigEntrySet('default_theme')) && (getConfig('default_theme') != '')) $ret = getConfig('default_theme');
+	if ((isConfigEntrySet('default_theme')) && (getConfig('default_theme') != '')) {
+		$ret = getConfig('default_theme');
+	} // END - if
 
-	if (!isSessionVariableSet('mailer_theme')) {
+	if (!isMailerThemeSet()) {
 		// Set default theme
-		setTheme($ret);
-	} elseif ((isSessionVariableSet('mailer_theme')) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {
-		//die("<pre>".print_r($GLOBALS['cache_array']['themes'], true)."</pre>");
+		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');
 
@@ -240,38 +248,30 @@ function getActualTheme () {
 			// Fix it to default
 			$ret = 'default';
 		} // END - if
-	} elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
+	} elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequestElementSet('theme')) || (isPostRequestElementSet('theme')))) {
 		// Prepare filename for checking
-		$themeFile = sprintf("theme/%s/theme.php", getRequestParameter('theme'));
+		$themeFile = sprintf("theme/%s/theme.php", getRequestElement('theme'));
 
 		// Installation mode active
-		if ((isGetRequestParameterSet('theme')) && (isIncludeReadable($theme))) {
+		if ((isGetRequestElementSet('theme')) && (isIncludeReadable($theme))) {
 			// Set cookie from URL data
-			setTheme(getRequestParameter('theme'));
-		} elseif (isIncludeReadable(sprintf("theme/%s/theme.php", postRequestParameter('theme')))) {
+			setMailerTheme(getRequestElement('theme'));
+		} elseif (isIncludeReadable(sprintf("theme/%s/theme.php", postRequestElement('theme')))) {
 			// Set cookie from posted data
-			setTheme(postRequestParameter('theme'));
+			setMailerTheme(postRequestElement('theme'));
 		}
 
 		// Set return value
 		$ret = getSession('mailer_theme');
 	} else {
 		// Invalid design, reset cookie
-		setTheme($ret);
+		setMailerTheme($ret);
 	}
 
 	// Return theme value
 	return $ret;
 }
 
-/**
- * Setter for theme in session (This setter does return the success of
- * setSession() which is required e.g. for destroySponsorSession().
- */
-function setTheme ($newTheme) {
-	return setSession('mailer_theme', $newTheme);
-}
-
 // Get id from theme
 function getThemeId ($name) {
 	// Default id