SF.net SVN: postfixadmin:[1324] branches/postfixadmin-2.3

[<chr...@us...>]

Revision: 1324
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1324&view=rev
Author:   christian_boltz
Date:     2012-01-10 20:01:23 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
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)

Modified Paths:
--------------
    branches/postfixadmin-2.3/edit-vacation.php
    branches/postfixadmin-2.3/templates/edit-vacation.php

Modified: branches/postfixadmin-2.3/edit-vacation.php
===================================================================
--- branches/postfixadmin-2.3/edit-vacation.php	2012-01-10 19:39:29 UTC (rev 1323)
+++ branches/postfixadmin-2.3/edit-vacation.php	2012-01-10 20:01:23 UTC (rev 1324)
@@ -61,7 +61,7 @@
 $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")
 {

Modified: branches/postfixadmin-2.3/templates/edit-vacation.php
===================================================================
--- branches/postfixadmin-2.3/templates/edit-vacation.php	2012-01-10 19:39:29 UTC (rev 1323)
+++ branches/postfixadmin-2.3/templates/edit-vacation.php	2012-01-10 20:01:23 UTC (rev 1324)
@@ -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">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.