X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fstylesheet.php;h=47c6b65abd6efa1a0778f416c8ecc505fdcefac0;hb=b8a6f8012aa3509d8e0f8fd078e044f20e80707a;hp=8a519af59776b3fdddcef77132a2947e30dcd88f;hpb=f74581eca45c393033acfd9d7798b958031bc625;p=mailer.git
diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 8a519af597..47c6b65abd 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -1,7 +1,7 @@
0)) {
+ if ((isFileReadable($FQFN)) && (filesize($FQFN) > 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(READ_FILE($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("");
+ $newTheme = 'default';
+ if (isGetRequestElementSet('theme')) $newTheme = getRequestElement('theme');
+ if (isPostRequestElementSet('theme')) $newTheme = secureString(postRequestElement('theme'));
+ outputHtml('?theme=' . $newTheme . '&installing=1', false);
+ } else {
+ // Add SVN revision to bypass caching problems
+ outputHtml('?rev=' . getConfig('CURR_SVN_REVISION'));
+ }
+
+ // Close tag
+ outputHtml('%}" />');
}
-//
+// [EOF]
?>