X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fstylesheet.php;h=14e30495454a9a0857703ae9282ba29a050f2704;hb=9553dbc9eed40bfa2beffa79813f2d5cd21fa8ac;hp=d8e1514d01cc9f8f6bfe938f2f0f3c3724e7a5d9;hpb=7cb246c51e8634735aaf24e546bcbc46c5ce3833;p=mailer.git
diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index d8e1514d01..14e3049545 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -18,6 +18,7 @@
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -53,12 +54,12 @@ if ((isInstallationPhase())) $stylesList[] = 'install.css';
if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', 'FILE');
// Output CSS files or content or link to css.php ?
-if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
+if ((isCssOutputMode()) || (getConfig('css_php') == 'DIRECT')) {
// Load CSS files
$stylesList = merge_array($stylesList, getExtensionCssFiles());
// Generate base path
- $basePath = sprintf("%stheme/%s/css/", getConfig('PATH'), getCurrentTheme());
+ $basePath = sprintf("%stheme/%s/css/", getPath(), getCurrentTheme());
// Output inclusion lines
foreach ($stylesList as $value) {
@@ -69,25 +70,25 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
switch (getConfig('css_php')) {
case 'DIRECT': // Just link them (unsupported)
- outputHtml('');
+ $GLOBALS['page_header'] .= '';
break;
case 'FILE': // Output contents
- outputHtml(readFromFile($FQFN));
+ $GLOBALS['page_header'] .= readFromFile($FQFN);
break;
default: // Invalid mode!
- debug_report_bug(sprintf("Invalid css_php value %s detected.", getConfig('css_php')));
+ debug_report_bug(__FILE__, __LINE__, sprintf("Invalid css_php value %s detected.", getConfig('css_php')));
break;
} // END - switch
} // END - if
} // END - foreach
-} elseif ((getOutputMode() == '0') || (getConfig('css_php') == 'INLINE')) {
+} elseif ((isHtmlOutputMode()) || (getConfig('css_php') == 'INLINE')) {
// Load CSS files
$stylesList = merge_array($stylesList, getExtensionCssFiles());
// Generate base path
- $basePath = sprintf("%stheme/%s/css/", getConfig('PATH'), getCurrentTheme());
+ $basePath = sprintf("%stheme/%s/css/", getPath(), getCurrentTheme());
// Output inclusion lines
$OUT = '';
@@ -103,23 +104,23 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
} // END - foreach
// Load template
- loadTemplate('css_inline', false, $OUT);
+ $GLOBALS['page_header'] .= loadTemplate('css_inline', true, $OUT);
} else {
// Now we load all CSS files from css.php!
- outputHtml('');
+ $GLOBALS['page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
}
// [EOF]