X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=4e58c9ad15efb703053b410cacda62d2fa49d1aa;hb=7d14f333e1ca0847509579c575a7d7335a7775e6;hp=8c62a7b7b7a37afaf166945aa196a5436a85ada6;hpb=cc7c700143bca2420ff0497e648d31a18cc9add2;p=mailer.git

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 8c62a7b7b7..4e58c9ad15 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * 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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -43,18 +48,15 @@ $STYLES = array(
 );
 
 // Add stylesheet for installation
-if ((basename($_SERVER['PHP_SELF']) == "install.php") || (!isBooleanConstantAndTrue('mxchange_installed')) || (isset($_GET['installing']))) $STYLES[] = "install.css";
+if ((isInstalling()) || (!isInstalled())) $STYLES[] = "install.css";
 
 // When no CSS output-mode is set, set it to file-output
 if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', "FILE");
 
 // Output CSS files or content or link to css.php ?
-if (($CSS == "1") || (getConfig('css_php') == "DIRECT")) {
+if (($GLOBALS['output_mode'] == "1") || (getConfig('css_php') == "DIRECT")) {
 	// Load CSS files
-	if (is_array($EXT_CSS_FILES)) {
-		// Load extension's CSS files
-		foreach ($EXT_CSS_FILES as $value) $STYLES[] = $value;
-	} // END - if
+	$STYLES = merge_array($STYLES, EXT_GET_CSS_FILES());
 
 	// Output inclusion lines
 	foreach ($STYLES as $value) {
@@ -78,12 +80,12 @@ if (($CSS == "1") || (getConfig('css_php') == "DIRECT")) {
 } else {
 	// Now we load all CSS files from css.php!
 	OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"{!URL!}/css.php", false);
-	if (isBooleanConstantAndTrue('mxchange_installing')) {
+	if ((isInstalling()) || (!isInstalled())) {
 		// Default theme first
-		$NEW_THEME = "default";
-		if (!empty($_GET['theme']))  $NEW_THEME = SQL_ESCAPE($_GET['theme']);
-		if (!empty($_POST['theme'])) $NEW_THEME = SQL_ESCAPE($_POST['theme']);
-		OUTPUT_HTML("?theme=".$NEW_THEME."&amp;installing=1", false);
+		$newTheme = "default";
+		if (REQUEST_ISSET_GET(('theme')))  $newTheme = REQUEST_GET(('theme'));
+		if (REQUEST_ISSET_POST(('theme'))) $newTheme = SQL_ESCAPE(REQUEST_POST('theme'));
+		OUTPUT_HTML("?theme=".$newTheme."&amp;installing=1", false);
 	} // END - if
 	OUTPUT_HTML("\" />");
 }