--- loncom/interface/loncreateuser.pm 2009/03/05 10:25:10 1.284 +++ 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.284 2009/03/05 10:25:10 bisitz 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', @@ -143,6 +144,7 @@ sub portfolio_quota { $custom_off = ' checked="checked" '; my $quota_javascript = <<"END_SCRIPT"; <script type="text/javascript"> +// <![CDATA[ function quota_changes(caller) { if (caller == "custom") { if (document.cu.customquota[0].checked) { @@ -153,6 +155,7 @@ function quota_changes(caller) { document.cu.customquota[1].checked = true; } } +// ]]> </script> END_SCRIPT if ($quotatype eq 'custom') { @@ -214,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", @@ -225,63 +229,242 @@ sub build_tools_display { 'usde' => "Use default", 'uscu' => "Use custom", 'official' => 'Can request creation of official courses', - 'unofficial' => 'Can request creation of unofficial courses', + 'unofficial' => 'Can request creation of unofficial courses', + 'community' => 'Can request creation of communities', ); if ($context eq 'requestcourses') { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, - 'requestcourses.official','requestcourses.unofficial'); - @usertools = ('official','unofficial'); + '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; +} + +sub coursereq_externaluser { + my ($ccuname,$ccdomain,$cdom) = @_; + 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', + 'community' => 'Can request creation of communities', + ); + + %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, + '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 ($curroption,$currlimit,$tooloff); + if ($userenv{'reqcrsotherdom.'.$item} ne '') { + my @curr = split(',',$userenv{'reqcrsotherdom.'.$item}); + 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 .= '</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 { @@ -299,7 +482,9 @@ sub print_username_entry_form { my $jscript = &Apache::loncommon::studentbrowser_javascript()."\n". '<script type="text/javascript">'."\n". - &Apache::lonhtmlcommon::set_form_elements($elements->{$formtoset}). + '// <![CDATA['."\n". + &Apache::lonhtmlcommon::set_form_elements($elements->{$formtoset})."\n". + '// ]]>'."\n". '</script>'."\n"; my %loaditems = ( @@ -466,6 +651,7 @@ sub user_modification_js { return <<END; <script type="text/javascript" language="Javascript"> +// <![CDATA[ function pclose() { parmwin=window.open("/adm/rat/empty.html","LONCAPAparms", @@ -483,14 +669,14 @@ sub user_modification_js { } $nondc_setsection_code - +// ]]> </script> END } # =================================================================== Phase two sub print_user_selection_page { - my ($r,$response,$srch,$srch_results,$srcharray,$context) = @_; + my ($r,$response,$srch,$srch_results,$srcharray,$context,$opener_elements) = @_; my @fields = ('username','domain','lastname','firstname','permanentemail'); my $sortby = $env{'form.sortby'}; @@ -502,6 +688,7 @@ sub print_user_selection_page { my $jscript = (<<ENDSCRIPT); <script type="text/javascript"> +// <![CDATA[ function pickuser(uname,udom) { document.usersrchform.seluname.value=uname; document.usersrchform.seludom.value=udom; @@ -510,6 +697,7 @@ function pickuser(uname,udom) { } $jsback +// ]]> </script> ENDSCRIPT @@ -524,28 +712,32 @@ ENDSCRIPT 'firstname' => "first name", 'permanentemail' => "permanent e-mail", ); - $r->print(&Apache::loncommon::start_page('User Management',$jscript)); + if ($context eq 'requestcrs') { + $r->print('<div>'); + } else { + $r->print(&Apache::loncommon::start_page('User Management',$jscript)); - my %breadcrumb_text = &singleuser_breadcrumb(); - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:backPage(document.usersrchform,'','')", - text=>$breadcrumb_text{'search'}, - faq=>282,bug=>'Instructor Interface',}, - {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')", - text=>$breadcrumb_text{'userpicked'}, - faq=>282,bug=>'Instructor Interface',}); - if ($env{'form.action'} eq 'singleuser') { - $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', - 'Course_Change_Privileges')); - $r->print("<b>$lt{'usrch'}</b><br />"); - $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context)); - $r->print('<h3>'.$lt{'usel'}.'</h3>'); - } elsif ($env{'form.action'} eq 'singlestudent') { - $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', - 'Course_Add_Student')); - $r->print($jscript."<b>$lt{'stusrch'}</b><br />"); - $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context)); - $r->print('</form><h3>'.$lt{'stusel'}.'</h3>'); + my %breadcrumb_text = &singleuser_breadcrumb(); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:backPage(document.usersrchform,'','')", + text=>$breadcrumb_text{'search'}, + faq=>282,bug=>'Instructor Interface',}, + {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')", + text=>$breadcrumb_text{'userpicked'}, + faq=>282,bug=>'Instructor Interface',}); + if ($env{'form.action'} eq 'singleuser') { + $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', + 'Course_Change_Privileges')); + $r->print("<b>$lt{'usrch'}</b><br />"); + $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context)); + $r->print('<h3>'.$lt{'usel'}.'</h3>'); + } elsif ($env{'form.action'} eq 'singlestudent') { + $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', + 'Course_Add_Student')); + $r->print($jscript."<b>$lt{'stusrch'}</b><br />"); + $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context)); + $r->print('</form><h3>'.$lt{'stusel'}.'</h3>'); + } } $r->print('<form name="usersrchform" method="post">'. &Apache::loncommon::start_data_table()."\n". @@ -570,8 +762,20 @@ ENDSCRIPT foreach my $user (@sorted_users) { my ($uname,$udom) = split(/:/,$user); + my $onclick; + if ($context eq 'requestcrs') { + $onclick = + 'onclick="javascript:gochoose('."'$uname','$udom',". + "'$srch_results->{$user}->{firstname}',". + "'$srch_results->{$user}->{lastname}',". + "'$srch_results->{$user}->{permanentemail}'".');"'; + } else { + $onclick = + ' onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".');"'; + } $r->print(&Apache::loncommon::start_data_table_row(). - '<td><input type="button" name="seluser" value="'.&mt('Select').'" onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".')" /></td>'. + '<td><input type="button" name="seluser" value="'.&mt('Select').'" '. + $onclick.' /></td>'. '<td><tt>'.$uname.'</tt></td>'. '<td><tt>'.$udom.'</tt></td>'); foreach my $field ('lastname','firstname','permanentemail') { @@ -591,7 +795,11 @@ ENDSCRIPT ' <input type="hidden" name="currstate" value="select" />'."\n". ' <input type="hidden" name="phase" value="get_user_info" />'."\n". ' <input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n"); - $r->print($response.'</form>'.&Apache::loncommon::end_page()); + if ($context eq 'requestcrs') { + $r->print($opener_elements.'</form></div>'); + } else { + $r->print($response.'</form>'.&Apache::loncommon::end_page()); + } } sub print_user_query_page { @@ -631,7 +839,7 @@ sub print_user_modification_page { &Apache::lonuserutils::can_create_user($ccdomain,$context, $usertype); if (!$cancreate) { - my $helplink = ' href="javascript:helpMenu('."'display'".')"'; + my $helplink = 'javascript:helpMenu('."'display'".')'; my %usertypetext = ( official => 'institutional', unofficial => 'non-institutional', @@ -641,7 +849,12 @@ sub print_user_modification_page { $response = '<span class="LC_warning">'.&mt('No match was found for the username ([_1]) in LON-CAPA domain: [_2]',$ccuname,$ccdomain). '</span><br />'; } - $response .= '<span class="LC_warning">'.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the <a[_1]>helpdesk</a> for assistance.',$helplink).'</span><br /><br />'; + $response .= '<p class="LC_warning">' + .&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.") + .' ' + .&mt('Please contact the [_1]helpdesk[_2] for assistance.' + ,'<a href="'.$helplink.'">','</a>') + .'</p><br />'; $env{'form.phase'} = ''; &print_username_entry_form($r,$context,$response); return; @@ -753,7 +966,9 @@ $crumbs $response $forminfo <script type="text/javascript" language="Javascript"> +// <![CDATA[ $loginscript +// ]]> </script> <input type='hidden' name='makeuser' value='1' /> <h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain @@ -777,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); @@ -810,7 +1032,7 @@ KERB } else { if ($authtype eq 'int') { $varauth = '<br />'. -&mt('[_1] Internally authenticated (with initial password [_2])','','<input type="password" size="10" name="intarg" value="" />')."<label><input type=\"checkbox\" name=\"visible\" onClick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>'; +&mt('[_1] Internally authenticated (with initial password [_2])','','<input type="password" size="10" name="intarg" value="" />')."<label><input type=\"checkbox\" name=\"visible\" onclick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>'; } elsif ($authtype eq 'loc') { $varauth = '<br />'. &mt('[_1] Local Authentication with argument [_2]','','<input type="text" name="'.$authtype.'arg" value="" />')."\n"; @@ -868,10 +1090,15 @@ ENDCHANGEUSER $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,'requestcourses'). - &Apache::loncommon::end_data_table()); + $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) { + $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses')); + } else { + $r->print(&coursereq_externaluser($ccuname,$ccdomain, + $env{'request.role.domain'})); + } + $r->print(&Apache::loncommon::end_data_table()); } $r->print('</div>'); my $user_auth_text = &user_authentication($ccuname,$ccdomain,$formname); @@ -901,7 +1128,7 @@ ENDNOPORTPRIV if (&Apache::lonnet::allowed('mut',$env{'request.role.domain'})) { my %lt=&Apache::lonlocal::texthash( 'utav' => "User Tools Availability", - 'yodo' => "You do not have privileges to modify Portfolio, Blog or Home Page settings for this user.", + 'yodo' => "You do not have privileges to modify Portfolio, Blog or Personal Information Page settings for this user.", 'ifch' => "If a change is required, contact a domain coordinator for the domain", ); $user_tools_text = <<ENDNOTOOLSPRIV; @@ -947,7 +1174,7 @@ ENDNOTOOLSPRIV } ## End of new user/old user logic if ($env{'form.action'} eq 'singlestudent') { - $r->print('<br /><input type="button" value="'.&mt('Enroll Student').'" onClick="setSections(this.form)" />'."\n"); + $r->print('<br /><input type="button" value="'.&mt('Enroll Student').'" onclick="setSections(this.form)" />'."\n"); } else { $r->print('<h3>'.&mt('Add Roles').'</h3>'); my $addrolesdisplay = 0; @@ -960,14 +1187,14 @@ ENDNOTOOLSPRIV $addrolesdisplay = $add_domainroles; } $r->print(&course_level_dc($env{'request.role.domain'},'Course')); - $r->print('<br /><input type="button" value="'.&mt('Save').'" onClick="setCourse()" />'."\n"); + $r->print('<br /><input type="button" value="'.&mt('Save').'" onclick="setCourse()" />'."\n"); } elsif ($context eq 'author') { if ($addrolesdisplay) { $r->print('<br /><input type="button" value="'.&mt('Save').'"'); if ($newuser) { - $r->print(' onClick="auth_check()" \>'."\n"); + $r->print(' onclick="auth_check()" \>'."\n"); } else { - $r->print('onClick="this.form.submit()" \>'."\n"); + $r->print('onclick="this.form.submit()" \>'."\n"); } } else { $r->print('<br /><a href="javascript:backPage(document.cu)">'. @@ -975,7 +1202,7 @@ ENDNOTOOLSPRIV } } else { $r->print(&course_level_table(%inccourses)); - $r->print('<br /><input type="button" value="'.&mt('Save').'" onClick="setSections(this.form)" />'."\n"); + $r->print('<br /><input type="button" value="'.&mt('Save').'" onclick="setSections(this.form)" />'."\n"); } } $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain'])); @@ -1043,7 +1270,11 @@ sub validation_javascript { $nondc_setsection_code,$groupslist); my ($jsback,$elements) = &crumb_utilities(); $js .= "\n". - '<script type="text/javascript">'."\n".$jsback."\n".'</script>'; + '<script type="text/javascript">'."\n". + '// <![CDATA['."\n". + $jsback."\n". + '// ]]>'."\n". + '</script>'."\n"; return $js; } @@ -1199,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; @@ -1230,8 +1461,17 @@ sub display_existing_roles { } } if ($rolesdisplay == 1) { + my $contextrole=''; + if ($env{'request.course.id'}) { + $contextrole = 'Existing Roles in this Course'; + } elsif ($env{'request.role'} =~ /^au\./) { + $contextrole = 'Existing Co-Author Roles in your Construction Space'; + } else { + $contextrole = 'Existing Roles in this Domain'; + } $r->print(' <h3>'.$lt{'rer'}.'</h3>'. +'<div>'.&mt($contextrole).'</div>'. &Apache::loncommon::start_data_table("LC_createuser"). &Apache::loncommon::start_data_table_header_row(). '<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}. @@ -1283,7 +1523,7 @@ sub new_coauthor_roles { &Apache::loncommon::end_data_table_header_row()."\n". &Apache::loncommon::start_data_table_row().' <td> - <input type=checkbox name="act_'.$cudom.'_'.$cuname.'_ca" /> + <input type="checkbox" name="act_'.$cudom.'_'.$cuname.'_ca" /> </td> <td>'.$lt{'cau'}.'</td> <td>'.$cudom.'_'.$cuname.'</td> @@ -1295,7 +1535,7 @@ sub new_coauthor_roles { "javascript:pjump('."'date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n". &Apache::loncommon::end_data_table_row()."\n". &Apache::loncommon::start_data_table_row()."\n". -'<td><input type=checkbox name="act_'.$cudom.'_'.$cuname.'_aa" /></td> +'<td><input type="checkbox" name="act_'.$cudom.'_'.$cuname.'_aa" /></td> <td>'.$lt{'caa'}.'</td> <td>'.$cudom.'_'.$cuname.'</td> <td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_aa" value="" /> @@ -1335,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( @@ -1346,7 +1588,7 @@ sub new_domain_roles { $num_domain_level ++; $domaintext .= &Apache::loncommon::start_data_table_row(). -'<td><input type=checkbox name="act_'.$thisdomain.'_'.$role.'" /></td> +'<td><input type="checkbox" name="act_'.$thisdomain.'_'.$role.'" /></td> <td>'.$plrole.'</td> <td>'.$thisdomain.'</td> <td><input type="hidden" name="start_'.$thisdomain.'_'.$role.'" value="" /> @@ -1387,7 +1629,9 @@ sub user_authentication { my $choices = &Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc); $outcome = <<ENDBADAUTH; <script type="text/javascript" language="Javascript"> +// <![CDATA[ $loginscript +// ]]> </script> <span class="LC_error">$lt{'err'}: $lt{'uuas'} ($currentauth). $lt{'sldb'}.</span> @@ -1416,7 +1660,9 @@ ENDBADAUTH ); $outcome = '<script type="text/javascript" language="Javascript">'."\n". + '// <![CDATA['."\n". $loginscript."\n". + '// ]]>'."\n". '</script>'."\n". '<h3>'.$lt{'ld'}.'</h3>'. &Apache::loncommon::start_data_table(). @@ -1524,16 +1770,19 @@ sub modify_login_block { sub personal_data_display { my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray) = @_; - my ($output,$showforceid,%userenv,%canmodify); + my ($output,$showforceid,%userenv,%canmodify,%canmodify_status); my @userinfo = ('firstname','middlename','lastname','generation', 'permanentemail','id'); my $rowcount = 0; my $editable = 0; + %canmodify_status = + &Apache::lonuserutils::can_modify_userinfo($context,$ccdomain, + ['inststatus'],$rolesarray); if (!$newuser) { # Get the users information %userenv = &Apache::lonnet::get('environment', ['firstname','middlename','lastname','generation', - 'permanentemail','id'],$ccdomain,$ccuname); + 'permanentemail','id','inststatus'],$ccdomain,$ccuname); %canmodify = &Apache::lonuserutils::can_modify_userinfo($context,$ccdomain, \@userinfo,$rolesarray); @@ -1549,7 +1798,8 @@ sub personal_data_display { 'generation' => "Generation", 'permanentemail' => "Permanent e-mail address", 'id' => "Student/Employee ID", - 'lg' => "Login Data" + 'lg' => "Login Data", + 'inststatus' => "Affiliation", ); my %textboxsize = ( firstname => '15', @@ -1587,11 +1837,15 @@ sub personal_data_display { } } else { if ($context eq 'selfcreate') { - if ($canmodify{$item}) { - $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />'; - $editable ++; + if (($item eq 'permanentemail') && ($newuser eq 'email')) { + $row .= $ccuname; } else { - $hiderow = 1; + if ($canmodify{$item}) { + $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />'; + $editable ++; + } else { + $hiderow = 1; + } } } else { $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />'; @@ -1613,6 +1867,30 @@ sub personal_data_display { $rowcount ++; } } + if (($canmodify_status{'inststatus'}) || ($context ne 'selfcreate')) { + my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($ccdomain); + if (ref($types) eq 'ARRAY') { + if (@{$types} > 0) { + my ($hiderow,$shown); + if ($canmodify_status{'inststatus'}) { + $shown = &pick_inst_statuses($userenv{'inststatus'},$usertypes,$types); + } else { + $shown .= $userenv{'inststatus'}; + if ($userenv{'inststatus'} eq '') { + $hiderow = 1; + } + } + if (!$hiderow) { + my $row = &Apache::lonhtmlcommon::row_title(&mt('Affliations'),undef,'LC_oddrow_value')."\n". + $shown.&Apache::lonhtmlcommon::row_closure(1); + if ($context eq 'selfcreate') { + $rowcount ++; + } + $output .= $row; + } + } + } + } $output .= &Apache::lonhtmlcommon::end_pick_box(); if (wantarray) { if ($context eq 'selfcreate') { @@ -1625,6 +1903,48 @@ sub personal_data_display { } } +sub pick_inst_statuses { + my ($curr,$usertypes,$types) = @_; + my ($output,$rem,@currtypes); + if ($curr ne '') { + @currtypes = map { &unescape($_); } split(/:/,$curr); + } + my $numinrow = 2; + if (ref($types) eq 'ARRAY') { + $output = '<table>'; + my $lastcolspan; + for (my $i=0; $i<@{$types}; $i++) { + if (defined($usertypes->{$types->[$i]})) { + my $rem = $i%($numinrow); + if ($rem == 0) { + if ($i<@{$types}-1) { + if ($i > 0) { + $output .= '</tr>'; + } + $output .= '<tr>'; + } + } elsif ($i==@{$types}-1) { + my $colsleft = $numinrow - $rem; + if ($colsleft > 1) { + $lastcolspan = ' colspan="'.$colsleft.'"'; + } + } + my $check = ' '; + if (grep(/^\Q$types->[$i]\E$/,@currtypes)) { + $check = ' checked="checked" '; + } + $output .= '<td class="LC_left_item"'.$lastcolspan.'>'. + '<span class="LC_nobreak"><label>'. + '<input type="checkbox" name="inststatus" '. + 'value="'.$types->[$i].'"'.$check.'/>'. + $usertypes->{$types->[$i]}.'</label></span></td>'; + } + } + $output .= '</tr></table>'; + } + return $output; +} + sub selfcreate_canmodify { my ($context,$dom,$userinfo,$inst_results,$rolesarray) = @_; if (ref($inst_results) eq 'HASH') { @@ -1673,7 +1993,10 @@ sub update_user_data { my $newuser = 0; my ($jsback,$elements) = &crumb_utilities(); my $jscript = '<script type="text/javascript">'."\n". - $jsback."\n".'</script>'."\n"; + '// <![CDATA['."\n". + $jsback."\n". + '// ]]>'."\n". + '</script>'."\n"; my %breadcrumb_text = &singleuser_breadcrumb(); my $args; if ($env{'form.popup'}) { @@ -1773,7 +2096,9 @@ 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'); + my @requestcourses = ('official','unofficial','community'); + my ($othertitle,$usertypes,$types) = + &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'}); if ($env{'form.makeuser'}) { $r->print('<h3>'.&mt('Creating new account.').'</h3>'); # Check for the authentication mode and password @@ -1852,10 +2177,23 @@ 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'); } + if (exists($env{'form.inststatus'})) { + my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus'); + if (@inststatuses > 0) { + $changeHash{'inststatus'} = join(',',@inststatuses); + $changed{'inststatus'} = $changeHash{'inststatus'}; + } + } if (keys(%changed)) { $changeHash{'firstname'} = $env{'form.cfirstname'}; $changeHash{'middlename'} = $env{'form.cmiddlename'}; @@ -1901,7 +2239,9 @@ sub update_user_data { ('environment',['firstname','middlename','lastname','generation', 'id','permanentemail','portfolioquota','inststatus','tools.aboutme', 'tools.blog','tools.portfolio','requestcourses.official', - 'requestcourses.unofficial'], + 'requestcourses.unofficial','requestcourses.community', + 'reqcrsotherdom.official','reqcrsotherdom.unofficial', + 'reqcrsotherdom.community'], $env{'form.ccdomain'},$env{'form.ccuname'}); my ($tmp) = keys(%userenv); if ($tmp =~ /^(con_lost|error)/i) { @@ -2003,7 +2343,7 @@ sub update_user_data { (!$forceid)) { if ($env{'form.cid'} ne $uidhash{$env{'form.ccuname'}}) { $env{'form.cid'} = $userenv{'id'}; - $no_forceid_alert = &mt('New Student/Employee ID does not match existing ID for this user.') + $no_forceid_alert = &mt('New student/employee ID does not match existing ID for this user.') .'<br />' .&mt("Change is not permitted without checking the 'Force ID change' checkbox on the previous page.") .'<br />'."\n"; @@ -2024,12 +2364,13 @@ sub update_user_data { } } } - my ($quotachanged,$oldportfolioquota,$newportfolioquota, - $inststatus,$oldisdefault,$newisdefault,$olddefquotatext, - $newdefquotatext,%oldaccess,%oldaccesstext,%newaccess,%newaccesstext); + my ($quotachanged,$oldportfolioquota,$newportfolioquota,$oldinststatus, + $inststatus,$newinststatus,$oldisdefault,$newisdefault,$olddefquotatext, + $newdefquotatext,%oldaccess,%oldaccesstext,%newaccess,%newaccesstext, + $oldinststatuses,$newinststatuses); my ($defquota,$settingstatus) = &Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus); - my ($showquota,$showtools,$showrequestcourses); + my ($showquota,$showtools,$showrequestcourses,$showinststatus,$showreqotherdom); if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) { $showquota = 1; } @@ -2038,8 +2379,49 @@ sub update_user_data { } if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) { $showrequestcourses = 1; + } elsif (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { + $showreqotherdom = 1; + } + if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) { + $showinststatus = 1; } my (%changeHash,%changed); + $oldinststatus = $userenv{'inststatus'}; + if ($oldinststatus eq '') { + $oldinststatuses = $othertitle; + } else { + if (ref($usertypes) eq 'HASH') { + $oldinststatuses = join(', ',map{ $usertypes->{ &unescape($_) }; } (split(/:/,$userenv{'inststatus'}))); + } else { + $oldinststatuses = join(', ',map{ &unescape($_); } (split(/:/,$userenv{'inststatus'}))); + } + } + $changeHash{'inststatus'} = $userenv{'inststatus'}; + my %canmodify_inststatus = &Apache::lonuserutils::can_modify_userinfo($context,$env{'form.ccdomain'},['inststatus'],\@userroles); + if ($canmodify_inststatus{'inststatus'}) { + if (exists($env{'form.inststatus'})) { + my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus'); + if (@inststatuses > 0) { + $newinststatus = join(':',map { &escape($_); } @inststatuses); + $changeHash{'inststatus'} = $newinststatus; + if ($newinststatus ne $oldinststatus) { + $changed{'inststatus'} = $newinststatus; + } + if (ref($usertypes) eq 'HASH') { + $newinststatuses = join(', ',map{ $usertypes->{$_}; } (@inststatuses)); + } else { + $newinststatuses = join(', ',map{ $usertypes->{$_}; } (@inststatuses)); + } + } else { + $newinststatus = ''; + $changeHash{'inststatus'} = $newinststatus; + $newinststatuses = $othertitle; + if ($newinststatus ne $oldinststatus) { + $changed{'inststatus'} = $changeHash{'inststatus'}; + } + } + } + } $changeHash{'portfolioquota'} = $userenv{'portfolioquota'}; if ($userenv{'portfolioquota'} ne '') { $oldportfolioquota = $userenv{'portfolioquota'}; @@ -2082,8 +2464,13 @@ sub update_user_data { } &tool_changes('tools',\@usertools,\%oldaccess,\%oldaccesstext,\%userenv, \%changeHash,\%changed,\%newaccess,\%newaccesstext); - &tool_changes('requestcourses',\@requestcourses,\%oldaccess,\%oldaccesstext, - \%userenv, \%changeHash,\%changed,\%newaccess,\%newaccesstext); + if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) { + &tool_changes('requestcourses',\@requestcourses,\%oldaccess,\%oldaccesstext, + \%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext); + } else { + &tool_changes('reqcrsotherdom',\@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'} || @@ -2109,7 +2496,8 @@ sub update_user_data { ($env{'user.domain'} eq $env{'form.ccdomain'})) { my %newenvhash; foreach my $key (keys(%changed)) { - if (($key eq 'official') || ($key eq 'unofficial')) { + if (($key eq 'official') || ($key eq 'unofficial') + || ($key eq 'community')) { $newenvhash{'environment.requestcourses.'.$key} = $changeHash{'requestcourses.'.$key}; if ($changeHash{'requestcourses.'.$key} ne '') { @@ -2171,6 +2559,8 @@ sub update_user_data { 'portfolio' => 'Portfolio Availability', 'official' => 'Can Request Official Courses', 'unofficial' => 'Can Request Unofficial Courses', + 'community' => 'Can Request Communities', + 'inststatus' => "Affiliation", 'prvs' => 'Previous Value:', 'chto' => 'Changed To:' ); @@ -2186,11 +2576,20 @@ sub update_user_data { <th>$lt{'id'}</th> <th>$lt{'mail'}</th> END + if ($showinststatus) { + $r->print(" + <th>$lt{'inststatus'}</th>\n"); + } if ($showrequestcourses) { foreach my $item (@requestcourses) { $r->print(" <th>$lt{$item}</th>\n"); } + } elsif ($showreqotherdom) { + foreach my $item (@requestcourses) { + $r->print(" + <th>$lt{$item}</th>\n"); + } } if ($showquota) { $r->print(" @@ -2213,11 +2612,20 @@ END <td>$userenv{'id'}</td> <td>$userenv{'permanentemail'} </td> END + if ($showinststatus) { + $r->print(" + <td>$oldinststatuses</td>\n"); + } if ($showrequestcourses) { foreach my $item (@requestcourses) { $r->print(" <td>$oldaccess{$item} $oldaccesstext{$item}</td>\n"); } + } elsif ($showreqotherdom) { + foreach my $item (@requestcourses) { + $r->print(" + <td>$oldaccess{$item} $oldaccesstext{$item}</td>\n"); + } } if ($showquota) { $r->print(" @@ -2240,11 +2648,20 @@ END <td>$env{'form.cid'} </td> <td>$env{'form.cpermanentemail'} </td> END + if ($showinststatus) { + $r->print(" + <td>$newinststatuses</td>\n"); + } if ($showrequestcourses) { foreach my $item (@requestcourses) { $r->print(" <td>$newaccess{$item} $newaccesstext{$item} </td>\n"); } + } elsif ($showreqotherdom) { + foreach my $item (@requestcourses) { + $r->print(" + <td>$newaccess{$item} $newaccesstext{$item} </td>\n"); + } } if ($showquota) { $r->print(" @@ -2292,10 +2709,12 @@ END 'mail' => "Permanent e-mail address", 'disk' => "Disk space allocated to user's portfolio files", 'blog' => "Blog Availability", - 'aboutme' => "Home Page Availability", + 'aboutme' => "Personal Information Page Availability", 'portfolio' => "Portfolio Availability", 'official' => "Can Request Official Courses", - 'unofficial' => "Can Request Unofficial Course", + 'unofficial' => "Can Request Unofficial Courses", + 'community' => "Can Request Communities", + 'inststatus' => "Affiliation", ); $r->print(<<"END"); <h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'} @@ -2304,11 +2723,19 @@ END $r->print('<br />['.$lt{'mail'}.': '. $userenv{'permanentemail'}.']'); } + if ($showinststatus) { + $r->print('<br />['.$lt{'inststatus'}.': '.$oldinststatuses.']'); + } if ($showrequestcourses) { foreach my $item (@requestcourses) { $r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '. $newaccesstext{$item}.']'."\n"); } + } elsif ($showreqotherdom) { + foreach my $item (@requestcourses) { + $r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '. + $newaccesstext{$item}.']'."\n"); + } } if ($showtools) { foreach my $item (@usertools) { @@ -2345,8 +2772,11 @@ END } else { $r->print(&mt("You do not have the authority to change these fields given the user's current set of active/future [_1] roles:",$contextname)); } - $r->print('<span class="LC_cusr_emph">'.$rolestr.'</span><br />'. - &mt('Contact your <a href="[_1]">helpdesk</a> for more information.',"javascript:helpMenu('display')").'<br />'); + my $helplink = 'javascript:helpMenu('."'display'".')'; + $r->print('<span class="LC_cusr_emph">'.$rolestr.'</span><br />' + .&mt('Please contact your [_1]helpdesk[_2] for more information.' + ,'<a href="'.$helplink.'">','</a>') + .'<br />'); } $r->print('<span class="LC_warning">' .$no_forceid_alert @@ -2397,7 +2827,101 @@ sub tool_changes { (ref($newaccess) eq 'HASH') && (ref($newaccesstext) eq 'HASH'))) { 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'); + $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 ($newop) { + $changed->{$tool}=&tool_admin($tool,$cdom.':'.$newop, + $changeHash,$context); + if ($changed->{$tool}) { + $newaccesstext->{$tool} = &mt('Yes'); + } else { + $newaccesstext->{$tool} = $oldaccesstext->{$tool}; + } + } + } else { + my @curr = split(',',$userenv->{$context.'.'.$tool}); + my @new; + my $changedoms; + 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; + } + } + if ((!$changedoms) && ($newop)) { + $changedoms = 1; + @new = sort(@curr,$cdom.':'.$newop); + } + if ($changedoms) { + my $newdomstr; + if (@new) { + $newdomstr = join(',',@new); + } + $changed->{$tool}=&tool_admin($tool,$newdomstr,$changeHash, + $context); + if ($changed->{$tool}) { + if ($env{'form.'.$context.'_'.$tool}) { + 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'); + } + } + } + } + } + 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}) { @@ -2407,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'"); @@ -2436,20 +2960,20 @@ sub tool_changes { } else { $newaccess->{$tool} = $oldaccess->{$tool}; if ($userenv->{$context.'.'.$tool}) { - $newaccesstext->{$tool} = &mt("availability set to 'on'"); + $newaccesstext->{$tool} = &mt("availability set to 'on'"); } else { - $newaccesstext->{$tool} = &mt("availability set to 'off'"); + $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); + $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'"); @@ -2532,8 +3056,8 @@ sub update_roles { if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) { my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4); # Delete custom role - $r->print(&mt('Deleting custom role [_1] by [_2]:[_3] in [_4]', - $rolename,$rnam,$rdom,$url).': <b>'. + $r->print(&mt('Deleting custom role [_1] by [_2] in [_3]', + $rolename,$rnam.':'.$rdom,$url).': <b>'. &Apache::lonnet::assigncustomrole($env{'form.ccdomain'}, $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now, 0,1,$context).'</b><br />'); @@ -2584,8 +3108,8 @@ sub update_roles { my $result = &Apache::lonnet::assigncustomrole( $env{'form.ccdomain'}, $env{'form.ccuname'}, $url,$rdom,$rnam,$rolename,0,$now,undef,$context); - $r->print(&mt('Re-enabling custom role [_1] by [_2]:[_3] in [_4] : [_5]', - $rolename,$rnam,$rdom,$url,'<b>'.$result.'</b>').'<br />'); + $r->print(&mt('Re-enabling custom role [_1] by [_2] in [_3]: [_4]', + $rolename,$rnam.':'.$rdom,$url,'<b>'.$result.'</b>').'<br />'); if (!grep(/^cr$/,@rolechanges)) { push(@rolechanges,'cr'); } @@ -2835,6 +3359,10 @@ sub tool_admin { if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) { $canchange = 1; } + } elsif ($context eq 'reqcrsotherdom') { + if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { + $canchange = 1; + } } elsif (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) { # Current user has quota modification privileges $canchange = 1; @@ -2954,13 +3482,16 @@ sub custom_role_editor { my ($jsback,$elements) = &crumb_utilities(); my $button_code = "\n"; my $head_script = "\n"; - $head_script .= '<script type="text/javascript">'."\n"; + $head_script .= '<script type="text/javascript">'."\n" + .'// <![CDATA['."\n"; my @template_roles = ("cc","in","ta","ep","st"); foreach my $role (@template_roles) { $head_script .= &make_script_template($role); $button_code .= &make_button_code($role).' '; } - $head_script .= "\n".$jsback."\n".'</script>'."\n"; + $head_script .= "\n".$jsback."\n" + .'// ]]>'."\n" + .'</script>'."\n"; $r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script)); &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:backPage(document.form1,'pickrole','')", @@ -3001,14 +3532,14 @@ ENDCCF my $privtext = &Apache::lonnet::plaintext($priv); $r->print(&Apache::loncommon::start_data_table_row(). '<td>'.$privtext.'</td><td>'. - ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c" '. - ($courselevelcurrent{$priv}?'checked="1"':'').' />':' '). + ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c"'. + ($courselevelcurrent{$priv}?' checked="checked"':'').' />':' '). '</td><td>'. - ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d" '. - ($domainlevelcurrent{$priv}?'checked="1"':'').' />':' '). + ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d"'. + ($domainlevelcurrent{$priv}?' checked="checked"':'').' />':' '). '</td><td>'. - ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s" '. - ($systemlevelcurrent{$priv}?'checked="1"':'').' />':' '). + ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s"'. + ($systemlevelcurrent{$priv}?' checked="checked"':'').' />':' '). '</td>'. &Apache::loncommon::end_data_table_row()); } @@ -3090,7 +3621,7 @@ sub make_script_template { sub make_button_code { my ($role) = @_; my $label = &Apache::lonnet::plaintext($role); - my $button_code = '<input type="button" onClick="set_'.$role.'()" value="'.$label.'" />'; + my $button_code = '<input type="button" onclick="set_'.$role.'()" value="'.$label.'" />'; return ($button_code); } # ---------------------------------------------------------- Call to definerole @@ -3103,7 +3634,11 @@ sub set_custom_role { return; } my ($jsback,$elements) = &crumb_utilities(); - my $jscript = '<script type="text/javascript">'.$jsback."\n".'</script>'; + my $jscript = '<script type="text/javascript">' + .'// <![CDATA['."\n" + .$jsback."\n" + .'// ]]>'."\n" + .'</script>'."\n"; $r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript); &Apache::lonhtmlcommon::add_breadcrumb @@ -3200,8 +3735,11 @@ sub handler { if ($env{'form.action'} ne 'dateselect') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/createuser", - text=>"User Management"}); + text=>"User Management", + help=>'Course_Create_Class_List,Course_Change_Privileges,Course_View_Class_List,Course_Editing_Custom_Roles,Course_Add_Student,Course_Drop_Student,Course_Automated_Enrollment,Course_Self_Enrollment,Course_Manage_Group'}); } + #SD Following files not added to help, because the corresponding .tex-files seem to + #be missing: Course_Approve_Selfenroll,Course_User_Logs, my ($permission,$allowed) = &Apache::lonuserutils::get_permission($context); if (!$allowed) { @@ -3426,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', @@ -3438,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') { @@ -3472,7 +4013,11 @@ sub header { sub add_script { my ($js) = @_; - return '<script type="text/javascript">'."\n".$js."\n".'</script>'; + return '<script type="text/javascript">'."\n" + .'// <![CDATA['."\n" + .$js."\n" + .'// ]]>'."\n" + .'</script>'."\n"; } sub verify_user_display { @@ -3495,141 +4040,160 @@ END sub print_main_menu { my ($permission,$context) = @_; my %links = ( - domain => { - upload => 'Upload a File of Users', - singleuser => 'Add/Modify a Single User', - listusers => 'Manage Multiple Users', - }, - author => { - upload => 'Upload a File of Co-authors', - singleuser => 'Add/Modify a Single Co-author', - listusers => 'Display Co-authors and Manage Multiple Users', - }, - course => { - upload => 'File of Course Users', - singleuser => 'Single Course User', - listusers => 'Course User Lists', - }, - ); - 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 => - [ - ]}, - ); - + domain => { + upload => 'Upload a File of Users', + singleuser => 'Add/Modify a User', + listusers => 'Manage Users', + }, + author => { + upload => 'Upload a File of Co-authors', + singleuser => 'Add/Modify a Co-author', + listusers => 'Manage Co-authors', + }, + course => { + upload => 'Upload a File of Course Users', + singleuser => 'Add/Modify a Course User', + listusers => 'Manage Course Users', + }, + ); + my @menu = ( {categorytitle => 'Single Users', + items => + [ + { + 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 => 'Multiple 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}{'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 => 'Administration', + 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.', - }); - + + push(@{ $menu[2]->{items} }, #Category: Administration + { + 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.', - }); + my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity(); + + push(@{ $menu[0]->{items} }, #Category: Single Users + { + linktext => 'Add/Modify a 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} }, #Category: Multiple Users + { + 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.', + }, + ); + push(@{ $menu[2]->{items} }, #Category: Administration + { + 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.', + }, + { + 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.', + }, + ); 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.', - }); + push(@{ $menu[2]->{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.', - }); + + 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.', + }, + ); + + } }; return Apache::lonhtmlcommon::generate_menu(@menu); # { text => 'View Log-in History', @@ -3833,7 +4397,9 @@ ENDSCRIPT my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; my $output = '<script type="text/javascript">'."\n". + '// <![CDATA['."\n". $setsec_js."\n".$selfenroll_js."\n". + '// ]]>'."\n". '</script>'."\n". '<h3>'.$lt->{'selfenroll'}.'</h3>'."\n"; my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum); @@ -3862,9 +4428,7 @@ ENDSCRIPT if (ref($lt) eq 'HASH') { $title = $lt->{$item}; } - $output .= - &Apache::lonhtmlcommon::row_title($title, - 'LC_selfenroll_pick_box_title','LC_oddrow_value')."\n"; + $output .= &Apache::lonhtmlcommon::row_title($title); if ($item eq 'types') { my $curr_types = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_types'}; my $showdomdesc = 1; @@ -4096,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); @@ -4631,13 +4922,6 @@ sub print_userchangelogs_display { my (%whodunit,%changed,$version); ($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/); $r->print(&role_display_filter($formname,$cdom,$cnum,\%curr,$version)); - my $showntablehdr = 0; - my $tablehdr = &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(). - '<th> </th><th>'.&mt('When').'</th><th>'.&mt('Who made the change'). - '</th><th>'.&mt('Changed User').'</th><th>'.&mt('Role').'</th><th>'.&mt('Section').'</th><th>'. - &mt('Context').'</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'. - &Apache::loncommon::end_data_table_header_row(); my ($minshown,$maxshown); $minshown = 1; my $count = 0; @@ -4647,6 +4931,9 @@ sub print_userchangelogs_display { $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'}; } } + + # Collect user change log data + my $content = ''; foreach my $id (sort { $roleslog{$b}{'exe_time'}<=>$roleslog{$a}{'exe_time'} } (keys(%roleslog))) { next if (($roleslog{$id}{'exe_time'} < $curr{'rolelog_start_date'}) || ($roleslog{$id}{'exe_time'} > $curr{'rolelog_end_date'})); @@ -4668,10 +4955,7 @@ sub print_userchangelogs_display { } $count ++; next if ($count < $minshown); - if (!$showntablehdr) { - $r->print($tablehdr); - $showntablehdr = 1; - } + if ($whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} eq '') { $whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} = &Apache::loncommon::plainname($roleslog{$id}{'exe_uname'},$roleslog{$id}{'exe_udom'}); @@ -4710,21 +4994,43 @@ sub print_userchangelogs_display { if ($chgcontext ne '' && $lt{$chgcontext} ne '') { $chgcontext = $lt{$chgcontext}; } - $r->print(&Apache::loncommon::start_data_table_row().'<td>'.$count.'</td><td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td><td>'.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.'</td><td>'.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.'</td><td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'}).'</td><td>'.$sec.'</td><td>'.$chgcontext.'</td><td>'.$rolestart.'</td><td>'.$roleend.'</td>'.&Apache::loncommon::end_data_table_row()."\n"); + $content .= + &Apache::loncommon::start_data_table_row() + .'<td>'.$count.'</td>' + .'<td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td>' + .'<td>'.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.'</td>' + .'<td>'.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.'</td>' + .'<td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'}).'</td>' + .'<td>'.$sec.'</td>' + .'<td>'.$chgcontext.'</td>' + .'<td>'.$rolestart.'</td>' + .'<td>'.$roleend.'</td>' + .&Apache::loncommon::end_data_table_row(); + } + + # Form Footer + my $form_footer = + '<input type="hidden" name="page" value="'.$curr{'page'}.'" />' + .'<input type="hidden" name="action" value="changelogs" />' + .'</form>'; + + # Only display table, if content is available (has been collected above) + if (!$content) { + $r->print('<p class="LC_info">' + .&mt('There are no records to display.') + .'</p>' + ); + $r->print($form_footer); + return; } - if ($showntablehdr) { - $r->print(&Apache::loncommon::end_data_table().'<br />'); - if (($curr{'page'} > 1) || ($more_records)) { - $r->print('<table><tr>'); - if ($curr{'page'} > 1) { - $r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>'); - } - if ($more_records) { - $r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>'); - } - $r->print('</tr></table>'); - $r->print(<<"ENDSCRIPT"); + + # Content to display, so create navigation and display table + + # Create Navigation: + # Navigation Script + my $nav_script = <<"ENDSCRIPT"; <script type="text/javascript"> +// <![CDATA[ function chgPage(caller) { if (caller == 'previous') { document.$formname.page.value --; @@ -4735,14 +5041,53 @@ function chgPage(caller) { document.$formname.submit(); return; } +// ]]> </script> ENDSCRIPT - } - } else { - $r->print(&mt('There are no records to display')); - } - $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'. - '<input type="hidden" name="action" value="changelogs" /></form>'); + # Navigation Buttons + my $nav_links; + $nav_links = '<p>'; + if (($curr{'page'} > 1) || ($more_records)) { + if ($curr{'page'} > 1) { + $nav_links .= '<input type="button"' + .' onclick="javascript:chgPage('."'previous'".');"' + .' value="'.&mt('Previous [_1] changes',$curr{'show'}) + .'" /> '; + } + if ($more_records) { + $nav_links .= '<input type="button"' + .' onclick="javascript:chgPage('."'next'".');"' + .' value="'.&mt('Next [_1] changes',$curr{'show'}) + .'" />'; + } + } + $nav_links .= '</p>'; + + # Table Header + my $tableheader = + &Apache::loncommon::start_data_table_header_row() + .'<th> </th>' + .'<th>'.&mt('When').'</th>' + .'<th>'.&mt('Who made the change').'</th>' + .'<th>'.&mt('Changed User').'</th>' + .'<th>'.&mt('Role').'</th>' + .'<th>'.&mt('Section').'</th>' + .'<th>'.&mt('Context').'</th>' + .'<th>'.&mt('Start').'</th>' + .'<th>'.&mt('End').'</th>' + .&Apache::loncommon::end_data_table_header_row(); + + # Print Content + $r->print( + $nav_script + .$nav_links + .&Apache::loncommon::start_data_table() + .$tableheader + .$content + .&Apache::loncommon::end_data_table() + .$nav_links + .$form_footer + ); return; } @@ -4751,7 +5096,7 @@ sub role_display_filter { my $context = 'course'; my $nolink = 1; my $output = '<table><tr><td valign="top">'. - '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b><br />'. + '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b></span><br />'. &Apache::lonmeta::selectbox('show',$curr->{'show'},undef, (&mt('all'),5,10,20,50,100,1000,10000)). '</td><td> </td>'; @@ -4764,9 +5109,13 @@ sub role_display_filter { $curr->{'rolelog_end_date'},undef, undef,undef,undef,undef,undef,undef,$nolink); my %lt = &rolechg_contexts(); - $output .= '<td valign="top"><b>'.&mt('Window during which changes occurred:').'</b><br /><table><tr><td>'.&mt('After:'). - '</td><td>'.$startform.'</td></tr><tr><td>'.&mt('Before:').'</td><td>'. - $endform.'</td></tr></table></td><td> </td>'. + $output .= '<td valign="top"><b>'.&mt('Window during which changes occurred:').'</b><br />'. + '<table><tr><td>'.&mt('After:'). + '</td><td>'.$startform.'</td></tr>'. + '<tr><td>'.&mt('Before:').'</td>'. + '<td>'.$endform.'</td></tr></table>'. + '</td>'. + '<td> </td>'. '<td valign="top"><b>'.&mt('Role:').'</b><br />'. '<select name="role"><option value="any"'; if ($curr->{'role'} eq 'any') { @@ -4787,25 +5136,36 @@ sub role_display_filter { } $output .= ' <option value="'.$role.'"'.$selstr.'>'.$plrole.'</option>'; } - $output .= '</select></td><td> </td><td valign="top"><b>'. + $output .= '</select></td>'. + '<td> </td>'. + '<td valign="top"><b>'. &mt('Context:').'</b><br /><select name="chgcontext">'; foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll') { my $selstr = ''; if ($curr->{'chgcontext'} eq $chgtype) { - $output .= $selstr = ' selected="selected"'; + $selstr = ' selected="selected"'; } if (($chgtype eq 'auto') || ($chgtype eq 'updatenow')) { next if (!&Apache::lonnet::auto_run($cnum,$cdom)); } $output .= '<option value="'.$chgtype.'"'.$selstr.'>'.$lt{$chgtype}.'</option>'."\n"; } - $output .= '</select></td><td> </td><td valign="middle"><input type="submit" value="'. - &mt('Update Display').'" /></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 noshade><br />'; + $output .= ' '.&mt('This LON-CAPA server is version [_1]',$version); + } + $output .= '</p><hr />'; return $output; } @@ -4817,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; } @@ -4902,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); @@ -5193,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>') @@ -5214,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('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 />'; } } } @@ -5434,7 +5817,7 @@ sub course_level_dc { '<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'. &Apache::loncommon::end_data_table_header_row(); my $otheritems = &Apache::loncommon::start_data_table_row()."\n". - '<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n". + '<td><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n". '<td><select name="role">'."\n"; foreach my $role (@roles) { my $plrole=&Apache::lonnet::plaintext($role); @@ -5613,7 +5996,7 @@ sub update_selfenroll_config { } } else { my @differences = - &compare_arrays(\@currnotified,\@newnotified); + &Apache::loncommon::compare_arrays(\@currnotified,\@newnotified); if (@differences > 0) { if (@newnotified > 0) { $changes{'internal.selfenroll_notifylist'} = join(',',@newnotified); @@ -5623,7 +6006,7 @@ sub update_selfenroll_config { } } } else { - my @differences = &compare_arrays(\@currnotified,\@newnotified); + my @differences = &Apache::loncommon::compare_arrays(\@currnotified,\@newnotified); if (@differences > 0) { if (@newnotified > 0) { $changes{'internal.selfenroll_notifylist'} = join(',',@newnotified); @@ -5725,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"); @@ -5813,22 +6196,6 @@ 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', 'approval','limit');