X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=7cd2a38cf4d105ed69964e001fe0781b1813b130;hb=206ee1f32b11eaa38a8df0536d7f7732c6dcebc9;hp=0181c6ebd09ceb749479eab99c2886f09c928781;hpb=c3f2beb3f1d47c9593d262d7f5dac47640b4aa52;p=mailer.git diff --git a/inc/stylesheet.php b/inc/stylesheet.php index 0181c6ebd0..7cd2a38cf4 100644 --- a/inc/stylesheet.php +++ b/inc/stylesheet.php @@ -14,10 +14,9 @@ * $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 * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -53,12 +52,12 @@ if ((isInstallationPhase())) $stylesList[] = 'install.css'; 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) { @@ -77,17 +76,17 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) { 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 = ''; @@ -115,7 +114,7 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) { $OUT .= '?theme=' . $newTheme . '&installing=1'; } else { // Add SVN revision to bypass caching problems - $OUT .= '?rev=' . getConfig('CURR_SVN_REVISION'); + $OUT .= '?rev=' . getCurrentRepositoryRevision(); } // Close tag