X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=3c16a1335914e3a281c4d35e8b2e5e21ef807308;hb=1e5953f6bfcadb2cbdaead2e516c4401078e620d;hp=cd60159cc5cd1560deb328b3735bb17d3a89b2de;hpb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;p=mailer.git
diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index cd60159cc5..3c16a13359 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -16,8 +16,8 @@
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2013 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,56 +43,70 @@ if (!defined('__SECURITY')) {
// Default styles
$stylesList = array(
'general.css',
+ 'ajax.css',
);
// Add stylesheet for installation
-if ((isInstallationPhase())) $stylesList[] = 'install.css';
+if ((isInstaller())) {
+ 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')) {
+if ((isCssOutputMode()) || (getCssPhp() == 'DIRECT')) {
// Load CSS files
$stylesList = merge_array($stylesList, getExtensionCssFiles());
// Generate base path
- $basePath = sprintf("%stheme/%s/css/", getPath(), getCurrentTheme());
+ $basePath = getBasePathFromTheme($currentTheme);
// Output inclusion lines
foreach ($stylesList as $value) {
// Only include found CSS files (to reduce 404 requests)
- $FQFN = $basePath . $value;
+ $FQFN = $basePath . '/' . $value;
// Do include only existing files and whose are not empty
if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
- switch (getConfig('css_php')) {
+ switch (getCssPhp()) {
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'] .= removeDeprecatedComment(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.', getCssPhp()));
break;
} // END - switch
} // END - if
} // END - foreach
-} elseif ((isHtmlOutputMode()) || (getConfig('css_php') == 'INLINE')) {
+} elseif ((isHtmlOutputMode()) || (getCssPhp() == 'INLINE')) {
// Load CSS files
$stylesList = merge_array($stylesList, getExtensionCssFiles());
// Generate base path
- $basePath = sprintf("%stheme/%s/css/", getPath(), getCurrentTheme());
+ $basePath = getBasePathFromTheme(getCurrentTheme());
// Output inclusion lines
$OUT = '';
foreach ($stylesList as $value) {
// Only include found CSS files (to reduce 404 requests)
- $FQFN = $basePath . $value;
+ $FQFN = $basePath . '/' . $value;
// Do include only existing files and whose are not empty
if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
@@ -102,23 +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, removeDeprecatedComment($OUT));
} else {
// Now we load all CSS files from css.php!
$OUT = '';
+ $GLOBALS['__page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
}
// [EOF]