Reverted of changes in 1704, see ticket #160

[mailer.git] / inc / stylesheet.php

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index d8e1514d01cc9f8f6bfe938f2f0f3c3724e7a5d9..12838b3b3392d8bab258b01df89c1a38bad66e1f 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -69,11 +70,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!
@@ -103,23 +104,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 . '%}{%ext,version=sql_patches%}" />';
 }
 
 // [EOF]