X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fstylesheet.php;h=d7e03ce3f389a29f05926602a9fbf1a421c0dcc9;hb=150ed402878985508f10f4e06d25831e0fb3a1f8;hp=392ea5a4a5d5ac275cee46c60ca6b87efd5e9926;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6;p=mailer.git
diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 392ea5a4a5..d7e03ce3f3 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -10,15 +10,9 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Style-Sheets werden hier abgelegt *
* -------------------------------------------------------------------- *
- * $Revision:: $ *
- * $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 - 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 *
@@ -44,56 +38,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 ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
+if ((isCssOutputMode()) || (getCssPhp() == 'DIRECT')) {
// Load CSS files
$stylesList = merge_array($stylesList, getExtensionCssFiles());
// Generate base path
- $basePath = sprintf("%stheme/%s/css/", getConfig('PATH'), 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)
- outputHtml('');
+ $GLOBALS['__page_header'] .= '';
break;
case 'FILE': // Output contents
- outputHtml(readFromFile($FQFN));
+ $GLOBALS['__page_header'] .= removeDeprecatedComment(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.', getCssPhp()));
break;
} // END - switch
} // END - if
} // END - foreach
-} elseif ((getOutputMode() == '0') || (getConfig('css_php') == 'INLINE')) {
+} elseif ((isHtmlOutputMode()) || (getCssPhp() == 'INLINE')) {
// Load CSS files
$stylesList = merge_array($stylesList, getExtensionCssFiles());
// Generate base path
- $basePath = sprintf("%stheme/%s/css/", getConfig('PATH'), 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)) {
@@ -103,23 +111,21 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
} // END - foreach
// Load template
- loadTemplate('css_inline', false, $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]