fix login redirect with query portion (i.e. cust_main.cgi?1) and on errors, RT#21563

diff --git a/httemplate/loginout/login.html b/httemplate/loginout/login.html
index 3c6e2ae..8d599ad 100644 (file)
--- a/httemplate/loginout/login.html
+++ b/httemplate/loginout/login.html
@@ -13,8 +13,10 @@
 % } 
              
 %#  <FORM METHOD="POST" ACTION="<%$url_string%>loginout/login">
+%  my $uri = $r->prev->uri;
+%  $uri .= '?'. $r->prev->args if length( $r->prev->args );
   <FORM METHOD="POST" ACTION="/login">
-    <INPUT TYPE="hidden" NAME="destination" VALUE="<% $r->prev->unparsed_uri %>">
+    <INPUT TYPE="hidden" NAME="destination" VALUE="<% $uri %>">
 
     <TABLE CELLSPACING=0 CELLPADDING=4 BGCOLOR="#cccccc">
       <TR>
@@ -45,7 +47,7 @@ my %error = (
 );
 
 my $error = # $cgi->param('logout') ||
-            $r->prev->subprocess_env("AuthCookieReason");
+            $r->prev->subprocess_env('AuthCookieReason');
 
 $error = exists($error{$error}) ? $error{$error} : $error;