X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=147e7245d39c580209e463b98d7b2ddcab78f0ac;hb=9b06a0b9b72fbdaf5bf638df82ae37c56a5654cb;hp=42d018ed4bdb198bf27b0749b844ac7eb05d1875;hpb=aa63aed07428a99ea09002c8d072990677700080;p=mailer.git

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 42d018ed4b..147e7245d3 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                                   *
@@ -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 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,57 +37,92 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
+	die();
 }
 
 // Default styles
-$STYLES = array(
-		"general.css",
+$stylesList = array(
+		'general.css',
 );
 
 // Add stylesheet for installation
-if ((isInstalling()) || (!isInstalled())) $STYLES[] = "install.css";
+if ((isInstallationPhase())) $stylesList[] = 'install.css';
 
 // 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');
 
 // Output CSS files or content or link to css.php ?
-if (($GLOBALS['output_mode'] == "1") || (getConfig('css_php') == "DIRECT")) {
+if ((isCssOutputMode()) || (getConfig('css_php') == 'DIRECT')) {
 	// Load CSS files
-	$STYLES = merge_array($STYLES, EXT_GET_CSS_FILES());
+	$stylesList = merge_array($stylesList, getExtensionCssFiles());
+
+	// Generate base path
+	$basePath = sprintf("%stheme/%s/css/", getPath(), getCurrentTheme());
 
 	// Output inclusion lines
-	foreach ($STYLES as $value) {
+	foreach ($stylesList as $value) {
 		// Only include found CSS files (to reduce 404 requests)
-		$basePath = sprintf("%stheme/%s/css/", constant('PATH'), GET_CURR_THEME());
 		$FQFN = $basePath . $value;
 
 		// Do include only existing files and whose are not empty
-		if ((FILE_READABLE($FQFN)) && (filesize($FQFN) > 0)) {
+		if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
 			switch (getConfig('css_php')) {
-				case 'DIRECT':
-					OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"{!URL!}/theme/".GET_CURR_THEME()."/".$value."\" />");
+				case 'DIRECT': // Just link them (unsupported)
+					$GLOBALS['page_header'] .= '<link rel="stylesheet" type="text/css" href="{%url=theme/' . getCurrentTheme() . '/' . $value . '%}" />';
+					break;
+
+				case 'FILE': // Output contents
+					$GLOBALS['page_header'] .= readFromFile($FQFN);
 					break;
 
-				case 'FILE':
-					OUTPUT_HTML(READ_FILE($FQFN));
+				default: // Invalid mode!
+					debug_report_bug(__FILE__, __LINE__, sprintf("Invalid css_php value %s detected.", getConfig('css_php')));
 					break;
 			} // END - switch
 		} // END - if
 	} // END - foreach
+} elseif ((isHtmlOutputMode()) || (getConfig('css_php') == 'INLINE')) {
+	// Load CSS files
+	$stylesList = merge_array($stylesList, getExtensionCssFiles());
+
+	// Generate base path
+	$basePath = sprintf("%stheme/%s/css/", getPath(), getCurrentTheme());
+
+	// Output inclusion lines
+	$OUT = '';
+	foreach ($stylesList 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
+	$GLOBALS['page_header'] .= loadTemplate('css_inline', true, $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())) {
+	$OUT = '<link rel="stylesheet" type="text/css" href="{%url=css.php';
+	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("\" />");
+		$newTheme = 'default';
+		if (isPostRequestElementSet('theme')) {
+			$newTheme = postRequestElement('theme');
+		} elseif (isGetRequestElementSet('theme')) {
+			$newTheme = getRequestElement('theme');
+		}
+		$OUT .= '?theme=' . $newTheme . '&amp;installing=1';
+	} else {
+		// Add SVN revision to bypass caching problems
+		$OUT .= '?rev=' . getCurrentRepositoryRevision();
+	}
+
+	// Close tag
+	$GLOBALS['page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
 }
 
-//
+// [EOF]
 ?>