Reverted of changes in 1704, see ticket #160

[mailer.git] / inc / stylesheet.php

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 3748c130d14b6ebc7bb08875c69b5070933029a7..12838b3b3392d8bab258b01df89c1a38bad66e1f 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                                   *
@@ -17,7 +17,8 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * 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 *
@@ -38,41 +39,42 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
+       die();
 }
 
 // Default styles
-$STYLES = array(
+$stylesList = array(
                'general.css',
 );
 
 // Add stylesheet for installation
-if ((isInstalling()) || (!isInstalled())) $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 (($GLOBALS['output_mode'] == '1') || (getConfig('css_php') == 'DIRECT')) {
+if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
        // Load CSS files
-       $STYLES = merge_array($STYLES, EXT_GET_CSS_FILES());
+       $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)
-               $basePath = sprintf("%stheme/%s/css/", constant('PATH'), getCurrentTheme());
                $FQFN = $basePath . $value;
 
                // Do include only existing files and whose are not empty
                if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
                        switch (getConfig('css_php')) {
                                case 'DIRECT': // Just link them (unsupported)
-                                       OUTPUT_HTML('<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
-                                       OUTPUT_HTML(readFromFile($FQFN));
+                                       $GLOBALS['page_header'] .= readFromFile($FQFN);
                                        break;
 
                                default: // Invalid mode!
@@ -81,18 +83,45 @@ if (($GLOBALS['output_mode'] == '1') || (getConfig('css_php') == 'DIRECT')) {
                        } // END - switch
                } // END - if
        } // END - foreach
+} elseif ((getOutputMode() == '0') || (getConfig('css_php') == 'INLINE')) {
+       // Load CSS files
+       $stylesList = merge_array($stylesList, getExtensionCssFiles());
+
+       // Generate base path
+       $basePath = sprintf("%stheme/%s/css/", getConfig('PATH'), getCurrentTheme());
+
+       // Output inclusion lines
+       $OUT = '';
+       foreach ($stylesList as $value) {
+               // Only include found CSS files (to reduce 404 requests)
+               $FQFN = $basePath . $value;
+
+               // Do include only existing files and whose are not empty
+               if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
+                       // Load CSS content
+                       $OUT .= readFromFile($FQFN);
+               } // END - if
+       } // END - foreach
+
+       // Load template
+       $GLOBALS['page_header'] .= loadTemplate('css_inline', true, $OUT);
 } else {
        // Now we load all CSS files from css.php!
-       OUTPUT_HTML('<link rel="stylesheet" type="text/css" href="{!URL!}/css.php', false);
-       if ((isInstalling()) || (!isInstalled())) {
+       $OUT = '<link rel="stylesheet" type="text/css" href="{%url=css.php';
+       if ((isInstallationPhase())) {
                // Default theme first
                $newTheme = 'default';
-               if (REQUEST_ISSET_GET('theme'))  $newTheme = REQUEST_GET('theme');
-               if (REQUEST_ISSET_POST('theme')) $newTheme = SQL_ESCAPE(REQUEST_POST('theme'));
-               OUTPUT_HTML('?theme=' . $newTheme . '&amp;installing=1', false);
-       } // END - if
-       OUTPUT_HTML('" />');
+               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
+               $OUT .= '?rev=' . getConfig('CURR_SVN_REVISION');
+       }
+
+       // Close tag
+       $GLOBALS['page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
 }
 
-//
+// [EOF]
 ?>