'what' files should be loaded only once

[mailer.git] / inc / stylesheet.php

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index d77e9c93318db48f5d54adb9bd93d9bb55541c01..715bf8fc4cf23fd531bd8670b231d45a49c12848 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -14,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -53,12 +52,12 @@ if ((isInstallationPhase())) $stylesList[] = 'install.css';
 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
        $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 ($stylesList as $value) {
@@ -77,17 +76,17 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
                                        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
        $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 = '';
@@ -110,16 +109,19 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
        if ((isInstallationPhase())) {
                // Default theme first
                $newTheme = 'default';
-               if (isGetRequestParameterSet('theme'))  $newTheme = getRequestParameter('theme');
-               if (isPostRequestParameterSet('theme')) $newTheme = secureString(postRequestParameter('theme'));
+               if (isPostRequestElementSet('theme')) {
+                       $newTheme = postRequestElement('theme');
+               } elseif (isGetRequestElementSet('theme')) {
+                       $newTheme = getRequestElement('theme');
+               }
                $OUT .= '?theme=' . $newTheme . '&installing=1';
        } else {
                // Add SVN revision to bypass caching problems
-               $OUT .= '?rev=' . getConfig('CURR_SVN_REVISION');
+               $OUT .= '?rev=' . getCurrentRepositoryRevision();
        }
 
        // Close tag
-       $GLOBALS['page_header'] .= $OUT . '%}" />';
+       $GLOBALS['page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
 }
 
 // [EOF]