--- loncom/interface/loncreateuser.pm 2009/08/08 00:36:00 1.306 +++ loncom/interface/loncreateuser.pm 2009/08/11 00:39:45 1.307 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.306 2009/08/08 00:36:00 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.307 2009/08/11 00:39:45 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -68,7 +68,7 @@ use Apache::loncommon; use Apache::lonlocal; use Apache::longroup; use Apache::lonuserutils; -use Apache::selfenroll(); +use Apache::loncoursequeueadmin; use LONCAPA qw(:DEFAULT :match); my $loginscript; # piece of javascript used in two separate instances @@ -3937,11 +3937,13 @@ sub handler { my $cid = $env{'request.course.id'}; my $cdom = $env{'course.'.$cid.'.domain'}; my $cnum = $env{'course.'.$cid.'.num'}; + my $coursedesc = $env{'course.'.$cid.'.description'}; if (!exists($env{'form.state'})) { $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment requests', 'Course_SelfEnrollment_Approval')); $r->print('

'.&mt('Pending enrollment requests').'

'."\n"); - &display_selfenroll_queue($r,$context,$permission,$cnum,$cdom); + $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context, + $cdom,$cnum)); } elsif ($env{'form.state'} eq 'done') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/createuser?action=selfenrollqueue', @@ -3949,7 +3951,8 @@ sub handler { $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment result', 'Course_Self_Enrollment')); $r->print('

'.&mt('Enrollment request processing').'

'."\n"); - &update_selfenroll_queue($r,$context,$permission,$cid,$cnum,$cdom); + $r->print(&Apache::loncoursequeueadmin::update_request_queue($context, + $cdom,$cnum,$coursedesc)); } $r->print(&Apache::loncommon::end_page()); } elsif ($env{'form.action'} eq 'changelogs') { @@ -4630,279 +4633,6 @@ ENDSCRIPT return; } -sub display_selfenroll_queue { - my ($r,$context,$permission,$cnum,$cdom) = @_; - my $namespace = 'selfenrollrequests'; - my ($output,%queue_by_date); - my %requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum); - if (keys(%requesthash) > 0) { - $r->print('
'. - ''. - ''. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(). - ''.&mt('Action').''. - ''.&mt('Requestor').''. - ''.&mt('Section').''. - ''.&mt('Date requested').''. - &Apache::loncommon::end_data_table_header_row()); - foreach my $item (keys(%requesthash)) { - my ($timestamp,$usec) = split(/:/,$requesthash{$item}); - if (exists($queue_by_date{$timestamp})) { - if (ref($queue_by_date{$timestamp}) eq 'ARRAY') { - push(@{$queue_by_date{$timestamp}},$item.':'.$usec); - } - } else { - @{$queue_by_date{$timestamp}} = ($item.':'.$usec); - } - } - my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date)); - my $count = 0; - foreach my $item (@sortedtimes) { - if (ref($queue_by_date{$item}) eq 'ARRAY') { - foreach my $request (sort(@{$queue_by_date{$item}})) { - my ($puname,$pudom,$pusec) = split(/:/,$request); - my $showsec = $pusec; - if ($showsec eq '') { - $showsec = &mt('none'); - } - my $namelink = &Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($puname,$pudom), - $puname,$pudom); - $r->print(&Apache::loncommon::start_data_table_row(). - '
'. - '
'. - ''.$namelink.''. - ''.$showsec.''. - ''.&Apache::lonlocal::locallocaltime($item).''. - &Apache::loncommon::end_data_table_row()); - $count ++; - } - } - } - $r->print(&Apache::loncommon::end_data_table(). - '
'); - } else { - $r->print(&mt('There are currently no enrollment requests.')); - } - return; -} - -sub update_selfenroll_queue { - my ($r,$context,$permission,$cid,$cnum,$cdom) = @_; - my @approvals = &Apache::loncommon::get_env_multiple('form.approvereq'); - my @rejections = &Apache::loncommon::get_env_multiple('form.rejectreq'); - my $access_start = $env{'course.'.$cid.'.internal.selfenroll_start_access'}; - my $access_end = $env{'course.'.$cid.'.internal.selfenroll_end_access'}; - my $limit = $env{'course.'.$cid.'.internal.selfenroll_limit'}; - my $cap = $env{'course.'.$cid.'.internal.selfenroll_cap'}; - my $notifylist = $env{'course.'.$cid.'.internal.selfenroll_notifylist'}; - my $namespace = 'selfenrollrequests'; - my ($stucounts,$idx,$classlist) = &get_student_counts($cdom,$cnum); - my %requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum); - my $coursedesc = $env{'course.'.$cid.'.description'}; - my $chome = &Apache::lonnet::homeserver($cnum,$cdom); - my $hostname = &Apache::lonnet::hostname($chome); - my $protocol = $Apache::lonnet::protocol{$chome}; - $protocol = 'http' if ($protocol ne 'https'); - my (@existing,@missingreq,@invalidusers,@limitexceeded,@enrolled, - @enrollerrors,@warn_approves,@warn_rejects); - my $now = time; - my $sender = $env{'user.name'}.':'.$env{'user.domain'}; - my $approvedmsg = [{ - mt => 'Your request for enrollment has been approved.', - }, - { - mt => 'Visit [_1], to log-in and access the course', - args => [$protocol.'://'.$hostname], - }]; - - my $rejectedmsg = [{ - mt => 'Your request for enrollment has not been approved.', - }]; - foreach my $item (sort {$a <=> $b} @approvals) { - my ($num,$uname,$udom,$usec) = split(/:/,$item); - my $uhome = &Apache::lonnet::homeserver($uname,$udom); - if ($uhome ne 'no_host') { - if (exists($requesthash{$uname.':'.$udom})) { - - if (exists($classlist->{$uname.':'.$udom})) { - if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') { - if (($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Active') || - ($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Future')) { - push(@existing,$uname.':'.$udom); - next; - } - } - } - } else { - push(@missingreq,$uname.':'.$udom); - next; - } - if (!grep(/^\Q$item\E$/,@rejections)) { - if ($limit eq 'allstudents') { - if ($stucounts->{$limit} >= $cap) { - push(@limitexceeded,$uname.':'.$udom); - last; - } - } elsif ($limit eq 'selfenrolled') { - if ($stucounts->{$limit} >= $cap) { - push(@limitexceeded,$uname.':'.$udom); - last; - } - } - my $result = - &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$usec,$access_end,$access_start,'selfenroll',undef,$cdom.'_'.$cnum,1); - if ($result eq 'ok') { - push(@enrolled,$uname.':'.$udom); - $stucounts->{'allstudents'} ++; - $stucounts->{'selfenrolled'} ++; - &Apache::selfenroll::send_notification($uname.':'.$udom,$approvedmsg,$cid, - $coursedesc,$now,'enroller',$sender); - my %userrequest = ( - $cdom.'_'.$cnum => { - timestamp => $now, - section => $usec, - adjudicator => $env{'user.name'}.':'.$env{'user.domain'}, - status => 'approved', - } - ); - my $userresult = - &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname); - if ($userresult ne 'ok') { - push(@warn_approves,$uname.':'.$udom); - } - } else { - push(@enrollerrors,$uname.':'.$udom); - } - } - } else { - push(@invalidusers,$uname.':'.$udom); - } - } - my @changes = (@enrolled,@rejections); - if (@rejections) { - foreach my $user (@rejections) { - &Apache::selfenroll::send_notification($user,$rejectedmsg,$cid, - $coursedesc,$now,'enroller',$sender); - my ($uname,$udom) = split(/:/,$user); - my %userrequest = ( - $cdom.'_'.$cnum => { - timestamp => $now, - adjudicator => $env{'user.name'}.':'.$env{'user.domain'}, - status => 'rejected', - } - ); - my $userresult = - &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname); - if ($userresult ne 'ok') { - push(@warn_rejects,$user); - } - } - } - if (@changes) { - my $delresult = &Apache::lonnet::del($namespace,\@changes,$cdom,$cnum); - if ($delresult eq 'ok') { - my $namelink = - &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}).' ('.$env{'user.name'}.':'.$env{'user.domain'}.')'; - my $chgmsg = "'Action was taken on the following enrollment requests by [_1].',$namelink"; - my ($approvedlist,$rejectedlist); - if (@enrolled) { - $approvedlist = join("\n",@enrolled); - $r->print('

'.&mt('The following were enrolled in the course:').'

'); - } - if (@rejections) { - $rejectedlist = join("\n",@rejections); - $r->print('

'.&mt('The following enrollment requests were rejected:').'

'); - } - &Apache::selfenroll::send_notification($notifylist,$chgmsg,$cid, - $coursedesc,$now,'managers', - $sender,$approvedlist,$rejectedlist); - } - } - if (@existing) { - $r->print('

'.&mt('The following enrollment requests were deleted because the user is already enrolled in the course:').'

'); - } - if (@missingreq) { - $r->print('

'.&mt('The following enrollment requests were ignored because the request is no longer in the enrollment queue:').'

'); - } - if (@invalidusers) { - $r->print('

'.&mt('The following enrollment requests were deleted because the requestor does not have a LON-CAPA account:').'

'); - } - if (@limitexceeded) { - $r->print('

'.&mt('The following enrollment requests were skipped because the enrollment limit has been reached for the course:').'

'); - } - if (@enrollerrors) { - $r->print('

'.&mt('The following enrollment requests could not be processed because an error occurred:').'

'); - } - if (@warn_approves) { - $r->print('

'.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'

'); - } - if (@warn_rejects) { - $r->print('

'.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'

'); - } - return; -} - -sub get_student_counts { - my ($cdom,$cnum) = @_; - my (%idx,%stucounts); - my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cnum); - $idx{'type'} = &Apache::loncoursedata::CL_TYPE(); - $idx{'status'} = &Apache::loncoursedata::CL_STATUS(); - while (my ($student,$data) = each(%$classlist)) { - if (($data->[$idx{'status'}] eq 'Active') || - ($data->[$idx{'status'}] eq 'Future')) { - if ($data->[$idx{'type'}] eq 'selfenroll') { - $stucounts{'selfenroll'} ++; - } - $stucounts{'allstudents'} ++; - } - } - return (\%stucounts,\%idx,$classlist); -} - sub visible_in_cat { my ($cdom,$cnum) = @_; my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);