From 4b7e59b662611213dc51c1f8dca799236ccd7835 Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Sun, 6 Mar 2011 21:30:55 +0000
Subject: [PATCH] edit-vacation: - db_log vacation changes

Known bug: enabling vacation causes two log entries if the user used
vacation before. Better than not logging vacation changes at all.

trunk already has a different fix - it uses VacationHandler which does
indirect logging via AliasHandler.


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/branches/postfixadmin-2.3@987 a1433add-5e2c-0410-b055-b7f2511e0802
---
 CHANGELOG.TXT     | 1 +
 edit-vacation.php | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 52fccdfa..67f2158c 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -25,6 +25,7 @@ Version 2.3.3 - 2011/**/** - SVN r*** (postfixadmin-2.3 branch)
     to bigint to allow mailboxes >4 GB (run setup.php to upgrade your database)
   - vacation.pl logged literal $variable instead of the variable content at two
     places
+  - edit-vacation: log enabling/disabling vacation if done by admins
   - POSTFIX_CONF.txt: fixed filename for quota map
   - config.inc.php: removed double $CONF['database_prefix']
   - config.inc.php: fixed comments about domain_post* script parameters
diff --git a/edit-vacation.php b/edit-vacation.php
index 49159a9a..4984b695 100644
--- a/edit-vacation.php
+++ b/edit-vacation.php
@@ -55,6 +55,7 @@ else {
    $fUsername = $SESSID_USERNAME;
    $fDomain = $USERID_DOMAIN;
 }
+list (/*NULL*/, $domain) = explode('@', $fUsername);
 
 $vacation_domain = $CONF['vacation_domain'];
 $vacation_goto = preg_replace('/@/', '#', $fUsername);
@@ -140,6 +141,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
             {
                $error = 1;
             }
+            db_log($SESSID_USERNAME, $domain, 'edit_alias', "$fUsername -> $goto");
          }
       }
    }
@@ -184,6 +186,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
       {
          $error = 1;
       }
+      db_log($SESSID_USERNAME, $domain, 'edit_alias', "$fUsername -> $goto");
    }
 }