X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=74678bbf510ea077f0faf8ca2260def6967281b7;hb=8848f4a3fd7b32a1bbd9139766171701b94b2f42;hp=a7312b5589155be7af4c275cb0d994eefe521747;hpb=7b0f17cd637e388049d2167811e4332cec1e979b;p=mailer.git
diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index a7312b5589..74678bbf51 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -1,7 +1,7 @@
0)) {
- switch (getConfig('css_php')) {
- case 'DIRECT':
- OUTPUT_HTML('');
+ switch (getCssPhp()) {
+ case 'DIRECT': // Just link them (unsupported)
+ $GLOBALS['__page_header'] .= '';
+ break;
+
+ case 'FILE': // Output contents
+ $GLOBALS['__page_header'] .= removeDeprecatedComment(readFromFile($FQFN));
break;
- case 'FILE':
- OUTPUT_HTML(readFromFile($FQFN));
+ default: // Invalid mode!
+ reportBug(__FILE__, __LINE__, sprintf('Invalid css_php value %s detected.', getCssPhp()));
break;
} // END - switch
} // END - if
} // END - foreach
+} elseif ((isHtmlOutputMode()) || (getCssPhp() == 'INLINE')) {
+ // Load CSS files
+ $stylesList = merge_array($stylesList, getExtensionCssFiles());
+
+ // Generate base path
+ $basePath = getBasePathFromTheme(getCurrentTheme());
+
+ // Output inclusion lines
+ $OUT = '';
+ foreach ($stylesList as $value) {
+ // Only include found CSS files (to reduce 404 requests)
+ $FQFN = $basePath . '/' . $value;
+
+ // Do include only existing files and whose are not empty
+ if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
+ // Load CSS content
+ $OUT .= readFromFile($FQFN);
+ } // END - if
+ } // END - foreach
+
+ // Load template
+ $GLOBALS['__page_header'] .= loadTemplate('css_inline', TRUE, removeDeprecatedComment($OUT));
} else {
// Now we load all CSS files from css.php!
- OUTPUT_HTML('');
+ $OUT .= '?theme=' . getCurrentTheme() . '&installing=1';
+ } else {
+ // Add version + a number to bypass caching problems
+ $OUT .= '?ver={?FULL_VERSION?}&cb={?CACHE_BUSTER?}';
+ }
+
+ // Close tag
+ $GLOBALS['__page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
}
-//
+// [EOF]
?>