* -------------------------------------------------------------------- *
* Kurzbeschreibung : Style-Sheets werden hier abgelegt *
* -------------------------------------------------------------------- *
- * $Revision:: $ *
- * $Date:: $ *
- * $Tag:: 0.2.1-FINAL $ *
- * $Author:: $ *
- * -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * 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 *
);
// Add stylesheet for installation
-if ((isInstallationPhase())) {
+if ((isInstaller())) {
array_push($stylesList, 'install.css');
} // END - if
} // 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(), $currentTheme);
+ $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'] .= '<link rel="stylesheet" type="text/css" href="{%url=theme/' . getCurrentTheme() . '/' . $value . '%}" />';
break;
case 'FILE': // Output contents
- $GLOBALS['__page_header'] .= readFromFile($FQFN);
+ $GLOBALS['__page_header'] .= removeDeprecatedComment(readFromFile($FQFN));
break;
default: // Invalid mode!
- reportBug(__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)) {
} // 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 = '<link rel="stylesheet" type="text/css" href="{%url=css.php';
- if ((isInstallationPhase())) {
+
+ if ((isInstaller())) {
// Default theme first
$OUT .= '?theme=' . getCurrentTheme() . '&installing=1';
} else {
- // Add SVN revision to bypass caching problems
- $OUT .= '?rev=' . getCurrentRepositoryRevision();
+ // Add version + a number to bypass caching problems
+ $OUT .= '?ver={?FULL_VERSION?}&cb={?CACHE_BUSTER?}';
}
// Close tag