version 1.28, 2014/03/31 02:31:05
|
version 1.30, 2014/04/04 23:06:32
|
Line 232 sub handler {
|
Line 232 sub handler {
|
&process_self_enroll($r,$cdom,$cnum,$selfenroll_types,$selfenroll_registered, |
&process_self_enroll($r,$cdom,$cnum,$selfenroll_types,$selfenroll_registered, |
$selfenroll_access_start,$selfenroll_access_end, |
$selfenroll_access_start,$selfenroll_access_end, |
$selfenroll_section,$now,$selfenroll_approval, |
$selfenroll_section,$now,$selfenroll_approval, |
$selfenroll_notifylist,$owner,$crstype,$lonhost); |
$selfenroll_notifylist,$owner,$crstype,$lonhost,$handle); |
} elsif ($env{'form.phase'} eq 'login') { |
} elsif ($env{'form.phase'} eq 'login') { |
my $submit_text = &mt('Log in'); |
my $submit_text = &mt('Log in'); |
$r->print('<h3>'.&mt('Log-in to LON-CAPA').'</h3>'); |
$r->print('<h3>'.&mt('Log-in to LON-CAPA').'</h3>'); |
Line 410 sub has_role {
|
Line 410 sub has_role {
|
sub process_self_enroll { |
sub process_self_enroll { |
my ($r,$cdom,$cnum,$selfenroll_types,$selfenroll_registered, |
my ($r,$cdom,$cnum,$selfenroll_types,$selfenroll_registered, |
$selfenroll_access_start,$selfenroll_access_end,$selfenroll_section, |
$selfenroll_access_start,$selfenroll_access_end,$selfenroll_section, |
$now,$selfenroll_approval,$selfenroll_notifylist,$owner,$crstype,$lonhost) = @_; |
$now,$selfenroll_approval,$selfenroll_notifylist,$owner,$crstype,$lonhost,$handle) = @_; |
my $udom = $env{'user.domain'}; |
my $udom = $env{'user.domain'}; |
my $uname = $env{'user.name'}; |
my $uname = $env{'user.name'}; |
my $selfenroll = 0; |
my $selfenroll = 0; |
Line 455 sub process_self_enroll {
|
Line 455 sub process_self_enroll {
|
my $outcome = |
my $outcome = |
&store_selfenroll_request($udom,$uname,$usec,$cdom,$cnum, |
&store_selfenroll_request($udom,$uname,$usec,$cdom,$cnum, |
$selfenroll_notifylist,$owner, |
$selfenroll_notifylist,$owner, |
$selfenroll_approval,$crstype,$lonhost); |
$selfenroll_approval,$crstype,$lonhost,$handle); |
$r->print($outcome); |
$r->print($outcome); |
} else { |
} else { |
my $enrollresult = |
my $enrollresult = |
Line 534 sub user_can_selfenroll {
|
Line 534 sub user_can_selfenroll {
|
|
|
sub store_selfenroll_request { |
sub store_selfenroll_request { |
my ($udom,$uname,$usec,$cdom,$cnum,$selfenroll_notifylist,$owner, |
my ($udom,$uname,$usec,$cdom,$cnum,$selfenroll_notifylist,$owner, |
$selfenroll_approval,$crstype,$lonhost) = @_; |
$selfenroll_approval,$crstype,$lonhost,$handle) = @_; |
my $namespace = 'selfenrollrequests'; |
my $namespace = 'selfenrollrequests'; |
my $output; |
my $output; |
my $now = time; |
my $now = time; |
Line 562 sub store_selfenroll_request {
|
Line 562 sub store_selfenroll_request {
|
}); |
}); |
my $token; |
my $token; |
if ($status eq 'pending') { |
if ($status eq 'pending') { |
$token = &Apache::lonnet::tmpput(\%selfenroll,$lonhost);; |
$token = &Apache::lonnet::tmpput(\%selfenroll,$lonhost); |
$userenroll{$cdom.'_'.$cnum}{'token'} = $token; |
$userenroll{$cdom.'_'.$cnum}{'token'} = $token; |
|
$userenroll{$cdom.'_'.$cnum}{'lonhost'} = $lonhost; |
|
$userenroll{$cdom.'_'.$cnum}{'handle'} = $handle; |
} |
} |
my $warning; |
my $warning; |
my $userresult = &Apache::lonnet::put($namespace,\%userenroll,$udom,$uname); |
my $userresult = &Apache::lonnet::put($namespace,\%userenroll,$udom,$uname); |
Line 581 sub store_selfenroll_request {
|
Line 583 sub store_selfenroll_request {
|
'token' => $token, |
'token' => $token, |
); |
); |
my %domconfig = &Apache::lonnet::get_dom('configuration',['selfenrollment'],$cdom); |
my %domconfig = &Apache::lonnet::get_dom('configuration',['selfenrollment'],$cdom); |
|
|
if (ref($domconfig{'selfenrollment'}) eq 'HASH') { |
if (ref($domconfig{'selfenrollment'}) eq 'HASH') { |
my ($url,$buttontext,$code,@fields); |
my ($url,$buttontext,$code,@fields); |
if (ref($domconfig{'selfenrollment'}{'validation'}) eq 'HASH') { |
if (ref($domconfig{'selfenrollment'}{'validation'}) eq 'HASH') { |
my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum,{ 'one_time' => 1}); |
my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum,{ 'one_time' => 1}); |
$postvalues{'uniquecode'} = $courseinfo{'internal.uniquecode'}; |
$postvalues{'uniquecode'} = $courseinfo{'internal.uniquecode'}; |
|
$postvalues{'description'} = $courseinfo{'description'}; |
$url = $domconfig{'selfenrollment'}{'validation'}{'url'}; |
$url = $domconfig{'selfenrollment'}{'validation'}{'url'}; |
if (ref($domconfig{'selfenrollment'}{'validation'}{'fields'}) eq 'ARRAY') { |
if (ref($domconfig{'selfenrollment'}{'validation'}{'fields'}) eq 'ARRAY') { |
@fields = @{$domconfig{'selfenrollment'}{'validation'}{'fields'}}; |
@fields = @{$domconfig{'selfenrollment'}{'validation'}{'fields'}}; |
Line 600 sub store_selfenroll_request {
|
Line 604 sub store_selfenroll_request {
|
$output .= '<input type="hidden" name="'.$field.'" value="'.$postvalues{$field}.'" />'."\n"; |
$output .= '<input type="hidden" name="'.$field.'" value="'.$postvalues{$field}.'" />'."\n"; |
} |
} |
} |
} |
} |
if ($buttontext eq '') { |
if ($buttontext eq '') { |
$buttontext = &mt('Complete my enrollment'); |
$buttontext = &mt('Complete my enrollment'); |
} |
} |
my $protocol = $Apache::lonnet::protocol{$lonhost}; |
$output .= '<input type="submit" name="validate" value="'.$buttontext.'" />'."\n". |
$protocol = 'http' if ($protocol ne 'https'); |
'</form>'."\n"; |
my $enroller = $protocol.'://'.&Apache::lonnet::hostname($lonhost).'/cgi-bin/enrollqueued.pl'; |
|
$output .= '<input type="hidden" name="enroller" value="'.$enroller.'" />'."\n". |
|
'<input type="submit" name="validate" value="'.$buttontext.'" />'."\n". |
|
'</form>'."\n"; |
|
} else { |
|
$status = 'request'; |
|
} |
} |
} |
} else { |
} else { |
$status eq 'request'; |
$status = 'request'; |
} |
} |
} |
} |
if ($status eq 'request') { |
if ($status eq 'request') { |