Merge branch 'develop' into 1703-worker-splitting

[friendica.git] / include / msgclean.php

diff --git a/include/msgclean.php b/include/msgclean.php
index 284ad1ce4b232e9066251481c7d4b9018e5bff5e..de7dacca29ba1510eab76e76e3230e498fc7ae50 100644 (file)
--- 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) == '>')