holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

control (and try to fix) messed up addresses by horde, when fetching the envelope

Browse Source
This commit is contained in:
Klaus Leithoff 2013-11-27 15:40:00 +00:00
parent 9031d1d051
commit 6e88374e6f
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3981,7 +3981,22 @@ class mail_bo
case 'cc': case 'cc':
case 'bcc': case 'bcc':
case 'sender': case 'sender':
//error_log(__METHOD__.__LINE__.array2string($env->$v->addresses));
$envelope[$v]=$env->$v->addresses; $envelope[$v]=$env->$v->addresses;
$address = array();
foreach ($envelope[$v] as $k => $ad)
{
if (stripos($ad,'@')===false)
{
$remember=$k;
}
else
{
$address[] = (!is_null($remember)?$envelope[$v][$remember].' ':'').$ad;
$remember=null;
}
}
$envelope[$v] = $address;
break; break;
case 'date': case 'date':
$envelope[$v]=egw_time::to($env->$v); $envelope[$v]=egw_time::to($env->$v);

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

@ -1589,7 +1589,6 @@ unset($query['actions']);
} }
if (!empty($uid)) $flags = $this->mail_bo->getFlags($uid); if (!empty($uid)) $flags = $this->mail_bo->getFlags($uid);
$envelope = $this->mail_bo->getMessageEnvelope($uid, $partID,true); $envelope = $this->mail_bo->getMessageEnvelope($uid, $partID,true);
$rawheaders = $this->mail_bo->getMessageRawHeader($uid, $partID); $rawheaders = $this->mail_bo->getMessageRawHeader($uid, $partID);
$fetchEmbeddedImages = false; $fetchEmbeddedImages = false;
if ($htmlOptions !='always_display') $fetchEmbeddedImages = true; if ($htmlOptions !='always_display') $fetchEmbeddedImages = true;

2
mail/lang/egw_de.lang
View File

@ -89,7 +89,7 @@ force plain text mail de erzwinge Text
forward as attachment mail de weiterleiten als Anhang forward as attachment mail de weiterleiten als Anhang
forward inline mail de Inline weiterleiten forward inline mail de Inline weiterleiten
forward to mail de weiterleiten an forward to mail de weiterleiten an
from mail de von from mail de Von
from(a->z) mail de Von (A->Z) from(a->z) mail de Von (A->Z)
from(z->a) mail de Von (Z->A) from(z->a) mail de Von (Z->A)
general settings mail de Allgemeine Einstellungen general settings mail de Allgemeine Einstellungen