X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fstylesheet.php;h=8aa0924e7da797dd823a416b8c85b119ff36a707;hb=d7d40e177e09a7161b79bfc95a1d2e91fdff4691;hp=8c62a7b7b7a37afaf166945aa196a5436a85ada6;hpb=cc7c700143bca2420ff0497e648d31a18cc9add2;p=mailer.git
diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 8c62a7b7b7..8aa0924e7d 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -1,7 +1,7 @@
0)) {
- switch (getConfig('css_php')) {
- case "DIRECT":
- OUTPUT_HTML("");
+ if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
+ switch (getCssPhp()) {
+ case 'DIRECT': // Just link them (unsupported)
+ $GLOBALS['__page_header'] .= '';
break;
- case "FILE":
- OUTPUT_HTML(READ_FILE($FQFN));
+ case 'FILE': // Output contents
+ $GLOBALS['__page_header'] .= readFromFile($FQFN);
+ break;
+
+ 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 = sprintf("%stheme/%s/css/", getPath(), 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, $OUT);
} else {
// Now we load all CSS files from css.php!
- OUTPUT_HTML("");
+ $OUT .= '?theme=' . getCurrentTheme() . '&installing=1';
+ } else {
+ // Add SVN revision to bypass caching problems
+ $OUT .= '?rev=' . getCurrentRepositoryRevision();
+ }
+
+ // Close tag
+ $GLOBALS['__page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
}
-//
+// [EOF]
?>