X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=3c16a1335914e3a281c4d35e8b2e5e21ef807308;hb=7770a9545292d628afd2be4f58f86da5c9139619;hp=29b7304c5ccb471498bf068e8fd4da7f129d3954;hpb=63f159414369b5ea19a8ca75d8cd8033c45d8341;p=mailer.git

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 29b7304c5c..3c16a13359 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -47,7 +47,7 @@ $stylesList = array(
 );
 
 // Add stylesheet for installation
-if ((isInstallationPhase())) {
+if ((isInstaller())) {
 	array_push($stylesList, 'install.css');
 } // END - if
 
@@ -66,47 +66,47 @@ if ($currentTheme != getSession('mailer_theme')) {
 } // END - if
 
 // Output CSS files or content or link to css.php ?
-if ((isCssOutputMode()) || (getConfig('css_php') == 'DIRECT')) {
+if ((isCssOutputMode()) || (getCssPhp() == 'DIRECT')) {
 	// Load CSS files
 	$stylesList = merge_array($stylesList, getExtensionCssFiles());
 
 	// Generate base path
-	$basePath = sprintf("%stheme/%s/css/", getPath(), $currentTheme);
+	$basePath = getBasePathFromTheme($currentTheme);
 
 	// Output inclusion lines
 	foreach ($stylesList as $value) {
 		// Only include found CSS files (to reduce 404 requests)
-		$FQFN = $basePath . $value;
+		$FQFN = $basePath . '/' . $value;
 
 		// Do include only existing files and whose are not empty
 		if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
-			switch (getConfig('css_php')) {
+			switch (getCssPhp()) {
 				case 'DIRECT': // Just link them (unsupported)
 					$GLOBALS['__page_header'] .= '<link rel="stylesheet" type="text/css" href="{%url=theme/' . getCurrentTheme() . '/' . $value . '%}" />';
 					break;
 
 				case 'FILE': // Output contents
-					$GLOBALS['__page_header'] .= readFromFile($FQFN);
+					$GLOBALS['__page_header'] .= removeDeprecatedComment(readFromFile($FQFN));
 					break;
 
 				default: // Invalid mode!
-					reportBug(__FILE__, __LINE__, sprintf("Invalid css_php value %s detected.", getConfig('css_php')));
+					reportBug(__FILE__, __LINE__, sprintf('Invalid css_php value %s detected.', getCssPhp()));
 					break;
 			} // END - switch
 		} // END - if
 	} // END - foreach
-} elseif ((isHtmlOutputMode()) || (getConfig('css_php') == 'INLINE')) {
+} elseif ((isHtmlOutputMode()) || (getCssPhp() == 'INLINE')) {
 	// Load CSS files
 	$stylesList = merge_array($stylesList, getExtensionCssFiles());
 
 	// Generate base path
-	$basePath = sprintf("%stheme/%s/css/", getPath(), getCurrentTheme());
+	$basePath = getBasePathFromTheme(getCurrentTheme());
 
 	// Output inclusion lines
 	$OUT = '';
 	foreach ($stylesList as $value) {
 		// Only include found CSS files (to reduce 404 requests)
-		$FQFN = $basePath . $value;
+		$FQFN = $basePath . '/' . $value;
 
 		// Do include only existing files and whose are not empty
 		if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
@@ -116,11 +116,11 @@ if ((isCssOutputMode()) || (getConfig('css_php') == 'DIRECT')) {
 	} // END - foreach
 
 	// Load template
-	$GLOBALS['__page_header'] .= loadTemplate('css_inline', true, $OUT);
+	$GLOBALS['__page_header'] .= loadTemplate('css_inline', TRUE, removeDeprecatedComment($OUT));
 } else {
 	// Now we load all CSS files from css.php!
 	$OUT = '<link rel="stylesheet" type="text/css" href="{%url=css.php';
-	if ((isInstallationPhase())) {
+	if ((isInstaller())) {
 		// Default theme first
 		$OUT .= '?theme=' . getCurrentTheme() . '&amp;installing=1';
 	} else {