$lt{'wel'}
-$welcome
-$lt{'pro'}
+$welcome
+$loginhelp
$remoteinfo
$maincall
$continuelink
$end_page
ENDSUCCESS
+ return;
}
# --------------------------------------------------------------- Failed login!
sub failed {
my ($r,$message,$form) = @_;
- my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef,
- {'no_inline_link' => 1,});
- my $retry = '/adm/login?username='.$form->{'uname'}.
- '&domain='.$form->{'udom'};
+ (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;
+ }
if (exists($form->{role})) {
- $retry .= '&role='.$form->{role};
+ my $role = &Apache::loncommon::cleanup_html($form->{role});
+ if ($role ne '') {
+ $retry .= (($retry=~/\?/)?'&':'?').'role='.$role;
+ }
}
if (exists($form->{symb})) {
- $retry .= '&symb='.$form->{symb};
+ my $symb = &Apache::loncommon::cleanup_html($form->{symb});
+ if ($symb ne '') {
+ $retry .= (($retry=~/\?/)?'&':'?').'symb='.$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?').'');
+ }
+ #FIXME: link to helpdesk might be added here
+
$r->print(
$start_page
- .''.&mt('Sorry ...').'
'
- .''.&mt($message).'
'
- .''.&mt('Please [_1]log in again[_2].','','')
- .'
'
- .''.&mt('Login problems?').'
'
+ .''.&mt('Sorry ...').'
'
+ .&Apache::lonhtmlcommon::confirm_success(&mt($message),1).'
'
+ .&Apache::lonhtmlcommon::actionbox(\@actions)
.$end_page
);
}
@@ -189,18 +230,19 @@ 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
sub handler {
my $r = shift;
+ my $londocroot = $r->dir_config('lonDocRoot');
my $form;
# Are we re-routing?
- if (-e '/home/httpd/html/lon-status/reroute.txt') {
+ if (-e "$londocroot/lon-status/reroute.txt") {
&reroute($r);
return OK;
}
@@ -217,19 +259,19 @@ sub handler {
} else {
# Indeed, a valid token is found
&Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
- my $start_page =
- &Apache::loncommon::start_page('Already logged in');
- my $end_page =
- &Apache::loncommon::end_page();
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ my $start_page =
+ &Apache::loncommon::start_page('Already logged in');
+ my $end_page =
+ &Apache::loncommon::end_page();
my $dest = '/adm/roles';
if ($env{'form.firsturl'} ne '') {
$dest = $env{'form.firsturl'};
}
$r->print(
$start_page
- .''.&mt('You are already logged in!').'
'
+ .''.&mt('You are already logged in!').'
'
.''.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].'
,'','','','')
.'
'
@@ -252,7 +294,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.',
@@ -277,8 +319,8 @@ sub handler {
my $tmpinfo=Apache::lonnet::reply('tmpget:'.$form{'logtoken'},
$form{'serverid'});
- if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost') ||
- ($tmpinfo eq 'no_such_host')) {
+ 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);
return OK;
} else {
@@ -296,19 +338,25 @@ sub handler {
return OK;
}
- my ($key,$firsturl,$rolestr,$symbstr)=split(/&/,$tmpinfo);
+ my ($key,$firsturl,$rolestr,$symbstr,$iptokenstr)=split(/&/,$tmpinfo);
if ($rolestr) {
$rolestr = &unescape($rolestr);
}
if ($symbstr) {
$symbstr= &unescape($symbstr);
}
+ if ($iptokenstr) {
+ $iptokenstr = &unescape($iptokenstr);
+ }
if ($rolestr =~ /^role=/) {
(undef,$form{'role'}) = split('=',$rolestr);
}
if ($symbstr =~ /^symb=/) {
(undef,$form{'symb'}) = split('=',$symbstr);
}
+ if ($iptokenstr =~ /^iptoken=/) {
+ (undef,$form{'iptoken'}) = split('=',$iptokenstr);
+ }
my $keybin=pack("H16",$key);
@@ -343,42 +391,64 @@ sub handler {
}
}
my $clientcancheckhost = 1;
- my $uname = $form{'uname'};
- my $authhost=Apache::lonnet::authenticate($uname,$upass,
+ my $authhost=Apache::lonnet::authenticate($form{'uname'},$upass,
$form{'udom'},$defaultauth,
$clientcancheckhost);
# --------------------------------------------------------------------- Failed?
if ($authhost eq 'no_host') {
- my $lc_uname = lc($uname);
- if ($uname eq $lc_uname) {
- &failed($r,'Username and/or password could not be authenticated.',
- \%form);
- return OK;
- } else {
- $authhost=Apache::lonnet::authenticate($lc_uname,$upass,
- $form{'udom'},$defaultauth);
- if ($authhost eq 'no_host') {
- &failed($r,'Username (in lower case) and/or password could not be authenticated.',
- \%form);
- return OK;
- } elsif ($authhost eq 'no_account_on_host') {
- &create_account($r,\%form,\@cancreate,$lc_uname,$contact_name);
+ &failed($r,'Username and/or password could not be authenticated.',
+ \%form);
+ return OK;
+ } elsif ($authhost eq 'no_account_on_host') {
+ if ($defaultauth) {
+ my $domdesc = &Apache::lonnet::domain($form{'udom'},'description');
+ unless (&check_can_host($r,\%form,'no_account_on_host',$domdesc)) {
return OK;
- } else {
- $form{'uname'} = $lc_uname;
}
+ my $start_page =
+ &Apache::loncommon::start_page('Create a user account in LON-CAPA',
+ '',{'no_inline_link' => 1,});
+ my $lonhost = $r->dir_config('lonHostID');
+ my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
+ my $contacts =
+ &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
+ $form{'udom'},$origmail);
+ my ($contact_email) = split(',',$contacts);
+ my $output =
+ &Apache::createaccount::username_check($form{'uname'},$form{'udom'},
+ $domdesc,'',$lonhost,
+ $contact_email,$contact_name,
+ undef,$statustocreate);
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ &Apache::createaccount::print_header($r,$start_page);
+ $r->print(''.&mt('Account creation').'
'.
+ &mt('Although your username and password were authenticated, you do not currently have a LON-CAPA account at this institution.').'
'.
+ $output.&Apache::loncommon::end_page());
+ return OK;
+ } else {
+ &failed($r,'Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.',\%form);
+ return OK;
}
- } elsif ($authhost eq 'no_account_on_host') {
- &create_account($r,\%form,\@cancreate,$uname,$contact_name);
- return OK;
}
if (($firsturl eq '') ||
($firsturl=~/^\/adm\/(logout|remote)/)) {
$firsturl='/adm/roles';
}
+
+ my $hosthere;
+ if ($form{'iptoken'}) {
+ my %sessiondata = &Apache::lonnet::tmpget($form{'iptoken'});
+ my $delete = &Apache::lonnet::tmpdel($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
@@ -402,15 +472,31 @@ sub handler {
}
}
- if ($r->dir_config("lonBalancer") eq 'yes') {
- my $otherserver = &Apache::lonnet::spareserver(30000,undef,1,$form{'udom'});
- if (!$otherserver) {
+ my ($is_balancer,$otherserver);
+
+ unless ($hosthere) {
+ ($is_balancer,$otherserver) =
+ &Apache::lonnet::check_loadbalancing($form{'uname'},$form{'udom'});
+ }
+
+ if ($is_balancer) {
+ if (!$otherserver) {
($otherserver) = &Apache::lonnet::choose_server($form{'udom'});
}
if ($otherserver) {
&success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef,
\%form);
- $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl);
+ 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);
} else {
$r->print(&noswitch());
}
@@ -421,12 +507,23 @@ sub handler {
if ($otherserver) {
&success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef,
\%form);
- $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl);
+ 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);
} else {
$r->print(&noswitch());
}
return OK;
}
+
# ------------------------------------------------------- Do the load balancing
# ---------------------------------------------------------- Determine own load
@@ -492,7 +589,7 @@ sub check_can_host {
unless ($canhost) {
if ($authhost eq 'no_account_on_host') {
my $checkloginvia = 1;
- my ($login_host,$hostname) =
+ my ($login_host,$hostname) =
&Apache::lonnet::choose_server($udom,$checkloginvia);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -532,34 +629,29 @@ sub noswitch {
return $result;
}
-sub create_account {
- my ($r,$form,$cancreate,$uname,$contact_name) = @_;
- return unless((ref($form) eq 'HASH') && (ref($cancreate) eq 'ARRAY'));
- my %domconfig =
- &Apache::lonnet::get_dom('configuration',['usercreation'],$form->{'udom'});
- if (&check_can_host($r,\%form,'no_account_on_host',$domdesc)) {
- my $start_page =
- &Apache::loncommon::start_page('Create a user account in LON-CAPA',
- '',{'no_inline_link' => 1,});
- my $domdesc = &Apache::lonnet::domain($form->{'udom'},'description');
- my $lonhost = $r->dir_config('lonHostID');
- my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
- my $contacts =
- &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
- $form->{'udom'},$origmail);
- my ($contact_email) = split(',',$contacts);
- my $output =
- &Apache::createaccount::username_check($uname,$form->{'udom'},
- $domdesc,'',$lonhost,
- $contact_email,$contact_name);
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
- &Apache::createaccount::print_header($r,$start_page);
- $r->print(''.&mt('Account creation').'
'.
- &mt('Although your username and password were authenticated, you do not currently have a LON-CAPA account at this institution.').'
'.
- $output.&Apache::loncommon::end_page());
- } else {
- &failed($r,'Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.',$form);
+sub loginhelpdisplay {
+ my ($authdomain) = @_;
+ my $login_help = 1;
+ my $lang = &Apache::lonlocal::current_language();
+ if ($login_help) {
+ my $dom = $authdomain;
+ if ($dom eq '') {
+ $dom = &Apache::lonnet::default_login_domain();
+ }
+ my %domconfhash = &Apache::loncommon::get_domainconf($dom);
+ my $loginhelp_url;
+ if ($lang) {
+ $loginhelp_url = $domconfhash{$dom.'.login.helpurl_'.$lang};
+ if ($loginhelp_url ne '') {
+ return $loginhelp_url;
+ }
+ }
+ $loginhelp_url = $domconfhash{$dom.'.login.helpurl_nolang'};
+ if ($loginhelp_url ne '') {
+ return $loginhelp_url;
+ } else {
+ return '/adm/loginproblems.html';
+ }
}
return;
}