--- loncom/interface/loncreateuser.pm 2009/03/18 15:31:46 1.268.2.8 +++ loncom/interface/loncreateuser.pm 2009/02/05 12:19:50 1.277 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.268.2.8 2009/03/18 15:31:46 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.277 2009/02/05 12:19:50 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -68,6 +68,7 @@ use Apache::loncommon; use Apache::lonlocal; use Apache::longroup; use Apache::lonuserutils; +use Apache::selfenroll(); use LONCAPA qw(:DEFAULT :match); my $loginscript; # piece of javascript used in two separate instances @@ -123,18 +124,10 @@ sub portfolio_quota { my ($ccuname,$ccdomain) = @_; my %lt = &Apache::lonlocal::texthash( 'usrt' => "User Tools", - 'blog' => "Personal User Blog", - 'aboutme' => "Personal Information Page", - 'portfolio' => "Personal User Portfolio", - 'avai' => "Available", - 'cusa' => "availability", - 'chse' => "Change setting", 'disk' => "Disk space allocated to user's portfolio files", 'cuqu' => "Current quota", 'cust' => "Custom quota", 'defa' => "Default", - 'usde' => "Use default", - 'uscu' => "Use custom", 'chqu' => "Change quota", ); my ($currquota,$quotatype,$inststatus,$defquota) = @@ -190,50 +183,7 @@ END_SCRIPT &Apache::loncommon::start_data_table(); if (&Apache::lonnet::allowed('mut',$ccdomain)) { - my %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, - 'tools.aboutme','tools.portfolio','tools.blog'); - my @usertools = ('aboutme','blog','portfolio'); - foreach my $item (@usertools) { - my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off); - $cust_off = 'checked="checked" '; - $tool_on = 'checked="checked" '; - $curr_access = &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item); - if ($userenv{'tools.'.$item} eq '') { - $custom_access = 'default'; - if (!$curr_access) { - $tool_off = 'checked="checked" '; - $tool_on = ''; - } - } else { - $custom_access = 'custom'; - $cust_on = ' checked="checked" '; - $cust_off = ''; - if ($userenv{'tools.'.$item} == 0) { - $tool_off = 'checked="checked" '; - $tool_on = ''; - } - } - $output .= ' <tr class="LC_info_row">'."\n". - ' <td>'.$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::end_data_table_row()."\n". - &Apache::loncommon::start_data_table_row()."\n". - ' <td><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="tools_'.$item.'" value="1" '. - $tool_on.'/>'.&mt('On').'</label> <label>'. - '<input type="radio" name="tools_'.$item.'" value="0" '. - $tool_off.'/>'.&mt('Off').'</label></span></td>'."\n". - &Apache::loncommon::end_data_table_row()."\n"; - } + $output .= &build_tools_display($ccuname,$ccdomain,'tools'); } if (&Apache::lonnet::allowed('mpq',$ccdomain)) { $output .= '<tr class="LC_info_row">'."\n". @@ -262,6 +212,76 @@ END_SCRIPT return $output; } +sub build_tools_display { + my ($ccuname,$ccdomain,$context) = @_; + my (@usertools,%userenv,$output); + my %lt = &Apache::lonlocal::texthash ( + 'blog' => "Personal User Blog", + 'aboutme' => "Personal Information Page", + 'portfolio' => "Personal User Portfolio", + 'avai' => "Available", + 'cusa' => "availability", + 'chse' => "Change setting", + 'usde' => "Use default", + 'uscu' => "Use custom", + 'official' => 'Can request creation of official courses', + 'unofficial' => 'Can request creation of unofficial courses', + ); + if ($context eq 'requestcourse') { + %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, + 'requestcourse.official','requestcourse.unofficial'); + @usertools = ('official','unofficial'); + } 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); + $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'; + $cust_on = ' checked="checked" '; + $cust_off = ''; + if ($userenv{$context.'.'.$item} == 0) { + $tool_off = 'checked="checked" '; + $tool_on = ''; + } + } + $output .= ' <tr class="LC_info_row">'."\n". + ' <td>'.$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::end_data_table_row()."\n". + &Apache::loncommon::start_data_table_row()."\n". + ' <td><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". + &Apache::loncommon::end_data_table_row()."\n"; + } + return $output; +} + # =================================================================== Phase one sub print_username_entry_form { @@ -769,7 +789,7 @@ $lt{'hs'}: $home_server_pick my $authtype = $rules->{$matchedrule}{'authtype'}; if ($authtype !~ /^(krb4|krb5|int|fsys|loc)$/) { $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc)); - } else { + } else { my $authparm = $rules->{$matchedrule}{'authparm'}; $authmsg = $rules->{$matchedrule}{'authmsg'}; if ($authtype =~ /^krb(4|5)$/) { @@ -847,9 +867,15 @@ ENDCHANGEUSER if ($showforceid) { $r->print(&Apache::lonuserutils::forceid_change($context)); } + if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { + $r->print('<h3>'.&mt('User Can Request Creation of Courses?').'</h3>'. + &Apache::loncommon::start_data_table(). + &build_tools_display($ccuname,$ccdomain,'requestcourse'). + &Apache::loncommon::end_data_table()); + } $r->print('</div>'); my $user_auth_text = &user_authentication($ccuname,$ccdomain,$formname); - my ($user_quota_text,$user_tools_text); + my ($user_quota_text,$user_tools_text,$user_reqcrs_text); if ((&Apache::lonnet::allowed('mpq',$ccdomain)) || (&Apache::lonnet::allowed('mut',$ccdomain))) { # Current user has quota modification privileges @@ -1561,15 +1587,11 @@ sub personal_data_display { } } else { if ($context eq 'selfcreate') { - if (($item eq 'permanentemail') && ($newuser eq 'email')) { - $row .= $ccuname; + if ($canmodify{$item}) { + $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />'; + $editable ++; } else { - if ($canmodify{$item}) { - $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />'; - $editable ++; - } else { - $hiderow = 1; - } + $hiderow = 1; } } else { $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />'; @@ -1691,8 +1713,8 @@ sub update_user_data { } if ( $env{'form.ccuname'} ne &LONCAPA::clean_username($env{'form.ccuname'}) ) { - $r->print($error.&mt('Invalid login name.').' '. - &mt('Only letters, numbers, periods, dashes, @, and underscores are valid.'). + $r->print($error.&mt('Invalid login name').'. '. + &mt('Only letters, numbers, periods, dashes, @, and underscores are valid').'.'. $end.$rtnlink); return; } @@ -1702,8 +1724,8 @@ sub update_user_data { } if ( $env{'form.ccdomain'} ne &LONCAPA::clean_domain($env{'form.ccdomain'}) ) { - $r->print($error.&mt ('Invalid domain name.').' '. - &mt('Only letters, numbers, periods, dashes, and underscores are valid.'). + $r->print($error.&mt ('Invalid domain name').'. '. + &mt('Only letters, numbers, periods, dashes, and underscores are valid').'.'. $end.$rtnlink); return; } @@ -1751,6 +1773,7 @@ sub update_user_data { $env{'form.ccuname'}, $env{'form.ccdomain'}).'</h3>'); my (%alerts,%rulematch,%inst_results,%curr_rules); my @usertools = ('aboutme','blog','portfolio'); + my @requestcourses = ('official','unofficial'); if ($env{'form.makeuser'}) { $r->print('<h3>'.&mt('Creating new account.').'</h3>'); # Check for the authentication mode and password @@ -1824,7 +1847,15 @@ sub update_user_data { foreach my $item (@usertools) { if ($env{'form.custom'.$item} == 1) { $newcustom{$item} = $env{'form.tools_'.$item}; - $changed{$item} = &tool_admin($item,$newcustom{$item},\%changeHash); + $changed{$item} = &tool_admin($item,$newcustom{$item}, + \%changeHash,'tools'); + } + } + if (&Apache::lonnet::allowed('ccc',$env{'request.domain'})) { + foreach my $item (@requestcourses) { + $newcustom{$item} = $env{'form.requestcourse_'.$item}; + $changed{$item} = &tool_admin($item,$newcustom{$item}, + \%changeHash,'requestcourse'); } } if (keys(%changed)) { @@ -1871,7 +1902,8 @@ sub update_user_data { my %userenv = &Apache::lonnet::get ('environment',['firstname','middlename','lastname','generation', 'id','permanentemail','portfolioquota','inststatus','tools.aboutme', - 'tools.blog','tools.portfolio'], + 'tools.blog','tools.portfolio','requestcourse.official', + 'requestcourse.unofficial'], $env{'form.ccdomain'},$env{'form.ccuname'}); my ($tmp) = keys(%userenv); if ($tmp =~ /^(con_lost|error)/i) { @@ -1999,13 +2031,16 @@ sub update_user_data { $newdefquotatext,%oldaccess,%oldaccesstext,%newaccess,%newaccesstext); my ($defquota,$settingstatus) = &Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus); - my ($showquota,$showtools); + my ($showquota,$showtools,$showrequestcourses); if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) { $showquota = 1; } if (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) { $showtools = 1; } + if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) { + $showrequestcourses = 1; + } my (%changeHash,%changed); $changeHash{'portfolioquota'} = $userenv{'portfolioquota'}; if ($userenv{'portfolioquota'} ne '') { @@ -2047,73 +2082,10 @@ sub update_user_data { if ($newisdefault) { $newdefquotatext = &get_defaultquota_text($settingstatus); } - - foreach my $tool (@usertools) { - if ($userenv{'tools.'.$tool} ne '') { - $oldaccess{$tool} = &mt('custom'); - if ($userenv{'tools_'.$tool}) { - $oldaccesstext{$tool} = &mt("availability set to 'on'"); - } else { - $oldaccesstext{$tool} = &mt("availability set to 'off'"); - } - $changeHash{'tools.'.$tool} = $userenv{'tools.'.$tool}; - if ($env{'form.custom'.$tool} == 1) { - if ($env{'form.tools_'.$tool} ne $userenv{'tools.'.$tool}) { - $changed{$tool} = &tool_admin($tool,$env{'form.tools_'.$tool}, - \%changeHash); - if ($changed{$tool}) { - $newaccess{$tool} = &mt('custom'); - if ($env{'form.tools_'.$tool}) { - $newaccesstext{$tool} = &mt("availability set to 'on'"); - } else { - $newaccesstext{$tool} = &mt("availability set to 'off'"); - } - } else { - $newaccess{$tool} = $oldaccess{$tool}; - if ($userenv{'tools.'.$tool}) { - $newaccesstext{$tool} = &mt("availability set to 'on'"); - } else { - $newaccesstext{$tool} = &mt("availability set to 'off'"); - } - } - } else { - $newaccess{$tool} = $oldaccess{$tool}; - $newaccesstext{$tool} = $oldaccesstext{$tool}; - } - } else { - $changed{$tool} = &tool_admin($tool,'',\%changeHash); - if ($changed{$tool}) { - $newaccess{$tool} = &mt('default'); - } else { - $newaccess{$tool} = $oldaccess{$tool}; - if ($userenv{'tools.'.$tool}) { - $newaccesstext{$tool} = &mt("availability set to 'on'"); - } else { - $newaccesstext{$tool} = &mt("availability set to 'off'"); - } - } - } - } else { - $oldaccess{$tool} = &mt('default'); - if ($env{'form.custom'.$tool} == 1) { - $changed{$tool} = &tool_admin($tool,$env{'form.tools_'.$tool}, - \%changeHash); - if ($changed{$tool}) { - $newaccess{$tool} = &mt('custom'); - if ($env{'form.tools_'.$tool}) { - $newaccesstext{$tool} = &mt("availability set to 'on'"); - } else { - $newaccesstext{$tool} = &mt("availability set to 'off'"); - } - } else { - $newaccess{$tool} = $oldaccess{$tool}; - } - } else { - $newaccess{$tool} = $oldaccess{$tool}; - } - } - } - + &tool_changes('tools',\@usertools,\%oldaccess,\%oldaccesstext,\%userenv, + \%changeHash,\%changed,\%newaccess,\%newaccesstext); + &tool_changes('requestcourse',\@requestcourses,\%oldaccess,\%oldaccesstext, + \%userenv, \%changeHash,\%changed,\%newaccess,\%newaccesstext); if ($env{'form.cfirstname'} ne $userenv{'firstname'} || $env{'form.cmiddlename'} ne $userenv{'middlename'} || $env{'form.clastname'} ne $userenv{'lastname'} || @@ -2139,7 +2111,13 @@ sub update_user_data { ($env{'user.domain'} eq $env{'form.ccdomain'})) { my %newenvhash; foreach my $key (keys(%changed)) { - if ($key ne 'quota') { + if (($key eq 'official') || ($key eq 'unofficial')) { + $newenvhash{'environment.canrequest.'.$key} = + $changeHash{'requestcourse.'.$key}; + $newenvhash{'environment.canrequest.'.$key} = + $changeHash{'requestcourse.'.$key}; + + } elsif ($key ne 'quota') { $newenvhash{'environment.tools.'.$key} = $changeHash{'tools.'.$key}; $newenvhash{'environment.availabletools.'.$key} = @@ -2172,19 +2150,21 @@ sub update_user_data { ((keys(%changed) > 0) && $chgresult eq 'ok')) { # Tell the user we changed the name my %lt=&Apache::lonlocal::texthash( - 'uic' => "User Information Changed", - 'frst' => "First", - 'mddl' => "Middle", - 'lst' => "Last", - 'gen' => "Generation", - 'id' => "Student/Employee ID", - 'mail' => "Permanent E-mail", - 'disk' => "Disk space allocated to portfolio files", - 'blog' => "Blog Availability", - 'aboutme' => "Home Page Availability", - 'portfolio' => "Portfolio Availability", - 'prvs' => "Previous", - 'chto' => "Changed To" + 'uic' => "User Information Changed", + 'frst' => "First", + 'mddl' => "Middle", + 'lst' => "Last", + 'gen' => "Generation", + 'id' => "Student/Employee ID", + 'mail' => "Permanent E-mail", + 'disk' => "Disk space allocated to portfolio files", + 'blog' => "Blog Availability", + 'aboutme' => "Home Page Availability", + 'portfolio' => "Portfolio Availability", + 'official' => "Can Request Official Courses", + 'unofficial' => "Can Request Unofficial Courses", + 'prvs' => "Previous", + 'chto' => "Changed To" ); $r->print('<h4>'.$lt{'uic'}.'</h4>'. &Apache::loncommon::start_data_table(). @@ -2198,6 +2178,12 @@ sub update_user_data { <th>$lt{'id'}</th> <th>$lt{'mail'}</th> END + if ($showrequestcourses) { + foreach my $item (@requestcourses) { + $r->print(" + <th>$lt{$item}</th>\n"); + } + } if ($showquota) { $r->print(" <th>$lt{'disk'}</th>\n"); @@ -2219,6 +2205,12 @@ END <td>$userenv{'id'}</td> <td>$userenv{'permanentemail'} </td> END + if ($showrequestcourses) { + foreach my $item (@requestcourses) { + $r->print(" + <td>$oldaccess{$item} $oldaccesstext{$item}</td>\n"); + } + } if ($showquota) { $r->print(" <td>$oldportfolioquota Mb $olddefquotatext </td>\n"); @@ -2240,6 +2232,12 @@ END <td>$env{'form.cid'} </td> <td>$env{'form.cpermanentemail'} </td> END + if ($showrequestcourses) { + foreach my $item (@requestcourses) { + $r->print(" + <td>$newaccess{$item} $newaccesstext{$item} </td>\n"); + } + } if ($showquota) { $r->print(" <td>$newportfolioquota Mb $newdefquotatext </td>\n"); @@ -2278,15 +2276,18 @@ END $env{'form.ccdomain'}.'</span><br />'); } } else { # End of if ($env ... ) logic - # They did not want to change the users name, quota or tool availability, + # They did not want to change the users name, quota, tool availability, + # or ability to request creation of courses, # but we can still tell them what the name and quota and availabilities are my %lt=&Apache::lonlocal::texthash( - 'id' => "Student/Employee ID", - 'mail' => "Permanent e-mail", - 'disk' => "Disk space allocated to user's portfolio files", - 'blog' => "Blog Availability", - 'aboutme' => "Home Page Availability", - 'portfolio' => "Portfolio Availability", + 'id' => "Student/Employee ID", + 'mail' => "Permanent e-mail", + 'disk' => "Disk space allocated to user's portfolio files", + 'blog' => "Blog Availability", + 'aboutme' => "Home Page Availability", + 'portfolio' => "Portfolio Availability", + 'official' => "Can Request Official Courses", + 'unofficial' => "Can Request Unofficial Course", ); $r->print(<<"END"); <h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'} @@ -2295,6 +2296,12 @@ END $r->print('<br />['.$lt{'mail'}.': '. $userenv{'permanentemail'}.']'); } + if ($showrequestcourses) { + foreach my $item (@requestcourses) { + $r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '. + $newaccesstext{$item}.']'."\n"); + } + } if ($showtools) { foreach my $item (@usertools) { $r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '. @@ -2373,6 +2380,83 @@ END $r->print(&Apache::loncommon::end_page()); } +sub tool_changes { + my ($context,$usertools,$oldaccess,$oldaccesstext,$userenv,$changeHash, + $changed,$newaccess,$newaccesstext) = @_; + if (!((ref($usertools) eq 'ARRAY') && (ref($oldaccess) eq 'HASH') && + (ref($oldaccesstext) eq 'HASH') && (ref($userenv) eq 'HASH') && + (ref($changeHash) eq 'HASH') && (ref($changed) eq 'HASH') && + (ref($newaccess) eq 'HASH') && (ref($newaccesstext) eq 'HASH'))) { + return; + } + foreach my $tool (@{$usertools}) { + if ($userenv->{$context.'.'.$tool} ne '') { + $oldaccess->{$tool} = &mt('custom'); + if ($userenv->{$context.'.'.$tool}) { + $oldaccesstext->{$tool} = &mt("availability set to 'on'"); + } else { + $oldaccesstext->{$tool} = &mt("availability set to 'off'"); + } + $changeHash->{$context.'.'.$tool} = $userenv->{'tools.'.$tool}; + if ($env{'form.custom'.$tool} == 1) { + if ($env{'form.'.$context.'_'.$tool} ne $userenv->{'tools.'.$tool}) { + $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool}, + $changeHash,$context); + if ($changed->{$tool}) { + $newaccess->{$tool} = &mt('custom'); + if ($env{'form.'.$context.'_'.$tool}) { + $newaccesstext->{$tool} = &mt("availability set to 'on'"); + } else { + $newaccesstext->{$tool} = &mt("availability set to 'off'"); + } + } else { + $newaccess->{$tool} = $oldaccess->{$tool}; + if ($userenv->{$context.'.'.$tool}) { + $newaccesstext->{$tool} = &mt("availability set to 'on'"); + } else { + $newaccesstext->{$tool} = &mt("availability set to 'off'"); + } + } + } else { + $newaccess->{$tool} = $oldaccess->{$tool}; + $newaccesstext->{$tool} = $oldaccesstext->{$tool}; + } + } else { + $changed->{$tool} = &tool_admin($tool,'',$changeHash,$context); + if ($changed->{$tool}) { + $newaccess->{$tool} = &mt('default'); + } else { + $newaccess->{$tool} = $oldaccess->{$tool}; + if ($userenv->{$context.'.'.$tool}) { + $newaccesstext->{$tool} = &mt("availability set to 'on'"); + } else { + $newaccesstext->{$tool} = &mt("availability set to 'off'"); + } + } + } + } else { + $oldaccess->{$tool} = &mt('default'); + if ($env{'form.custom'.$tool} == 1) { + $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool}, + $changeHash,$context); + if ($changed->{$tool}) { + $newaccess->{$tool} = &mt('custom'); + if ($env{'form.'.$context.'_'.$tool}) { + $newaccesstext->{$tool} = &mt("availability set to 'on'"); + } else { + $newaccesstext->{$tool} = &mt("availability set to 'off'"); + } + } else { + $newaccess->{$tool} = $oldaccess->{$tool}; + } + } else { + $newaccess->{$tool} = $oldaccess->{$tool}; + } + } + } + return; +} + sub update_roles { my ($r,$context) = @_; my $now=time; @@ -2615,12 +2699,18 @@ sub update_roles { $r->print('<p><span class="LC_error">'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$key.'</tt></span></p><br />'); } foreach my $key (sort(keys(%disallowed))) { + $r->print('<p class="LC_warning">'); if (($key eq 'none') || ($key eq 'all')) { - $r->print('<p>'.&mt('[_1] may not be used as the name for a section, as it is a reserved word.',$key)); + $r->print(&mt('[_1] may not be used as the name for a section, as it is a reserved word.','<tt>'.$key.'</tt>')); } else { - $r->print('<p>'.&mt('[_1] may not be used as the name for a section, as it is the name of a course group.',$key)); + $r->print(&mt('[_1] may not be used as the name for a section, as it is the name of a course group.','<tt>'.$key.'</tt>')); } - $r->print(' '.&mt('Please <a href="javascript:history.go(-1)">go back</a> and choose a different section name.').'</p><br />'); + $r->print('</p><p>' + .&mt('Please [_1]go back[_2] and choose a different section name.' + ,'<a href="javascript:history.go(-1)' + ,'</a>') + .'</p><br />' + ); } } } # End of foreach (keys(%env)) @@ -2731,13 +2821,21 @@ sub quota_admin { } sub tool_admin { - my ($tool,$settool,$changeHash) = @_; - my $toolchanged; - if (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) { + my ($tool,$settool,$changeHash,$context) = @_; + my $canchange = 0; + if ($context eq 'requestcourse') { + if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) { + $canchange = 1; + } + } elsif (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) { # Current user has quota modification privileges + $canchange = 1; + } + my $toolchanged; + if ($canchange) { if (ref($changeHash) eq 'HASH') { $toolchanged = 1; - $changeHash->{'tools.'.$tool} = $settool; + $changeHash->{$context.'.'.$tool} = $settool; } } return $toolchanged; @@ -3312,6 +3410,29 @@ sub handler { &update_selfenroll_config($r,$context,$permission); } $r->print(&Apache::loncommon::end_page()); + } elsif ($env{'form.action'} eq 'selfenrollqueue') { + $r->print(&header()); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/createuser?action=selfenrollqueue', + text=>"Enrollment requests"}); + my $cid = $env{'request.course.id'}; + my $cdom = $env{'course.'.$cid.'.domain'}; + my $cnum = $env{'course.'.$cid.'.num'}; + 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); + } elsif ($env{'form.state'} eq 'done') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/createuser?action=selfenrollqueue', + text=>"Result"}); + $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::loncommon::end_page()); } elsif ($env{'form.action'} eq 'changelogs') { $r->print(&header()); &Apache::lonhtmlcommon::add_breadcrumb @@ -3377,101 +3498,137 @@ sub print_main_menu { listusers => 'Display Co-authors and Manage Multiple Users', }, course => { - upload => 'Upload a File of Course Users', - singleuser => 'Add/Modify a Single Course User', - listusers => 'Display Class Lists and Manage Multiple Users', + upload => 'File of Course Users', + singleuser => 'Single Course User', + listusers => 'Course User Lists', }, ); - my @menu = - ( - { text => $links{$context}{'upload'}, - help => 'Course_Create_Class_List', - action => 'upload', - permission => $permission->{'cusr'}, - }, - { text => $links{$context}{'singleuser'}, - help => 'Course_Change_Privileges', - action => 'singleuser', - permission => $permission->{'cusr'}, - }, - { text => $links{$context}{'listusers'}, - help => 'Course_View_Class_List', - action => 'listusers', - permission => ($permission->{'view'} || $permission->{'cusr'}), - }, - ); - if ($context eq 'domain' || $context eq 'course') { - my $customlink = { text => 'Edit Custom Roles', - help => 'Course_Editing_Custom_Roles', - action => 'custom', - permission => $permission->{'custom'}, - }; - push(@menu,$customlink); - } - if ($context eq 'course') { - my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity(); - my @courselinks = - ( - { text => 'Enroll a Single Student', - help => 'Course_Add_Student', - action => 'singlestudent', - permission => $permission->{'cusr'}, - }, - { text => 'Drop Students', - help => 'Course_Drop_Student', - action => 'drop', - permission => $permission->{'cusr'}, - }); - if (!exists($permission->{'cusr_section'})) { - push(@courselinks, - { text => 'Automated Enrollment Manager', - help => 'Course_Automated_Enrollment', - permission => (&Apache::lonnet::auto_run($cnum,$cdom) - && $permission->{'cusr'}), - url => '/adm/populate', - }, - { text => 'Configure User Self-enrollment', - help => 'Course_Self_Enrollment', - action => 'selfenroll', - permission => $permission->{'cusr'}, - }); - } - push(@courselinks, - { text => 'Manage Course Groups', - help => 'Course_Manage_Group', - permission => $permission->{'grp_manage'}, - url => '/adm/coursegroups?refpage=cusr', - }, - { text => 'View Change Logs', - help => 'Course_User_Logs', - action => 'changelogs', - permission => $permission->{'cusr'}, - },); + my @menu = ( {categorytitle => 'Add Users', + items => + [{ + linktext => $links{$context}{'upload'}, + icon => 'sctr.png', + #help => 'Course_Create_Class_List', + url => '/adm/createuser?action=upload', + permission => $permission->{'cusr'}, + linktitle => 'Upload a CSV or a text file containing users.', + }, + { + linktext => $links{$context}{'singleuser'}, + icon => 'edit-redo.png', + #help => 'Course_Change_Privileges', + url => '/adm/createuser?action=singleuser', + permission => $permission->{'cusr'}, + linktitle => 'Add a user with a certain role to this course.', + }]}, + {categorytitle => 'Administration', + items => + [{ + linktext => $links{$context}{'listusers'}, + icon => 'edit-find.png', + #help => 'Course_View_Class_List', + url => '/adm/createuser?action=listusers', + permission => ($permission->{'view'} || $permission->{'cusr'}), + linktitle => 'Show and manage users of this course.', + }]}, + {categorytitle => 'Configuration', + items => + [ + ]}, + ); + + if ($context eq 'domain'){ + + push(@{ $menu[1]->{items} }, + { linktext => 'Custom Roles', + icon => 'emblem-photos.png', + #help => 'Course_Editing_Custom_Roles', + url => '/adm/createuser?action=custom', + permission => $permission->{'custom'}, + linktitle => 'Configure a custom role.', + }); + + }elsif ($context eq 'course'){ + my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity(); + + push(@{ $menu[0]->{items} }, + { linktext => 'Single Student', + #help => 'Course_Add_Student', + icon => 'list-add.png', + url => '/adm/createuser?action=singlestudent', + permission => $permission->{'cusr'}, + linktitle => 'Add a user with the role student to this course.', + }); + + push(@{ $menu[1]->{items} }, + { linktext => 'Drop Students', + icon => 'edit-undo.png', + #help => 'Course_Drop_Student', + url => '/adm/createuser?action=drop', + permission => $permission->{'cusr'}, + linktitle =>'Remove a student from this course.', + }, + { linktext => 'Custom Roles', + icon => 'emblem-photos.png', + #help => 'Course_Editing_Custom_Roles', + url => '/adm/createuser?action=custom', + permission => $permission->{'custom'}, + linktitle => 'Configure a custom role.', + }); + if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) { + push(@{ $menu[1]->{items} }, + { linktext => 'Enrollment Requests', + icon => 'selfenrl-queue.png', + #help => 'Course_Approve_Selfenroll', + url => '/adm/createuser?action=selfenrollqueue', + permission => $permission->{'cusr'}, + linktitle =>'Approve or reject enrollment requests.', + }); + } + + if (!exists($permission->{'cusr_section'})){ + + push(@{ $menu[2]->{items} }, + { linktext => 'Automated Enrollment', + icon => 'roles.png', + #help => 'Course_Automated_Enrollment', + permission => (&Apache::lonnet::auto_run($cnum,$cdom) + && $permission->{'cusr'}), + url => '/adm/populate', + linktitle => 'Automated enrollment manager.', + }, + { linktext => 'User Self-Enrollment', + icon => 'cstr.png', + #help => 'Course_Self_Enrollment', + url => '/adm/createuser?action=selfenroll', + permission => $permission->{'cusr'}, + linktitle => 'Configure user self enrollment.', + }); + + } + + push(@{ $menu[2]->{items} }, + { linktext => 'Course Groups', + icon => 'conf.png', + #help => 'Course_Manage_Group', + url => '/adm/coursegroups?refpage=cusr', + permission => $permission->{'grp_manage'}, + linktitle => 'Manage course groups.', + }, + { linktext => 'Change Logs', + icon => 'document-properties.png', + #help => 'Course_User_Logs', + url => '/adm/createuser?action=changelogs', + permission => $permission->{'cusr'}, + linktitle => 'View change log.', + }); + }; +return Apache::lonhtmlcommon::generate_menu(@menu); # { text => 'View Log-in History', # help => 'Course_User_Logins', # action => 'logins', # permission => $permission->{'cusr'}, # }); - push(@menu,@courselinks); - } - my $menu_html = ''; - foreach my $menu_item (@menu) { - next if (! $menu_item->{'permission'}); - $menu_html.='<p>'; - if (exists($menu_item->{'help'})) { - $menu_html.= - &Apache::loncommon::help_open_topic($menu_item->{'help'}); - } - $menu_html.='<font size="+1">'; - if (exists($menu_item->{'url'})) { - $menu_html.=qq{<a href="$menu_item->{'url'}">}; - } else { - $menu_html.= - qq{<a href="/adm/createuser?action=$menu_item->{'action'}">}; } - $menu_html.= &mt($menu_item->{'text'}).'</a></font>'; - $menu_html.='</p>'; - } - return $menu_html; } sub restore_prev_selections { @@ -3674,10 +3831,9 @@ ENDSCRIPT my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum); if (ref($visactions) eq 'HASH') { if ($visible) { - $output .= '<p class="LC_info">'.$visactions->{'vis'}.'</p>'; + $output .= '<p>'.$visactions->{'vis'}.'</p>'; } else { - $output .= '<p class="LC_warning">'.$visactions->{'miss'}.'</p>' - .$visactions->{'yous'}. + $output .= $visactions->{'miss'}.'<br />'.$visactions->{'yous'}. '<p>'.$visactions->{'gen'}.'<br />'.$visactions->{'coca'}; if (ref($vismsgs) eq 'ARRAY') { $output .= '<br />'.$visactions->{'make'}.'<ul>'; @@ -3830,6 +3986,95 @@ ENDSCRIPT '<input type="hidden" name="sections" value="" />'."\n". '<input type="hidden" name="state" value="done" />'."\n". '</td></tr></table>'."\n"; + } elsif ($item eq 'approval') { + my ($appon,$appoff); + my $cid = $env{'request.course.id'}; + my $currnotified = $env{'course.'.$cid.'.internal.selfenroll_notifylist'}; + if ($env{'course.'.$cid.'.internal.selfenroll_approval'}) { + $appon = ' checked="checked" '; + $appoff = ' '; + } else { + $appon = ' '; + $appoff = ' checked="checked" '; + } + $output .= '<label>'. + '<input type="radio" name="selfenroll_approval" value="1"'.$appon.'/>'. + &mt('Yes').'</label> <label>'. + '<input type="radio" name="selfenroll_approval" value="0"'.$appoff.'/>'. + &mt('No').'</label>'; + my %advhash = &Apache::lonnet::get_course_adv_roles($cid,1); + my (@ccs,%notified); + if ($advhash{'cc'}) { + @ccs = split(/,/,$advhash{'cc'}); + } + if ($currnotified) { + foreach my $current (split(/,/,$currnotified)) { + $notified{$current} = 1; + if (!grep(/^\Q$current\E$/,@ccs)) { + push(@ccs,$current); + } + } + } + if (@ccs) { + $output .= '<br />'.&mt('Personnel to be notified when an enrollment request needs approval, or has been approved:').' '.&Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_row(); + my $count = 0; + my $numcols = 4; + foreach my $cc (sort(@ccs)) { + my $notifyon; + my ($ccuname,$ccudom) = split(/:/,$cc); + if ($notified{$cc}) { + $notifyon = ' checked="checked" '; + } + if ($count && !$count%$numcols) { + $output .= &Apache::loncommon::end_data_table_row(). + &Apache::loncommon::start_data_table_row() + } + $output .= '<td><span class="LC_nobreak"><label>'. + '<input type="checkbox" name="selfenroll_notify"'.$notifyon.' value="'.$cc.'" />'. + &Apache::loncommon::plainname($ccuname,$ccudom). + '</label></span></td>'; + $count; + } + my $rem = $count%$numcols; + if ($rem) { + my $emptycols = $numcols - $rem; + for (my $i=0; $i<$emptycols; $i++) { + $output .= '<td> </td>'; + } + } + $output .= &Apache::loncommon::end_data_table_row(). + &Apache::loncommon::end_data_table(); + } + } elsif ($item eq 'limit') { + my ($crslimit,$selflimit,$nolimit); + my $cid = $env{'request.course.id'}; + my $currlim = $env{'course.'.$cid.'.internal.selfenroll_limit'}; + my $currcap = $env{'course.'.$cid.'.internal.selfenroll_cap'}; + my $nolimit = ' checked="checked" '; + if ($currlim eq 'allstudents') { + $crslimit = ' checked="checked" '; + $selflimit = ' '; + $nolimit = ' '; + } elsif ($currlim eq 'selfenrolled') { + $crslimit = ' '; + $selflimit = ' checked="checked" '; + $nolimit = ' '; + } else { + $crslimit = ' '; + $selflimit = ' '; + } + $output .= '<table><tr><td><label>'. + '<input type="radio" name="selfenroll_limit" value="0"'.$nolimit.'/>'. + &mt('No limit').'</label></td><td><label>'. + '<input type="radio" name="selfenroll_limit" value="allstudents"'.$crslimit.'/>'. + &mt('Limit by total students').'</label></td><td><label>'. + '<input type="radio" name="selfenroll_limit" value="selfenrolled"'.$selflimit.'/>'. + &mt('Limit by total self-enrolled students'). + '</td></tr><tr>'. + '<td> </td><td colspan="2"><span class="LC_nobreak">'. + (' 'x3).&mt('Maximum number allowed: '). + '<input type="text" name="selfenroll_cap" size = "5" value="'.$currcap.'" /></td></tr></table>'; } $output .= &Apache::lonhtmlcommon::row_closure(1); } @@ -3842,6 +4087,238 @@ 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,); + 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); + } 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); + } + } + 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>'); + } + 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); @@ -5037,6 +5514,74 @@ sub update_selfenroll_config { $changes{'internal.selfenroll_types'} = $selfenroll_types; } } + } elsif ($item eq 'limit') { + my $newlimit = $env{'form.selfenroll_limit'}; + my $newcap = $env{'form.selfenroll_cap'}; + $newcap =~s/\s+//g; + my $currlimit = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_limit'}; + $currlimit = 'none' if ($currlimit eq ''); + my $currcap = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_cap'}; + if ($newlimit ne $currlimit) { + if ($newlimit ne 'none') { + if ($newcap =~ /^\d+$/) { + if ($newcap ne $currcap) { + $changes{'internal.selfenroll_cap'} = $newcap; + } + $changes{'internal.selfenroll_limit'} = $newlimit; + } else { + $warning{$item} = &mt('Maximum enrollment setting unchanged.').'<br />'.&mt('The value provided was invalid - it must be a positive integer if enrollment is being limited.'); + } + } elsif ($currcap ne '') { + $changes{'internal.selfenroll_cap'} = ''; + $changes{'internal.selfenroll_limit'} = $newlimit; + } + } elsif ($currlimit ne 'none') { + if ($newcap =~ /^\d+$/) { + if ($newcap ne $currcap) { + $changes{'internal.selfenroll_cap'} = $newcap; + } + } else { + $warning{$item} = &mt('Maximum enrollment setting unchanged.').'<br />'.&mt('The value provided was invalid - it must be a positive integer if enrollment is being limited.'); + } + } + } elsif ($item eq 'approval') { + my (@currnotified,@newnotified); + my $currapproval = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}; + my $currnotifylist = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_notifylist'}; + if ($currnotifylist ne '') { + @currnotified = split(/,/,$currnotifylist); + @currnotified = sort(@currnotified); + } + my $newapproval = $env{'form.selfenroll_approval'}; + @newnotified = &Apache::loncommon::get_env_multiple('form.selfenroll_notify'); + @newnotified = sort(@newnotified); + if ($newapproval ne $currapproval) { + $changes{'internal.selfenroll_approval'} = $newapproval; + if (!$newapproval) { + if ($currnotifylist ne '') { + $changes{'internal.selfenroll_notifylist'} = ''; + } + } else { + my @differences = + &compare_arrays(\@currnotified,\@newnotified); + if (@differences > 0) { + if (@newnotified > 0) { + $changes{'internal.selfenroll_notifylist'} = join(',',@newnotified); + } else { + $changes{'internal.selfenroll_notifylist'} = join(',',@newnotified); + } + } + } + } else { + my @differences = &compare_arrays(\@currnotified,\@newnotified); + if (@differences > 0) { + if (@newnotified > 0) { + $changes{'internal.selfenroll_notifylist'} = join(',',@newnotified); + } else { + $changes{'internal.selfenroll_notifylist'} = ''; + } + } + } } else { my $curr_val = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_'.$item}; @@ -5048,7 +5593,7 @@ sub update_selfenroll_config { $warning{$item} = &mt('Section for self-enrolled users unchanged as the proposed section is a group').'<br />'.&mt('Group names and section names must be distinct'); } elsif ($newval eq 'all') { $newval = $curr_val; - $warning{$item} = &mt("Section for self-enrolled users unchanged, as 'all' is a reserved section name."); + $warning{$item} = &mt('Section for self-enrolled users unchanged, as "all" is a reserved section name.'); } if ($newval eq '') { $newval = 'none'; @@ -5109,6 +5654,62 @@ sub update_selfenroll_config { $title,$type,$newdate).'</li>'); } } + } elsif ($item eq 'limit') { + if ((exists($changes{'internal.selfenroll_limit'})) || + (exists($changes{'internal.selfenroll_cap'}))) { + my ($newval,$newcap); + if ($changes{'internal.selfenroll_cap'} ne '') { + $newcap = $changes{'internal.selfenroll_cap'} + } else { + $newcap = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_cap'}; + } + if ($changes{'internal.selfenroll_limit'} eq 'none') { + $newval = &mt('No limit'); + } elsif ($changes{'internal.selfenroll_limit'} 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 number of self-enrolled students reaches [_1].',$newcap); + } else { + my $currlimit = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_limit'}; + 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); + } + } + $r->print('<li>'.&mt('"[_1]" set to "[_2]".',$title,$newval).'</li>'."\n"); + } + } elsif ($item eq 'approval') { + if ((exists($changes{'internal.selfenroll_approval'})) || + (exists($changes{'internal.selfenroll_notifylist'}))) { + my ($newval,$newnotify); + if (exists($changes{'internal.selfenroll_notifylist'})) { + $newnotify = $changes{'internal.selfenroll_notifylist'}; + } else { + $newnotify = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_notifylist'}; + } + if ($changes{'internal.selfenroll_approval'}) { + $newval = &mt('Yes'); + } elsif ($changes{'internal.selfenroll_approval'} eq '0') { + $newval = &mt('No'); + } else { + my $currapproval = + $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}; + if ($currapproval) { + $newval = &mt('Yes'); + } else { + $newval = &mt('No'); + } + } + $r->print('<li>'.&mt('"[_1]" set to "[_2]".',$title,$newval)); + if ($newnotify) { + $r->print('<br />'.&mt('The following will be notified when an enrollment request needs approval, or has been approved: [_1].',$newnotify)); + } else { + $r->print('<br />'.&mt('No notifications sent when an enrollment request needs approval, or has been approved.')); + } + $r->print('</li>'."\n"); + } } else { if (exists($changes{'internal.selfenroll_'.$item})) { my $newval = $changes{'internal.selfenroll_'.$item}; @@ -5162,14 +5763,33 @@ sub update_selfenroll_config { return; } +sub compare_arrays { + my ($arrayref1,$arrayref2) = @_; + my (@difference,%count); + @difference = (); + %count = (); + if ((ref($arrayref1) eq 'ARRAY') && (ref($arrayref2) eq 'ARRAY')) { + foreach my $element (@{$arrayref1}, @{$arrayref2}) { $count{$element}++; } + foreach my $element (keys(%count)) { + if ($count{$element} == 1) { + push(@difference,$element); + } + } + } + return @difference; +} + sub get_selfenroll_titles { - my @row = ('types','registered','enroll_dates','access_dates','section'); + my @row = ('types','registered','enroll_dates','access_dates','section', + 'approval','limit'); my %lt = &Apache::lonlocal::texthash ( types => 'Users allowed to self-enroll in this course', registered => 'Restrict self-enrollment to students officially registered for the course', enroll_dates => 'Dates self-enrollment available', access_dates => 'Course access dates assigned to self-enrolling users', section => 'Section assigned to self-enrolling users', + approval => 'Self-enrollment requests need approval?', + limit => 'Enrollment limit', ); return (\@row,\%lt); }