X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=0e2045ae026938a12e0498acee01af40b7e8632b;hb=63dd53434c74dbba1e9310af2a7f267e2823459f;hp=5b0888977cfd6e49c7a6b80a10f343a09000dfa6;hpb=e6785b4a4845d7a885b0e9c6dac517c6867940e1;p=mailer.git
diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 5b0888977c..0e2045ae02 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -44,50 +44,54 @@ if (!defined('__SECURITY')) {
// Default styles
$STYLES = array(
- "general.css",
+ 'general.css',
);
// Add stylesheet for installation
-if ((isInstalling()) || (!isInstalled())) $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");
+if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', 'FILE');
// Output CSS files or content or link to css.php ?
-if (($GLOBALS['output_mode'] == "1") || (getConfig('css_php') == "DIRECT")) {
+if ((getOutputMode() == '1') || (getConfig('css_php') == 'DIRECT')) {
// Load CSS files
$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());
- $FQFN = $BASE.$value;
+ $basePath = sprintf("%stheme/%s/css/", constant('PATH'), getCurrentTheme());
+ $FQFN = $basePath . $value;
// Do include only existing files and whose are not empty
- if ((FILE_READABLE($FQFN)) && (filesize($FQFN) > 0)) {
+ if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
switch (getConfig('css_php')) {
- case "DIRECT":
- OUTPUT_HTML("");
+ case 'DIRECT': // Just link them (unsupported)
+ OUTPUT_HTML('');
break;
- case "FILE":
- OUTPUT_HTML(READ_FILE($FQFN));
+ case 'FILE': // Output contents
+ OUTPUT_HTML(readFromFile($FQFN));
+ break;
+
+ default: // Invalid mode!
+ debug_report_bug(sprintf("Invalid css_php value %s detected.", getConfig('css_php')));
break;
} // END - switch
} // END - if
} // END - foreach
} else {
// Now we load all CSS files from css.php!
- OUTPUT_HTML("");
+ OUTPUT_HTML('" />');
}
//