Merge branch 'postfixadmin:master' into master

This commit is contained in:
Jan Kruis authored and GitHub committed 2022-10-19 01:54:09 +02:00
commit 7c6daecd12
3 files changed
+5 -8

No files matched your search

+1 -4
View File
@@ -15,10 +15,7 @@
* Used to switch active status for admins, domains, mailboxes, aliases and aliasdomains, etc.
*
* Template File:
* list-virutal.tpl
* list-virutal-alias.tpl which incl list-virutal.tpl
* list-virutal-alias_domains.tpl which incl list-virutal.tpl
* list-virutal_mailbox.tpl
* none - redirects to $formconf['listview']
*/
require_once('common.php');
+3 -3
View File
@@ -16,9 +16,9 @@
*
* Template File:
* list-virutal.tpl
* list-virutal-alias.tpl which incl list-virutal.tpl
* list-virutal-alias_domains.tpl which incl list-virutal.tpl
* list-virutal_mailbox.tpl
* list-virtual-alias.tpl which incl list-virtual.tpl
* list-virtual-alias_domains.tpl which incl list-virtual.tpl
* list-virtual_mailbox.tpl
*
* Form POST \ GET Variables:
*
+1 -1
View File
@@ -158,7 +158,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
## because vacation.pl will report SMTP recipient $smtp_recipient which resolves to $email does not have an active vacation (rv: $rv, email: $email)"
## and will not send message
## set $tActtiveFrom to the begin of the day (00:00:00) and $tActiveUntil to the end of de day (23:59:59)
## set $tActiveFrom to the begin of the day (00:00:00) and $tActiveUntil to the end of the day (23:59:59)
## time part is now set to entry time
date_modify($tActiveFrom,"00:00:00") ;
date_modify($tActiveUntil,"23:59:59") ;