version 1.55, 2013/02/05 15:45:18
|
version 1.57, 2014/01/30 12:15:06
|
Line 56 sub handler {
|
Line 56 sub handler {
|
|
|
my $domain; |
my $domain; |
|
|
my $sso_username = $r->subprocess_env->get('REDIRECT_SSOUserUnknown'); |
my $sso_username = $r->subprocess_env->get('SSOUserUnknown'); |
my $sso_domain = $r->subprocess_env->get('REDIRECT_SSOUserDomain'); |
my $sso_domain = $r->subprocess_env->get('SSOUserDomain'); |
|
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token','courseid']); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
|
['token','courseid','domain']); |
&Apache::lonacc::get_posted_cgi($r); |
&Apache::lonacc::get_posted_cgi($r); |
&Apache::lonlocal::get_language_handle($r); |
&Apache::lonlocal::get_language_handle($r); |
|
|
if ($sso_username ne '' && $sso_domain ne '') { |
if ($sso_username ne '' && $sso_domain ne '') { |
$domain = $sso_domain; |
$domain = $sso_domain; |
} else { |
} else { |
($domain, undef) = Apache::lonnet::is_course($env{'form.courseid'}); |
($domain, undef) = Apache::lonnet::is_course($env{'form.courseid'}); |
$domain ||= &Apache::lonnet::default_login_domain(); |
unless ($domain) { |
|
if ($env{'form.phase'} =~ /^username_(activation|validation)$/) { |
|
if (($env{'form.udom'} =~ /^$match_domain$/) && |
|
(&Apache::lonnet::domain($env{'form.udom'}) ne '')) { |
|
$domain = $env{'form.udom'}; |
|
} else { |
|
$domain = &Apache::lonnet::default_login_domain(); |
|
} |
|
} elsif (($env{'form.phase'} eq '') && |
|
($env{'form.domain'} =~ /^$match_domain$/) && |
|
(&Apache::lonnet::domain($env{'form.domain'}) ne '')) { |
|
$domain = $env{'form.domain'}; |
|
} else { |
|
$domain = &Apache::lonnet::default_login_domain(); |
|
} |
|
} |
} |
} |
my $domdesc = &Apache::lonnet::domain($domain,'description'); |
my $domdesc = &Apache::lonnet::domain($domain,'description'); |
my $contact_name = &mt('LON-CAPA helpdesk'); |
my $contact_name = &mt('LON-CAPA helpdesk'); |
Line 1041 sub username_activation {
|
Line 1057 sub username_activation {
|
$output = &mt('Sorry, your authentication has expired.'); |
$output = &mt('Sorry, your authentication has expired.'); |
} |
} |
if ($earlyout ne '') { |
if ($earlyout ne '') { |
$output .= '<br />'.&mt('Please [_1]start again[_2].','<a href="/adm/createaccount">','</a>'); |
my $link = '/adm/createaccount'; |
|
if (&Apache::lonnet::domain($domain) ne '') { |
|
$link .= "?domain=$domain"; |
|
} |
|
$output .= '<br />'.&mt('Please [_1]start again[_2].', |
|
'<a href="'.$link.'">','</a>'); |
return($earlyout,$output); |
return($earlyout,$output); |
} |
} |
if ((($domdefaults{'auth_def'} =~/^krb(4|5)$/) && |
if ((($domdefaults{'auth_def'} =~/^krb(4|5)$/) && |