extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 16:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

always check VACATION-SECONDS is available

Browse Source
This commit is contained in:
ralf 2024-02-01 15:11:49 +02:00
parent 4ce3298241
commit 4fcd761f0c
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mail/inc/class.mail_sieve.inc.php
View File

@ -563,7 +563,7 @@ class mail_sieve
}
else
{
if ($icServer->acc_imap_administration || (!empty($icServer->getExtensions()) && in_array('DATE', $icServer->getExtensions())))
if (!empty($icServer->getExtensions()) && in_array('DATE', $icServer->getExtensions()))
{
$ByDate = array('by_date' => lang('By date'));
}
@ -656,7 +656,12 @@ class mail_sieve
if (!$resSetvac)
{
$msg = lang('vacation update failed') . "\n" . lang('Vacation notice update failed') . ":" . $this->account->imapServer()->error;
$msg = lang('Vacation notice update failed') . ":\n" . $this->account->imapServer()->error;
if (!$content['days'])
{
$msg .= "\n\n".lang('%1 requires Sieve extension %2, maybe try %1 or higher number of days.',
lang('Always respond / auto-responder'), 'VACATION-SECONDS', lang('Once per day'));
}
break;
}
// schedule job to switch message on/off, if request and not already in past
@ -710,7 +715,7 @@ class mail_sieve
),
'addresses' => array_combine($vacRules['aliases'],$vacRules['aliases']),
);
if ($icServer->acc_imap_administration || in_array('VACATION-SECONDS', $icServer->getExtensions()))
if (in_array('VACATION-SECONDS', $icServer->getExtensions()))
{
$sel_options['days']['0'] = lang('Always respond / auto-responder');
}

1
mail/lang/egw_de.lang
View File

@ -5,6 +5,7 @@
%1 has been removed from whiltelisted email addresses mail de %1 wurde als E-Mail-Adresse von der Whitelist entfernt
%1 is not writable by you! mail de %1 ist nicht beschreibbar für Sie
%1 mails selected mail de %1 E-Mail(s) ausgewählt
%1 requires sieve extension %2, maybe try %1 or higher number of days. mail de %1 benötigt die Sieve Erweiterung %2, versuchen Sie statt dessen %3 oder eine höhere Anzahl von Tagen.
(*) please consider, forward to multiple addresses will not work if number of addresses exceeds the limit. for most mail servers the limit is 4 by default, please contact your mail server administrator for further info. mail de (*) Achtung: Eine Weiterleitung an mehr als 4 E-Mail-Adressen funktioniert bei den manchen Mail-Servern nicht. Daher ist das als Limit zur Eingabe festgelegt. Für weitere Informationen kontaktieren sie bitte Ihren Administrator.
(leave empty for no quota) mail de (Leer lassen, um einen die Begrenzung zu deaktivieren)
(no subject) mail de (Kein Betreff)

1
mail/lang/egw_en.lang
View File

@ -5,6 +5,7 @@
%1 has been removed from whiltelisted email addresses mail en %1 has been removed from whiltelisted email addresses
%1 is not writable by you! mail en %1 is NOT writable by you!
%1 mails selected mail en %1 emails selected
%1 requires sieve extension %2, maybe try %1 or higher number of days. mail en %1 requires Sieve extension %2, maybe try %1 or higher number of days.
(*) please consider, forward to multiple addresses will not work if number of addresses exceeds the limit. for most mail servers the limit is 4 by default, please contact your mail server administrator for further info. mail en (*) Please consider, forward to multiple addresses will not work if number of addresses exceeds the Limit. For most mail servers the limit is 4 by default, please contact your mail server administrator for further info.
(leave empty for no quota) mail en (Leave empty for no quota)
(no subject) mail en (no subject)