From: Roland Häder <roland@mxchange.org>
Date: Wed, 12 Jun 2013 03:20:59 +0000 (+0000)
Subject: Removed @deprecated from CSS inline/PHP output
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ab3fe2cd85baa68950504b41ea5c057899178a49;p=mailer.git

Removed @deprecated from CSS inline/PHP output
---

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index baaee6da2c..3c16a13359 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -86,7 +86,7 @@ if ((isCssOutputMode()) || (getCssPhp() == 'DIRECT')) {
 					break;
 
 				case 'FILE': // Output contents
-					$GLOBALS['__page_header'] .= readFromFile($FQFN);
+					$GLOBALS['__page_header'] .= removeDeprecatedComment(readFromFile($FQFN));
 					break;
 
 				default: // Invalid mode!
@@ -116,7 +116,7 @@ if ((isCssOutputMode()) || (getCssPhp() == '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';
diff --git a/inc/template-functions.php b/inc/template-functions.php
index 139759e5b0..9d8412562c 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -2399,5 +2399,27 @@ function getTemplateBasePath ($part) {
 	return $GLOBALS[__FUNCTION__][$part];
 }
 
+// Removes comments with @DEPRECATED
+function removeDeprecatedComment ($output) {
+	// Explode it into pieces ... ;)
+	$lines = explode(chr(10), $output);
+
+	// Walk through all
+	$return = '';
+	foreach ($lines as $line) {
+		// Is there a @DEPRECATED?
+		if (isInString('@DEPRECATED', $line)) {
+			// Ignore this line
+			continue;
+		} // END - if
+
+		// Add it
+		$return .= $line . chr(13);
+	} // END - foreach
+
+	// Returned cleaned content
+	return $return;
+}
+
 // [EOF]
 ?>
diff --git a/templates/de/html/css_inline.tpl b/templates/de/html/css_inline.tpl
index 0841fd704f..73260d17ef 100644
--- a/templates/de/html/css_inline.tpl
+++ b/templates/de/html/css_inline.tpl
@@ -1,5 +1,3 @@
 <style type="text/css">
-<!--
 $content
-//-->
 </style>