extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-22 21:30:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed signature changing to work when switching to or from empty or no signature, as well as multibyte chars like German umlauts

Browse Source
This commit is contained in:
Ralf Becker 2012-07-17 11:24:47 +00:00
parent f82147a464
commit b0990eafbe
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
felamimail/inc/class.ajaxfelamimail.inc.php
View File

@ -1448,13 +1448,13 @@ class ajaxfelamimail
$_content = str_replace(array("\r","\t","<br />\n",": "),array("","","<br />",":"),($_currentMode == 'html'?html::purify($_content,$htmlConfig,array(),true):$_content));
if ($_currentMode == 'html')
{
$found = strpos($_content,"<!-- HTMLSIGBEGIN -->");
$endSig = strpos($_content,"<!-- HTMLSIGEND -->");
if ($found !== false && $endSig !== false)
$_content = str_replace("\n",'\n',$_content); // dont know why, but \n screws up preg_replace
$_content = preg_replace($reg='|'.preg_quote('<!-- HTMLSIGBEGIN -->','|').'.*'.preg_quote('<!-- HTMLSIGEND -->','|').'|u',
$rep='<!-- HTMLSIGBEGIN -->'.$sigText.'<!-- HTMLSIGEND -->', $in=$_content, -1, $replaced);
$_content = str_replace('\n',"\n",$_content);
//error_log(__METHOD__."() preg_replace('$reg', '$rep', '$in', -1)='$_content', replaced=$replaced");
if ($replaced)
{
$lengthSig = $endSig-($found+strlen('<!-- HTMLSIGBEGIN -->'));
$_content = substr_replace($_content,$sigText,$found+strlen('<!-- HTMLSIGBEGIN -->'),$lengthSig);
//error_log(__METHOD__.__LINE__.'->'.$_content);
$found = false; // this way we skip further replacement efforts
}
else