$lt{'wel'}
$welcome
$loginhelp
-$remoteinfo
-$maincall
$continuelink
$end_page
ENDSUCCESS
@@ -171,42 +161,19 @@ ENDSUCCESS
sub failed {
my ($r,$message,$form) = @_;
- (undef,undef,undef,my $clientmathml,my $clientunicode) =
- &Apache::loncommon::decode_user_agent();
- my $args = {};
- if ($clientunicode && !$clientmathml) {
- $args = {'browser.unicode' => 1};
- }
-
- my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef,$args);
- my $uname = &Apache::loncommon::cleanup_html($form->{'uname'});
- 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;
- }
- if ($udom) {
- $retry .= (($retry=~/\?/)?'&':'?').'domain='.$udom;
- }
+ my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef);
+ my $retry = '/adm/login?username='.$form->{'uname'}.
+ '&domain='.$form->{'udom'};
if (exists($form->{role})) {
- my $role = &Apache::loncommon::cleanup_html($form->{role});
- if ($role ne '') {
- $retry .= (($retry=~/\?/)?'&':'?').'role='.$role;
- }
+ $retry .= '&role='.$form->{role};
}
if (exists($form->{symb})) {
- my $symb = &Apache::loncommon::cleanup_html($form->{symb});
- if ($symb ne '') {
- $retry .= (($retry=~/\?/)?'&':'?').'symb='.$symb;
- }
+ $retry .= '&symb='.$form->{symb};
}
- my $end_page = &Apache::loncommon::end_page();
+ my $end_page = &Apache::loncommon::end_page();
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- my $loginhelp = &loginhelpdisplay($udom);
+ my $loginhelp = &loginhelpdisplay($form->{'udom'});
if ($loginhelp) {
$loginhelp = ''.&mt('Login problems?').'
';
}
@@ -228,9 +195,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,{'no_auto_mt_msg' => 1});
+ &Apache::loncommon::simple_error_page($r,'Rerouting',$msg);
}
# ---------------------------------------------------------------- Main handler
@@ -269,7 +236,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].'
,'','','','')
.'
'
@@ -292,7 +259,7 @@ sub handler {
$value =~ tr/+/ /;
$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
$form{$name}=$value;
- }
+ }
if ((!$form{'uname'}) || (!$form{'upass0'}) || (!$form{'udom'})) {
&failed($r,'Username, password and domain need to be specified.',
@@ -317,12 +284,6 @@ sub handler {
my $tmpinfo=Apache::lonnet::reply('tmpget:'.$form{'logtoken'},
$form{'serverid'});
- my %sessiondata;
- if ($form{'iptoken'}) {
- %sessiondata = &Apache::lonnet::tmpget($form{'iptoken'});
- my $delete = &Apache::lonnet::tmpdel($form{'token'});
- }
-
if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost') ||
($tmpinfo eq 'no_such_host')) {
&failed($r,'Information needed to verify your login information is missing, inaccessible or expired.',\%form);
@@ -406,8 +367,7 @@ sub handler {
return OK;
}
my $start_page =
- &Apache::loncommon::start_page('Create a user account in LON-CAPA',
- '',{'no_inline_link' => 1,});
+ &Apache::loncommon::start_page('Create a user account in LON-CAPA');
my $lonhost = $r->dir_config('lonHostID');
my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
my $contacts =
@@ -436,15 +396,6 @@ sub handler {
($firsturl=~/^\/adm\/(logout|remote)/)) {
$firsturl='/adm/roles';
}
-
- my $hosthere;
- if ($form{'iptoken'}) {
- if (($sessiondata{'domain'} eq $form{'udom'}) &&
- ($sessiondata{'username'} eq $form{'uname'})) {
- $hosthere = 1;
- }
- }
-
# --------------------------------- Are we attempting to login as somebody else?
if ($form{'suname'}) {
# ------------ see if the original user has enough privileges to pull this stunt
@@ -468,12 +419,8 @@ sub handler {
}
}
- my ($is_balancer,$otherserver);
-
- unless ($hosthere) {
- ($is_balancer,$otherserver) =
- &Apache::lonnet::check_loadbalancing($form{'uname'},$form{'udom'});
- }
+ my ($is_balancer,$otherserver) =
+ &Apache::lonnet::check_loadbalancing($form{'uname'},$form{'udom'});
if ($is_balancer) {
if (!$otherserver) {