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

Fix mail preview does not show bcc field

Browse Source
This commit is contained in:
hadi 2023-08-14 17:19:12 +02:00
parent 6c9d9aa8ed
commit f0656f280f
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1794,7 +1794,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
if (empty($rowsFetched['messages'])) $rowsFetched['messages'] = $rowsFetched['rowsFetched']; if (empty($rowsFetched['messages'])) $rowsFetched['messages'] = $rowsFetched['rowsFetched'];
//error_log(__METHOD__.__LINE__.' Rows fetched:'.$rowsFetched.' Data:'.array2string($sortResult)); //error_log(__METHOD__.__LINE__.' Rows fetched:'.$rowsFetched.' Data:'.array2string($sortResult));
$cols = array('row_id','uid','status','attachments','subject','address','toaddress','fromaddress','ccaddress','additionaltoaddress','date','size','modified','bodypreview', 'security'); $cols = array('row_id','uid','status','attachments','subject','address','toaddress','fromaddress','ccaddress','bccaddress','additionaltoaddress','date','size','modified','bodypreview', 'security');
if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode']=='EGW_SELECTMODE_TOGGLE') unset($cols[0]); if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode']=='EGW_SELECTMODE_TOGGLE') unset($cols[0]);
$rows = $mail_ui->header2gridelements($sortResult['header'],$cols, $_folderName, $folderType=$toSchema); $rows = $mail_ui->header2gridelements($sortResult['header'],$cols, $_folderName, $folderType=$toSchema);
@ -2102,6 +2102,10 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
{ {
$data['ccaddress'] = $header['cc_addresses']; $data['ccaddress'] = $header['cc_addresses'];
} }
if (in_array("bccaddress", $cols))
{
$data['bccaddress'] = $header['bcc_addresses'];
}
if (in_array("date", $cols)) if (in_array("date", $cols))
{ {
$data["date"] = $header['date']; $data["date"] = $header['date'];

6
mail/templates/default/index.xet
View File

@ -47,6 +47,12 @@
rows="1" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail" rows="1" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"
onTagClick="app.mail.onclickCompose"></et2-select-email> onTagClick="app.mail.onclickCompose"></et2-select-email>
</et2-hbox> </et2-hbox>
<et2-hbox disabled="!@bccaddress" width="100%">
<et2-description value="Bcc" class="firstColumnTitle"></et2-description>
<et2-select-email id="bccaddress" readonly="true" multiple="true"
rows="1" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"
onTagClick="app.mail.onclickCompose"></et2-select-email>
</et2-hbox>
<et2-hbox width="100%" disabled="!@attachmentsBlock"> <et2-hbox width="100%" disabled="!@attachmentsBlock">
<et2-description value="Attachments" class="firstColumnTitle"></et2-description> <et2-description value="Attachments" class="firstColumnTitle"></et2-description>
<et2-details overlaySummaryOnOpen="true" toggleAlign="right" toggleOnHover="true" hoist="true" class="attachments" > <et2-details overlaySummaryOnOpen="true" toggleAlign="right" toggleOnHover="true" hoist="true" class="attachments" >