--- loncom/auth/lonauth.pm 2012/08/27 11:55:26 1.121.2.2 +++ loncom/auth/lonauth.pm 2013/08/28 14:12:56 1.121.2.5 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.121.2.2 2012/08/27 11:55:26 raeburn Exp $ +# $Id: lonauth.pm,v 1.121.2.5 2013/08/28 14:12:56 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -103,7 +103,7 @@ sub success { if ($destsymb =~ /___/) { # FIXME Need to deal with encrypted symbs and urls as needed. my ($map,$resid,$desturl)=split(/___/,$destsymb); - unless ($desturl=~/^(adm|uploaded|editupload|public)/) { + unless ($desturl=~/^(adm|editupload|public)/) { $desturl = &Apache::lonnet::clutter($desturl); } $desturl = &HTML::Entities::encode($desturl,'"<>&'); @@ -205,9 +205,9 @@ sub reroute { my ($r) = @_; &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - my $msg='

'.&mt('Sorry ...').'

' + my $msg=''.&mt('Sorry ...').'
' .&mt('Please [_1]log in again[_2].'); - &Apache::loncommon::simple_error_page($r,'Rerouting',$msg); + &Apache::loncommon::simple_error_page($r,'Rerouting',$msg,{'no_auto_mt_msg' => 1}); } # ---------------------------------------------------------------- Main handler @@ -246,7 +246,7 @@ sub handler { } $r->print( $start_page - .'

' + .'

'.&mt('You are already logged in!').'

' .'

'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].' ,'','','','') .'

'