SF.net SVN: postfixadmin:[1596] trunk

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

Revision: 1596
          http://sourceforge.net/p/postfixadmin/code/1596
Author:   christian_boltz
Date:     2013-12-01 22:29:25 +0000 (Sun, 01 Dec 2013)
Log Message:
-----------
r1595 accidently included more changed files than it should.

This commit contains some dummy changes to get a proper changelog
attached to those files.

VacationHandler:
- (r1595) rewrite based on PFAHandler (not useable yet)
- (this commit) add a dummy init() function that calls die()

DOCUMENTS/DOVECOT.txt:
- (r1595) TODO note
- (this commit) remove the TODO note again

CHANGELOG.TXT:
- (r1595) include changes of 2.3.4, 2.3.5 and 2.3.6 (copied from 2.3 branch)
- (r1595) update some notes about SVN version (still far from complete)	

Revision Links:
--------------
    http://sourceforge.net/p/postfixadmin/code/1595
    http://sourceforge.net/p/postfixadmin/code/1595
    http://sourceforge.net/p/postfixadmin/code/1595
    http://sourceforge.net/p/postfixadmin/code/1595
    http://sourceforge.net/p/postfixadmin/code/1595

Modified Paths:
--------------
    trunk/CHANGELOG.TXT
    trunk/DOCUMENTS/DOVECOT.txt
    trunk/model/VacationHandler.php

Modified: trunk/CHANGELOG.TXT
===================================================================
--- trunk/CHANGELOG.TXT	2013-12-01 21:48:14 UTC (rev 1595)
+++ trunk/CHANGELOG.TXT	2013-12-01 22:29:25 UTC (rev 1596)
@@ -13,6 +13,7 @@
 Version ***svn*** - 2009/12/26 - SVN r***
 -----------------------------------
 
+
   - NOTE: changes from the 2.3 branch also apply to this version
   - use smarty for templates
   - new command-line interface for PostfixAdmin (scripts/postfixadmin-cli)

Modified: trunk/DOCUMENTS/DOVECOT.txt
===================================================================
--- trunk/DOCUMENTS/DOVECOT.txt	2013-12-01 21:48:14 UTC (rev 1595)
+++ trunk/DOCUMENTS/DOVECOT.txt	2013-12-01 22:29:25 UTC (rev 1596)
@@ -144,5 +144,3 @@
 - use the 'quota2' table (also created by setup.php)
 - set $CONF['new_quota_table'] = 'YES'
 
-
-*** TODO: Update based on chatlog 2012-05-02 ***

Modified: trunk/model/VacationHandler.php
===================================================================
--- trunk/model/VacationHandler.php	2013-12-01 21:48:14 UTC (rev 1595)
+++ trunk/model/VacationHandler.php	2013-12-01 22:29:25 UTC (rev 1596)
@@ -7,7 +7,10 @@
     protected $id_field = 'email';
     protected $domain_field = 'domain';
 
-    # init $this->struct, $this->db_table and $this->id_field
+    function init($id) {
+        die('VacationHandler is not yet ready to be used with *Handler methods'); # obvious TODO: remove when it's ready ;-) 
+    }
+
     protected function initStruct() {
         $this->struct=array(
             # field name                allow       display in...   type    $PALANG label                     $PALANG description                 default / options / ...

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