From 638f2755eb8896f6462483bd426ee72eb2d73df6 Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Tue, 10 Jan 2012 20:01:23 +0000
Subject: [PATCH] edit-vacation.php, templates/edit-vacation.php: - only
 urlencode() $fDomain, not the whole fCanceltarget (otherwise   the ? is also
 encoded, which results in a 404 error)

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/branches/postfixadmin-2.3@1324 a1433add-5e2c-0410-b055-b7f2511e0802
---
 edit-vacation.php           | 2 +-
 templates/edit-vacation.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/edit-vacation.php b/edit-vacation.php
index 4984b695..d258c2ad 100644
--- a/edit-vacation.php
+++ b/edit-vacation.php
@@ -61,7 +61,7 @@ $vacation_domain = $CONF['vacation_domain'];
 $vacation_goto = preg_replace('/@/', '#', $fUsername);
 $vacation_goto = $vacation_goto . '@' . $vacation_domain;
 
-$fCanceltarget = $CONF['postfix_admin_url'] . "/list-virtual.php?domain=$fDomain";
+$fCanceltarget = $CONF['postfix_admin_url'] . "/list-virtual.php?domain=" . urlencode($fDomain);
 
 if ($_SERVER['REQUEST_METHOD'] == "GET")
 {
diff --git a/templates/edit-vacation.php b/templates/edit-vacation.php
index e5ddb888..cca38bf9 100644
--- a/templates/edit-vacation.php
+++ b/templates/edit-vacation.php
@@ -2,7 +2,7 @@
 <script type="text/javascript">
 function newLocation()
 {
-    window.location= "<?php echo urlencode($fCanceltarget); ?>"
+    window.location= "<?php echo $fCanceltarget; ?>"
 }
 </script>
 <div id="edit_form">