X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fstylesheet.php;h=0e2045ae026938a12e0498acee01af40b7e8632b;hb=885637e9f61f315ba051500061ec193ebc937f7b;hp=be068d59a01ccb62887e318346cfb66dffb78080;hpb=508228c85fba8448d00865b1639cb8cd7a69e457;p=mailer.git

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index be068d59a0..0e2045ae02 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -10,7 +10,7 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Style-Sheets werden hier abgelegt                *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
+ * $Revision::                                                        $ *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
@@ -38,56 +38,60 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
 // Default styles
 $STYLES = array(
-		"general.css",
+		'general.css',
 );
 
 // Add stylesheet for installation
-if ((basename($_SERVER['PHP_SELF']) == "install.php") || (!isInstalled()) || (REQUEST_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");
+if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', 'FILE');
 
 // Output CSS files or content or link to css.php ?
-if (($GLOBALS['output_mode'] == "1") || (getConfig('css_php') == "DIRECT")) {
+if ((getOutputMode() == '1') || (getConfig('css_php') == 'DIRECT')) {
 	// Load CSS files
 	$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());
-		$FQFN = $BASE.$value;
+		$basePath = sprintf("%stheme/%s/css/", constant('PATH'), getCurrentTheme());
+		$FQFN = $basePath . $value;
 
 		// Do include only existing files and whose are not empty
-		if ((FILE_READABLE($FQFN)) && (filesize($FQFN) > 0)) {
+		if ((isFileReadable($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."\" />");
+				case 'DIRECT': // Just link them (unsupported)
+					OUTPUT_HTML('<link rel="stylesheet" type="text/css" href="{!URL!}/theme/' . getCurrentTheme() . '/' . $value . '" />');
 					break;
 
-				case "FILE":
-					OUTPUT_HTML(READ_FILE($FQFN));
+				case 'FILE': // Output contents
+					OUTPUT_HTML(readFromFile($FQFN));
+					break;
+
+				default: // Invalid mode!
+					debug_report_bug(sprintf("Invalid css_php value %s detected.", getConfig('css_php')));
 					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 (isInstalling()) {
+	OUTPUT_HTML('<link rel="stylesheet" type="text/css" href="{!URL!}/css.php', false);
+	if ((isInstalling()) || (!isInstalled())) {
 		// Default theme first
-		$NEW_THEME = "default";
-		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);
+		$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("\" />");
+	OUTPUT_HTML('" />');
 }
 
 //