X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fstylesheet.php;h=392ea5a4a5d5ac275cee46c60ca6b87efd5e9926;hp=cd64492f18d13a9fd80b9c12b19e1faa74d39e96;hb=2f312726826db5c4c3363926c743fea3c1c23b34;hpb=c2e17d983fcbc0c3bd1dd37908d87c678f0367df

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index cd64492f18..392ea5a4a5 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                                   *
@@ -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,7 +69,7 @@ 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 . '" />');
+					outputHtml('<link rel="stylesheet" type="text/css" href="{%url=theme/' . getCurrentTheme() . '/' . $value . '%}" />');
 					break;
 
 				case 'FILE': // Output contents
@@ -82,16 +82,16 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
 			} // END - switch
 		} // END - if
 	} // END - foreach
-} elseif ((getOutputMode() == 0) || (getConfig('css_php') == 'INLINE')) {
+} 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;
 
@@ -106,20 +106,20 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
 	loadTemplate('css_inline', false, $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 = SQL_ESCAPE(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('" />');
+	outputHtml($OUT . '%}" />');
 }
 
 // [EOF]