Even more fixes

[mailer.git] / inc / stylesheet.php

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index c5e0d7a80ad02ea7e1ffb17e27243eaff97ffe00..b2d81171024f82b37b0d251b0fcc49594c01cccd 100644 (file)
--- 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,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
@@ -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;
 
@@ -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 = secureString(postRequestElement('theme'));
-               outputHtml('?theme=' . $newTheme . '&amp;installing=1', false);
+               $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]