Complete rewrite of and , wrapper functions added, see bug #101

[mailer.git] / inc / stylesheet.php

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 8c62a7b7b7a37afaf166945aa196a5436a85ada6..c523bbda59c22374f834b1e07cc2363205d5edfd 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -43,18 +43,15 @@ $STYLES = array(
 );
 
 // 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") || (!isBooleanConstantAndTrue('mxchange_installed')) || (REQUEST_ISSET_GET(('installing')))) $STYLES[] = "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 (($CSS == "1") || (getConfig('css_php') == "DIRECT")) {
+if (($GLOBALS['output_mode'] == "1") || (getConfig('css_php') == "DIRECT")) {
        // 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) {
@@ -81,8 +78,8 @@ if (($CSS == "1") || (getConfig('css_php') == "DIRECT")) {
        if (isBooleanConstantAndTrue('mxchange_installing')) {
                // 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 = SQL_ESCAPE(REQUEST_GET('theme'));
+               if (REQUEST_ISSET_POST(('theme'))) $NEW_THEME = SQL_ESCAPE(REQUEST_POST('theme'));
                OUTPUT_HTML("?theme=".$NEW_THEME."&installing=1", false);
        } // END - if
        OUTPUT_HTML("\" />");