extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 17:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

try to fix missing sender email

Browse Source
This commit is contained in:
Klaus Leithoff 2014-01-20 09:26:26 +00:00
parent bb12e99a8b
commit d32e576dfa
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mail/inc/class.mail_bo.inc.php
View File

@ -1665,7 +1665,6 @@ class mail_bo
else else
{ {
$_string = translation::decodeMailHeader($_string,self::$displayCharset); $_string = translation::decodeMailHeader($_string,self::$displayCharset);
//$_tryIDNConversion=false;
if ($_tryIDNConversion===true && stripos($_string,'@')!==false) if ($_tryIDNConversion===true && stripos($_string,'@')!==false)
{ {
$rfcAddr = imap_rfc822_parse_adrlist(str_replace(',','\,',$_string),''); $rfcAddr = imap_rfc822_parse_adrlist(str_replace(',','\,',$_string),'');

12
mail/inc/class.mail_compose.inc.php
View File

@ -2176,7 +2176,11 @@ class mail_compose
$this->sessionData['attachments'] = $_formData['attachments']; $this->sessionData['attachments'] = $_formData['attachments'];
try try
{ {
$identity = emailadmin_account::read_identity($this->sessionData['mailaccount'],true); $acc = emailadmin_account::read($this->sessionData['mailaccount']);
//error_log(__METHOD__.__LINE__.array2string($acc));
$identity = emailadmin_account::read_identity($acc['ident_id'],true);
//$identity = emailadmin_account::read_identity($this->sessionData['mailaccount'],true);
} }
catch (Exception $e) catch (Exception $e)
{ {
@ -2289,7 +2293,11 @@ class mail_compose
#error_log(print_r($this->preferences,true)); #error_log(print_r($this->preferences,true));
try try
{ {
$identity = emailadmin_account::read_identity($this->sessionData['mailaccount'],true); $acc = emailadmin_account::read($this->sessionData['mailaccount']);
//error_log(__METHOD__.__LINE__.array2string($acc));
$identity = emailadmin_account::read_identity($acc['ident_id'],true);
//$identity = emailadmin_account::read_identity($this->sessionData['mailaccount'],true);
} }
catch (Exception $e) catch (Exception $e)
{ {