version 1.25, 2008/08/22 10:52:56
|
version 1.27, 2009/01/14 13:13:59
|
Line 58 sub handler {
|
Line 58 sub handler {
|
my $sso_username = $r->subprocess_env->get('REDIRECT_SSOUserUnknown'); |
my $sso_username = $r->subprocess_env->get('REDIRECT_SSOUserUnknown'); |
my $sso_domain = $r->subprocess_env->get('REDIRECT_SSOUserDomain'); |
my $sso_domain = $r->subprocess_env->get('REDIRECT_SSOUserDomain'); |
|
|
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token','courseid']); |
|
&Apache::lonacc::get_posted_cgi($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 = &Apache::lonnet::default_login_domain(); |
$domain = &Apache::lonnet::default_login_domain(); |
|
if (defined($env{'form.courseid'})) { |
|
if (&validate_course($env{'form.courseid'})) { |
|
if ($env{'form.courseid'} =~ /^($match_domain)_($match_courseid)$/) { |
|
$domain = $1; |
|
} |
|
} |
|
} |
} |
} |
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 74 sub handler {
|
Line 85 sub handler {
|
my $include = $r->dir_config('lonIncludes'); |
my $include = $r->dir_config('lonIncludes'); |
my $start_page; |
my $start_page; |
|
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token','courseid']); |
|
&Apache::lonacc::get_posted_cgi($r); |
|
&Apache::lonlocal::get_language_handle($r); |
|
|
|
my $handle = &Apache::lonnet::check_for_valid_session($r); |
my $handle = &Apache::lonnet::check_for_valid_session($r); |
if ($handle ne '') { |
if ($handle ne '') { |
$start_page = |
$start_page = |
Line 381 sub print_username_form {
|
Line 388 sub print_username_form {
|
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
unam => 'username', |
unam => 'username', |
udom => 'domain', |
udom => 'domain', |
uemail => 'Email address in LON-CAPA', |
uemail => 'E-mail address in LON-CAPA', |
proc => 'Proceed'); |
proc => 'Proceed'); |
my $output; |
my $output; |
if (ref($cancreate) eq 'ARRAY') { |
if (ref($cancreate) eq 'ARRAY') { |