From 836a3b07e3c53265414969390227ce8efd7683a2 Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 8 Jun 2020 13:30:57 -0600 Subject: [PATCH] Mail: Only show EPL version needed blur if EPL is not available --- admin/inc/class.admin_mail.inc.php | 3 +++ admin/templates/default/mailaccount.xet | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/admin/inc/class.admin_mail.inc.php b/admin/inc/class.admin_mail.inc.php index ae587a37a3..9dabbfd094 100644 --- a/admin/inc/class.admin_mail.inc.php +++ b/admin/inc/class.admin_mail.inc.php @@ -1361,6 +1361,9 @@ class admin_mail $content['ident_email'] = Mail::fixInvalidAliasAddress (Api\Accounts::id2name($content['acc_imap_account_id'], 'account_email'), $content['ident_email']); } + // If no EPL available, show that in spamtitan blur + $content['spamtitan_blur'] = $GLOBALS['egw_info']['user']['apps']['stylite'] ? '' : lang('SpamTitian integration requires EPL version'); + $tpl->exec(static::APP_CLASS.'edit', $content, $sel_options, $readonlys, $content, 2); } diff --git a/admin/templates/default/mailaccount.xet b/admin/templates/default/mailaccount.xet index ee108b0d9f..e451bb0943 100644 --- a/admin/templates/default/mailaccount.xet +++ b/admin/templates/default/mailaccount.xet @@ -243,7 +243,7 @@ - +