projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
default to a session cookie instead of setting an explicit timeout, weird timezone...
[freeside.git]
/
httemplate
/
loginout
/
login.html
diff --git
a/httemplate/loginout/login.html
b/httemplate/loginout/login.html
index
d06d0a8
..
1785ea7
100644
(file)
--- a/
httemplate/loginout/login.html
+++ b/
httemplate/loginout/login.html
@@
-1,5
+1,5
@@
<& /elements/header-minimal.html, 'Login' &>
<& /elements/header-minimal.html, 'Login' &>
-<link href="<%$url_string%>elements/freeside.css" type="text/css" rel="stylesheet">
+<link href="<%$url_string%>elements/freeside.css
?v=<% $FS::VERSION %>
" type="text/css" rel="stylesheet">
<CENTER>
<CENTER>
@@
-13,10
+13,12
@@
% }
%# <FORM METHOD="POST" ACTION="<%$url_string%>loginout/login">
% }
%# <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">
<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>
<TR>
<TD ALIGN="right">Username: </TD>
<TD><INPUT TYPE="text" NAME="credential_0" SIZE="13"></TD>
@@
-25,6
+27,10
@@
<TD ALIGN="right">Password: </TD>
<TD><INPUT TYPE="password" NAME="credential_1" SIZE="13"></TD>
</TR>
<TD ALIGN="right">Password: </TD>
<TD><INPUT TYPE="password" NAME="credential_1" SIZE="13"></TD>
</TR>
+ <TR>
+ <TD ALIGN="right">One-time code: </TD>
+ <TD><INPUT TYPE="text" NAME="credential_2" SIZE="13"></TD>
+ </TR>
</TABLE>
<BR>
</TABLE>
<BR>
@@
-40,12
+46,12
@@
my %error = (
'no_cookie' => '', #First login, don't display an error
'bad_cookie' => 'Bad Cookie', #timed out?
my %error = (
'no_cookie' => '', #First login, don't display an error
'bad_cookie' => 'Bad Cookie', #timed out?
- 'bad_credentials' => 'Incorrect username / password',
+ 'bad_credentials' => 'Incorrect username / password
/ one-time code
',
#'logout' => 'You have been logged out.',
);
my $error = # $cgi->param('logout') ||
#'logout' => 'You have been logged out.',
);
my $error = # $cgi->param('logout') ||
- $r->prev->subprocess_env(
"AuthCookieReason"
);
+ $r->prev->subprocess_env(
'AuthCookieReason'
);
$error = exists($error{$error}) ? $error{$error} : $error;
$error = exists($error{$error}) ? $error{$error} : $error;