mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-25 16:18:57 +01:00
Mail - display multiple From addresses
This commit is contained in:
parent
4381af2839
commit
b9292aad18
@ -1777,6 +1777,16 @@ class Mail
|
|||||||
//error_log(__METHOD__.' ('.__LINE__.') '.$headerObject['SUBJECT'].'->'.array2string($_headerObject->getEnvelope()->__get('from')));
|
//error_log(__METHOD__.' ('.__LINE__.') '.$headerObject['SUBJECT'].'->'.array2string($_headerObject->getEnvelope()->__get('from')));
|
||||||
if(is_array($headerObject['FROM']) && $headerObject['FROM'][0]) {
|
if(is_array($headerObject['FROM']) && $headerObject['FROM'][0]) {
|
||||||
$retValue['header'][$sortOrder[$uid]]['sender_address'] = self::decode_header($headerObject['FROM'][0],true);
|
$retValue['header'][$sortOrder[$uid]]['sender_address'] = self::decode_header($headerObject['FROM'][0],true);
|
||||||
|
if (count($headerObject['FROM'])>1)
|
||||||
|
{
|
||||||
|
$ki=0;
|
||||||
|
foreach($headerObject['FROM'] as $k => $add)
|
||||||
|
{
|
||||||
|
if ($k==0) continue;
|
||||||
|
$retValue['header'][$sortOrder[$uid]]['additional_from_addresses'][$ki] = self::decode_header($add,true);
|
||||||
|
$ki++;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(is_array($headerObject['REPLY-TO']) && $headerObject['REPLY-TO'][0]) {
|
if(is_array($headerObject['REPLY-TO']) && $headerObject['REPLY-TO'][0]) {
|
||||||
$retValue['header'][$sortOrder[$uid]]['reply_to_address'] = self::decode_header($headerObject['REPLY-TO'][0],true);
|
$retValue['header'][$sortOrder[$uid]]['reply_to_address'] = self::decode_header($headerObject['REPLY-TO'][0],true);
|
||||||
|
@ -207,6 +207,9 @@ a.et2_url.url {
|
|||||||
.et2_email > span.email {
|
.et2_email > span.email {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
.et2_email a:not(:first-child) {
|
||||||
|
margin-left: 1em;
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* Button widget - text only, and icon
|
* Button widget - text only, and icon
|
||||||
*/
|
*/
|
||||||
|
@ -2003,6 +2003,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
|
|||||||
{
|
{
|
||||||
$data["fromaddress"] = $header['sender_address'];
|
$data["fromaddress"] = $header['sender_address'];
|
||||||
}
|
}
|
||||||
|
$data['additionalfromaddress'] = $header['additional_from_addresses'];
|
||||||
if (in_array("ccaddress", $cols))
|
if (in_array("ccaddress", $cols))
|
||||||
{
|
{
|
||||||
$data['ccaddress'] = $header['cc_addresses'];
|
$data['ccaddress'] = $header['cc_addresses'];
|
||||||
|
@ -1006,7 +1006,6 @@ app.classes.mail = AppJS.extend(
|
|||||||
|
|
||||||
// Widget ID:data key map of widgets we can directly set from cached data
|
// Widget ID:data key map of widgets we can directly set from cached data
|
||||||
var data_widgets = {
|
var data_widgets = {
|
||||||
'previewFromAddress': 'fromaddress',
|
|
||||||
'previewDate': 'date',
|
'previewDate': 'date',
|
||||||
'previewSubject': 'subject'
|
'previewSubject': 'subject'
|
||||||
};
|
};
|
||||||
@ -1051,6 +1050,7 @@ app.classes.mail = AppJS.extend(
|
|||||||
// TO addresses have the first one split out, not all together
|
// TO addresses have the first one split out, not all together
|
||||||
// list of keys:
|
// list of keys:
|
||||||
var expand_content = [
|
var expand_content = [
|
||||||
|
{build_children: true, data_one: 'fromaddress', data: 'additionalfromaddress', widget: 'additionalFromAddress', line: 'mailPreviewHeadersFrom'},
|
||||||
{build_children: true, data_one: 'toaddress', data: 'additionaltoaddress', widget: 'additionalToAddress', line: 'mailPreviewHeadersTo'},
|
{build_children: true, data_one: 'toaddress', data: 'additionaltoaddress', widget: 'additionalToAddress', line: 'mailPreviewHeadersTo'},
|
||||||
{build_children: true, data: 'ccaddress', widget: 'additionalCCAddress', line: 'mailPreviewHeadersCC'},
|
{build_children: true, data: 'ccaddress', widget: 'additionalCCAddress', line: 'mailPreviewHeadersCC'},
|
||||||
{build_children: false, data: 'attachmentsBlock', widget:'previewAttachmentArea', line: 'mailPreviewHeadersAttachments'}
|
{build_children: false, data: 'attachmentsBlock', widget:'previewAttachmentArea', line: 'mailPreviewHeadersAttachments'}
|
||||||
|
@ -12,7 +12,9 @@
|
|||||||
<hbox>
|
<hbox>
|
||||||
<hbox class="mailDisplayHeaders" id="mailDisplayHeadersFrom" disabled="!@FROM" width="70%">
|
<hbox class="mailDisplayHeaders" id="mailDisplayHeadersFrom" disabled="!@FROM" width="70%">
|
||||||
<description value="From"/>
|
<description value="From"/>
|
||||||
<url-email id="FROM" readonly="true"/>
|
<hbox id="FROM" class="mail_extraEmails">
|
||||||
|
</hbox>
|
||||||
|
<buttononly class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader"/>
|
||||||
</hbox>
|
</hbox>
|
||||||
<hbox class="mailDisplayHeaders" align="right" width="30%">
|
<hbox class="mailDisplayHeaders" align="right" width="30%">
|
||||||
<description value="Date"/>
|
<description value="Date"/>
|
||||||
|
@ -13,7 +13,9 @@
|
|||||||
</box>
|
</box>
|
||||||
<hbox width="100%" id="mailPreviewHeadersFrom" class="mailPreviewHeaders">
|
<hbox width="100%" id="mailPreviewHeadersFrom" class="mailPreviewHeaders">
|
||||||
<description value="From"/>
|
<description value="From"/>
|
||||||
<url-email id="previewFromAddress" contact_plus = "true" readonly="true"/>
|
<hbox id="additionalFromAddress" class="mail_extraEmails">
|
||||||
|
</hbox>
|
||||||
|
<buttononly class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader"/>
|
||||||
</hbox>
|
</hbox>
|
||||||
<hbox id="mailPreviewHeadersSubject" class="mailPreviewHeaders">
|
<hbox id="mailPreviewHeadersSubject" class="mailPreviewHeaders">
|
||||||
<description value="Subject"/>
|
<description value="Subject"/>
|
||||||
|
Loading…
Reference in New Issue
Block a user