X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fstylesheet.php;h=392ea5a4a5d5ac275cee46c60ca6b87efd5e9926;hp=a7312b5589155be7af4c275cb0d994eefe521747;hb=2f312726826db5c4c3363926c743fea3c1c23b34;hpb=7b0f17cd637e388049d2167811e4332cec1e979b
diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index a7312b5589..392ea5a4a5 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -1,7 +1,7 @@
0)) {
switch (getConfig('css_php')) {
- case 'DIRECT':
- OUTPUT_HTML('');
+ case 'DIRECT': // Just link them (unsupported)
+ outputHtml('');
+ break;
+
+ case 'FILE': // Output contents
+ outputHtml(readFromFile($FQFN));
break;
- case 'FILE':
- OUTPUT_HTML(readFromFile($FQFN));
+ default: // Invalid mode!
+ debug_report_bug(sprintf("Invalid css_php value %s detected.", getConfig('css_php')));
break;
} // 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
+ loadTemplate('css_inline', false, $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
+ outputHtml($OUT . '%}" />');
}
-//
+// [EOF]
?>