--- loncom/auth/lonauth.pm 2013/12/20 14:54:34 1.129 +++ loncom/auth/lonauth.pm 2014/04/06 13:40:19 1.133 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.129 2013/12/20 14:54:34 raeburn Exp $ +# $Id: lonauth.pm,v 1.133 2014/04/06 13:40:19 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -108,11 +108,11 @@ sub success { } $desturl = &HTML::Entities::encode($desturl,'"<>&'); $destsymb = &HTML::Entities::encode($destsymb,'"<>&'); - $destination .= '&destinationurl='.$desturl. + $destination .= 'destinationurl='.$desturl. '&destsymb='.$destsymb; } else { $destsymb = &HTML::Entities::encode($destsymb,'"<>&'); - $destination .= '&destinationurl='.$destsymb; + $destination .= 'destinationurl='.$destsymb; } } if ($destination =~ m{^/adm/roles}) { @@ -173,7 +173,7 @@ sub failed { my $udom = &Apache::loncommon::cleanup_html($form->{'udom'}); if (&Apache::lonnet::domain($udom,'description') eq '') { undef($udom); - } + } my $retry = '/adm/login'; if ($uname eq $form->{'uname'}) { $retry .= '?username='.$uname; @@ -183,7 +183,7 @@ sub failed { } if (exists($form->{role})) { my $role = &Apache::loncommon::cleanup_html($form->{role}); - if ($role ne '') { + if ($role ne '') { $retry .= (($retry=~/\?/)?'&':'?').'role='.$role; } } @@ -196,18 +196,19 @@ sub failed { my $end_page = &Apache::loncommon::end_page(); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; + my @actions = + (&mt('Please [_1]log in again[_2].','','')); my $loginhelp = &loginhelpdisplay($udom); if ($loginhelp) { - $loginhelp = '
'; + push(@actions, ''.&mt('Login problems?').''); } + #FIXME: link to helpdesk might be added here $r->print( $start_page - .''.&mt($message).'
' - .''.&mt('Please [_1]log in again[_2].','','') - .'
' - .$loginhelp + .'