X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fstylesheet.php;h=c523bbda59c22374f834b1e07cc2363205d5edfd;hp=5c56b5632070c09f748812e1dfbf7400a6bb4b53;hb=d8148e3f1f3a6762b2e786dbe99ada269dcf2ea0;hpb=8f60465485bd5e9ab2c0ddfa1f054458cf510042

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 5c56b56320..c523bbda59 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -43,48 +43,45 @@ $STYLES = array(
 );
 
 // Add stylesheet for installation
-if ((basename($_SERVER['PHP_SELF']) == "install.php") || (!isBooleanConstantAndTrue('mxchange_installed')) || (isset($_GET['installing']))) $STYLES[] = "install.css";
+if ((basename($_SERVER['PHP_SELF']) == "install.php") || (!isBooleanConstantAndTrue('mxchange_installed')) || (REQUEST_ISSET_GET(('installing')))) $STYLES[] = "install.css";
 
 // When no CSS output-mode is set, set it to file-output
-if (getConfig('css_php') == null) setConfigEntry('css_php', "FILE");
+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) {
 		// Only include found CSS files (to reduce 404 requests)
 		$BASE = sprintf("%stheme/%s/css/", constant('PATH'), GET_CURR_THEME());
-		$file = $BASE.$value;
+		$FQFN = $BASE.$value;
 
 		// Do include only existing files and whose are not empty
-		if ((FILE_READABLE($file)) && (filesize($file) > 0)) {
+		if ((FILE_READABLE($FQFN)) && (filesize($FQFN) > 0)) {
 			switch (getConfig('css_php')) {
 				case "DIRECT":
 					OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"{!URL!}/theme/".GET_CURR_THEME()."/".$value."\" />");
 					break;
 
 				case "FILE":
-					OUTPUT_HTML(READ_FILE($file));
+					OUTPUT_HTML(READ_FILE($FQFN));
 					break;
-			}
-		}
-	}
+			} // END - switch
+		} // END - if
+	} // END - foreach
 } 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')) {
 		// 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']);
+		if (REQUEST_ISSET_GET(('theme')))  $NEW_THEME = SQL_ESCAPE(REQUEST_GET('theme'));
+		if (REQUEST_ISSET_POST(('theme'))) $NEW_THEME = SQL_ESCAPE(REQUEST_POST('theme'));
 		OUTPUT_HTML("?theme=".$NEW_THEME."&amp;installing=1", false);
-	}
+	} // END - if
 	OUTPUT_HTML("\" />");
 }