Fixed logfile writing in installation phase, .revision is now ignored

[mailer.git] / inc / stylesheet.php

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 4840655c2645ff9e6bb4bfa46ffaedf4b8ed67b9..817d790abe2f984769754ae5138a093687919795 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Style-Sheets werden hier abgelegt                *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Style-Sheets werden hier abgelegt                *
  * -------------------------------------------------------------------- *

- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * 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                           *
  * For more information visit: http://www.mxchange.org                  *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *


@@ -43,48 +48,45 @@ $STYLES = array(
 );
 
 // Add stylesheet for installation
 );
 
 // Add stylesheet for installation

-if ((basename($_SERVER['PHP_SELF']) == "install.php") || (!isBooleanConstantAndTrue('mxchange_installed')) || (isset($_GET['installing']))) $STYLES[] = "install.css";
+if ((basename($_SERVER['PHP_SELF']) == "install.php") || (!isInstalled()) || (REQUEST_ISSET_GET(('installing')))) $STYLES[] = "install.css";

 
 // When no CSS output-mode is set, set it to file-output
 
 // When no CSS output-mode is set, set it to file-output

-if (getConfig('css_php') == "") $_CONFIG['css_php'] = "FILE";
+if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', "FILE");

 
 // Output CSS files or content or link to css.php ?
 
 // Output CSS files or content or link to css.php ?

-if (($CSS == "1") || (getConfig('css_php') == "DIRECT")) {
+if (($GLOBALS['output_mode'] == "1") || (getConfig('css_php') == "DIRECT")) {

        // Load CSS files
        // Load CSS files

-       if (is_array($EXT_CSS_FILES)) {
-               // Load extension's CSS files
-               foreach ($EXT_CSS_FILES as $value) $STYLES[] = $value;
-       } // END - if
+       $STYLES = merge_array($STYLES, EXT_GET_CSS_FILES());

 
        // Output inclusion lines
        foreach ($STYLES as $value) {
                // Only include found CSS files (to reduce 404 requests)
                $BASE = sprintf("%stheme/%s/css/", constant('PATH'), GET_CURR_THEME());
 
        // Output inclusion lines
        foreach ($STYLES as $value) {
                // Only include found CSS files (to reduce 404 requests)
                $BASE = sprintf("%stheme/%s/css/", constant('PATH'), GET_CURR_THEME());

-               $file = $BASE.$value;
+               $FQFN = $BASE.$value;

 
                // Do include only existing files and whose are not empty
 
                // Do include only existing files and whose are not empty

-               if ((FILE_READABLE($file)) && (filesize($file) > 0)) {
+               if ((FILE_READABLE($FQFN)) && (filesize($FQFN) > 0)) {

                        switch (getConfig('css_php')) {
                                case "DIRECT":
                                        OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"{!URL!}/theme/".GET_CURR_THEME()."/".$value."\" />");
                                        break;
 
                                case "FILE":
                        switch (getConfig('css_php')) {
                                case "DIRECT":
                                        OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"{!URL!}/theme/".GET_CURR_THEME()."/".$value."\" />");
                                        break;
 
                                case "FILE":

-                                       OUTPUT_HTML(READ_FILE($file));
+                                       OUTPUT_HTML(READ_FILE($FQFN));

                                        break;
                                        break;

-                       }
-               }
-       }
+                       } // END - switch
+               } // END - if
+       } // END - foreach

 } else {
        // Now we load all CSS files from css.php!
        OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"{!URL!}/css.php", false);
 } else {
        // Now we load all CSS files from css.php!
        OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"{!URL!}/css.php", false);

-       if (isBooleanConstantAndTrue('mxchange_installing')) {
+       if (isInstalling()) {

                // Default theme first
                $NEW_THEME = "default";
                // Default theme first
                $NEW_THEME = "default";

-               if (!empty($_GET['theme'])) $NEW_THEME = SQL_ESCAPE($_GET['theme']);
-               if (!empty($_POST['theme'])) $NEW_THEME = SQL_ESCAPE($_POST['theme']);
+               if (REQUEST_ISSET_GET(('theme')))  $NEW_THEME = REQUEST_GET(('theme'));
+               if (REQUEST_ISSET_POST(('theme'))) $NEW_THEME = SQL_ESCAPE(REQUEST_POST('theme'));

                OUTPUT_HTML("?theme=".$NEW_THEME."&amp;installing=1", false);
                OUTPUT_HTML("?theme=".$NEW_THEME."&amp;installing=1", false);

-       }
+       } // END - if

        OUTPUT_HTML("\" />");
 }
 
        OUTPUT_HTML("\" />");
 }