X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftheme_functions.php;h=1a8e05bba28b6aa0656cfaa46313db2c1d1c577d;hb=5cd400374d6d8401603e6bfe8c07fa3f3199b092;hp=2b82becd18b9b73726e549b96f075eb0b30f139a;hpb=8ec82aa8ce39be68e4087a26f9763b86fc124ed4;p=mailer.git

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 2b82becd18..1a8e05bba2 100644
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -14,12 +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                           *
- * Copyright (c) 2009, 2010 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 *
@@ -62,12 +60,13 @@ function generateThemeSelectionBox () {
 	// Only activated themes for the user
 	$add = " WHERE `theme_active`='Y'";
 
-	// Do we have admin?
+	// Is there admin?
 	if (isAdmin()) $add = '';
 
 	// Select all themes we want
 	$result = SQL_QUERY('SELECT
-	`theme_path`, `theme_name`
+	`theme_path`,
+	`theme_name`
 FROM
 	`{?_MYSQL_PREFIX?}_themes`
 ' . $add . '
@@ -83,8 +82,8 @@ ORDER BY
 		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'], $content['theme_path']);
+			array_push($themesArray['theme_name'], $GLOBALS['theme_data']['name']);
 		} // END - if
 	} // END - while
 
@@ -107,7 +106,7 @@ ORDER BY
 	);
 
 	// Return generated selection
-	return loadTemplate('theme_select_form', true, $content);
+	return loadTemplate('theme_select_form', TRUE, $content);
 }
 
 // Get version from name
@@ -147,7 +146,7 @@ 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));
@@ -158,11 +157,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])) {
@@ -227,50 +226,47 @@ 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('mxchange_theme')) {
+	if (!isMailerThemeSet()) {
 		// Set default theme
-		setTheme($ret);
-	} elseif ((isSessionVariableSet('mxchange_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('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()) || (getScriptOutputMode() == true)) && ((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", secureString(postRequestParameter('theme'))))) {
+			setMailerTheme(getRequestElement('theme'));
+		} elseif (isIncludeReadable(sprintf("theme/%s/theme.php", postRequestElement('theme')))) {
 			// Set cookie from posted data
-			setTheme(secureString(postRequestParameter('theme')));
+			setMailerTheme(postRequestElement('theme'));
 		}
 
 		// Set return value
-		$ret = getSession('mxchange_theme');
+		$ret = getSession('mailer_theme');
 	} else {
 		// Invalid design, reset cookie
-		setTheme($ret);
+		setMailerTheme($ret);
 	}
 
 	// Return theme value
 	return $ret;
 }
 
-// Setter for theme in session
-function setTheme ($newTheme) {
-	setSession('mxchange_theme', $newTheme);
-}
-
 // Get id from theme
 function getThemeId ($name) {
 	// Default id
@@ -302,42 +298,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(__FUNCTION__, __LINE__, 'Please only run this filter for logged in users.');
-	} // END - if
-
-	// Change to new theme
-	setTheme(getUserData('curr_theme'));
-}
-
 // [EOF]
 ?>