X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=0e2045ae026938a12e0498acee01af40b7e8632b;hb=60c6d7a179157acd6e5f6df2ed8968980aebe193;hp=17572429a25e349180352895c422a46b8ac4a8b3;hpb=c3822adad779fbfc5650f2a50880765375578200;p=mailer.git

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 17572429a2..0e2045ae02 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                  *
@@ -32,73 +37,61 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+if (!defined('__SECURITY')) {
+	$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") || (!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 (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 ((getOutputMode() == '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 = sprintf("%stheme/%s/css/", PATH, GET_CURR_THEME());
-		$file = $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_exists($file)) && (filesize($file) > 0)) {
-			switch ($_CONFIG['css_php']) {
-				case "DIRECT":
-					OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"".URL."/".$BASE."\" />");
+		if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
+			switch (getConfig('css_php')) {
+				case 'DIRECT': // Just link them (unsupported)
+					OUTPUT_HTML('<link rel="stylesheet" type="text/css" href="{!URL!}/theme/' . getCurrentTheme() . '/' . $value . '" />');
+					break;
+
+				case 'FILE': // Output contents
+					OUTPUT_HTML(readFromFile($FQFN));
 					break;
 
-				case "FILE":
-					$load = implode("", file($file));
-					OUTPUT_HTML($load);
+				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 (isBooleanConstantAndTrue('mxchange_installing')) {
+	OUTPUT_HTML('<link rel="stylesheet" type="text/css" href="{!URL!}/css.php', false);
+	if ((isInstalling()) || (!isInstalled())) {
 		// 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("\" />");
+		$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('" />');
 }
 
 //