X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=29b7304c5ccb471498bf068e8fd4da7f129d3954;hb=099437d5083d63a798f7d7a05f54842395985cb7;hp=d8e1514d01cc9f8f6bfe938f2f0f3c3724e7a5d9;hpb=7cb246c51e8634735aaf24e546bcbc46c5ce3833;p=mailer.git
diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index d8e1514d01..29b7304c5c 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -14,11 +14,10 @@
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -44,21 +43,35 @@ if (!defined('__SECURITY')) {
// Default styles
$stylesList = array(
'general.css',
+ 'ajax.css',
);
// Add stylesheet for installation
-if ((isInstallationPhase())) $stylesList[] = 'install.css';
+if ((isInstallationPhase())) {
+ array_push($stylesList, 'install.css');
+} // END - if
// When no CSS output-mode is set, set it to file-output
-if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', 'FILE');
+if (!isConfigEntrySet('css_php')) {
+ setConfigEntry('css_php', 'FILE');
+} // END - if
+
+// Get current theme
+$currentTheme = getCurrentTheme();
+
+// Has the theme changed?
+if ($currentTheme != getSession('mailer_theme')) {
+ // Then set it
+ setMailerTheme($currentTheme);
+} // END - if
// 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(), $currentTheme);
// Output inclusion lines
foreach ($stylesList as $value) {
@@ -69,25 +82,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')));
+ reportBug(__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 +116,20 @@ 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]