X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=12838b3b3392d8bab258b01df89c1a38bad66e1f;hb=50c257ecdf297672ffb6c6f1f9430bc35bca2c51;hp=87c64c2e48624cebf7f69ec3dd6a03be7345639f;hpb=66b91ce490ab549425619c95fc12086e126d541b;p=mailer.git
diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 87c64c2e48..12838b3b33 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -1,7 +1,7 @@
0)) {
switch (getConfig('css_php')) {
case 'DIRECT': // Just link them (unsupported)
- OUTPUT_HTML('');
+ $GLOBALS['page_header'] .= '';
break;
case 'FILE': // Output contents
- OUTPUT_HTML(readFromFile($FQFN));
+ $GLOBALS['page_header'] .= readFromFile($FQFN);
break;
default: // Invalid mode!
@@ -83,17 +83,44 @@ if ((getOutputMode() == '1') || (getConfig('css_php') == 'DIRECT')) {
} // END - switch
} // END - if
} // END - foreach
+} elseif ((getOutputMode() == '0') || (getConfig('css_php') == 'INLINE')) {
+ // Load CSS files
+ $stylesList = merge_array($stylesList, getExtensionCssFiles());
+
+ // Generate base path
+ $basePath = sprintf("%stheme/%s/css/", getConfig('PATH'), 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('');
+ if (isGetRequestParameterSet('theme')) $newTheme = getRequestParameter('theme');
+ if (isPostRequestParameterSet('theme')) $newTheme = secureString(postRequestParameter('theme'));
+ $OUT .= '?theme=' . $newTheme . '&installing=1';
+ } else {
+ // Add SVN revision to bypass caching problems
+ $OUT .= '?rev=' . getConfig('CURR_SVN_REVISION');
+ }
+
+ // Close tag
+ $GLOBALS['page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
}
// [EOF]