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

Mail: Link expiration date blur text now changes if you have EPL enabled

Browse Source
This commit is contained in:
nathangray 2020-06-05 14:33:26 -06:00
parent aed7914a67
commit 213a30a250
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,7 +284,7 @@ class mail_compose
/**
* Compose dialog
*
* @var arra $_content =null etemplate content array
* @var array $_content =null etemplate content array
* @var string $msg =null a possible message to be passed and displayed to the userinterface
* @var string $_focusElement ='to' subject, to, body supported
* @var boolean $suppressSigOnTop =false
@ -1269,6 +1269,7 @@ class mail_compose
//if (is_array($content['attachments'])) foreach($content['attachments'] as $k => &$file) $file['delete['.$file['tmp_name'].']']=0;
$content['no_griddata'] = empty($content['attachments']);
$preserv['attachments'] = $content['attachments'];
$content['expiration_blur'] = $GLOBALS['egw_info']['user']['apps']['stylite'] ? lang('Select a date') : lang('EPL only');
//if (is_array($content['attachments']))error_log(__METHOD__.__LINE__.' Attachments:'.array2string($content['attachments']));
// if no filemanager -> no vfsFileSelector

2
mail/templates/default/compose.xet
View File

@ -95,7 +95,7 @@
<vbox class="et2_file mailUploadSection" disabled="@no_griddata">
<hbox>
<select id="filemode" label="Send files as" onchange="app.mail.check_sharing_filemode"/>
<date id="expiration" label="Expiration" blur="EPL only" data_format="Y-m-d"/>
<date id="expiration" label="Expiration" blur="@expiration_blur" data_format="Y-m-d"/>
<passwd id="password" blur="password protect" statustext="Only makes sense, if you transport password through a different channel / outside of this mail to recipients!"/>
</hbox>
<grid id="attachments" width="100%" maxheight="165" class="egwGridView_grid" resize_ratio="0">