config.inc.php:

- remove unused config options:
  - $CONF['vacation_replytype_control']
  - $CONF['vacation_allow_user_reply'];
  - $CONF['vacation_autoreplydelay_default']
  - $CONF['vacation_intervaldelay_default']

CHANGELOG.TXT
- update with vacation changes


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1613 a1433add-5e2c-0410-b055-b7f2511e0802

CHANGELOG.TXT

@@ -9,7 +9,6 @@
 # Last update:
 # $Id$
 
-# (last real update was in r1166 - the above Id: was a minor change)
 Version ***svn*** - 2013/12/09 - SVN r***
 -----------------------------------
 
@@ -40,8 +39,7 @@ Version ***svn*** - 2013/12/09 - SVN r***
     - at least 2 characters
     - at least 2 digits
   - $CONF['*_struct_hook'] - make $struct in the *Handler classes customizeable
-  - $CONF['vacation_replytype_control'] - allow selecting vacation reply interval
+  - $CONF['vacation_choice_of_reply'] - list of reply interval options
-******* and various other options related to this feature ***********
   - $CONF[domain_quota] - total quota per domain
   - $CONF['theme_custom_css'] - to add some custom CSS without editing the
     default CSS file
@@ -203,47 +201,16 @@ Version ***svn*** - 2013/12/09 - SVN r***
 
   VacationHandler:
   - rewrite based on PFAHandler (not useable yet)
-
-  ------------------------------------------------------------------------
-
-  vacation:
-
   - add ability to choose activation date, end date and reply interval for
-    vacation message
+    vacation message - http://sourceforge.net/p/postfixadmin/patches/111/
-*** reply interval needs rework,
-*** http://sourceforge.net/p/postfixadmin/patches/111/
 
-  vacation.pl
+  vacation.pl:
-  - encode subject
+  - encode subject - https://sourceforge.net/p/postfixadmin/bugs/272/ ,
-    https://sourceforge.net/p/postfixadmin/bugs/272/
     https://sourceforge.net/p/postfixadmin/patches/119/
-
+  - add a friendly from address to vacation messages ($friendly_from)
-
+  - make error handling if we cannot send the reply more robust
-
-
-  r1373 | GingerDog | 2012-04-19 23:55:36 +0200 (Do, 19. Apr 2012) | 1 Zeile
-     M /trunk/VIRTUAL_VACATION/vacation.pl
-     M /trunk/config.inc.php
-     M /trunk/model/VacationHandler.php
-     M /trunk/templates/vacation.tpl
-     M /trunk/upgrade.php
-     M /trunk/vacation.php
-
-  Merge jan-kruis's vacation interval reply behaviour - see
-  http://sourceforge.net/p/postfixadmin/patches/111/
-
-     M /trunk/VIRTUAL_VACATION/vacation.pl
-
-  add a friendly from address to vacation messages ("Vacation Service");
-  probably needs more work to beautify it though...;
-
-  change error handling if we cannot
-  send the reply to be hopefully more robust
-
   - add $smtp_client config option to specify the helo name
-  - added custom noreply detection
+  - added custom noreply detection ($noreply_pattern, $custom_noreply_pattern)
-
-  ------------------------------------------------------------------------
 
   Config.php
   - new class to store $CONF

config.inc.php

@@ -324,17 +324,6 @@ $CONF['vacation_control'] ='YES';
 // Set to 'YES' if your domain admins should be able to edit user vacation.
 $CONF['vacation_control_admin'] = 'YES';
 
-// Alllow ReplyType Control
-// This varible will be checked in ./templates/vacation.tpl 
-// YES means it show the reply option, everything else means it will not show
-$CONF['vacation_replytype_control'] = 'YES';
-
-// AllowUser Reply
-// You can Allow or Disable User control over Reply Type
-// This variable will be checked in ./templates/vacation.tpl 
-// YES means it show the reply option, anything else means it will not show
-$CONF['vacation_allow_user_reply'] = 'YES';
-
 // ReplyType options
 // If you want to define additional reply options put them in array below.
 // The array has the format   seconds between replies => $PALANG text
@@ -348,16 +337,6 @@ $CONF['vacation_choice_of_reply'] = array (
    60*60 *24*7 => 'reply_once_per_week'        // Reply if last autoreply was at least a week ago
 );
 
-// autoreplydelay
-// You should define autodefaultdelay is seconds
-// if a new message comes in within this delay it most likely that that the sender is
-// autoreplying on our autoreply message.
-$CONF['vacation_autoreplydelay_default'] = '10';
-
-// Replydelay default
-// You should define default replydelay time here time in in seconds.
-$CONF['vacation_intervaldelay_default'] = '86400'; // is 1 day = 60 sec * 60 min * 24 hours
-
 //
 // End Vacation Stuff.
 //