X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftheme_functions.php;h=01339ea1d06165f5cd149570d664086bdc6f0d05;hb=c744215dba419b52b84291622179c5e3a6ab17e2;hp=2fb7de3b7f8a9b8d1a36c7c8bd45c2767fed3609;hpb=07e126c776ca39d4e8d6a751af02b08221e664e2;p=mailer.git

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 2fb7de3b7f..01339ea1d0 100644
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -14,8 +14,6 @@
  * $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                    *
@@ -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,13 +120,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__);
@@ -170,7 +169,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__);
@@ -204,7 +203,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__);
@@ -241,7 +240,7 @@ function getActualTheme () {
 			// 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'));
 
@@ -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('mxchange_theme', $newTheme);
 }
 
 // Get id from theme
@@ -301,9 +303,9 @@ function getThemeId ($name) {
 	return $id;
 }
 
-///////////////////////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
 //                              Only filter functions
-///////////////////////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
 
 // Filter for generic handling of theme change
 function FILTER_HANDLE_THEME_CHANGE () {
@@ -331,7 +333,7 @@ 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.');
+		debug_report_bug(__FUNCTION__, __LINE__, 'Please only run this filter for logged in users.');
 	} // END - if
 
 	// Change to new theme