From 283c563d84aa019ca9e457c758321398b6997a76 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian2009@users.sourceforge.net>
Date: Sun, 8 Nov 2009 19:02:22 +0000
Subject: [PATCH] - small bugfix. Display date correctly

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@766 a1433add-5e2c-0410-b055-b7f2511e0802
---
 templates/users_vacation.tpl | 4 ++--
 users/vacation.php           | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/templates/users_vacation.tpl b/templates/users_vacation.tpl
index d1f3a143..42aa18c2 100644
--- a/templates/users_vacation.tpl
+++ b/templates/users_vacation.tpl
@@ -15,7 +15,7 @@
 	</tr>
 	<tr>
 		<td>{$PALANG.pUsersVacation_activefrom}:</td>
-		<td><input name="fActiveFrom" value="{$fActiveFrom}" readonly="readonly" style="background:#eee;"/>
+		<td><input name="fActiveFrom" value="{$tActiveFrom}" readonly="readonly" style="background:#eee;"/>
 {literal}
 <script language="JavaScript">
 	new tcal ({
@@ -29,7 +29,7 @@
 	</tr>
 	<tr>
 		<td>{$PALANG.pUsersVacation_activeuntil}:</td>
-		<td><input name="fActiveUntil" value="{$fActiveUntil}" readonly="readonly" style="background:#eee;"/>
+		<td><input name="fActiveUntil" value="{$tActiveUntil}" readonly="readonly" style="background:#eee;"/>
 {literal}
 <script language="JavaScript">
 	new tcal ({
diff --git a/users/vacation.php b/users/vacation.php
index 73814eb9..b2c5ea7f 100644
--- a/users/vacation.php
+++ b/users/vacation.php
@@ -48,11 +48,15 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
 {
     $tSubject = '';
     $tBody = '';
-
+	$tActiveFrom = '';
+	$tActiveUntil = '';
+		
 	$details = $vh->get_details();
 	if($details != false) {
         $tSubject = $details['subject'];
         $tBody = $details['body'];
+		$fActiveFrom = $details['activeFrom'];
+		$fActiveUntil = $details['activeUntil'];
     }
     if($vh->check_vacation()) {
         $tMessage = $PALANG['pUsersVacation_welcome_text'];