From 1951f725ef4707d8781fcdf102e8e447a526c564 Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Tue, 17 Jun 2008 21:40:33 +0000 Subject: [PATCH] fixes from trunk - r385:387 git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/branches/postfixadmin-2.2.1@390 a1433add-5e2c-0410-b055-b7f2511e0802 --- VIRTUAL_VACATION/INSTALL.TXT | 2 +- edit-mailbox.php | 1 + templates/edit-vacation.php | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/VIRTUAL_VACATION/INSTALL.TXT b/VIRTUAL_VACATION/INSTALL.TXT index 1d7f940d..2ee6edac 100644 --- a/VIRTUAL_VACATION/INSTALL.TXT +++ b/VIRTUAL_VACATION/INSTALL.TXT @@ -23,7 +23,7 @@ You need to have the following installed to be able to use Virtual Vacation. About Virtual Vacation ---------------------- -Virual Vacation is today done with a local shell account that can receive +Virtual Vacation is today done with a local shell account that can receive email. The email is then handled by a Perl script which sends the Vacation message back to the sender. diff --git a/edit-mailbox.php b/edit-mailbox.php index a22642e7..c61d839d 100644 --- a/edit-mailbox.php +++ b/edit-mailbox.php @@ -153,6 +153,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") $formvars['active']=$sqlActive; $result = db_update ('mailbox', "username='$fUsername' AND domain='$fDomain'", $formvars, array('modified')); + $maildir = $user_details['maildir']; if ($result != 1 || !mailbox_postedit($fUsername,$fDomain,$maildir, $quota)) { $tMessage = $PALANG['pEdit_mailbox_result_error']; } diff --git a/templates/edit-vacation.php b/templates/edit-vacation.php index 3fd349a7..268c910b 100644 --- a/templates/edit-vacation.php +++ b/templates/edit-vacation.php @@ -20,12 +20,12 @@ window.location="" - +   - +