Rewritten all THEME_FOO variables to GLOBALS

[mailer.git] / inc / stylesheet.php

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index be068d59a01ccb62887e318346cfb66dffb78080..4e58c9ad15efb703053b410cacda62d2fa49d1aa 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -10,7 +10,7 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Style-Sheets werden hier abgelegt                *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
+ * $Revision::                                                        $ *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
@@ -48,7 +48,7 @@ $STYLES = array(
 );
 
 // Add stylesheet for installation
-if ((basename($_SERVER['PHP_SELF']) == "install.php") || (!isInstalled()) || (REQUEST_ISSET_GET(('installing')))) $STYLES[] = "install.css";
+if ((isInstalling()) || (!isInstalled())) $STYLES[] = "install.css";
 
 // When no CSS output-mode is set, set it to file-output
 if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', "FILE");
@@ -80,12 +80,12 @@ if (($GLOBALS['output_mode'] == "1") || (getConfig('css_php') == "DIRECT")) {
 } 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()) {
+       if ((isInstalling()) || (!isInstalled())) {
                // Default theme first
-               $NEW_THEME = "default";
-               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);
+               $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("\" />");
 }