* $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 - 2011 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 *
if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', 'FILE');
// 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(), getCurrentTheme());
// Output inclusion lines
foreach ($stylesList as $value) {
if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
switch (getConfig('css_php')) {
case 'DIRECT': // Just link them (unsupported)
- outputHtml('<link rel="stylesheet" type="text/css" href="{%url=theme/' . getCurrentTheme() . '/' . $value . '%}" />');
+ $GLOBALS['page_header'] .= '<link rel="stylesheet" type="text/css" href="{%url=theme/' . getCurrentTheme() . '/' . $value . '%}" />';
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')));
+ debug_report_bug(__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 = '';
} // 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!
$OUT = '<link rel="stylesheet" type="text/css" href="{%url=css.php';
if ((isInstallationPhase())) {
// Default theme first
$newTheme = 'default';
- if (isGetRequestElementSet('theme')) $newTheme = getRequestElement('theme');
- if (isPostRequestElementSet('theme')) $newTheme = secureString(postRequestElement('theme'));
+ if (isPostRequestElementSet('theme')) {
+ $newTheme = postRequestElement('theme');
+ } elseif (isGetRequestElementSet('theme')) {
+ $newTheme = getRequestElement('theme');
+ }
$OUT .= '?theme=' . $newTheme . '&installing=1';
} else {
// Add SVN revision to bypass caching problems
- $OUT .= '?rev=' . getConfig('CURR_SVN_REVISION');
+ $OUT .= '?rev=' . getCurrentRepositoryRevision();
}
// Close tag
- outputHtml($OUT . '%}" />');
+ $GLOBALS['page_header'] .= $OUT . '%}{%ext,version=sql_patches%}" />';
}
// [EOF]