X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=8aa0924e7da797dd823a416b8c85b119ff36a707;hb=ec3907de5b6c1ca85da82232707c85d22e197c11;hp=715bf8fc4cf23fd531bd8670b231d45a49c12848;hpb=20741b93fd58620af677a7f1039ffd16ea6ec689;p=mailer.git

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 715bf8fc4c..8aa0924e7d 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,21 +43,35 @@ if (!defined('__SECURITY')) {
 // Default styles
 $stylesList = array(
 		'general.css',
+		'ajax.css',
 );
 
 // Add stylesheet for installation
-if ((isInstallationPhase())) $stylesList[] = 'install.css';
+if ((isInstallationPhase())) {
+	array_push($stylesList, 'install.css');
+} // END - if
 
 // When no CSS output-mode is set, set it to file-output
-if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', 'FILE');
+if (!isConfigEntrySet('css_php')) {
+	setConfigEntry('css_php', 'FILE');
+} // END - if
+
+// Get current theme
+$currentTheme = getCurrentTheme();
+
+// Has the theme changed?
+if ($currentTheme != getSession('mailer_theme')) {
+	// Then set it
+	setMailerTheme($currentTheme);
+} // END - if
 
 // Output CSS files or content or link to css.php ?
-if ((isCssOutputMode()) || (getConfig('css_php') == 'DIRECT')) {
+if ((isCssOutputMode()) || (getCssPhp() == 'DIRECT')) {
 	// Load CSS files
 	$stylesList = merge_array($stylesList, getExtensionCssFiles());
 
 	// Generate base path
-	$basePath = sprintf("%stheme/%s/css/", getPath(), getCurrentTheme());
+	$basePath = sprintf("%stheme/%s/css/", getPath(), $currentTheme);
 
 	// Output inclusion lines
 	foreach ($stylesList as $value) {
@@ -66,22 +80,22 @@ if ((isCssOutputMode()) || (getConfig('css_php') == 'DIRECT')) {
 
 		// Do include only existing files and whose are not empty
 		if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
-			switch (getConfig('css_php')) {
+			switch (getCssPhp()) {
 				case 'DIRECT': // Just link them (unsupported)
-					$GLOBALS['page_header'] .= '<link rel="stylesheet" type="text/css" href="{%url=theme/' . getCurrentTheme() . '/' . $value . '%}" />';
+					$GLOBALS['__page_header'] .= '<link rel="stylesheet" type="text/css" href="{%url=theme/' . getCurrentTheme() . '/' . $value . '%}" />';
 					break;
 
 				case 'FILE': // Output contents
-					$GLOBALS['page_header'] .= readFromFile($FQFN);
+					$GLOBALS['__page_header'] .= readFromFile($FQFN);
 					break;
 
 				default: // Invalid mode!
-					debug_report_bug(__FILE__, __LINE__, sprintf("Invalid css_php value %s detected.", getConfig('css_php')));
+					reportBug(__FILE__, __LINE__, sprintf("Invalid css_php value %s detected.", getCssPhp()));
 					break;
 			} // END - switch
 		} // END - if
 	} // END - foreach
-} elseif ((isHtmlOutputMode()) || (getConfig('css_php') == 'INLINE')) {
+} elseif ((isHtmlOutputMode()) || (getCssPhp() == 'INLINE')) {
 	// Load CSS files
 	$stylesList = merge_array($stylesList, getExtensionCssFiles());
 
@@ -102,26 +116,20 @@ if ((isCssOutputMode()) || (getConfig('css_php') == 'DIRECT')) {
 	} // END - foreach
 
 	// Load template
-	$GLOBALS['page_header'] .= loadTemplate('css_inline', true, $OUT);
+	$GLOBALS['__page_header'] .= loadTemplate('css_inline', TRUE, $OUT);
 } else {
 	// Now we load all CSS files from css.php!
 	$OUT = '<link rel="stylesheet" type="text/css" href="{%url=css.php';
 	if ((isInstallationPhase())) {
 		// Default theme first
-		$newTheme = 'default';
-		if (isPostRequestElementSet('theme')) {
-			$newTheme = postRequestElement('theme');
-		} elseif (isGetRequestElementSet('theme')) {
-			$newTheme = getRequestElement('theme');
-		}
-		$OUT .= '?theme=' . $newTheme . '&amp;installing=1';
+		$OUT .= '?theme=' . getCurrentTheme() . '&amp;installing=1';
 	} else {
 		// Add SVN revision to bypass caching problems
 		$OUT .= '?rev=' . getCurrentRepositoryRevision();
 	}
 
 	// Close tag
-	$GLOBALS['page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
+	$GLOBALS['__page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
 }
 
 // [EOF]