X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fstylesheet.php;h=d77e9c93318db48f5d54adb9bd93d9bb55541c01;hp=c5e0d7a80ad02ea7e1ffb17e27243eaff97ffe00;hb=744a2d99cf8759ecd219214bc98f0d32ae038ec1;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index c5e0d7a80a..d77e9c9331 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -42,12 +42,12 @@ if (!defined('__SECURITY')) {
 }
 
 // Default styles
-$STYLES = array(
+$stylesList = array(
 		'general.css',
 );
 
 // Add stylesheet for installation
-if ((isInstallationPhase())) $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');
@@ -55,13 +55,13 @@ 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, getExtensionCssFiles());
+	$stylesList = merge_array($stylesList, getExtensionCssFiles());
 
 	// Generate base path
 	$basePath = sprintf("%stheme/%s/css/", getConfig('PATH'), getCurrentTheme());
 
 	// Output inclusion lines
-	foreach ($STYLES as $value) {
+	foreach ($stylesList as $value) {
 		// Only include found CSS files (to reduce 404 requests)
 		$FQFN = $basePath . $value;
 
@@ -69,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)
-					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!
@@ -84,14 +84,14 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
 	} // END - foreach
 } elseif ((getOutputMode() == '0') || (getConfig('css_php') == '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());
 
 	// Output inclusion lines
 	$OUT = '';
-	foreach ($STYLES as $value) {
+	foreach ($stylesList as $value) {
 		// Only include found CSS files (to reduce 404 requests)
 		$FQFN = $basePath . $value;
 
@@ -103,23 +103,23 @@ 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!
-	outputHtml('<link rel="stylesheet" type="text/css" href="{?URL?}/css.php', false);
+	$OUT = '<link rel="stylesheet" type="text/css" href="{%url=css.php';
 	if ((isInstallationPhase())) {
 		// 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);
+		if (isGetRequestParameterSet('theme'))  $newTheme = getRequestParameter('theme');
+		if (isPostRequestParameterSet('theme')) $newTheme = secureString(postRequestParameter('theme'));
+		$OUT .= '?theme=' . $newTheme . '&amp;installing=1';
 	} else {
 		// Add SVN revision to bypass caching problems
-		outputHtml('?rev=' . getConfig('CURR_SVN_REVISION'));
+		$OUT .= '?rev=' . getConfig('CURR_SVN_REVISION');
 	}
 
 	// Close tag
-	outputHtml('" />');
+	$GLOBALS['page_header'] .= $OUT . '%}" />';
 }
 
 // [EOF]