X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=497339beb8f04e02050180306449f824268e4989;hb=572e4b0f128dc3e7c44331d21f366fb8b19665e4;hp=9c3a67dd9e3714007f1c9f9b11b7c2de4ef01385;hpb=60494e212a67fe360bfbb481eb4928480a6f379b;p=mailer.git

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 9c3a67dd9e..497339beb8 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -44,7 +44,7 @@ $STYLES = array(
 );
 
 // Add stylesheet for installation
-if ((basename($_SERVER['PHP_SELF']) == "install.php") || (!mxchange_installed) || (isset($_GET['installing']))) $STYLES[] = "install.css";
+if ((basename($_SERVER['PHP_SELF']) == "install.php") || (!isBooleanConstantAndTrue('mxchange_installed')) || (isset($_GET['installing']))) $STYLES[] = "install.css";
 
 // When no CSS output-mode is set, set it to file-output
 if (empty($_CONFIG['css_php'])) $_CONFIG['css_php'] = "FILE";
@@ -71,38 +71,34 @@ if (($CSS == "1") || ($_CONFIG['css_php'] == "DIRECT"))
 	foreach ($STYLES as $value)
 	{
 		// Only include found CSS files (to reduce 404 requests)
-		$BASE = PATH."theme/".GET_CURR_THEME()."/css/";
+		$BASE = sprintf("%stheme/%s/css/", PATH, GET_CURR_THEME());
 		$file = $BASE.$value;
+
 		// Do include only existing files and whose are not empty
-		if ((file_exists($file)) && (filesize($file) > 0))
-		{
-			switch ($_CONFIG['css_php'])
-			{
-			case "DIRECT":
-				OUTPUT_HTML("<LINK rel=\"stylesheet\" type=\"text/css\" href=\"".URL."/".$BASE."\">");
-				break;
+		if ((FILE_READABLE($file)) && (filesize($file) > 0)) {
+			switch ($_CONFIG['css_php']) {
+				case "DIRECT":
+					OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"".URL."/".$BASE."\" />");
+					break;
 
-			case "FILE":
-				$load = implode("", file($file));
-				OUTPUT_HTML($load);
-				break;
+				case "FILE":
+					$load = implode("", file($file));
+					OUTPUT_HTML($load);
+					break;
 			}
 		}
 	}
-}
- else
-{
+} else {
 	// Now we load all CSS files from css.php!
-	OUTPUT_HTML("<LINK rel=\"stylesheet\" type=\"text/css\" href=\"".URL."/css.php", false);
-	if (mxchange_installing)
-	{
+	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 = $_GET['theme'];
 		if (!empty($_POST['theme'])) $NEW_THEME = $_POST['theme'];
 		OUTPUT_HTML("?theme=".$NEW_THEME."&amp;installing=1", false);
 	}
-	OUTPUT_HTML("\">");
+	OUTPUT_HTML("\" />");
 }
 
 //