X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=715bf8fc4cf23fd531bd8670b231d45a49c12848;hb=647822147615bad8572ad4282c9c3958fe983f5c;hp=c8c0565234a89abe8b49683e821bc926dc6fe18e;hpb=c72268213d4d4829d845d39c101bb08fbe4ed79a;p=mailer.git diff --git a/inc/stylesheet.php b/inc/stylesheet.php index c8c0565234..715bf8fc4c 100644 --- a/inc/stylesheet.php +++ b/inc/stylesheet.php @@ -14,12 +14,10 @@ * $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, 2010 by Mailer Developer Team * - * 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 * @@ -54,7 +52,7 @@ if ((isInstallationPhase())) $stylesList[] = 'install.css'; if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', 'FILE'); // Output CSS files or content or link to css.php ? -if ((getScriptOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) { +if ((isCssOutputMode()) || (getConfig('css_php') == 'DIRECT')) { // Load CSS files $stylesList = merge_array($stylesList, getExtensionCssFiles()); @@ -83,7 +81,7 @@ if ((getScriptOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) { } // END - switch } // END - if } // END - foreach -} elseif ((getScriptOutputMode() == '0') || (getConfig('css_php') == 'INLINE')) { +} elseif ((isHtmlOutputMode()) || (getConfig('css_php') == 'INLINE')) { // Load CSS files $stylesList = merge_array($stylesList, getExtensionCssFiles()); @@ -111,12 +109,15 @@ if ((getScriptOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) { if ((isInstallationPhase())) { // Default theme first $newTheme = 'default'; - if (isGetRequestParameterSet('theme')) $newTheme = getRequestParameter('theme'); - if (isPostRequestParameterSet('theme')) $newTheme = secureString(postRequestParameter('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=' . getCurrSvnRevision(); + $OUT .= '?rev=' . getCurrentRepositoryRevision(); } // Close tag