From d3f9c892b54b4145322f9aad305ac28a1af2ba4f Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 26 Sep 2011 14:39:59 +0000
Subject: [PATCH] * eMail/Sieve/Vacation: set default to 7 for days setting in
 vacation for new vacation setups

---
 felamimail/inc/class.uisieve.inc.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/felamimail/inc/class.uisieve.inc.php b/felamimail/inc/class.uisieve.inc.php
index bdacdd5b41..4d08123ab8 100644
--- a/felamimail/inc/class.uisieve.inc.php
+++ b/felamimail/inc/class.uisieve.inc.php
@@ -660,10 +660,9 @@
 				// ToDO set default
 
 			} else {
-				$this->t->set_var('selected_'.$vacation['days'], 'selected="selected"');
+				$this->t->set_var('selected_'.($vacation['days']?$vacation['days']:'7'), 'selected="selected"');
 			}
-			if (empty($preferences->preferences['prefpreventforwarding']) ||
-                    $preferences->preferences['prefpreventforwarding'] == 0 )
+			if (empty($preferences->preferences['prefpreventforwarding']) || $preferences->preferences['prefpreventforwarding'] == 0 )
 			{
 				$this->t->set_var('vacation_forwards','<input class="input_text" name="vacation_forwards" size="80" value="'.htmlspecialchars($vacation['forwards']).'" />');
 			}