X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=29b7304c5ccb471498bf068e8fd4da7f129d3954;hb=b0ed0547ba277e815ca38b3333b191149a88019c;hp=147e7245d39c580209e463b98d7b2ddcab78f0ac;hpb=2379934be6a196a54f4155bb8e24c49b20736969;p=mailer.git
diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 147e7245d3..29b7304c5c 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -16,8 +16,8 @@
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team *
- * 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 *
@@ -43,13 +43,27 @@ 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 ((isCssOutputMode()) || (getConfig('css_php') == 'DIRECT')) {
@@ -57,7 +71,7 @@ if ((isCssOutputMode()) || (getConfig('css_php') == 'DIRECT')) {
$stylesList = merge_array($stylesList, getExtensionCssFiles());
// Generate base path
- $basePath = sprintf("%stheme/%s/css/", getPath(), getCurrentTheme());
+ $basePath = sprintf("%stheme/%s/css/", getPath(), $currentTheme);
// Output inclusion lines
foreach ($stylesList as $value) {
@@ -68,15 +82,15 @@ if ((isCssOutputMode()) || (getConfig('css_php') == 'DIRECT')) {
if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
switch (getConfig('css_php')) {
case 'DIRECT': // Just link them (unsupported)
- $GLOBALS['page_header'] .= '';
+ $GLOBALS['__page_header'] .= '';
break;
case 'FILE': // Output contents
- $GLOBALS['page_header'] .= readFromFile($FQFN);
+ $GLOBALS['__page_header'] .= readFromFile($FQFN);
break;
default: // Invalid mode!
- debug_report_bug(__FILE__, __LINE__, 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
@@ -102,26 +116,20 @@ if ((isCssOutputMode()) || (getConfig('css_php') == 'DIRECT')) {
} // END - foreach
// Load template
- $GLOBALS['page_header'] .= loadTemplate('css_inline', true, $OUT);
+ $GLOBALS['__page_header'] .= loadTemplate('css_inline', true, $OUT);
} else {
// Now we load all CSS files from css.php!
$OUT = '';
+ $GLOBALS['__page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
}
// [EOF]