X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=d7e03ce3f389a29f05926602a9fbf1a421c0dcc9;hb=150ed402878985508f10f4e06d25831e0fb3a1f8;hp=7cd2a38cf4d105ed69964e001fe0781b1813b130;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2;p=mailer.git

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 7cd2a38cf4..d7e03ce3f3 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -10,14 +10,9 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Style-Sheets werden hier abgelegt                *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * 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 *
  * it under the terms of the GNU General Public License as published by *
@@ -43,56 +38,70 @@ if (!defined('__SECURITY')) {
 // Default styles
 $stylesList = array(
 		'general.css',
+		'ajax.css',
 );
 
 // Add stylesheet for installation
-if ((isInstallationPhase())) $stylesList[] = 'install.css';
+if ((isInstaller())) {
+	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 = getBasePathFromTheme($currentTheme);
 
 	// Output inclusion lines
 	foreach ($stylesList as $value) {
 		// Only include found CSS files (to reduce 404 requests)
-		$FQFN = $basePath . $value;
+		$FQFN = $basePath . '/' . $value;
 
 		// 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'] .= removeDeprecatedComment(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());
 
 	// Generate base path
-	$basePath = sprintf("%stheme/%s/css/", getPath(), getCurrentTheme());
+	$basePath = getBasePathFromTheme(getCurrentTheme());
 
 	// Output inclusion lines
 	$OUT = '';
 	foreach ($stylesList as $value) {
 		// Only include found CSS files (to reduce 404 requests)
-		$FQFN = $basePath . $value;
+		$FQFN = $basePath . '/' . $value;
 
 		// Do include only existing files and whose are not empty
 		if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
@@ -102,23 +111,21 @@ 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, removeDeprecatedComment($OUT));
 } else {
 	// Now we load all CSS files from css.php!
 	$OUT = '<link rel="stylesheet" type="text/css" href="{%url=css.php';
-	if ((isInstallationPhase())) {
+
+	if ((isInstaller())) {
 		// Default theme first
-		$newTheme = 'default';
-		if (isGetRequestParameterSet('theme'))  $newTheme = getRequestParameter('theme');
-		if (isPostRequestParameterSet('theme')) $newTheme = secureString(postRequestParameter('theme'));
-		$OUT .= '?theme=' . $newTheme . '&amp;installing=1';
+		$OUT .= '?theme=' . getCurrentTheme() . '&amp;installing=1';
 	} else {
-		// Add SVN revision to bypass caching problems
-		$OUT .= '?rev=' . getCurrentRepositoryRevision();
+		// Add version + a number to bypass caching problems
+		$OUT .= '?ver={?FULL_VERSION?}&amp;cb={?CACHE_BUSTER?}';
 	}
 
 	// Close tag
-	$GLOBALS['page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
+	$GLOBALS['__page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
 }
 
 // [EOF]