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

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index a044e8a06c..5fbcfb2edd 100644
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -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(
@@ -61,7 +60,10 @@ function generateThemeSelectionBox () {
 	$add = " WHERE `theme_active`='Y'";
 
 	// Is there admin?
-	if (isAdmin()) $add = '';
+	if (isAdmin()) {
+		// Then display all themes
+		$add = '';
+	} // END - if
 
 	// Select all themes we want
 	$result = SQL_QUERY('SELECT
@@ -74,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);
-			array_push($themesArray['theme_unix'], $content['theme_path']);
-			array_push($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
 
@@ -105,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
@@ -149,7 +154,7 @@ function getThemeVersion ($name) {
 // 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
@@ -157,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])) {
@@ -234,7 +239,7 @@ function getActualTheme () {
 		// Set default theme
 		setMailerTheme($ret);
 	} elseif ((isMailerThemeSet()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {
-		//die("<pre>".print_r($GLOBALS['cache_array']['themes'], true)."</pre>");
+		//die("<pre>".print_r($GLOBALS['cache_array']['themes'], TRUE)."</pre>");
 		// Get theme from cookie
 		$ret = getSession('mailer_theme');