Skip to content
Permalink
Browse files

[jan] Never send autoreplies again when setting zero vacation days in…

… Procmail or Maildrop backends (Bug #14549).
  • Loading branch information...
yunosh committed Jan 27, 2017
1 parent 726eb30 commit 88b16e40f845a0a6c26ca7bdd80dcb274e05ab58
Showing with 19 additions and 18 deletions.
  1. +2 −0 ingo/docs/CHANGES
  2. +1 −6 ingo/lib/Script/Maildrop/Recipe.php
  3. +14 −12 ingo/lib/Script/Procmail/Recipe.php
  4. +2 −0 ingo/package.xml
@@ -2,6 +2,8 @@
v3.2.14-git
-----------

[jan] Never send autoreplies again when setting zero vacation days in Procmail
or Maildrop backends (Bug #14549).
[jan] Don't split sieve body tests on commas (Bug #14546).


@@ -130,11 +130,6 @@ public function __construct($params = array(), $scriptparams = array())
if ($end === false) {
$end = 0;
}
$days = strftime($params['action-value']['days']);
if ($days === false) {
// Set to same value as $_days in ingo/lib/Storage.php
$days = 7;
}
// Rule : Do not send responses to bulk or list messages
if ($params['action-value']['ignorelist'] == 1) {
@@ -168,7 +163,7 @@ public function __construct($params = array(), $scriptparams = array())
$this->_action[] = ' cc "' . str_replace('"', '\\"', sprintf(
'| mailbot %s -D %d -c \'UTF-8\' -t $HOME/vacation.msg -d $HOME/vacation -A %s -s %s /usr/sbin/sendmail -t -f %s',
$this->_params['mailbotargs'],
$params['action-value']['days'],
$params['action-value']['days'] ?: 9999,
escapeshellarg('From: ' . $from),
escapeshellarg(Horde_Mime::encode($params['action-value']['subject'])),
escapeshellarg($from)))
@@ -157,20 +157,22 @@ public function __construct($params = array(), $scriptparams = array())
$this->_action[] = ' :0';
$this->_action[] = ' * ^TO_' . $address;
$this->_action[] = ' {';
$this->_action[] =
' FILEDATE=`test -f ${VACATION_DIR:-.}/\'.vacation.'
. $address . '\' && '
. $this->_params['ls']
. ' -lcn --time-style=+%s ${VACATION_DIR:-.}/\'.vacation.'
. $address . '\' | '
. 'awk \'{ print $6 + (' . $days * 86400 . ') }\'`';
$this->_action[] = ' DATE=`' . $this->_params['date']
. ' +%s`';
$this->_action[] =
' DUMMY=`test -f ${VACATION_DIR:-.}/\'.vacation.'
. $address . '\' && '
. 'test $FILEDATE -le $DATE && '
. 'rm ${VACATION_DIR:-.}/\'.vacation.' . $address . '\'`';
if ($days) {
$this->_action[] =
' FILEDATE=`test -f ${VACATION_DIR:-.}/\'.vacation.'
. $address . '\' && '
. $this->_params['ls']
. ' -lcn --time-style=+%s ${VACATION_DIR:-.}/\'.vacation.'
. $address . '\' | '
. 'awk \'{ print $6 + (' . $days * 86400 . ') }\'`';
$this->_action[] =
' DUMMY=`test -f ${VACATION_DIR:-.}/\'.vacation.'
. $address . '\' && '
. 'test $FILEDATE -le $DATE && '
. 'rm ${VACATION_DIR:-.}/\'.vacation.' . $address . '\'`';
}
if ($timed) {
$this->_action[] = ' START='
. $params['action-value']['start'];
@@ -33,6 +33,7 @@
</stability>
<license uri="http://www.horde.org/licenses/apache">ASL</license>
<notes>
* [jan] Never send autoreplies again when setting zero vacation days in Procmail or Maildrop backends (Bug #14549).
* [jan] Don&apos;t split sieve body tests on commas (Bug #14546).
</notes>
<contents>
@@ -1704,6 +1705,7 @@
<date>2016-12-16</date>
<license uri="http://www.horde.org/licenses/apache">ASL</license>
<notes>
* [jan] Never send autoreplies again when setting zero vacation days in Procmail or Maildrop backends (Bug #14549).
* [jan] Don&apos;t split sieve body tests on commas (Bug #14546).
</notes>
</release>

0 comments on commit 88b16e4

Please sign in to comment.
You can’t perform that action at this time.