X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fmsgclean.php;h=9e8ebed790ef23ef274a41528a93078c6cdb6165;hb=cb3077b7a9023a65b6dc13df065bfbbe7f7633fb;hp=284ad1ce4b232e9066251481c7d4b9018e5bff5e;hpb=4f927392f8d3791e55d9bf695a967a28d6dbceb0;p=friendica.git

diff --git a/include/msgclean.php b/include/msgclean.php
index 284ad1ce4b..9e8ebed790 100644
--- a/include/msgclean.php
+++ b/include/msgclean.php
@@ -13,7 +13,7 @@ function savereplace($pattern, $replace, $text)
 
 function unifyattributionline($message)
 {
-	$quotestr = array('quote', 'collapsed');
+	$quotestr = array('quote', 'spoiler');
 	foreach ($quotestr as $quote) {
 
 		$message = savereplace('/----- Original Message -----\s.*?From: "([^<"].*?)" <(.*?)>\s.*?To: (.*?)\s*?Cc: (.*?)\s*?Sent: (.*?)\s.*?Subject: ([^\n].*)\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
@@ -127,9 +127,9 @@ function removesig($message)
 	if (($sigpos < $quotepos) and ($sigpos != 0))
 		return(array('body' => $message, 'sig' => ''));
 
-	// To-Do: Regexp umstellen, so dass auf 1 oder kein Leerzeichen
-	// geprueft wird
-	//$message = str_replace("\n--\n", "\n-- \n", $message);
+	/// @TODO Regexp umstellen, so dass auf 1 oder kein Leerzeichen
+	/// geprueft wird
+	/// $message = str_replace("\n--\n", "\n-- \n", $message);
 
 	$pattern = '/(.*)[\r\n]-- [\r\n](.*)/is';
 
@@ -154,7 +154,7 @@ function removelinebreak($message)
 	$lines = array();
 	$lineno = 0;
 
-	foreach($arrbody as $i => $line) {
+	foreach ($arrbody as $i => $line) {
 		$currquotelevel = 0;
 		$currline = $line;
 		while ((strlen($currline)>0) and ((substr($currline, 0, 1) == '>')
@@ -187,7 +187,7 @@ function removelinebreak($message)
 				(substr(trim($nextline), 0, 7) == 'http://') or
 				(substr(trim($nextline), 0, 8) == 'https://'));
 
-		if (!$specialchars) 
+		if (!$specialchars)
 			$specialchars = ((substr(rtrim($line), -1) == '-') or
 					(substr(rtrim($line), -1) == '=') or
 					(substr(rtrim($line), -1) == '*') or
@@ -222,4 +222,3 @@ function removelinebreak($message)
 	return(implode("\n", $lines));
 
 }
-?>