X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=8a519af59776b3fdddcef77132a2947e30dcd88f;hb=ee71bda9cc7d75f090ae2e1a2d05d4903523e112;hp=b63e94db6ed762c4cec93035db7205a5f598a490;hpb=75ad748a68473ace540251427a74fb781b1145e9;p=mailer.git

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index b63e94db6e..8a519af597 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
@@ -44,65 +43,46 @@ $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") || (!isInstalled()) || (REQUEST_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";
+if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', "FILE");
 
 // Output CSS files or content or link to css.php ?
-if (($CSS == "1") || ($CONFIG['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;
-	}
-
-	// Create missing configuration file
-	if (!function_exists('GET_CURR_THEME')) {
-		// Dummy for e.g. down database links
-		function GET_CURR_THEME () {
-			return "default";
-		}
-	}
+	$STYLES = merge_array($STYLES, EXT_GET_CSS_FILES());
 
 	// Output inclusion lines
-	foreach ($STYLES as $value)
-	{
+	foreach ($STYLES as $value) {
 		// Only include found CSS files (to reduce 404 requests)
-		$BASE = PATH."theme/".GET_CURR_THEME()."/css/";
-		$file = $BASE.$value;
+		$BASE = sprintf("%stheme/%s/css/", constant('PATH'), GET_CURR_THEME());
+		$FQFN = $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($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":
-				$load = implode("", file($file));
-				OUTPUT_HTML ($load);
-				break;
-			}
-		}
-	}
-}
- else
-{
+				case "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 (mxchange_installing)
-	{
+	OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"{!URL!}/css.php", false);
+	if (isInstalling()) {
 		// 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 ("\">");
+		if (REQUEST_ISSET_GET(('theme')))  $NEW_THEME = 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("\" />");
 }
 
 //