X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=74678bbf510ea077f0faf8ca2260def6967281b7;hb=8848f4a3fd7b32a1bbd9139766171701b94b2f42;hp=6e4ac65e7f71d626c6f6bfc0dccce85615b1d8bc;hpb=aaf81b8f35512782d34f78c1a0dac8b42d745393;p=mailer.git

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 6e4ac65e7f..74678bbf51 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/29/2003 *
- * ===============                              Last change: 12/03/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 08/29/2003 *
+ * ===================                          Last change: 12/03/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : stylesheet.php                                   *
@@ -10,15 +10,9 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Style-Sheets werden hier abgelegt                *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2015 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 *
@@ -42,58 +36,72 @@ if (!defined('__SECURITY')) {
 }
 
 // Default styles
-$STYLES = array(
+$stylesList = array(
 		'general.css',
+		'ajax.css',
 );
 
 // Add stylesheet for installation
-if ((isInstallationPhase())) $STYLES[] = '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 ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
+if ((isCssOutputMode()) || (getCssPhp() == 'DIRECT')) {
 	// Load CSS files
-	$STYLES = merge_array($STYLES, getExtensionCssFiles());
+	$stylesList = merge_array($stylesList, getExtensionCssFiles());
 
 	// Generate base path
-	$basePath = sprintf("%stheme/%s/css/", getConfig('PATH'), getCurrentTheme());
+	$basePath = getBasePathFromTheme($currentTheme);
 
 	// Output inclusion lines
-	foreach ($STYLES as $value) {
+	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)
-					outputHtml('<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
-					outputHtml(readFromFile($FQFN));
+					$GLOBALS['__page_header'] .= removeDeprecatedComment(readFromFile($FQFN));
 					break;
 
 				default: // Invalid mode!
-					debug_report_bug(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 ((getOutputMode() == '0') || (getConfig('css_php') == 'INLINE')) {
+} elseif ((isHtmlOutputMode()) || (getCssPhp() == 'INLINE')) {
 	// Load CSS files
-	$STYLES = merge_array($STYLES, getExtensionCssFiles());
+	$stylesList = merge_array($stylesList, getExtensionCssFiles());
 
 	// Generate base path
-	$basePath = sprintf("%stheme/%s/css/", getConfig('PATH'), getCurrentTheme());
+	$basePath = getBasePathFromTheme(getCurrentTheme());
 
 	// Output inclusion lines
 	$OUT = '';
-	foreach ($STYLES as $value) {
+	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)) {
@@ -103,23 +111,21 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
 	} // END - foreach
 
 	// Load template
-	loadTemplate('css_inline', false, $OUT);
+	$GLOBALS['__page_header'] .= loadTemplate('css_inline', TRUE, removeDeprecatedComment($OUT));
 } else {
 	// Now we load all CSS files from css.php!
-	outputHtml('<link rel="stylesheet" type="text/css" href="{?URL?}/css.php', false);
-	if ((isInstallationPhase())) {
+	$OUT = '<link rel="stylesheet" type="text/css" href="{%url=css.php';
+
+	if ((isInstaller())) {
 		// Default theme first
-		$newTheme = 'default';
-		if (isGetRequestElementSet('theme'))  $newTheme = getRequestElement('theme');
-		if (isPostRequestElementSet('theme')) $newTheme = secureString(postRequestElement('theme'));
-		outputHtml('?theme=' . $newTheme . '&amp;installing=1', false);
+		$OUT .= '?theme=' . getCurrentTheme() . '&amp;installing=1';
 	} else {
-		// Add SVN revision to bypass caching problems
-		outputHtml('?rev=' . getConfig('CURR_SVN_REVISION'));
+		// Add version + a number to bypass caching problems
+		$OUT .= '?ver={?FULL_VERSION?}&amp;cb={?CACHE_BUSTER?}';
 	}
 
 	// Close tag
-	outputHtml('" />');
+	$GLOBALS['__page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
 }
 
 // [EOF]