X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fstylesheet.php;h=d7e03ce3f389a29f05926602a9fbf1a421c0dcc9;hb=150ed402878985508f10f4e06d25831e0fb3a1f8;hp=d311ef3d29bdfe42698731562a3589f88cdd7147;hpb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;p=mailer.git
diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index d311ef3d29..d7e03ce3f3 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -1,7 +1,7 @@
0)) {
- switch (getConfig('css_php')) {
+ switch (getCssPhp()) {
case 'DIRECT': // Just link them (unsupported)
- outputHtml('');
+ $GLOBALS['__page_header'] .= '';
break;
case 'FILE': // Output contents
- outputHtml(readFromFile($FQFN));
+ $GLOBALS['__page_header'] .= removeDeprecatedComment(readFromFile($FQFN));
break;
default: // Invalid mode!
- debug_report_bug(sprintf("Invalid css_php value %s detected.", getConfig('css_php')));
+ reportBug(__FILE__, __LINE__, sprintf('Invalid css_php value %s detected.', getCssPhp()));
break;
} // END - switch
} // END - if
} // END - foreach
-} elseif ((getOutputMode() == '0') || (getConfig('css_php') == 'INLINE')) {
+} elseif ((isHtmlOutputMode()) || (getCssPhp() == 'INLINE')) {
// Load CSS files
- $STYLES = merge_array($STYLES, getExtensionCssFiles());
+ $stylesList = merge_array($stylesList, getExtensionCssFiles());
// Generate base path
- $basePath = sprintf("%stheme/%s/css/", getConfig('PATH'), getCurrentTheme());
+ $basePath = getBasePathFromTheme(getCurrentTheme());
// Output inclusion lines
$OUT = '';
- foreach ($STYLES as $value) {
+ foreach ($stylesList as $value) {
// Only include found CSS files (to reduce 404 requests)
- $FQFN = $basePath . $value;
+ $FQFN = $basePath . '/' . $value;
// Do include only existing files and whose are not empty
if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
@@ -103,23 +111,21 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
} // END - foreach
// Load template
- loadTemplate('css_inline', false, $OUT);
+ $GLOBALS['__page_header'] .= loadTemplate('css_inline', TRUE, removeDeprecatedComment($OUT));
} else {
// Now we load all CSS files from css.php!
- outputHtml('');
+ $GLOBALS['__page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
}
// [EOF]