X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fstylesheet.php;h=9658652f397752d594c79d5d35b56040394e9648;hp=392ea5a4a5d5ac275cee46c60ca6b87efd5e9926;hb=e8ca54fe91872ab95a6ffdc4f1268bf18889021d;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 392ea5a4a5..9658652f39 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -14,10 +14,9 @@
  * $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                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -53,12 +52,12 @@ if ((isInstallationPhase())) $stylesList[] = 'install.css';
 if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', 'FILE');
 
 // Output CSS files or content or link to css.php ?
-if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
+if ((isCssOutputMode()) || (getConfig('css_php') == 'DIRECT')) {
 	// Load CSS files
 	$stylesList = merge_array($stylesList, getExtensionCssFiles());
 
 	// Generate base path
-	$basePath = sprintf("%stheme/%s/css/", getConfig('PATH'), getCurrentTheme());
+	$basePath = sprintf("%stheme/%s/css/", getPath(), getCurrentTheme());
 
 	// Output inclusion lines
 	foreach ($stylesList as $value) {
@@ -69,25 +68,25 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
 		if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
 			switch (getConfig('css_php')) {
 				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'] .= readFromFile($FQFN);
 					break;
 
 				default: // Invalid mode!
-					debug_report_bug(sprintf("Invalid css_php value %s detected.", getConfig('css_php')));
+					debug_report_bug(__FILE__, __LINE__, sprintf("Invalid css_php value %s detected.", getConfig('css_php')));
 					break;
 			} // END - switch
 		} // END - if
 	} // END - foreach
-} elseif ((getOutputMode() == '0') || (getConfig('css_php') == 'INLINE')) {
+} elseif ((isHtmlOutputMode()) || (getConfig('css_php') == 'INLINE')) {
 	// Load CSS files
 	$stylesList = merge_array($stylesList, getExtensionCssFiles());
 
 	// Generate base path
-	$basePath = sprintf("%stheme/%s/css/", getConfig('PATH'), getCurrentTheme());
+	$basePath = sprintf("%stheme/%s/css/", getPath(), getCurrentTheme());
 
 	// Output inclusion lines
 	$OUT = '';
@@ -103,7 +102,7 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
 	} // END - foreach
 
 	// Load template
-	loadTemplate('css_inline', false, $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';
@@ -115,11 +114,11 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
 		$OUT .= '?theme=' . $newTheme . '&amp;installing=1';
 	} else {
 		// Add SVN revision to bypass caching problems
-		$OUT .= '?rev=' . getConfig('CURR_SVN_REVISION');
+		$OUT .= '?rev=' . getCurrentRepositoryRevision();
 	}
 
 	// Close tag
-	outputHtml($OUT . '%}" />');
+	$GLOBALS['page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
 }
 
 // [EOF]