--- loncom/interface/loncreateuser.pm 2009/08/04 19:59:19 1.302 +++ loncom/interface/loncreateuser.pm 2009/09/21 17:09:22 1.315 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.302 2009/08/04 19:59:19 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.315 2009/09/21 17:09:22 bisitz 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 @@ -110,6 +110,7 @@ sub initialize_authen_forms { sub auth_abbrev { my %abv_auth = ( + krb5 => 'krb', krb4 => 'krb', internal => 'int', localuth => 'loc', @@ -216,7 +217,8 @@ END_SCRIPT sub build_tools_display { my ($ccuname,$ccdomain,$context) = @_; - my (@usertools,%userenv,$output); + my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay, + $colspan); my %lt = &Apache::lonlocal::texthash ( 'blog' => "Personal User Blog", 'aboutme' => "Personal Information Page", @@ -235,52 +237,130 @@ sub build_tools_display { 'requestcourses.official','requestcourses.unofficial', 'requestcourses.community'); @usertools = ('official','unofficial','community'); + @options =('norequest','approval','autolimit','validate'); + %validations = &Apache::lonnet::auto_courserequest_checks($ccdomain); + %reqtitles = &courserequest_titles(); + %reqdisplay = &courserequest_display(); + $colspan = ' colspan="2"'; } else { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'tools.aboutme','tools.portfolio','tools.blog'); @usertools = ('aboutme','blog','portfolio'); } foreach my $item (@usertools) { - my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off); + my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off, + $currdisp,$custdisp,$custradio); $cust_off = 'checked="checked" '; $tool_on = 'checked="checked" '; $curr_access = &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef, $context); - if ($userenv{$context.'.'.$item} eq '') { - $custom_access = 'default'; - if (!$curr_access) { - $tool_off = 'checked="checked" '; - $tool_on = ''; - } - } else { - $custom_access = 'custom'; + if ($userenv{$context.'.'.$item} ne '') { $cust_on = ' checked="checked" '; $cust_off = ''; - if ($userenv{$context.'.'.$item} == 0) { - $tool_off = 'checked="checked" '; - $tool_on = ''; + } + if ($context eq 'requestcourses') { + if ($userenv{$context.'.'.$item} eq '') { + $custom_access = &mt('Currently from default setting.'); + } else { + $custom_access = &mt('Currently from custom setting.'); + } + } else { + if ($userenv{$context.'.'.$item} eq '') { + $custom_access = + &mt('Availability determined currently from default setting.'); + if (!$curr_access) { + $tool_off = 'checked="checked" '; + $tool_on = ''; + } + } else { + $custom_access = + &mt('Availability determined currently from custom setting.'); + if ($userenv{$context.'.'.$item} == 0) { + $tool_off = 'checked="checked" '; + $tool_on = ''; + } } } $output .= ' <tr class="LC_info_row">'."\n". - ' <td>'.$lt{$item}.'</td>'."\n". + ' <td'.$colspan.'>'.$lt{$item}.'</td>'."\n". ' </tr>'."\n". - &Apache::loncommon::start_data_table_row()."\n". - ' <td>'.&mt('Availability determined currently from [_1] setting.',$custom_access). - ' '.$lt{'avai'}.': '. - ($curr_access?&mt('Yes'):&mt('No')).'</td>'."\n". + &Apache::loncommon::start_data_table_row()."\n"; + if ($context eq 'requestcourses') { + my ($curroption,$currlimit); + $curroption = $userenv{$context.'.'.$item}; + if (!$curroption) { + $curroption = 'norequest'; + } + if ($curroption =~ /^autolimit=(\d*)$/) { + $currlimit = $1; + if ($currlimit eq '') { + $currdisp = &mt('Yes, automatic creation'); + } else { + $currdisp = &mt('Yes, up to [quant,_1,request]/user',$currlimit); + } + } else { + $currdisp = $reqdisplay{$curroption}; + } + $custdisp = '<table>'; + foreach my $option (@options) { + my $val = $option; + if ($option eq 'norequest') { + $val = 0; + } + if ($option eq 'validate') { + my $canvalidate = 0; + if (ref($validations{$item}) eq 'HASH') { + if ($validations{$item}{'_custom_'}) { + $canvalidate = 1; + } + } + next if (!$canvalidate); + } + my $checked = ''; + if ($option eq $curroption) { + $checked = ' checked="checked"'; + } elsif ($option eq 'autolimit') { + if ($curroption =~ /^autolimit/) { + $checked = ' checked="checked"'; + } + } + $custdisp .= '<tr><td><span class="LC_nobreak"><label>'. + '<input type="radio" name="crsreq_'.$item. + '" value="'.$val.'"'.$checked.' />'. + $reqtitles{$option}.'</label> '; + if ($option eq 'autolimit') { + $custdisp .= '<input type="text" name="crsreq_'. + $item.'_limit" size="1" '. + 'value="'.$currlimit.'" /></span><br />'. + $reqtitles{'unlimited'}; + } else { + $custdisp .= '</span>'; + } + $custdisp .= '</td></tr>'; + } + $custdisp .= '</table>'; + $custradio = '</span></td><td>'.&mt('Custom setting').'<br />'.$custdisp; + } else { + $currdisp = ($curr_access?&mt('Yes'):&mt('No')); + $custdisp = '<span class="LC_nobreak"><label>'. + '<input type="radio" name="'.$context.'_'.$item.'"'. + ' value="1"'. $tool_on.'/>'.&mt('On').'</label> <label>'. + '<input type="radio" name="'.$context.'_'.$item.'" value="0" '. + $tool_off.'/>'.&mt('Off').'</label></span>'; + $custradio = (' 'x2).'--'.$lt{'cusa'}.': '.$custdisp. + '</span>'; + } + $output .= ' <td'.$colspan.'>'.$custom_access.(' 'x4). + $lt{'avai'}.': '.$currdisp.'</td>'."\n". &Apache::loncommon::end_data_table_row()."\n". &Apache::loncommon::start_data_table_row()."\n". - ' <td><span class="LC_nobreak">'.$lt{'chse'}.': <label>'. + ' <td style="vertical-align:top;"><span class="LC_nobreak">'. + $lt{'chse'}.': <label>'. '<input type="radio" name="custom'.$item.'" value="0" '. - $cust_off.'/>'.$lt{'usde'}.'</label> '. - '<label><input type="radio" name="custom'.$item.'" value="1" '. - $cust_on.'/>'.$lt{'uscu'}.'</label> -- '. - $lt{'cusa'}.': <label>'. - '<input type="radio" name="'.$context.'_'.$item.'" value="1" '. - $tool_on.'/>'.&mt('On').'</label> <label>'. - '<input type="radio" name="'.$context.'_'.$item.'" value="0" '. - $tool_off.'/>'.&mt('Off').'</label></span></td>'."\n". + $cust_off.'/>'.$lt{'usde'}.'</label>'.(' ' x3). + '<label><input type="radio" name="custom'.$item.'" value="1" '. + $cust_on.'/>'.$lt{'uscu'}.'</label>'.$custradio.'</td>'. &Apache::loncommon::end_data_table_row()."\n"; } return $output; @@ -288,7 +368,7 @@ sub build_tools_display { sub coursereq_externaluser { my ($ccuname,$ccdomain,$cdom) = @_; - my (@usertools,%userenv,$output); + my (@usertools,@options,%validations,%userenv,$output); my %lt = &Apache::lonlocal::texthash ( 'official' => 'Can request creation of official courses', 'unofficial' => 'Can request creation of unofficial courses', @@ -299,27 +379,92 @@ sub coursereq_externaluser { 'reqcrsotherdom.official','reqcrsotherdom.unofficial', 'reqcrsotherdom.community'); @usertools = ('official','unofficial','community'); + @options = ('approval','validate','autolimit'); + %validations = &Apache::lonnet::auto_courserequest_checks($cdom); + my $optregex = join('|',@options); + my %reqtitles = &courserequest_titles(); foreach my $item (@usertools) { - my ($tool_on,$tool_off); - $tool_off = 'checked="checked" '; + my ($curroption,$currlimit,$tooloff); if ($userenv{'reqcrsotherdom.'.$item} ne '') { my @curr = split(',',$userenv{'reqcrsotherdom.'.$item}); - if (grep(/^\Q$cdom\E$/,@curr)) { - $tool_on = 'checked="checked" '; - $tool_off = ''; + foreach my $req (@curr) { + if ($req =~ /^\Q$cdom\E\:($optregex)=?(\d*)$/) { + $curroption = $1; + $currlimit = $2; + last; + } + } + if (!$curroption) { + $curroption = 'norequest'; + $tooloff = ' checked="checked"'; + } + } else { + $curroption = 'norequest'; + $tooloff = ' checked="checked"'; + } + $output.= &Apache::loncommon::start_data_table_row()."\n". + ' <td><span class="LC_nobreak">'.$lt{$item}.': </span></td><td>'. + '<table><tr><td valign="top">'."\n". + '<label><input type="radio" name="reqcrsotherdom_'.$item. + '" value=""'.$tooloff.' />'.$reqtitles{'norequest'}. + '</label></td>'; + foreach my $option (@options) { + if ($option eq 'validate') { + my $canvalidate = 0; + if (ref($validations{$item}) eq 'HASH') { + if ($validations{$item}{'_external_'}) { + $canvalidate = 1; + } + } + next if (!$canvalidate); + } + my $checked = ''; + if ($option eq $curroption) { + $checked = ' checked="checked"'; + } + $output .= '<td valign="top"><span class="LC_nobreak"><label>'. + '<input type="radio" name="reqcrsotherdom_'.$item. + '" value="'.$option.'"'.$checked.' />'. + $reqtitles{$option}.'</label>'; + if ($option eq 'autolimit') { + $output .= ' <input type="text" name="reqcrsotherdom_'. + $item.'_limit" size="1" '. + 'value="'.$currlimit.'" /></span>'. + '<br />'.$reqtitles{'unlimited'}; + } else { + $output .= '</span>'; } + $output .= '</td>'; } - $output .= &Apache::loncommon::start_data_table_row()."\n". - ' <td><span class="LC_nobreak">'.$lt{$item}.': <label>'. - '<input type="radio" name="reqcrsotherdom_'.$item.'" value="1" '. - $tool_on.'/>'.&mt('Yes').'</label> <label>'. - '<input type="radio" name="reqcrsotherdom_'.$item.'" value="0" '. - $tool_off.'/>'.&mt('No').'</label></span></td>'."\n". + $output .= '</td></tr></table></td>'."\n". &Apache::loncommon::end_data_table_row()."\n"; } return $output; } +sub courserequest_titles { + my %titles = &Apache::lonlocal::texthash ( + official => 'Official', + unofficial => 'Unofficial', + community => 'Communities', + norequest => 'Not allowed', + approval => 'Approval by Dom. Coord.', + validate => 'With validation', + autolimit => 'Numerical limit', + unlimited => '(blank for unlimited)', + ); + return %titles; +} + +sub courserequest_display { + my %titles = &Apache::lonlocal::texthash ( + approval => 'Yes, need approval', + validate => 'Yes, with validation', + norequest => 'No', + ); + return %titles; +} + # =================================================================== Phase one sub print_username_entry_form { @@ -507,6 +652,7 @@ sub user_modification_js { return <<END; <script type="text/javascript" language="Javascript"> // <![CDATA[ + function pclose() { parmwin=window.open("/adm/rat/empty.html","LONCAPAparms", "height=350,width=350,scrollbars=no,menubar=no"); @@ -618,13 +764,13 @@ ENDSCRIPT my ($uname,$udom) = split(/:/,$user); my $onclick; if ($context eq 'requestcrs') { - $onclick = + $onclick = 'onclick="javascript:gochoose('."'$uname','$udom',". "'$srch_results->{$user}->{firstname}',". "'$srch_results->{$user}->{lastname}',". "'$srch_results->{$user}->{permanentemail}'".');"'; } else { - $onclick = + $onclick = ' onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".');"'; } $r->print(&Apache::loncommon::start_data_table_row(). @@ -846,6 +992,13 @@ $lt{'hs'}: $home_server_pick } else { $r->print($home_server_pick); } + if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { + $r->print('<br /><h3>'.&mt('User Can Request Creation of Courses in this Domain?').'</h3>'. + &Apache::loncommon::start_data_table(). + &build_tools_display($ccuname,$ccdomain, + 'requestcourses'). + &Apache::loncommon::end_data_table()); + } $r->print('</div>'."\n".'<div class="LC_left_float"><h3>'. $lt{'lg'}.'</h3>'); my ($fixedauth,$varauth,$authmsg); @@ -939,7 +1092,7 @@ ENDCHANGEUSER if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { $r->print('<h3>'.&mt('User Can Request Creation of Courses in this Domain?').'</h3>'. &Apache::loncommon::start_data_table()); - if ($env{'request.role.domain'} eq $ccdomain) { + if ($env{'request.role.domain'} eq $ccdomain) { $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses')); } else { $r->print(&coursereq_externaluser($ccuname,$ccdomain, @@ -1277,9 +1430,9 @@ sub display_existing_roles { } $row.= '</td><td>'.$plaintext. '</td><td>'.$area. - '</td><td>'.($role_start_time?localtime($role_start_time) + '</td><td>'.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time) : ' ' ). - '</td><td>'.($role_end_time ?localtime($role_end_time) + '</td><td>'.($role_end_time ?&Apache::lonlocal::locallocaltime($role_end_time) : ' ' ) ."</td>"; $sortrole{$sortkey}=$envkey; @@ -1422,8 +1575,10 @@ sub new_domain_roles { &mt('Extent').'</th>'. '<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'. &Apache::loncommon::end_data_table_header_row(); + my @allroles = &Apache::lonuserutils::roles_by_context('domain'); foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) { - foreach my $role ('dc','li','dg','au','sc') { + foreach my $role (@allroles) { + next if ($role eq 'ad'); if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) { my $plrole=&Apache::lonnet::plaintext($role); my %lt=&Apache::lonlocal::texthash( @@ -2022,7 +2177,13 @@ sub update_user_data { } } foreach my $item (@requestcourses) { - $newcustom{$item} = $env{'form.requestcourses_'.$item}; + $newcustom{$item} = $env{'form.crsreq_'.$item}; + if ($env{'form.crsreq_'.$item} eq 'autolimit') { + $newcustom{$item} .= '='; + unless ($env{'form.crsreq_'.$item.'_limit'} =~ /\D/) { + $newcustom{$item} .= $env{'form.crsreq_'.$item.'_limit'}; + } + } $changed{$item} = &tool_admin($item,$newcustom{$item}, \%changeHash,'requestcourses'); } @@ -2308,8 +2469,7 @@ sub update_user_data { \%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext); } else { &tool_changes('reqcrsotherdom',\@requestcourses,\%oldaccess,\%oldaccesstext, - \%userenv, - \%changeHash,\%changed,\%newaccess,\%newaccesstext); + \%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext); } if ($env{'form.cfirstname'} ne $userenv{'firstname'} || $env{'form.cmiddlename'} ne $userenv{'middlename'} || @@ -2668,16 +2828,29 @@ sub tool_changes { return; } if ($context eq 'reqcrsotherdom') { + my @options = ('approval','validate','autolimit'); + my $optregex = join('|',@options); + my %reqdisplay = &courserequest_display(); my $cdom = $env{'request.role.domain'}; foreach my $tool (@{$usertools}) { - $oldaccesstext->{$tool} = &mt('no'); + $oldaccesstext->{$tool} = &mt('No'); + $newaccesstext->{$tool} = $oldaccesstext->{$tool}; $changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool}; + my $newop; + if ($env{'form.'.$context.'_'.$tool}) { + $newop = $env{'form.'.$context.'_'.$tool}; + if ($newop eq 'autolimit') { + my $limit = $env{'form.'.$context.'_'.$tool.'_limit'}; + $limit =~ s/\D+//g; + $newop .= '='.$limit; + } + } if ($userenv->{$context.'.'.$tool} eq '') { - if ($env{'form.'.$context.'_'.$tool}) { - $changed->{$tool}=&tool_admin($tool,$cdom, + if ($newop) { + $changed->{$tool}=&tool_admin($tool,$cdom.':'.$newop, $changeHash,$context); if ($changed->{$tool}) { - $newaccesstext->{$tool} = &mt('yes'); + $newaccesstext->{$tool} = &mt('Yes'); } else { $newaccesstext->{$tool} = $oldaccesstext->{$tool}; } @@ -2686,23 +2859,32 @@ sub tool_changes { my @curr = split(',',$userenv->{$context.'.'.$tool}); my @new; my $changedoms; - if (grep(/^\Q$cdom\E$/,@curr)) { - $oldaccesstext->{$tool} = &mt('yes'); - unless ($env{'form.'.$context.'_'.$tool}) { - $changedoms = 1; - foreach my $dom (@curr) { - unless ($dom eq $cdom) { - push(@new,$dom); + foreach my $req (@curr) { + if ($req =~ /^\Q$cdom\E\:($optregex\=?\d*)$/) { + $oldaccesstext->{$tool} = &mt('Yes'); + my $oldop = $1; + if ($oldop ne $newop) { + $changedoms = 1; + foreach my $item (@curr) { + my ($reqdom,$option) = split(':',$item); + unless ($reqdom eq $cdom) { + push(@new,$item); + } + } + if ($newop) { + push(@new,$cdom.':'.$newop); } + @new = sort(@new); } + last; } - } elsif ($env{'form.'.$context.'_'.$tool}) { + } + if ((!$changedoms) && ($newop)) { $changedoms = 1; - @new = sort(@curr,$cdom); + @new = sort(@curr,$cdom.':'.$newop); } - $newaccesstext->{$tool} = $oldaccesstext->{$tool}; if ($changedoms) { - my $newdomstr; + my $newdomstr; if (@new) { $newdomstr = join(',',@new); } @@ -2710,9 +2892,19 @@ sub tool_changes { $context); if ($changed->{$tool}) { if ($env{'form.'.$context.'_'.$tool}) { - $newaccesstext->{$tool} = &mt('yes'); + if ($env{'form.'.$context.'_'.$tool} eq 'autolimit') { + my $limit = $env{'form.'.$context.'_'.$tool.'_limit'}; + $limit =~ s/\D+//g; + if ($limit) { + $newaccesstext->{$tool} = &mt('Yes, up to limit of [quant,_1,request] per user.',$limit); + } else { + $newaccesstext->{$tool} = &mt('Yes, processed automatically'); + } + } else { + $newaccesstext->{$tool} = $reqdisplay{$env{'form.'.$context.'_'.$tool}}; + } } else { - $newaccesstext->{$tool} = &mt('no'); + $newaccesstext->{$tool} = &mt('No'); } } } @@ -2721,6 +2913,15 @@ sub tool_changes { return; } foreach my $tool (@{$usertools}) { + my $newval; + if ($context eq 'requestcourses') { + $newval = $env{'form.crsreq_'.$tool}; + if ($newval eq 'autolimit') { + $newval .= '='.$env{'form.crsreq_'.$tool.'_limit'}; + } + } else { + $newval = $env{'form.'.$context.'_'.$tool}; + } if ($userenv->{$context.'.'.$tool} ne '') { $oldaccess->{$tool} = &mt('custom'); if ($userenv->{$context.'.'.$tool}) { @@ -2730,12 +2931,12 @@ sub tool_changes { } $changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool}; if ($env{'form.custom'.$tool} == 1) { - if ($env{'form.'.$context.'_'.$tool} ne $userenv->{$context.'.'.$tool}) { - $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool}, - $changeHash,$context); + if ($newval ne $userenv->{$context.'.'.$tool}) { + $changed->{$tool} = &tool_admin($tool,$newval,$changeHash, + $context); if ($changed->{$tool}) { $newaccess->{$tool} = &mt('custom'); - if ($env{'form.'.$context.'_'.$tool}) { + if ($newval) { $newaccesstext->{$tool} = &mt("availability set to 'on'"); } else { $newaccesstext->{$tool} = &mt("availability set to 'off'"); @@ -2768,11 +2969,11 @@ sub tool_changes { } else { $oldaccess->{$tool} = &mt('default'); if ($env{'form.custom'.$tool} == 1) { - $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool}, - $changeHash,$context); + $changed->{$tool} = &tool_admin($tool,$newval,$changeHash, + $context); if ($changed->{$tool}) { $newaccess->{$tool} = &mt('custom'); - if ($env{'form.'.$context.'_'.$tool}) { + if ($newval) { $newaccesstext->{$tool} = &mt("availability set to 'on'"); } else { $newaccesstext->{$tool} = &mt("availability set to 'off'"); @@ -3763,11 +3964,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('<h3>'.&mt('Pending enrollment requests').'</h3>'."\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', @@ -3775,7 +3978,8 @@ sub handler { $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment result', 'Course_Self_Enrollment')); $r->print('<h3>'.&mt('Enrollment request processing').'</h3>'."\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') { @@ -4456,279 +4660,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('<form method="post" name="changequeue" action="/adm/createuser" />'. - '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'. - '<input type="hidden" name="state" value="done" />'. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(). - '<th>'.&mt('Action').'</th>'. - '<th>'.&mt('Requestor').'</th>'. - '<th>'.&mt('Section').'</th>'. - '<th>'.&mt('Date requested').'</th>'. - &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(). - '<td><span class="LC_nobreak"><label>'. - '<input type="checkbox" value="'.$count.':'.$puname.':'.$pudom.':'.$pusec.'" name="approvereq" />'.&mt('Approve').'</label></span><br />'. - '<span class="LC_nobreak"><label>'. - '<input type="checkbox" value="'.$puname.':'.$pudom.'" name="rejectreq" />'.&mt('Reject').'</label></span><br /></td>'. - '<td>'.$namelink.'</td>'. - '<td>'.$showsec.'</td>'. - '<td>'.&Apache::lonlocal::locallocaltime($item).'</td>'. - &Apache::loncommon::end_data_table_row()); - $count ++; - } - } - } - $r->print(&Apache::loncommon::end_data_table(). - '<input type="submit" name="processqueue" value="'.&mt('Save').'" /></form>'); - } 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('<p>'.&mt('The following were enrolled in the course:').'<ul>'); - foreach my $user (@enrolled) { - my ($uname,$udom) = split(/:/,$user); - my $userlink = - &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom); - $r->print('<li>'.$userlink.'</li>'); - } - $r->print('</ul></p>'); - } - if (@rejections) { - $rejectedlist = join("\n",@rejections); - $r->print('<p>'.&mt('The following enrollment requests were rejected:').'<ul>'); - foreach my $user (@rejections) { - $r->print('<li>'.$user.'</li>'); - } - $r->print('</ul></p>'); - } - &Apache::selfenroll::send_notification($notifylist,$chgmsg,$cid, - $coursedesc,$now,'managers', - $sender,$approvedlist,$rejectedlist); - } - } - if (@existing) { - $r->print('<p>'.&mt('The following enrollment requests were deleted because the user is already enrolled in the course:').'<ul>'); - foreach my $user (@existing) { - $r->print('<li>'.$user.'</li>'); - } - $r->print('</ul></p>'); - } - if (@missingreq) { - $r->print('<p>'.&mt('The following enrollment requests were ignored because the request is no longer in the enrollment queue:').'<ul>'); - foreach my $user (@missingreq) { - $r->print('<li>'.$user.'</li>'); - } - $r->print('</ul></p>'); - } - if (@invalidusers) { - $r->print('<p>'.&mt('The following enrollment requests were deleted because the requestor does not have a LON-CAPA account:').'<ul>'); - foreach my $user (@invalidusers) { - $r->print('<li>'.$user.'</li>'); - } - $r->print('</ul></p>'); - } - if (@limitexceeded) { - $r->print('<p>'.&mt('The following enrollment requests were skipped because the enrollment limit has been reached for the course:').'<ul>'); - foreach my $user (@limitexceeded) { - $r->print('<li>'.$user.'</li>'); - } - $r->print('</ul></p>'); - } - if (@enrollerrors) { - $r->print('<p>'.&mt('The following enrollment requests could not be processed because an error occurred:').'<ul>'); - foreach my $user (@enrollerrors) { - $r->print('<li>'.$user.'</li>'); - } - $r->print('</ul></p>'); - } - if (@warn_approves) { - $r->print('<p>'.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'<ul>'); - foreach my $user (@warn_approves) { - $r->print('<li>'.$user.'</li>'); - } - $r->print('</ul></p>'); - } - if (@warn_rejects) { - $r->print('<p>'.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'<ul>'); - foreach my $user (@warn_rejects) { - $r->print('<li>'.$user.'</li>'); - } - $r->print('</ul></p>'); - } - 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); @@ -5134,8 +5065,7 @@ ENDSCRIPT # Table Header my $tableheader = - &Apache::loncommon::start_data_table() - .&Apache::loncommon::start_data_table_header_row() + &Apache::loncommon::start_data_table_header_row() .'<th> </th>' .'<th>'.&mt('When').'</th>' .'<th>'.&mt('Who made the change').'</th>' @@ -5220,15 +5150,22 @@ sub role_display_filter { } $output .= '<option value="'.$chgtype.'"'.$selstr.'>'.$lt{$chgtype}.'</option>'."\n"; } - $output .= '</select></td>'. - '<td> </td>'. - '<td valign="middle"><input type="submit" value="'. - &mt('Update Display').'" /></td></tr></table>'. - '<span class="LC_roleslog_note">'. - &mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.6.99.0 or later are displayed.'); + $output .= '</select></td>' + .'</tr></table>'; + + # Update Display button + $output .= '<p>' + .'<input type="submit" value="'.&mt('Update Display').'" />' + .'</p>'; + + # Server version info + $output .= '<p class="LC_info">' + .&mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.' + ,'2.6.99.0'); if ($version) { - $output .= ' '.&mt('This server is version [_3].','<b>','</b>',$version); } - $output .= '</span><hr /><br />'; + $output .= ' '.&mt('This LON-CAPA server is version [_1]',$version); + } + $output .= '</p><hr />'; return $output; } @@ -5240,7 +5177,8 @@ sub rolechg_contexts { createcourse => 'Course Creation', course => 'User Management in course', domain => 'User Management in domain', - selfenroll => 'Self-enrolled', + selfenroll => 'Self-enrolled', + requestcourses => 'Course Request', ); return %lt; } @@ -5325,6 +5263,15 @@ sub user_search_result { &build_search_response($context,$srch,%srch_results); } else { $currstate = 'modify'; + my $uname = $srch->{'srchterm'}; + my $udom = $srch->{'srchdomain'}; + $srch_results{$uname.':'.$udom} = + { &Apache::lonnet::get('environment', + ['firstname', + 'lastname', + 'permanentemail'], + $udom,$uname) + }; } } else { %srch_results = &Apache::lonnet::usersearch($srch); @@ -5616,17 +5563,27 @@ sub build_search_response { $response .= '<br />'.&mt('You may want to broaden your search to the selected LON-CAPA domain.'); } } - if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $env{'request.role.domain'})) { + my $createdom = $env{'request.role.domain'}; + if ($context eq 'requestcrs') { + if ($env{'form.coursedom'} ne '') { + $createdom = $env{'form.coursedom'}; + } + } + if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $createdom)) { my $cancreate = - &Apache::lonuserutils::can_create_user($env{'request.role.domain'},$context); + &Apache::lonuserutils::can_create_user($createdom,$context); + my $targetdom = '<span class="LC_cusr_emph">'.$createdom.'</span>'; if ($cancreate) { - my $showdom = &display_domain_info($env{'request.role.domain'}); + my $showdom = &display_domain_info($createdom); $response .= '<br /><br />' .'<b>'.&mt('To add a new user:').'</b>' - .'<br />' - .&mt("(You can only create new users in your current role's domain - [_1])" - ,'<span class="LC_cusr_emph">'.$env{'request.role.domain'}.'</span>') - .'<ul><li>' + .'<br />'; + if ($context eq 'requestcrs') { + $response .= &mt("(You can only define new users in the new course's domain - [_1])",$targetdom); + } else { + $response .= &mt("(You can only create new users in your current role's domain - [_1])",$targetdom); + } + $response .='<ul><li>' .&mt("Set 'Domain/institution to search' to: [_1]",'<span class="LC_cusr_emph">'.$showdom.'</span>') .'</li><li>' .&mt("Set 'Search criteria' to: [_1]username is ..... in selected LON-CAPA domain[_2]",'<span class="LC_cusr_emph">','</span>') @@ -5637,14 +5594,17 @@ sub build_search_response { .'</li></ul><br />'; } else { my $helplink = ' href="javascript:helpMenu('."'display'".')"'; - $response .= '<br /><br />' - .&mt("You are not authorized to create new users in your current role's domain - [_1]." - ,'<span class="LC_cusr_emph">'.$env{'request.role.domain'}.'</span>') - .'<br />' - .&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.' + $response .= '<br /><br />'; + if ($context eq 'requestcrs') { + $response .= &mt("You are not authorized to define new users in the new course's domain - [_1].",$targetdom); + } else { + $response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom); + } + $response .= '<br />' + .&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.' ,' <a'.$helplink.'>' ,'</a>') - .'<br /><br />'; + .'<br /><br />'; } } } @@ -6148,7 +6108,7 @@ sub update_selfenroll_config { if ($currlimit eq 'allstudents') { $newval = &mt('New self-enrollment no longer allowed when total (all students) reaches [_1].',$newcap); } elsif ($changes{'internal.selfenroll_limit'} eq 'selfenrolled') { - $newval = &mt('New self-enrollment no longer allowed when total umber of self-enrolled students reaches [_1].',$newcap); + $newval = &mt('New self-enrollment no longer allowed when total number of self-enrolled students reaches [_1].',$newcap); } } $r->print('<li>'.&mt('"[_1]" set to "[_2]".',$title,$newval).'</li>'."\n");