X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=219918f6b25e32b310880266b7310ea89f22756b;hb=dcab53bf379a6e7a0224b255dfab06512cb694dd;hp=87c64c2e48624cebf7f69ec3dd6a03be7345639f;hpb=66b91ce490ab549425619c95fc12086e126d541b;p=mailer.git

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 87c64c2e48..219918f6b2 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,8 +38,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
+	die();
 }
 
 // Default styles
@@ -48,7 +47,7 @@ $STYLES = array(
 );
 
 // Add stylesheet for installation
-if ((isInstalling()) || (!isInstalled())) $STYLES[] = 'install.css';
+if ((isInstallationPhase())) $STYLES[] = 'install.css';
 
 // When no CSS output-mode is set, set it to file-output
 if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', 'FILE');
@@ -56,7 +55,7 @@ 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')) {
 	// Load CSS files
-	$STYLES = merge_array($STYLES, EXT_GET_CSS_FILES());
+	$STYLES = merge_array($STYLES, getExtensionCssFiles());
 
 	// Generate base path
 	$basePath = sprintf("%stheme/%s/css/", getConfig('PATH'), getCurrentTheme());
@@ -70,11 +69,11 @@ if ((getOutputMode() == '1') || (getConfig('css_php') == 'DIRECT')) {
 		if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
 			switch (getConfig('css_php')) {
 				case 'DIRECT': // Just link them (unsupported)
-					OUTPUT_HTML('<link rel="stylesheet" type="text/css" href="{?URL?}/theme/' . getCurrentTheme() . '/' . $value . '" />');
+					outputHtml('<link rel="stylesheet" type="text/css" href="{?URL?}/theme/' . getCurrentTheme() . '/' . $value . '" />');
 					break;
 
 				case 'FILE': // Output contents
-					OUTPUT_HTML(readFromFile($FQFN));
+					outputHtml(readFromFile($FQFN));
 					break;
 
 				default: // Invalid mode!
@@ -83,17 +82,44 @@ if ((getOutputMode() == '1') || (getConfig('css_php') == 'DIRECT')) {
 			} // END - switch
 		} // END - if
 	} // END - foreach
+} elseif ((getOutputMode() == '0') || (getConfig('css_php') == 'INLINE')) {
+	// Load CSS files
+	$STYLES = merge_array($STYLES, getExtensionCssFiles());
+
+	// Generate base path
+	$basePath = sprintf("%stheme/%s/css/", getConfig('PATH'), getCurrentTheme());
+
+	// Output inclusion lines
+	$OUT = '';
+	foreach ($STYLES as $value) {
+		// Only include found CSS files (to reduce 404 requests)
+		$FQFN = $basePath . $value;
+
+		// Do include only existing files and whose are not empty
+		if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
+			// Load CSS content
+			$OUT .= readFromFile($FQFN);
+		} // END - if
+	} // END - foreach
+
+	// Load template
+	loadTemplate('css_inline', false, $OUT);
 } else {
 	// Now we load all CSS files from css.php!
-	OUTPUT_HTML('<link rel="stylesheet" type="text/css" href="{?URL?}/css.php', false);
-	if ((isInstalling()) || (!isInstalled())) {
+	outputHtml('<link rel="stylesheet" type="text/css" href="{?URL?}/css.php', false);
+	if ((isInstallationPhase())) {
 		// Default theme first
 		$newTheme = 'default';
-		if (REQUEST_ISSET_GET('theme'))  $newTheme = REQUEST_GET('theme');
-		if (REQUEST_ISSET_POST('theme')) $newTheme = SQL_ESCAPE(REQUEST_POST('theme'));
-		OUTPUT_HTML('?theme=' . $newTheme . '&amp;installing=1', false);
-	} // END - if
-	OUTPUT_HTML('" />');
+		if (isGetRequestElementSet('theme'))  $newTheme = getRequestElement('theme');
+		if (isPostRequestElementSet('theme')) $newTheme = SQL_ESCAPE(postRequestElement('theme'));
+		outputHtml('?theme=' . $newTheme . '&amp;installing=1', false);
+	} else {
+		// Add SVN revision to bypass caching problems
+		outputHtml('?rev=' . getConfig('CURR_SVN_REVISION'));
+	}
+
+	// Close tag
+	outputHtml('" />');
 }
 
 // [EOF]