SF.net SVN: postfixadmin:[987] branches/postfixadmin-2.3

[<chr...@us...>]

Revision: 987
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=987&view=rev
Author:   christian_boltz
Date:     2011-03-06 21:30:55 +0000 (Sun, 06 Mar 2011)

Log Message:
-----------
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.

Modified Paths:
--------------
    branches/postfixadmin-2.3/CHANGELOG.TXT
    branches/postfixadmin-2.3/edit-vacation.php

Modified: branches/postfixadmin-2.3/CHANGELOG.TXT
===================================================================
--- branches/postfixadmin-2.3/CHANGELOG.TXT	2011-03-06 20:40:41 UTC (rev 986)
+++ branches/postfixadmin-2.3/CHANGELOG.TXT	2011-03-06 21:30:55 UTC (rev 987)
@@ -25,6 +25,7 @@
     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

Modified: branches/postfixadmin-2.3/edit-vacation.php
===================================================================
--- branches/postfixadmin-2.3/edit-vacation.php	2011-03-06 20:40:41 UTC (rev 986)
+++ branches/postfixadmin-2.3/edit-vacation.php	2011-03-06 21:30:55 UTC (rev 987)
@@ -55,6 +55,7 @@
    $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 @@
             {
                $error = 1;
             }
+            db_log($SESSID_USERNAME, $domain, 'edit_alias', "$fUsername -> $goto");
          }
       }
    }
@@ -184,6 +186,7 @@
       {
          $error = 1;
       }
+      db_log($SESSID_USERNAME, $domain, 'edit_alias', "$fUsername -> $goto");
    }
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.