Two tickets resolved (57/89)

[mailer.git] / inc / stylesheet.php

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 4d7c214aaff4ab4a87f267a738130a9994816cf0..a84660c803eefb80d5ba1b4c1d2dc39594acab00 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -46,45 +46,38 @@ $STYLES = array(
 if ((basename($_SERVER['PHP_SELF']) == "install.php") || (!isBooleanConstantAndTrue('mxchange_installed')) || (isset($_GET['installing']))) $STYLES[] = "install.css";
 
 // When no CSS output-mode is set, set it to file-output
-if (empty($_CONFIG['css_php'])) $_CONFIG['css_php'] = "FILE";
+if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', "FILE");
 
 // Output CSS files or content or link to css.php ?
-if (($CSS == "1") || ($_CONFIG['css_php'] == "DIRECT")) {
+if (($CSS == "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
 
-       // Create missing configuration file
-       if (!function_exists('GET_CURR_THEME')) {
-               // Load dummy theme functions
-               require_once(PATH."inc/theme-dummy.php");
-       } // END - if
-
        // Output inclusion lines
        foreach ($STYLES as $value) {
                // Only include found CSS files (to reduce 404 requests)
-               $BASE = sprintf("%stheme/%s/css/", PATH, GET_CURR_THEME());
+               $BASE = sprintf("%stheme/%s/css/", constant('PATH'), GET_CURR_THEME());
                $file = $BASE.$value;
 
                // Do include only existing files and whose are not empty
                if ((FILE_READABLE($file)) && (filesize($file) > 0)) {
-                       switch ($_CONFIG['css_php']) {
+                       switch (getConfig('css_php')) {
                                case "DIRECT":
-                                       OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"".URL."/theme/".GET_CURR_THEME()."/".$value."\" />");
+                                       OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"{!URL!}/theme/".GET_CURR_THEME()."/".$value."\" />");
                                        break;
 
                                case "FILE":
-                                       $load = implode("", file($file));
-                                       OUTPUT_HTML($load);
+                                       OUTPUT_HTML(READ_FILE($file));
                                        break;
                        }
                }
        }
 } else {
        // Now we load all CSS files from css.php!
-       OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"".URL."/css.php", false);
+       OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"{!URL!}/css.php", false);
        if (isBooleanConstantAndTrue('mxchange_installing')) {
                // Default theme first
                $NEW_THEME = "default";