$lt{'wel'}
$welcome
$loginhelp
-$remoteinfo
-$maincall
$continuelink
$end_page
ENDSUCCESS
@@ -179,46 +169,36 @@ sub failed {
}
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;
- }
+ my $uname = $form->{'uname'};
+ my $udom;
+ if (&Apache::lonnet::domain($form->{'udom'},'description') ne '') {
+ $udom = $form->{'udom'};
+ }
+ my $retry = '/adm/login?username='.$form->{'uname'};
if ($udom) {
- $retry .= (($retry=~/\?/)?'&':'?').'domain='.$udom;
+ $retry .= '&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 @actions =
- (&mt('Please [_1]log in again[_2].','',''));
my $loginhelp = &loginhelpdisplay($udom);
if ($loginhelp) {
- push(@actions, ''.&mt('Login problems?').'');
+ $loginhelp = ''.&mt('Login problems?').'
';
}
- #FIXME: link to helpdesk might be added here
$r->print(
$start_page
- .''.&mt('Sorry ...').'
'
- .&Apache::lonhtmlcommon::confirm_success(&mt($message),1).'
'
- .&Apache::lonhtmlcommon::actionbox(\@actions)
+ .''.&mt('Sorry ...').'
'
+ .''.&mt($message).'
'
+ .''.&mt('Please [_1]log in again[_2].','','')
+ .'
'
+ .$loginhelp
.$end_page
);
}
@@ -407,8 +387,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 =
@@ -483,17 +462,7 @@ sub handler {
if ($otherserver) {
&success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef,
\%form);
- my $switchto = '/adm/switchserver?otherserver='.$otherserver;
- if (($firsturl) && ($firsturl ne '/adm/switchserver') && ($firsturl ne '/adm/roles')) {
- $switchto .= '&origurl='.$firsturl;
- }
- if ($form{'role'}) {
- $switchto .= '&role='.$form{'role'};
- }
- if ($form{'symb'}) {
- $switchto .= '&symb='.$form{'symb'};
- }
- $r->internal_redirect($switchto);
+ $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl);
} else {
$r->print(&noswitch());
}
@@ -504,17 +473,7 @@ sub handler {
if ($otherserver) {
&success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef,
\%form);
- my $switchto = '/adm/switchserver?otherserver='.$otherserver;
- if (($firsturl) && ($firsturl ne '/adm/switchserver') && ($firsturl ne '/adm/roles')) {
- $switchto .= '&origurl='.$firsturl;
- }
- if ($form{'role'}) {
- $switchto .= '&role='.$form{'role'};
- }
- if ($form{'symb'}) {
- $switchto .= '&symb='.$form{'symb'};
- }
- $r->internal_redirect($switchto);
+ $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl);
} else {
$r->print(&noswitch());
}