X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fstylesheet.php;h=c5e0d7a80ad02ea7e1ffb17e27243eaff97ffe00;hb=2eb01731e9a7a21c1b44ca5881a1444a801f5e5a;hp=d08d66b07b5260dba85c8a934ad8da700d1c6ef1;hpb=eeee0af1c4bb14b8438e2bfcb62dc14eb8f8fa5e;p=mailer.git
diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index d08d66b07b..c5e0d7a80a 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
+ $STYLES = merge_array($STYLES, getExtensionCssFiles());
+
+ // Generate base path
+ $basePath = sprintf("%stheme/%s/css/", getConfig('PATH'), getCurrentTheme());
+
+ // Output inclusion lines
+ $OUT = '';
+ foreach ($STYLES 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 (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]
?>