Renamed function so it might be more understandable

[mailer.git] / inc / stylesheet.php

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 219918f6b25e32b310880266b7310ea89f22756b..9658652f397752d594c79d5d35b56040394e9648 100644 (file)
--- 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 - 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 *
@@ -42,26 +41,26 @@ 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');
 
 // Output CSS files or content or link to css.php ?
-if ((getOutputMode() == '1') || (getConfig('css_php') == 'DIRECT')) {
+if ((isCssOutputMode()) || (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());
+       $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)
                $FQFN = $basePath . $value;
 
@@ -69,29 +68,29 @@ 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!
-                                       debug_report_bug(sprintf("Invalid css_php value %s detected.", getConfig('css_php')));
+                                       debug_report_bug(__FILE__, __LINE__, sprintf("Invalid css_php value %s detected.", getConfig('css_php')));
                                        break;
                        } // END - switch
                } // END - if
        } // END - foreach
-} elseif ((getOutputMode() == '0') || (getConfig('css_php') == 'INLINE')) {
+} elseif ((isHtmlOutputMode()) || (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());
+       $basePath = sprintf("%stheme/%s/css/", getPath(), 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 +102,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 = 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=' . getCurrentRepositoryRevision();
        }
 
        // Close tag
-       outputHtml('" />');
+       $GLOBALS['page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
 }
 
 // [EOF]