4.x style login page

[freeside.git] / httemplate / loginout / login.html

diff --git a/httemplate/loginout/login.html b/httemplate/loginout/login.html
index a67ea4b..b787a3e 100644 (file)
--- a/httemplate/loginout/login.html
+++ b/httemplate/loginout/login.html
@@ -13,10 +13,12 @@
 % } 
              
 %#  <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->uri %>">
+    <INPUT TYPE="hidden" NAME="destination" VALUE="<% $uri %>">
 
-    <TABLE CELLSPACING=0 CELLPADDING=4 BGCOLOR="#cccccc">
+    <TABLE CELLSPACING=0 CELLPADDING=4 CLASS="fsinnerbox">
       <TR>
         <TD ALIGN="right">Username: </TD>
         <TD><INPUT TYPE="text" NAME="credential_0" SIZE="13"></TD>
@@ -45,13 +47,12 @@ my %error = (
 );
 
 my $error = # $cgi->param('logout') ||
-            $r->prev->subprocess_env("AuthCookieReason");
+            $r->prev->subprocess_env('AuthCookieReason');
 
 $error = exists($error{$error}) ? $error{$error} : $error;
 
 
-#my $url_string = CGI->new->url;
-my $url_string = $cgi->url;
+my $url_string = $r->uri;
 
 #fake a freeside path for /login so we get our .css.  shrug
 $url_string =~ s/login$/freeside\/login/ unless $url_string =~ /freeside\//;