From 213a30a25041d613ed29c7001d84f8fa9badb4f9 Mon Sep 17 00:00:00 2001 From: nathangray Date: Fri, 5 Jun 2020 14:33:26 -0600 Subject: [PATCH] Mail: Link expiration date blur text now changes if you have EPL enabled --- mail/inc/class.mail_compose.inc.php | 3 ++- mail/templates/default/compose.xet | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php index bbc80f073f..8bf2457cb0 100644 --- a/mail/inc/class.mail_compose.inc.php +++ b/mail/inc/class.mail_compose.inc.php @@ -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 diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet index dbac3874f6..1fb6712e6e 100644 --- a/mail/templates/default/compose.xet +++ b/mail/templates/default/compose.xet @@ -95,7 +95,7 @@