X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftheme_functions.php;h=58d1fec2c24e0f9c9180e0dcf84dd6abeced686a;hb=330dbb3e2b34450cd1665497506455e195a0a166;hp=c733441a6afdd10f7f09f190da1f632f3c878645;hpb=e45e218c4f629ec63f0788cab231bfc88b3fa46e;p=mailer.git

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index c733441a6a..58d1fec2c2 100644
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -14,11 +14,9 @@
  * $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                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -66,13 +64,13 @@ function generateThemeSelectionBox () {
 	if (isAdmin()) $add = '';
 
 	// Select all themes we want
-	$result = SQL_QUERY("SELECT
+	$result = SQL_QUERY('SELECT
 	`theme_path`, `theme_name`
 FROM
 	`{?_MYSQL_PREFIX?}_themes`
-".$add."
+' . $add . '
 ORDER BY
-	`theme_name` ASC", __FILE__, __LINE__);
+	`theme_name` ASC', __FUNCTION__, __LINE__);
 
 	// Load all themes
 	while ($content = SQL_FETCHARRAY($result)) {
@@ -92,11 +90,12 @@ ORDER BY
 	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
@@ -121,9 +120,9 @@ 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');
@@ -228,20 +227,20 @@ function getActualTheme () {
 	// Load default theme if not empty from configuration
 	if ((isConfigEntrySet('default_theme')) && (getConfig('default_theme') != '')) $ret = getConfig('default_theme');
 
-	if (!isSessionVariableSet('mxchange_theme')) {
+	if (!isSessionVariableSet('mailer_theme')) {
 		// Set default theme
 		setTheme($ret);
-	} elseif ((isSessionVariableSet('mxchange_theme')) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {
+	} elseif ((isSessionVariableSet('mailer_theme')) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {
 		//die("<pre>".print_r($GLOBALS['cache_array']['themes'], true)."</pre>");
 		// Get theme from cookie
-		$ret = getSession('mxchange_theme');
+		$ret = getSession('mailer_theme');
 
 		// Is it valid?
 		if ((!isExtensionActive('theme')) || (getThemeId($ret) == '0')) {
 			// Fix it to default
 			$ret = 'default';
 		} // END - if
-	} elseif ((!isInstalled()) && ((isInstalling()) || (getOutputMode() == true)) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
+	} elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
 		// Prepare filename for checking
 		$themeFile = sprintf("theme/%s/theme.php", getRequestParameter('theme'));
 
@@ -249,13 +248,13 @@ function getActualTheme () {
 		if ((isGetRequestParameterSet('theme')) && (isIncludeReadable($theme))) {
 			// Set cookie from URL data
 			setTheme(getRequestParameter('theme'));
-		} elseif (isIncludeReadable(sprintf("theme/%s/theme.php", secureString(postRequestParameter('theme'))))) {
+		} elseif (isIncludeReadable(sprintf("theme/%s/theme.php", postRequestParameter('theme')))) {
 			// Set cookie from posted data
-			setTheme(secureString(postRequestParameter('theme')));
+			setTheme(postRequestParameter('theme'));
 		}
 
 		// Set return value
-		$ret = getSession('mxchange_theme');
+		$ret = getSession('mailer_theme');
 	} else {
 		// Invalid design, reset cookie
 		setTheme($ret);
@@ -265,9 +264,12 @@ function getActualTheme () {
 	return $ret;
 }
 
-// Setter for theme in session
+/**
+ * Setter for theme in session (This setter does return the success of
+ * setSession() which is required e.g. for destroySponsorSession().
+ */
 function setTheme ($newTheme) {
-	setSession('mxchange_theme', $newTheme);
+	return setSession('mailer_theme', $newTheme);
 }
 
 // Get id from theme
@@ -301,42 +303,5 @@ function getThemeId ($name) {
 	return $id;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-//                              Only filter functions
-///////////////////////////////////////////////////////////////////////////////
-
-// Filter for generic handling of theme change
-function FILTER_HANDLE_THEME_CHANGE () {
-	// Check if new theme is selcted
-	if ((isPostRequestParameterSet('new_theme')) && (postRequestParameter('new_theme') != getCurrentTheme())) {
-		// Set new theme for guests
-		$newTheme = postRequestParameter('new_theme');
-
-		// Change to new theme
-		setTheme($newTheme);
-
-		// Remove current from array
-		removeIncludeFromPool('theme', sprintf("theme/%s/theme.php", getCurrentTheme()));
-
-		// Add new theme
-		addIncludeToPool('theme', sprintf("theme/%s/theme.php", $newTheme));
-
-		// Redirect to same URL
-		redirectToRequestUri();
-	} // END - if
-}
-
-// Filter for settings theme from user profile, must be executed only if FILTER_FETCH_USER_DATA() ran before
-function FILTER_SET_USERS_THEME () {
-	// Is the user data valid?
-	if (!isMember()) {
-		// Do only run for logged in members
-		debug_report_bug('Please only run this filter for logged in users.');
-	} // END - if
-
-	// Change to new theme
-	setTheme(getUserData('curr_theme'));
-}
-
 // [EOF]
 ?>