extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-04 21:29:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

on reply use "its me" [some@mail.suffix] instead of "its me" <some@mail.suffix> when gathering mailheader data for display, as ckeditor took <some@mail.suffix> for a html-tag (and tried to close it) on compose of html messages; make sure that only messages in Draft folder will removed for lastDrafted messages

Browse Source
This commit is contained in:
Klaus Leithoff
2012-03-26 15:52:41 +00:00
parent 02cb2fe24a
commit bd7f00043c
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -336,7 +336,7 @@ class ajaxfelamimail
if ($_autoSave)
{
$bocompose->sessionData['lastDrafted'] = array('uid'=>$messageUid,'folder'=>$folder);
$bocompose->sessionData['messageFolder'] = $messageFolder;
if ($this->bofelamimail->isTemplateFolder($messageFolder)) $bocompose->sessionData['messageFolder'] = $messageFolder;
}
else
{

9
felamimail/inc/class.bocompose.inc.php
View File

@ -564,7 +564,7 @@
$bodyParts = $bofelamimail->getMessageBody($_uid, ($this->preferencesArray['htmlOptions']?$this->preferencesArray['htmlOptions']:''), $_partID);
//_debug_array($bodyParts);
$fromAddress = felamimail_bo::htmlspecialchars($bofelamimail->decode_header(($headers['FROM'][0]['PERSONAL_NAME'] != 'NIL') ? $headers['FROM'][0]['RFC822_EMAIL'] : $headers['FROM'][0]['EMAIL']));
$fromAddress = felamimail_bo::htmlspecialchars($bofelamimail->decode_header(($headers['FROM'][0]['PERSONAL_NAME'] != 'NIL') ? str_replace(array('<','>'),array('[',']'),$headers['FROM'][0]['RFC822_EMAIL']) : $headers['FROM'][0]['EMAIL']));
$toAddressA = array();
$toAddress = '';
@ -573,7 +573,7 @@
}
if (count($toAddressA)>0)
{
$toAddress = felamimail_bo::htmlspecialchars($bofelamimail->decode_header(implode(', ', $toAddressA)));
$toAddress = felamimail_bo::htmlspecialchars($bofelamimail->decode_header(implode(', ', str_replace(array('<','>'),array('[',']'),$toAddressA))));
$toAddress = @htmlspecialchars(lang("to")).": ".$toAddress.($bodyParts['0']['mimeType'] == 'text/html'?"\r\n<br>":"\r\n");;
}
$ccAddressA = array();
@ -583,7 +583,7 @@
}
if (count($ccAddressA)>0)
{
$ccAddress = felamimail_bo::htmlspecialchars($bofelamimail->decode_header(implode(', ', $ccAddressA)));
$ccAddress = felamimail_bo::htmlspecialchars($bofelamimail->decode_header(implode(', ', str_replace(array('<','>'),array('[',']'),$ccAddressA))));
$ccAddress = @htmlspecialchars(lang("cc")).": ".$ccAddress.($bodyParts['0']['mimeType'] == 'text/html'?"\r\n<br>":"\r\n");
}
if($bodyParts['0']['mimeType'] == 'text/html') {
@ -1161,8 +1161,9 @@
$lastDrafted = $this->sessionData['lastDrafted'];
if (isset($lastDrafted['uid']) && !empty($lastDrafted['uid'])) $lastDrafted['uid']=trim($lastDrafted['uid']);
if (isset($lastDrafted['uid']) && (empty($lastDrafted['uid']) || $lastDrafted['uid'] == $this->sessionData['uid'])) $lastDrafted=false;
//error_log(__METHOD__.__LINE__.array2string($lastDrafted));
}
if ($lastDrafted && is_array($lastDrafted)) $bofelamimail->deleteMessages((array)$lastDrafted['uid'],$lastDrafted['folder']);
if ($lastDrafted && is_array($lastDrafted) && $bofelamimail->isDraftFolder($lastDrafted['folder'])) $bofelamimail->deleteMessages((array)$lastDrafted['uid'],$lastDrafted['folder']);
unset($this->sessionData['lastDrafted']);
//error_log("handling draft messages, flagging and such");