--- loncom/interface/loncreateuser.pm 2010/03/19 21:59:53 1.295.2.30 +++ loncom/interface/loncreateuser.pm 2009/09/05 01:13:02 1.312 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.295.2.30 2010/03/19 21:59:53 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.312 2009/09/05 01:13:02 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,14 +51,13 @@ In LON-CAPA, roles are actually collecti Assistant", "Course Coordinator", and other such roles are really just collection of privileges that are useful in many circumstances. -Custom roles can be defined by a Domain Coordinator, Course Coordinator -or Community Coordinator via the Manage User functionality. -The custom role editor screen will show all privileges which can be -assigned to users. For a complete list of privileges, please see -C</home/httpd/lonTabs/rolesplain.tab>. +Creating custom roles can be done by the Domain Coordinator through +the Create User functionality. That screen will show all privileges +that can be assigned to users. For a complete list of privileges, +please see C</home/httpd/lonTabs/rolesplain.tab>. -Custom role definitions are stored in the C<roles.db> file of the creator -of the role. +Custom role definitions are stored in the C<roles.db> file of the role +author. =cut @@ -219,7 +218,7 @@ END_SCRIPT sub build_tools_display { my ($ccuname,$ccdomain,$context) = @_; my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay, - $colspan,$isadv,%domconfig); + $colspan); my %lt = &Apache::lonlocal::texthash ( 'blog' => "Personal User Blog", 'aboutme' => "Personal Information Page", @@ -243,9 +242,6 @@ sub build_tools_display { %reqtitles = &courserequest_titles(); %reqdisplay = &courserequest_display(); $colspan = ' colspan="2"'; - %domconfig = - &Apache::lonnet::get_dom('configuration',['requestcourses'],$ccdomain); - $isadv = &Apache::lonnet::is_advanced_user($ccuname,$ccdomain); } else { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'tools.aboutme','tools.portfolio','tools.blog'); @@ -265,20 +261,20 @@ sub build_tools_display { } if ($context eq 'requestcourses') { if ($userenv{$context.'.'.$item} eq '') { - $custom_access = &mt('Currently from default setting.'); + $custom_access = &mt('Currently from default setting.'); } else { $custom_access = &mt('Currently from custom setting.'); } } else { if ($userenv{$context.'.'.$item} eq '') { - $custom_access = + $custom_access = &mt('Availability determined currently from default setting.'); if (!$curr_access) { $tool_off = 'checked="checked" '; $tool_on = ''; } } else { - $custom_access = + $custom_access = &mt('Availability determined currently from custom setting.'); if ($userenv{$context.'.'.$item} == 0) { $tool_off = 'checked="checked" '; @@ -292,24 +288,13 @@ sub build_tools_display { &Apache::loncommon::start_data_table_row()."\n"; if ($context eq 'requestcourses') { my ($curroption,$currlimit); - if ($userenv{$context.'.'.$item} ne '') { - $curroption = $userenv{$context.'.'.$item}; - } else { - my (@inststatuses); - $curroption = - &Apache::loncoursequeueadmin::get_processtype($ccuname,$ccdomain,$isadv,$ccdomain, - $item,\@inststatuses,\%domconfig); - } + $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); - } + $currdisp = &mt('Yes, up to [quant,_1,request]/user',$currlimit); } else { $currdisp = $reqdisplay{$curroption}; } @@ -343,19 +328,16 @@ sub build_tools_display { if ($option eq 'autolimit') { $custdisp .= '<input type="text" name="crsreq_'. $item.'_limit" size="1" '. - 'value="'.$currlimit.'" /></span><br />'. - $reqtitles{'unlimited'}; - } else { - $custdisp .= '</span>'; + 'value="'.$currlimit.'" />'; } - $custdisp .= '</td></tr>'; + $custdisp .= '</span></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.'"'. + '<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>'; @@ -398,27 +380,22 @@ sub coursereq_externaluser { 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 (grep(/^\Q$cdom\E:($optregex)=?(\d*)$/,@curr)) { + $curroption = $1; + $currlimit = $2; + if (!$curroption) { + $curroption = 'norequest'; } } - 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". + ' <td><span class="LC_nobreak">'.$lt{$item}.': '. '<label><input type="radio" name="reqcrsotherdom_'.$item. - '" value=""'.$tooloff.' />'.$reqtitles{'norequest'}. - '</label></td>'; + '" value="0"'.$tooloff.' />'.$reqtitles{'norequest'}. + '</label> '; foreach my $option (@options) { if ($option eq 'validate') { my $canvalidate = 0; @@ -433,21 +410,18 @@ sub coursereq_externaluser { if ($option eq $curroption) { $checked = ' checked="checked"'; } - $output .= '<td valign="top"><span class="LC_nobreak"><label>'. + $output .= '<span class="LC_nobreak"><label>'. '<input type="radio" name="reqcrsotherdom_'.$item. '" value="'.$option.'"'.$checked.' />'. - $reqtitles{$option}.'</label>'; + $reqtitles{$option}.'</label> '; if ($option eq 'autolimit') { - $output .= ' <input type="text" name="reqcrsotherdom_'. + $output .= '<input type="text" name="reqcrsotherdom_'. $item.'_limit" size="1" '. - 'value="'.$currlimit.'" /></span>'. - '<br />'.$reqtitles{'unlimited'}; - } else { - $output .= '</span>'; + 'value="'.$currlimit.'" />'; } - $output .= '</td>'; + $output .= ' ' } - $output .= '</td></tr></table></td>'."\n". + $output .= '</span></td>'."\n". &Apache::loncommon::end_data_table_row()."\n"; } return $output; @@ -462,7 +436,6 @@ sub courserequest_titles { approval => 'Approval by Dom. Coord.', validate => 'With validation', autolimit => 'Numerical limit', - unlimited => '(blank for unlimited)', ); return %titles; } @@ -479,7 +452,7 @@ sub courserequest_display { # =================================================================== Phase one sub print_username_entry_form { - my ($r,$context,$response,$srch,$forcenewuser,$crstype) = @_; + my ($r,$context,$response,$srch,$forcenewuser) = @_; my $defdom=$env{'request.role.domain'}; my $formtoset = 'crtuser'; if (exists($env{'form.startrolename'})) { @@ -498,15 +471,10 @@ sub print_username_entry_form { '// ]]>'."\n". '</script>'."\n"; - my %existingroles=&Apache::lonuserutils::my_custom_roles($crstype); - if (($env{'form.action'} eq 'custom') && (keys(%existingroles) > 0) - && (&Apache::lonnet::allowed('mcr','/'))) { - $jscript .= &customrole_javascript(); - } my %loaditems = ( 'onload' => "javascript:setFormElements(document.$formtoset)", ); - my %breadcrumb_text = &singleuser_breadcrumb($crstype); + my %breadcrumb_text = &singleuser_breadcrumb(); my $start_page = &Apache::loncommon::start_page('User Management', $jscript,{'add_entries' => \%loaditems,}); @@ -528,113 +496,48 @@ sub print_username_entry_form { } my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management', $helpitem); + my %existingroles=&Apache::lonuserutils::my_custom_roles(); + my $choice=&Apache::loncommon::select_form('make new role','rolename', + ('make new role' => 'Generate new role ...',%existingroles)); my %lt=&Apache::lonlocal::texthash( 'srst' => 'Search for a user and enroll as a student', - 'srme' => 'Search for a user and enroll as a member', - 'srad' => 'Search for a user and modify/add user information or roles', 'usr' => "Username", 'dom' => "Domain", - 'ecrp' => "Define or Edit Custom Role", - 'nr' => "role name", + 'ecrp' => "Edit Custom Role Privileges", + 'nr' => "Name of Role", 'cre' => "Next", ); $r->print($start_page."\n".$crumbs); if ($env{'form.action'} eq 'custom') { if (&Apache::lonnet::allowed('mcr','/')) { - my $newroletext = &mt('Define new custom role:'); - $r->print('<form action="/adm/createuser" method="post" name="docustom">'. - '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'. - '<input type="hidden" name="phase" value="selected_custom_edit" />'. - '<h3>'.$lt{'ecrp'}.'</h3>'. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_row(). - '<td>'); - if (keys(%existingroles) > 0) { - $r->print('<br /><label><input type="radio" name="customroleaction" value="new" checked="checked" onclick="setCustomFields();" /><b>'.$newroletext.'</b></label>'); - } else { - $r->print('<br /><input type="hidden" name="customroleaction" value="new" /><b>'.$newroletext.'</b>'); - } - $r->print('</td><td align="center">'.$lt{'nr'}.'<br /><input type="text" size="15" name="newrolename" onfocus="setCustomAction('."'new'".');" /></td>'. - &Apache::loncommon::end_data_table_row()); - if (keys(%existingroles) > 0) { - $r->print(&Apache::loncommon::start_data_table_row().'<td><br />'. - '<label><input type="radio" name="customroleaction" value="edit" onclick="setCustomFields();"/><b>'. - &mt('View/Modify existing role:').'</b></label></td>'. - '<td align="center"><br />'. - '<select name="rolename" onchange="setCustomAction('."'edit'".');">'. - '<option value="" selected="selected">'. - &mt('Select')); - foreach my $role (sort(keys(%existingroles))) { - $r->print('<option value="'.$role.'">'.$role.'</option>'); - } - $r->print('</select>'. - '</td>'. - &Apache::loncommon::end_data_table_row()); - } - $r->print(&Apache::loncommon::end_data_table().'<p>'. - '<input name="customeditor" type="submit" value="'. - $lt{'cre'}.'" /></p>'. - '</form>'); + $r->print(<<ENDCUSTOM); +<form action="/adm/createuser" method="post" name="docustom"> +<input type="hidden" name="action" value="$env{'form.action'}" /> +<input type="hidden" name="phase" value="selected_custom_edit" /> +<h3>$lt{'ecrp'}</h3> +$choice $lt{'nr'}: <input type="text" size="15" name="newrolename" /><br /> +<input name="customeditor" type="submit" value="$lt{'cre'}" /> +</form> +ENDCUSTOM } } else { my $actiontext = $lt{'srad'}; if ($env{'form.action'} eq 'singlestudent') { - if ($crstype eq 'Community') { - $actiontext = $lt{'srme'}; - } else { - $actiontext = $lt{'srst'}; - } + $actiontext = $lt{'srst'}; } - $r->print("<h3>$actiontext</h3>"); + $r->print(" +<h3>$actiontext</h3>"); if ($env{'form.origform'} ne 'crtusername') { $r->print("\n".$response); } - $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype)); + $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response)); } $r->print(&Apache::loncommon::end_page()); } -sub customrole_javascript { - my $js = <<"END"; -<script type="text/javascript"> -// <![CDATA[ - -function setCustomFields() { - if (document.docustom.customroleaction.length > 0) { - for (var i=0; i<document.docustom.customroleaction.length; i++) { - if (document.docustom.customroleaction[i].checked) { - if (document.docustom.customroleaction[i].value == 'new') { - document.docustom.rolename.selectedIndex = 0; - } else { - document.docustom.newrolename.value = ''; - } - } - } - } - return; -} - -function setCustomAction(caller) { - if (document.docustom.customroleaction.length > 0) { - for (var i=0; i<document.docustom.customroleaction.length; i++) { - if (document.docustom.customroleaction[i].value == caller) { - document.docustom.customroleaction[i].checked = true; - } - } - } - setCustomFields(); - return; -} - -// ]]> -</script> -END - return $js; -} - sub entry_form { - my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype) = @_; + my ($dom,$srch,$forcenewuser,$context,$responsemsg) = @_; my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom); my ($usertype,$inexact); if (ref($srch) eq 'HASH') { @@ -674,7 +577,6 @@ ENDBLOCK my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain'); my %lt=&Apache::lonlocal::texthash( 'enro' => 'Enroll one student', - 'enrm' => 'Enroll one member', 'admo' => 'Add/modify a single user', 'crea' => 'create new user if required', 'uskn' => "username is known", @@ -687,11 +589,7 @@ ENDBLOCK my $sellink=&Apache::loncommon::selectstudent_link('crtusername','srchterm','srchdomain'); my ($title,$buttontext,$showresponse); if ($env{'form.action'} eq 'singlestudent') { - if ($crstype eq 'Community') { - $title = $lt{'enrm'}; - } else { - $title = $lt{'enro'}; - } + $title = $lt{'enro'}; $buttontext = $lt{'enrl'}; } else { $title = $lt{'admo'}; @@ -738,7 +636,6 @@ sub user_modification_js { return <<END; <script type="text/javascript" language="Javascript"> // <![CDATA[ - function pclose() { parmwin=window.open("/adm/rat/empty.html","LONCAPAparms", "height=350,width=350,scrollbars=no,menubar=no"); @@ -762,7 +659,7 @@ END # =================================================================== Phase two sub print_user_selection_page { - my ($r,$response,$srch,$srch_results,$srcharray,$context,$opener_elements,$crstype) = @_; + my ($r,$response,$srch,$srch_results,$srcharray,$context,$opener_elements) = @_; my @fields = ('username','domain','lastname','firstname','permanentemail'); my $sortby = $env{'form.sortby'}; @@ -790,10 +687,8 @@ ENDSCRIPT my %lt=&Apache::lonlocal::texthash( 'usrch' => "User Search to add/modify roles", 'stusrch' => "User Search to enroll student", - 'memsrch' => "User Search to enroll member", 'usel' => "Select a user to add/modify roles", - 'stusel' => "Select a user to enroll as a student", - 'memsel' => "Select a user to enroll as a member", + 'stusel' => "Select a user to enroll as a student", 'username' => "username", 'domain' => "domain", 'lastname' => "last name", @@ -805,7 +700,7 @@ ENDSCRIPT } else { $r->print(&Apache::loncommon::start_page('User Management',$jscript)); - my %breadcrumb_text = &singleuser_breadcrumb($crstype); + my %breadcrumb_text = &singleuser_breadcrumb(); &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:backPage(document.usersrchform,'','')", text=>$breadcrumb_text{'search'}, @@ -817,26 +712,14 @@ ENDSCRIPT $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,undef,$crstype)); + $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>"); - if ($crstype eq 'Community') { - $r->print($lt{'memsrch'}); - } else { - $r->print($lt{'stusrch'}); - } - $r->print("</b><br />"); - $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,$crstype)); - $r->print('</form><h3>'); - if ($crstype eq 'Community') { - $r->print($lt{'memsel'}); - } else { - $r->print($lt{'stusel'}); - } - $r->print('</h3>'); + $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">'. @@ -864,13 +747,13 @@ ENDSCRIPT my ($uname,$udom) = split(/:/,$user); my $onclick; if ($context eq 'requestcrs') { - $onclick = + $onclick = 'onclick="javascript:gochoose('."'$uname','$udom',". "'$srch_results->{$user}->{firstname}',". "'$srch_results->{$user}->{lastname}',". "'$srch_results->{$user}->{permanentemail}'".');"'; } else { - $onclick = + $onclick = ' onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".');"'; } $r->print(&Apache::loncommon::start_data_table_row(). @@ -911,11 +794,11 @@ sub print_user_query_page { } sub print_user_modification_page { - my ($r,$ccuname,$ccdomain,$srch,$response,$context,$permission,$crstype) = @_; + my ($r,$ccuname,$ccdomain,$srch,$response,$context,$permission) = @_; if (($ccuname eq '') || ($ccdomain eq '')) { my $usermsg = &mt('No username and/or domain provided.'); $env{'form.phase'} = ''; - &print_username_entry_form($r,$context,$usermsg,'','',$crstype); + &print_username_entry_form($r,$context,$usermsg); return; } my ($form,$formname); @@ -956,7 +839,7 @@ sub print_user_modification_page { ,'<a href="'.$helplink.'">','</a>') .'</p><br />'; $env{'form.phase'} = ''; - &print_username_entry_form($r,$context,$response,undef,undef,$crstype); + &print_username_entry_form($r,$context,$response); return; } $newuser = 1; @@ -980,7 +863,7 @@ sub print_user_modification_page { 'username'); } $env{'form.phase'} = ''; - &print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype); + &print_username_entry_form($r,$context,$userchkmsg); return; } } @@ -1007,7 +890,7 @@ sub print_user_modification_page { } my $start_page = &Apache::loncommon::start_page('User Management',$js,$args); - my %breadcrumb_text = &singleuser_breadcrumb($crstype); + my %breadcrumb_text = &singleuser_breadcrumb(); &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:backPage($form)", text=>$breadcrumb_text{'search'}, @@ -1039,24 +922,10 @@ sub print_user_modification_page { <input type="hidden" name="pres_type" value="" /> <input type="hidden" name="pres_marker" value="" /> ENDFORMINFO - my (%inccourses,$roledom); - if ($context eq 'course') { - $inccourses{$env{'request.course.id'}}=1; - $roledom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - } elsif ($context eq 'author') { - $roledom = $env{'request.role.domain'}; - } elsif ($context eq 'domain') { - foreach my $key (keys(%env)) { - $roledom = $env{'request.role.domain'}; - if ($key=~/^user\.priv\.cm\.\/($roledom)\/($match_username)/) { - $inccourses{$1.'_'.$2}=1; - } - } - } else { - foreach my $key (keys(%env)) { - if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) { - $inccourses{$1.'_'.$2}=1; - } + my %inccourses; + foreach my $key (keys(%env)) { + if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) { + $inccourses{$1.'_'.$2}=1; } } if ($newuser) { @@ -1070,7 +939,6 @@ ENDFORMINFO my %lt=&Apache::lonlocal::texthash( 'cnu' => 'Create New User', 'ast' => 'as a student', - 'ame' => 'as a member', 'ind' => 'in domain', 'lg' => 'Login Data', 'hs' => "Home Server", @@ -1089,17 +957,14 @@ $loginscript <h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain ENDTITLE if ($env{'form.action'} eq 'singlestudent') { - if ($crstype eq 'Community') { - $r->print(' ('.$lt{'ame'}.')'); - } else { - $r->print(' ('.$lt{'ast'}.')'); - } + $r->print(' ('.$lt{'ast'}.')'); } $r->print('</h2>'."\n".'<div class="LC_left_float">'); my $personal_table = &personal_data_display($ccuname,$ccdomain,$newuser,$context, $inst_results{$ccuname.':'.$ccdomain}); $r->print($personal_table); +#FIXME my ($home_server_pick,$numlib) = &Apache::loncommon::home_server_form_item($ccdomain,'hserver', 'default','hide'); @@ -1112,7 +977,7 @@ $lt{'hs'}: $home_server_pick $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/Communities in this Domain?').'</h3>'. + $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'). @@ -1186,7 +1051,6 @@ ENDAUTH my %lt=&Apache::lonlocal::texthash( 'cup' => "Modify existing user: ", 'ens' => "Enroll one student: ", - 'enm' => "Enroll one member: ", 'id' => "in domain", ); $r->print(<<ENDCHANGEUSER); @@ -1196,11 +1060,7 @@ $forminfo <h2> ENDCHANGEUSER if ($env{'form.action'} eq 'singlestudent') { - if ($crstype eq 'Community') { - $r->print($lt{'enm'}); - } else { - $r->print($lt{'ens'}); - } + $r->print($lt{'ens'}); } else { $r->print($lt{'cup'}); } @@ -1214,9 +1074,9 @@ 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/Communities in this Domain?').'</h3>'. + $r->print('<h3>'.&mt('User Can Request Creation of Courses in this Domain?').'</h3>'. &Apache::loncommon::start_data_table()); - if ($env{'request.role.domain'} eq $ccdomain) { + if ($env{'request.role.domain'} eq $ccdomain) { $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses')); } else { $r->print(&coursereq_externaluser($ccuname,$ccdomain, @@ -1293,18 +1153,12 @@ ENDNOTOOLSPRIV } $r->print('</div><div class="LC_clear_float_footer"></div>'); if ($env{'form.action'} ne 'singlestudent') { - &display_existing_roles($r,$ccuname,$ccdomain,\%inccourses,$context, - $roledom,$crstype); + &display_existing_roles($r,$ccuname,$ccdomain,\%inccourses); } } ## End of new user/old user logic + if ($env{'form.action'} eq 'singlestudent') { - my $btntxt; - if ($crstype eq 'Community') { - $btntxt = &mt('Enroll Member'); - } else { - $btntxt = &mt('Enroll Student'); - } - $r->print('<br /><input type="button" value="'.$btntxt.'" 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; @@ -1343,14 +1197,9 @@ ENDNOTOOLSPRIV } sub singleuser_breadcrumb { - my ($crstype) = @_; my %breadcrumb_text; if ($env{'form.action'} eq 'singlestudent') { - if ($crstype eq 'Community') { - $breadcrumb_text{'search'} = 'Enroll a member'; - } else { - $breadcrumb_text{'search'} = 'Enroll a student'; - } + $breadcrumb_text{'search'} = 'Enroll a student'; $breadcrumb_text{'userpicked'} = 'Select a user', $breadcrumb_text{'modify'} = 'Set section/dates', } else { @@ -1414,9 +1263,13 @@ sub validation_javascript { } sub display_existing_roles { - my ($r,$ccuname,$ccdomain,$inccourses,$context,$roledom,$crstype) = @_; - my $now=time; - my %lt=&Apache::lonlocal::texthash( + my ($r,$ccuname,$ccdomain,$inccourses) = @_; + my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname); + # Build up table of user roles to allow revocation and re-enabling of roles. + my ($tmp) = keys(%rolesdump); + if ($tmp !~ /^(con_lost|error)/i) { + my $now=time; + my %lt=&Apache::lonlocal::texthash( 'rer' => "Existing Roles", 'rev' => "Revoke", 'del' => "Delete", @@ -1426,242 +1279,181 @@ sub display_existing_roles { 'sta' => "Start", 'end' => "End", ); - my (%rolesdump,%roletext,%sortrole,%roleclass,%rolepriv); - if ($context eq 'course' || $context eq 'author') { - my @roles = &Apache::lonuserutils::roles_by_context($context,1,$crstype); - my %roleshash = - &Apache::lonnet::get_my_roles($ccuname,$ccdomain,'userroles', - ['active','previous','future'],\@roles,$roledom,1); - foreach my $key (keys(%roleshash)) { - my ($start,$end) = split(':',$roleshash{$key}); - next if ($start eq '-1' || $end eq '-1'); - my ($rnum,$rdom,$role,$sec) = split(':',$key); - if ($context eq 'course') { - next unless (($rnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) - && ($rdom eq $env{'course.'.$env{'request.course.id'}.'.domain'})); - } elsif ($context eq 'author') { - next unless (($rnum eq $env{'user.name'}) && ($rdom eq $env{'request.role.domain'})); - } - my ($newkey,$newvalue,$newrole); - $newkey = '/'.$rdom.'/'.$rnum; - if ($sec ne '') { - $newkey .= '/'.$sec; - } - $newvalue = $role; - if ($role =~ /^cr/) { - $newrole = 'cr'; - } else { - $newrole = $role; - } - $newkey .= '_'.$newrole; - if ($start ne '' && $end ne '') { - $newvalue .= '_'.$end.'_'.$start; - } elsif ($end ne '') { - $newvalue .= '_'.$end; - } - $rolesdump{$newkey} = $newvalue; - } - } else { - %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname); - } - # Build up table of user roles to allow revocation and re-enabling of roles. - my ($tmp) = keys(%rolesdump); - return if ($tmp =~ /^(con_lost|error)/i); - foreach my $area (sort { my $a1=join('_',(split('_',$a))[1,0]); - my $b1=join('_',(split('_',$b))[1,0]); - return $a1 cmp $b1; - } keys(%rolesdump)) { - next if ($area =~ /^rolesdef/); - my $envkey=$area; - my $role = $rolesdump{$area}; - my $thisrole=$area; - $area =~ s/\_\w\w$//; - my ($role_code,$role_end_time,$role_start_time) = - split(/_/,$role); + my (%roletext,%sortrole,%roleclass,%rolepriv); + foreach my $area (sort { my $a1=join('_',(split('_',$a))[1,0]); + my $b1=join('_',(split('_',$b))[1,0]); + return $a1 cmp $b1; + } keys(%rolesdump)) { + next if ($area =~ /^rolesdef/); + my $envkey=$area; + my $role = $rolesdump{$area}; + my $thisrole=$area; + $area =~ s/\_\w\w$//; + my ($role_code,$role_end_time,$role_start_time) = + split(/_/,$role); # Is this a custom role? Get role owner and title. - my ($croleudom,$croleuname,$croletitle)= - ($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$}); - my $allowed=0; - my $delallowed=0; - my $sortkey=$role_code; - my $class='Unknown'; - if ($area =~ m{^/($match_domain)/($match_courseid)} ) { - $class='Course'; - my ($coursedom,$coursedir) = ($1,$2); - my $cid = $1.'_'.$2; - # $1.'_'.$2 is the course id (eg. 103_12345abcef103l3). - my %coursedata= - &Apache::lonnet::coursedescription($cid); - if ($coursedir =~ /^$match_community$/) { - $class='Community'; - } - $sortkey.="\0$coursedom"; - my $carea; - if (defined($coursedata{'description'})) { - $carea=$coursedata{'description'}. - '<br />'.&mt('Domain').': '.$coursedom.(' 'x8). + my ($croleudom,$croleuname,$croletitle)= + ($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$}); + my $allowed=0; + my $delallowed=0; + my $sortkey=$role_code; + my $class='Unknown'; + if ($area =~ m{^/($match_domain)/($match_courseid)} ) { + $class='Course'; + my ($coursedom,$coursedir) = ($1,$2); + $sortkey.="\0$coursedom"; + # $1.'_'.$2 is the course id (eg. 103_12345abcef103l3). + my %coursedata= + &Apache::lonnet::coursedescription($1.'_'.$2); + my $carea; + if (defined($coursedata{'description'})) { + $carea=$coursedata{'description'}. + '<br />'.&mt('Domain').': '.$coursedom.(' 'x8). &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$coursedir,$coursedom); - $sortkey.="\0".$coursedata{'description'}; - $class=$coursedata{'type'}; - } else { - if ($class eq 'Community') { - $carea=&mt('Unavailable community').': '.$area; - $sortkey.="\0".&mt('Unavailable community').': '.$area; + $sortkey.="\0".$coursedata{'description'}; + $class=$coursedata{'type'}; } else { $carea=&mt('Unavailable course').': '.$area; $sortkey.="\0".&mt('Unavailable course').': '.$area; } - } - $sortkey.="\0$coursedir"; - $inccourses->{$cid}=1; - if ((&Apache::lonnet::allowed('c'.$role_code,$coursedom.'/'.$coursedir)) || - (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) { - $allowed=1; - } - unless ($allowed) { - my $isowner = &is_courseowner($cid,$coursedata{'internal.courseowner'}); - if ($isowner) { - if (($role_code eq 'co') && ($class eq 'Community')) { - $allowed = 1; - } elsif (($role_code eq 'cc') && ($class eq 'Course')) { - $allowed = 1; - } - } - } - if ((&Apache::lonnet::allowed('dro',$coursedom)) || - (&Apache::lonnet::allowed('dro',$ccdomain))) { - $delallowed=1; - } -# - custom role. Needs more info, too - if ($croletitle) { - if (&Apache::lonnet::allowed('ccr',$coursedom.'/'.$coursedir)) { - $allowed=1; - $thisrole.='.'.$role_code; - } - } - if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) { - $carea.='<br />Section: '.$3; - $sortkey.="\0$3"; - if (!$allowed) { - if ($env{'request.course.sec'} eq $3) { - if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2.'/'.$3)) { - $allowed = 1; - } - } - } - } - $area=$carea; - } else { - $sortkey.="\0".$area; - # Determine if current user is able to revoke privileges - if ($area=~m{^/($match_domain)/}) { - if ((&Apache::lonnet::allowed('c'.$role_code,$1)) || + $sortkey.="\0$coursedir"; + $inccourses->{$1.'_'.$2}=1; + if ((&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2)) || (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) { $allowed=1; } - if (((&Apache::lonnet::allowed('dro',$1)) || - (&Apache::lonnet::allowed('dro',$ccdomain))) && - ($role_code ne 'dc')) { + if ((&Apache::lonnet::allowed('dro',$1)) || + (&Apache::lonnet::allowed('dro',$ccdomain))) { $delallowed=1; } +# - custom role. Needs more info, too + if ($croletitle) { + if (&Apache::lonnet::allowed('ccr',$1.'/'.$2)) { + $allowed=1; + $thisrole.='.'.$role_code; + } + } + # Compute the background color based on $area + if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) { + $carea.='<br />Section: '.$3; + $sortkey.="\0$3"; + if (!$allowed) { + if ($env{'request.course.sec'} eq $3) { + if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2.'/'.$3)) { + $allowed = 1; + } + } + } + } + $area=$carea; } else { - if (&Apache::lonnet::allowed('c'.$role_code,'/')) { + $sortkey.="\0".$area; + # Determine if current user is able to revoke privileges + if ($area=~m{^/($match_domain)/}) { + if ((&Apache::lonnet::allowed('c'.$role_code,$1)) || + (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) { + $allowed=1; + } + if (((&Apache::lonnet::allowed('dro',$1)) || + (&Apache::lonnet::allowed('dro',$ccdomain))) && + ($role_code ne 'dc')) { + $delallowed=1; + } + } else { + if (&Apache::lonnet::allowed('c'.$role_code,'/')) { + $allowed=1; + } + } + if ($role_code eq 'ca' || $role_code eq 'au') { + $class='Construction Space'; + } elsif ($role_code eq 'su') { + $class='System'; + } else { + $class='Domain'; + } + } + if (($role_code eq 'ca') || ($role_code eq 'aa')) { + $area=~m{/($match_domain)/($match_username)}; + if (&Apache::lonuserutils::authorpriv($2,$1)) { $allowed=1; + } else { + $allowed=0; } } - if ($role_code eq 'ca' || $role_code eq 'au') { - $class='Construction Space'; - } elsif ($role_code eq 'su') { - $class='System'; + my $row = ''; + $row.= '<td>'; + my $active=1; + $active=0 if (($role_end_time) && ($now>$role_end_time)); + if (($active) && ($allowed)) { + $row.= '<input type="checkbox" name="rev:'.$thisrole.'" />'; } else { - $class='Domain'; + if ($active) { + $row.=' '; + } else { + $row.=&mt('expired or revoked'); + } } - } - if (($role_code eq 'ca') || ($role_code eq 'aa')) { - $area=~m{/($match_domain)/($match_username)}; - if (&Apache::lonuserutils::authorpriv($2,$1)) { - $allowed=1; + $row.='</td><td>'; + if ($allowed && !$active) { + $row.= '<input type="checkbox" name="ren:'.$thisrole.'" />'; } else { - $allowed=0; + $row.=' '; } - } - my $row = ''; - $row.= '<td>'; - my $active=1; - $active=0 if (($role_end_time) && ($now>$role_end_time)); - if (($active) && ($allowed)) { - $row.= '<input type="checkbox" name="rev:'.$thisrole.'" />'; - } else { - if ($active) { - $row.=' '; + $row.='</td><td>'; + if ($delallowed) { + $row.= '<input type="checkbox" name="del:'.$thisrole.'" />'; } else { - $row.=&mt('expired or revoked'); + $row.=' '; } - } - $row.='</td><td>'; - if ($allowed && !$active) { - $row.= '<input type="checkbox" name="ren:'.$thisrole.'" />'; - } else { - $row.=' '; - } - $row.='</td><td>'; - if ($delallowed) { - $row.= '<input type="checkbox" name="del:'.$thisrole.'" />'; - } else { - $row.=' '; - } - my $plaintext=''; - if (!$croletitle) { - $plaintext=&Apache::lonnet::plaintext($role_code,$class) - } else { - $plaintext= + my $plaintext=''; + if (!$croletitle) { + $plaintext=&Apache::lonnet::plaintext($role_code,$class) + } else { + $plaintext= "Customrole '$croletitle'<br />defined by $croleuname\@$croleudom"; - } - $row.= '</td><td>'.$plaintext. - '</td><td>'.$area. - '</td><td>'.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time) - : ' ' ). - '</td><td>'.($role_end_time ?&Apache::lonlocal::locallocaltime($role_end_time) - : ' ' ) - ."</td>"; - $sortrole{$sortkey}=$envkey; - $roletext{$envkey}=$row; - $roleclass{$envkey}=$class; - $rolepriv{$envkey}=$allowed; - } # end of foreach (table building loop) - my $rolesdisplay = 0; - my %output = (); - foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') { - $output{$type} = ''; - foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { - if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) { - $output{$type}.= - &Apache::loncommon::start_data_table_row(). - $roletext{$sortrole{$which}}. - &Apache::loncommon::end_data_table_row(); - } - } - unless($output{$type} eq '') { - $output{$type} = '<tr class="LC_info_row">'. - "<td align='center' colspan='7'>".&mt($type)."</td></tr>". - $output{$type}; - $rolesdisplay = 1; - } - } - if ($rolesdisplay == 1) { - my $contextrole=''; - if ($env{'request.course.id'}) { - if (&Apache::loncommon::course_type() eq 'Community') { - $contextrole = &mt('Existing Roles in this Community'); + } + $row.= '</td><td>'.$plaintext. + '</td><td>'.$area. + '</td><td>'.($role_start_time?localtime($role_start_time) + : ' ' ). + '</td><td>'.($role_end_time ?localtime($role_end_time) + : ' ' ) + ."</td>"; + $sortrole{$sortkey}=$envkey; + $roletext{$envkey}=$row; + $roleclass{$envkey}=$class; + $rolepriv{$envkey}=$allowed; + #$r->print($row); + } # end of foreach (table building loop) + my $rolesdisplay = 0; + my %output = (); + foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') { + $output{$type} = ''; + foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { + if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) { + $output{$type}.= + &Apache::loncommon::start_data_table_row(). + $roletext{$sortrole{$which}}. + &Apache::loncommon::end_data_table_row(); + } + } + unless($output{$type} eq '') { + $output{$type} = '<tr class="LC_info_row">'. + "<td align='center' colspan='7'>".&mt($type)."</td></tr>". + $output{$type}; + $rolesdisplay = 1; + } + } + 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 = &mt('Existing Roles in this Course'); + $contextrole = 'Existing Roles in this Domain'; } - } elsif ($env{'request.role'} =~ /^au\./) { - $contextrole = 'Existing Co-Author Roles in your Construction Space'; - } else { - $contextrole = 'Existing Roles in this Domain'; - } - $r->print(' + $r->print(' <h3>'.$lt{'rer'}.'</h3>'. '<div>'.&mt($contextrole).'</div>'. &Apache::loncommon::start_data_table("LC_createuser"). @@ -1670,13 +1462,14 @@ sub display_existing_roles { '</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}. '</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'. &Apache::loncommon::end_data_table_header_row()); - foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') { - if ($output{$type}) { - $r->print($output{$type}."\n"); + foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') { + if ($output{$type}) { + $r->print($output{$type}."\n"); + } } + $r->print(&Apache::loncommon::end_data_table()); } - $r->print(&Apache::loncommon::end_data_table()); - } + } # End of check for keys in rolesdump return; } @@ -2164,7 +1957,7 @@ sub get_inststatuses { # ================================================================= Phase Three sub update_user_data { - my ($r,$context,$crstype) = @_; + my ($r,$context) = @_; my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'}, $env{'form.ccdomain'}); # Error messages @@ -2188,7 +1981,7 @@ sub update_user_data { $jsback."\n". '// ]]>'."\n". '</script>'."\n"; - my %breadcrumb_text = &singleuser_breadcrumb($crstype); + my %breadcrumb_text = &singleuser_breadcrumb(); my $args; if ($env{'form.popup'}) { $args->{'no_nav_bar'} = 1; @@ -2287,7 +2080,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'); + my @requestcourses = ('official','unofficial','community'); my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'}); if ($env{'form.makeuser'}) { @@ -2420,10 +2213,9 @@ sub update_user_data { } } ## - my (@userroles,%userupdate,$cnum,$cdom,$crstype,$namechanged); + my (@userroles,%userupdate,$cnum,$cdom,$namechanged); if ($context eq 'course') { ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity(); - $crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum); } if (! $env{'form.makeuser'} ) { # Check for need to change @@ -2507,7 +2299,7 @@ sub update_user_data { if ($role eq 'cr') { push(@longroles,'Custom'); } else { - push(@longroles,&Apache::lonnet::plaintext($role,$crstype)); + push(@longroles,&Apache::lonnet::plaintext($role)); } } my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id'); @@ -2661,7 +2453,8 @@ sub update_user_data { \%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext); } else { &tool_changes('reqcrsotherdom',\@requestcourses,\%oldaccess,\%oldaccesstext, - \%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext); + \%userenv, + \%changeHash,\%changed,\%newaccess,\%newaccesstext); } if ($env{'form.cfirstname'} ne $userenv{'firstname'} || $env{'form.cmiddlename'} ne $userenv{'middlename'} || @@ -2693,7 +2486,8 @@ sub update_user_data { $newenvhash{'environment.requestcourses.'.$key} = $changeHash{'requestcourses.'.$key}; if ($changeHash{'requestcourses.'.$key} ne '') { - $newenvhash{'environment.canrequest.'.$key} = 1; + $newenvhash{'environment.canrequest.'.$key} = + $changeHash{'requestcourses.'.$key}; } else { $newenvhash{'environment.canrequest.'.$key} = &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'}, @@ -2975,14 +2769,9 @@ END .'</span>'); } if ($env{'form.action'} eq 'singlestudent') { - &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context,$crstype); - $r->print('<p><a href="javascript:backPage(document.userupdate)">'); - if ($crstype eq 'Community') { - $r->print(&mt('Enroll Another Member')); - } else { - $r->print(&mt('Enroll Another Student')); - } - $r->print('</a></p>'); + &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context); + $r->print('<p><a href="javascript:backPage(document.userupdate)">'. + &mt('Enroll Another Student').'</a></p>'); } else { my @rolechanges = &update_roles($r,$context); if ($namechanged) { @@ -3029,24 +2818,14 @@ sub tool_changes { my %reqdisplay = &courserequest_display(); my $cdom = $env{'request.role.domain'}; foreach my $tool (@{$usertools}) { - $oldaccesstext->{$tool} = &mt('No'); - $newaccesstext->{$tool} = $oldaccesstext->{$tool}; + $oldaccesstext->{$tool} = &mt('no'); $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, + if ($env{'form.'.$context.'_'.$tool}) { + $changed->{$tool}=&tool_admin($tool,$cdom, $changeHash,$context); if ($changed->{$tool}) { - $newaccesstext->{$tool} = &mt('Yes'); + $newaccesstext->{$tool} = &mt('yes'); } else { $newaccesstext->{$tool} = $oldaccesstext->{$tool}; } @@ -3055,32 +2834,35 @@ sub tool_changes { 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); + my $newop = $env{'form.'.$context.'_'.$tool}; + if ($newop eq 'autolimit') { + $newop .= '='; + unless ($env{'form.'.$context.'_'.$tool.'_limit'} =~ /\D/) { + $newop .= $env{'form.'.$context.'_'.$tool.'_limit'}; + } + } + if (grep(/^\Q$cdom:($optregex\=?\d*)\E$/,@curr)) { + $oldaccesstext->{$tool} = &mt('yes'); + my $oldop = $1; + if ($oldop ne $newop) { + $changedoms = 1; + foreach my $dom (@curr) { + unless ($dom eq $cdom) { + push(@new,$dom); } - @new = sort(@new); } - last; + if ($newop) { + push(@new,$cdom.':'.$newop); + } + @new = sort(@new); } - } - if ((!$changedoms) && ($newop)) { + } elsif ($env{'form.'.$context.'_'.$tool}) { $changedoms = 1; @new = sort(@curr,$cdom.':'.$newop); } + $newaccesstext->{$tool} = $oldaccesstext->{$tool}; if ($changedoms) { - my $newdomstr; + my $newdomstr; if (@new) { $newdomstr = join(',',@new); } @@ -3089,14 +2871,12 @@ sub tool_changes { 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 { + if ($env{'form.'.$context.'_'.$tool.'_limit'} =~ /\D/) { $newaccesstext->{$tool} = &mt('Yes, processed automatically'); + } else { + $newaccesstext->{$tool} = &mt('Yes, up to limit of [quant,_1,request] per user).',$env{'form.'.$context.'_'.$tool.'_limit'}); } - } else { + } else { $newaccesstext->{$tool} = $reqdisplay{$env{'form.'.$context.'_'.$tool}}; } } else { @@ -3115,7 +2895,7 @@ sub tool_changes { if ($newval eq 'autolimit') { $newval .= '='.$env{'form.crsreq_'.$tool.'_limit'}; } - } else { + } else { $newval = $env{'form.'.$context.'_'.$tool}; } if ($userenv->{$context.'.'.$tool} ne '') { @@ -3451,14 +3231,8 @@ sub update_roles { } sub enroll_single_student { - my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context,$crstype) = @_; - $r->print('<h3>'); - if ($crstype eq 'Community') { - $r->print(&mt('Enrolling Member')); - } else { - $r->print(&mt('Enrolling Student')); - } - $r->print('</h3>'); + my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context) = @_; + $r->print('<h3>'.&mt('Enrolling Student').'</h3>'); # Remove non alphanumeric values from section $env{'form.sections'}=~s/\W//g; @@ -3491,13 +3265,7 @@ sub enroll_single_student { } $r->print('.<br />'.$showstart.'; '.$showend); if ($startdate <= $now && !$newuser) { - $r->print('<p> '); - if ($crstype eq 'Community') { - $r->print(&mt('If the member is currently logged-in to LON-CAPA, the new role will be available when the member next logs in.')); - } else { - $r->print(&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.')); - } - $r->print('</p>'); + $r->print("<p> ".&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.')."</p>"); } } else { $r->print(&mt('unable to enroll').": ".$enroll_result); @@ -3622,27 +3390,18 @@ sub build_roles { sub custom_role_editor { my ($r) = @_; - my $action = $env{'form.customroleaction'}; - my $rolename; - if ($action eq 'new') { - $rolename=$env{'form.newrolename'}; - } else { - $rolename=$env{'form.rolename'}; + my $rolename=$env{'form.rolename'}; + + if ($rolename eq 'make new role') { + $rolename=$env{'form.newrolename'}; } $rolename=~s/[^A-Za-z0-9]//gs; + if (!$rolename || $env{'form.phase'} eq 'pickrole') { &print_username_entry_form($r); return; } - my ($crstype,$context); - if ($env{'request.course.id'}) { - $crstype = &Apache::loncommon::course_type(); - $context = 'course'; - } else { - $context = 'domain'; - $crstype = $env{'form.templatecrstype'}; - } # ------------------------------------------------------- What can be assigned? my %full=(); my %courselevel=(); @@ -3651,6 +3410,7 @@ sub custom_role_editor { my $dompriv=''; my $coursepriv=''; my $body_top; + my ($disp_dummy,$disp_roles) = &Apache::lonnet::get('roles',["st"]); my ($rdummy,$roledef)= &Apache::lonnet::get('roles',["rolesdef_$rolename"]); # ------------------------------------------------------- Does this role exist? @@ -3659,9 +3419,6 @@ sub custom_role_editor { $body_top .= &mt('Existing Role').' "'; # ------------------------------------------------- Get current role privileges ($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef); - if ($crstype eq 'Community') { - $syspriv =~ s/bre\&S//; - } } else { $body_top .= &mt('New Role').' "'; $roledef=''; @@ -3701,56 +3458,18 @@ sub custom_role_editor { my ($jsback,$elements) = &crumb_utilities(); my $button_code = "\n"; my $head_script = "\n"; - $head_script .= '<script type="text/javascript">'."\n". - '// <![CDATA['."\n"; - my @template_roles = ("in","ta","ep"); - if ($context eq 'domain') { - push(@template_roles,"ad"); - } - push(@template_roles,"st"); - if ($crstype eq 'Community') { - unshift(@template_roles,'co'); - } else { - unshift(@template_roles,'cc'); - } + $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,$crstype); - $button_code .= &make_button_code($role,$crstype).' '; + $head_script .= &make_script_template($role); + $button_code .= &make_button_code($role).' '; } - my $context_code; - if ($context eq 'domain') { - my $checkedCommunity = ''; - my $checkedCourse = ' checked="checked"'; - if ($env{'form.templatecrstype'} eq 'Community') { - $checkedCommunity = $checkedCourse; - $checkedCourse = ''; - } - $context_code = '<label>'. - '<input type="radio" name="templatecrstype" value="Course"'.$checkedCourse.' onclick="this.form.submit();">'. - &mt('Course'). - '</label>'.(' ' x2). - '<label>'. - '<input type="radio" name="templatecrstype" value="Community"'.$checkedCommunity.' onclick="this.form.submit();">'. - &mt('Community'). - '</label>'. - '</fieldset>'. - '<input type="hidden" name="customroleaction" value="'. - $action.'" />'; - if ($env{'form.customroleaction'} eq 'new') { - $context_code .= '<input type="hidden" name="newrolename" value="'. - $rolename.'" />'; - } else { - $context_code .= '<input type="hidden" name="rolename" value="'. - $rolename.'" />'; - } - $context_code .= '<input type="hidden" name="action" value="custom" />'. - '<input type="hidden" name="phase" value="selected_custom_edit" />'; - } - $head_script .= "\n".$jsback."\n". - '// ]]>'."\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 + &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:backPage(document.form1,'pickrole','')", text=>"Pick custom role", faq=>282,bug=>'Instructor Interface',}, @@ -3767,21 +3486,13 @@ sub custom_role_editor { 'dml' => "Domain Level", 'ssl' => "System Level"); - $r->print('<div class="LC_left_float">' + $r->print('<div>' .'<form action=""><fieldset>' .'<legend>'.&mt('Select a Template').'</legend>' .$button_code - .'</fieldset></form></div>'); - if ($context_code) { - $r->print('<div class="LC_left_float">' - .'<form action="/adm/createuser" method="post"><fieldset>' - .'<legend>'.&mt('Context').'</legend>' - .$context_code - .'</form>' - .'</div>' - ); - } - $r->print('<br clear="all" />'); + .'</fieldset></form>' + .'</div>' + ); $r->print(<<ENDCCF); <form name="form1" method="post"> @@ -3794,7 +3505,7 @@ ENDCCF '</th><th>'.$lt{'ssl'}.'</th>'. &Apache::loncommon::end_data_table_header_row()); foreach my $priv (sort keys %full) { - my $privtext = &Apache::lonnet::plaintext($priv,$crstype); + 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"'. @@ -3802,15 +3513,11 @@ ENDCCF '</td><td>'. ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d"'. ($domainlevelcurrent{$priv}?' checked="checked"':'').' />':' '). - '</td><td>'); - if ($priv eq 'bre' && $crstype eq 'Community') { - $r->print(' '); - } else { - $r->print($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s"'. - ($systemlevelcurrent{$priv}?' checked="checked"':'').' />':' '); - } - $r->print('</td>'. - &Apache::loncommon::end_data_table_row()); + '</td><td>'. + ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s"'. + ($systemlevelcurrent{$priv}?' checked="checked"':'').' />':' '). + '</td>'. + &Apache::loncommon::end_data_table_row()); } $r->print(&Apache::loncommon::end_data_table(). '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'. @@ -3822,7 +3529,7 @@ ENDCCF } # -------------------------------------------------------- sub make_script_template { - my ($role,$crstype) = @_; + my ($role) = @_; my %full_c=(); my %full_d=(); my %full_s=(); @@ -3836,7 +3543,6 @@ sub make_script_template { $full_d{$priv}=1; } foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) { - next if (($crstype eq 'Community') && ($item eq 'bre&S')); my ($priv,$restrict)=split(/\&/,$item); $full_s{$priv}=1; } @@ -3889,8 +3595,8 @@ sub make_script_template { } # ---------------------------------------------------------- sub make_button_code { - my ($role,$crstype) = @_; - my $label = &Apache::lonnet::plaintext($role,$crstype); + my ($role) = @_; + my $label = &Apache::lonnet::plaintext($role); my $button_code = '<input type="button" onclick="set_'.$role.'()" value="'.$label.'" />'; return ($button_code); } @@ -3904,11 +3610,11 @@ sub set_custom_role { return; } my ($jsback,$elements) = &crumb_utilities(); - my $jscript = '<script type="text/javascript">'. - '// <![CDATA['."\n". - $jsback."\n". - '// ]]>'."\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 @@ -3990,10 +3696,9 @@ sub handler { $r->send_http_header; return OK; } - my ($context,$crstype); + my $context; if ($env{'request.course.id'}) { $context = 'course'; - $crstype = &Apache::loncommon::course_type(); } elsif ($env{'request.role'} =~ /^au\./) { $context = 'author'; } else { @@ -4012,7 +3717,7 @@ sub handler { #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,$crstype); + &Apache::lonuserutils::get_permission($context); if (!$allowed) { $env{'user.error.msg'}= "/adm/createuser:cst:0:0:Cannot create/modify user data ". @@ -4027,7 +3732,7 @@ sub handler { if (! exists($env{'form.action'})) { $r->print(&header()); $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); - $r->print(&print_main_menu($permission,$context,$crstype)); + $r->print(&print_main_menu($permission,$context)); $r->print(&Apache::loncommon::end_page()); } elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) { $r->print(&header()); @@ -4043,7 +3748,7 @@ sub handler { &Apache::lonuserutils::print_first_users_upload_form($r,$context); } elsif ($env{'form.state'} eq 'got_file') { &Apache::lonuserutils::print_upload_manager_form($r,$context, - $permission,$crstype); + $permission); } elsif ($env{'form.state'} eq 'enrolling') { if ($env{'form.datatoken'}) { &Apache::lonuserutils::upfile_drop_add($r,$context,$permission); @@ -4068,13 +3773,13 @@ sub handler { if ($env{'form.srchterm'} !~ /^$match_username$/) { my $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @'); $env{'form.phase'} = ''; - &print_username_entry_form($r,$context,$response,$srch,undef,$crstype); + &print_username_entry_form($r,$context,$response,$srch); } else { my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'}); my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'}); &print_user_modification_page($r,$ccuname,$ccdomain, $srch,$response,$context, - $permission,$crstype); + $permission); } } elsif ($env{'form.phase'} eq 'get_user_info') { my ($currstate,$response,$forcenewuser,$results) = @@ -4084,7 +3789,7 @@ sub handler { } if ($currstate eq 'select') { &print_user_selection_page($r,$response,$srch,$results, - \@search,$context,undef,$crstype); + \@search,$context); } elsif ($currstate eq 'modify') { my ($ccuname,$ccdomain); if (($srch->{'srchby'} eq 'uname') && @@ -4102,24 +3807,24 @@ sub handler { } &print_user_modification_page($r,$ccuname,$ccdomain, $srch,$response,$context, - $permission,$crstype); + $permission); } elsif ($currstate eq 'query') { &print_user_query_page($r,'createuser'); } else { $env{'form.phase'} = ''; &print_username_entry_form($r,$context,$response,$srch, - $forcenewuser,$crstype); + $forcenewuser); } } elsif ($env{'form.phase'} eq 'userpicked') { my $ccuname = &LONCAPA::clean_username($env{'form.seluname'}); my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'}); &print_user_modification_page($r,$ccuname,$ccdomain,$srch,'', - $context,$permission,$crstype); + $context,$permission); } } elsif ($env{'form.phase'} eq 'update_user_data') { - &update_user_data($r,$context,$crstype); + &update_user_data($r,$context); } else { - &print_username_entry_form($r,$context,undef,$srch,undef,$crstype); + &print_username_entry_form($r,$context,undef,$srch); } } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) { if ($env{'form.phase'} eq 'set_custom_roles') { @@ -4154,22 +3859,10 @@ sub handler { text=>"List Users"}); my ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles); my $formname = 'studentform'; - if (($context eq 'domain') && (($env{'form.roletype'} eq 'course') || - ($env{'form.roletype'} eq 'community'))) { - if ($env{'form.roletype'} eq 'course') { - ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) = - &Apache::lonuserutils::courses_selector($env{'request.role.domain'}, - $formname); - } elsif ($env{'form.roletype'} eq 'community') { - $cb_jscript = - &Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'}); - my %elements = ( - coursepick => 'radio', - coursetotal => 'text', - courselist => 'text', - ); - $jscript = &Apache::lonhtmlcommon::set_form_elements(\%elements); - } + if ($context eq 'domain' && $env{'form.roletype'} eq 'course') { + ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) = + &Apache::lonuserutils::courses_selector($env{'request.role.domain'}, + $formname); $jscript .= &verify_user_display(); my $js = &add_script($jscript).$cb_jscript; my $loadcode = @@ -4190,25 +3883,19 @@ sub handler { } } elsif ($env{'form.action'} eq 'drop' && $permission->{'cusr'}) { $r->print(&header()); - my $brtext; - if ($crstype eq 'Community') { - $brtext = 'Drop Members'; - } else { - $brtext = 'Drop Students'; - } &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/createuser?action=drop', - text=>$brtext}); + text=>"Drop Students"}); if (!exists($env{'form.state'})) { $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students', 'Course_Drop_Student')); - &Apache::lonuserutils::print_drop_menu($r,$context,$permission,$crstype); + &Apache::lonuserutils::print_drop_menu($r,$context,$permission); } elsif ($env{'form.state'} eq 'done') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/createuser?action=drop', text=>"Result"}); - $r->print(&Apache::lonhtmlcommon::breadcrumbs($brtext, + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students', 'Course_Drop_Student')); &Apache::lonuserutils::update_user_list($r,$context,undef, $env{'form.action'}); @@ -4218,7 +3905,7 @@ sub handler { if ($permission->{'cusr'}) { $r->print(&header(undef,undef,{'no_nav_bar' => 1}). &Apache::lonuserutils::date_section_selector($context, - $permission,$crstype). + $permission). &Apache::loncommon::end_page()); } else { $r->print(&header(). @@ -4260,7 +3947,6 @@ sub handler { $r->print('<h3>'.&mt('Pending enrollment requests').'</h3>'."\n"); $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', @@ -4284,7 +3970,7 @@ sub handler { } else { $r->print(&header()); $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); - $r->print(&print_main_menu($permission,$context,$crstype)); + $r->print(&print_main_menu($permission,$context)); $r->print(&Apache::loncommon::end_page()); } return OK; @@ -4303,11 +3989,11 @@ sub header { sub add_script { my ($js) = @_; - return '<script type="text/javascript">'."\n". - '// <![CDATA['."\n". - "\n".$js."\n". - '// ]]>'."\n". - '</script>'."\n"; + return '<script type="text/javascript">'."\n" + .'// <![CDATA['."\n" + .$js."\n" + .'// ]]>'."\n" + .'</script>'."\n"; } sub verify_user_display { @@ -4328,137 +4014,169 @@ END ############################################################### # Menu Phase One sub print_main_menu { - my ($permission,$context,$crstype) = @_; - my $linkcontext = $context; - my $stuterm = lc(&Apache::lonnet::plaintext('st',$crstype)); - if (($context eq 'course') && ($crstype eq 'Community')) { - $linkcontext = lc($crstype); - $stuterm = 'Members'; - } - + 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 => 'Upload a File of Course Users', - singleuser => 'Add/Modify a Single Course User', - listusers => 'Display Class Lists and Manage Multiple Users', - }, - community => { - upload => 'Upload a File of Community Users', - singleuser => 'Add/Modify a Community User', - listusers => 'Manage Community Users', - }, + 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 = - ( - { text => $links{$context}{'upload'}, - help => 'Course_Create_Class_List', - action => 'upload', - permission => $permission->{'cusr'}, + 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.', }, - { text => $links{$context}{'singleuser'}, - help => 'Course_Change_Privileges', - action => 'singleuser', - permission => $permission->{'cusr'}, + { + 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[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.', }, - { 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') { + + }elsif ($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'})) { - if ($crstype ne 'Community') { - push(@courselinks, - { text => 'Automated Enrollment Manager', - help => 'Course_Automated_Enrollment', - permission => (&Apache::lonnet::auto_run($cnum,$cdom) - && $permission->{'cusr'}), - url => '/adm/populate', - }); - } - push(@courselinks, - { text => 'Configure User Self-enrollment', - help => 'Course_Self_Enrollment', - action => 'selfenroll', - permission => $permission->{'cusr'}, - }); - } + + 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(@courselinks, - { text => 'Enrollment Requests', - help => 'Course_Approve_Selfenroll', - action => 'selfenrollqueue', - 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', + 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.', + }, + ); + + } + }; +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 { @@ -4474,7 +4192,6 @@ sub restore_prev_selections { sub print_selfenroll_menu { my ($r,$context,$permission) = @_; - my $crstype = &Apache::loncommon::course_type(); my $formname = 'enrollstudent'; my $nolink = 1; my ($row,$lt) = &get_selfenroll_titles(); @@ -4687,9 +4404,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; @@ -4838,12 +4553,8 @@ ENDSCRIPT &mt('No').'</label>'; my %advhash = &Apache::lonnet::get_course_adv_roles($cid,1); my (@ccs,%notified); - my $ccrole = 'cc'; - if ($crstype eq 'Community') { - $ccrole = 'co'; - } - if ($advhash{$ccrole}) { - @ccs = split(/,/,$advhash{$ccrole}); + if ($advhash{'cc'}) { + @ccs = split(/,/,$advhash{'cc'}); } if ($currnotified) { foreach my $current (split(/,/,$currnotified)) { @@ -4930,9 +4641,9 @@ sub visible_in_cat { my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); my ($cathash,%settable,@vismsgs,$cansetvis); my %visactions = &Apache::lonlocal::texthash( - vis => 'Your course/community currently appears in the Course/Community Catalog for this domain.', + vis => 'Your course currently appears in the Course Catalog for this domain.', gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.', - miss => 'Your course/community does not currently appear in the Course/Community Catalog for this domain.', + miss => 'Your course does not currently appear in the Course Catalog for this domain.', yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.', coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.', make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:', @@ -5148,7 +4859,6 @@ sub print_userchangelogs_display { my $formname = 'roleslog'; my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - my $crstype = &Apache::loncommon::course_type(); my %roleslog=&Apache::lonnet::dump('nohist_rolelog',$cdom,$cnum); if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); } @@ -5187,14 +4897,7 @@ sub print_userchangelogs_display { } my (%whodunit,%changed,$version); ($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/); - $r->print(&role_display_filter($formname,$cdom,$cnum,\%curr,$version,$crstype)); - 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(); + $r->print(&role_display_filter($formname,$cdom,$cnum,\%curr,$version)); my ($minshown,$maxshown); $minshown = 1; my $count = 0; @@ -5204,6 +4907,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'})); @@ -5225,10 +4931,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'}); @@ -5263,24 +4966,45 @@ sub print_userchangelogs_display { if ($roleslog{$id}{'logentry'}{'selfenroll'}) { $chgcontext = 'selfenroll'; } - my %lt = &rolechg_contexts($crstype); + my %lt = &rolechg_contexts(); 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'},$crstype).'</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) { @@ -5296,21 +5020,56 @@ function chgPage(caller) { // ]]> </script> ENDSCRIPT - } - } else { - $r->print('<p class="LC_info">'. - &mt('There are no records to display'). - '</p>'); - } - $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; } sub role_display_filter { - my ($formname,$cdom,$cnum,$curr,$version,$crstype) = @_; + my ($formname,$cdom,$cnum,$curr,$version) = @_; my $context = 'course'; - my $lctype = lc($crstype); my $nolink = 1; my $output = '<table><tr><td valign="top">'. '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b></span><br />'. @@ -5325,23 +5084,27 @@ sub role_display_filter { &Apache::lonhtmlcommon::date_setter($formname,'rolelog_end_date', $curr->{'rolelog_end_date'},undef, undef,undef,undef,undef,undef,undef,$nolink); - my %lt = &rolechg_contexts($crstype); - $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>'. + 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>'. '<td valign="top"><b>'.&mt('Role:').'</b><br />'. '<select name="role"><option value="any"'; if ($curr->{'role'} eq 'any') { $output .= ' selected="selected"'; } $output .= '>'.&mt('Any').'</option>'."\n"; - my @roles = &Apache::lonuserutils::course_roles($context,undef,1,$lctype); + my @roles = &Apache::lonuserutils::course_roles($context,undef,1); foreach my $role (@roles) { my $plrole; if ($role eq 'cr') { $plrole = &mt('Custom Role'); } else { - $plrole=&Apache::lonnet::plaintext($role,$crstype); + $plrole=&Apache::lonnet::plaintext($role); } my $selstr = ''; if ($role eq $curr->{'role'}) { @@ -5349,9 +5112,11 @@ 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','requestcourses') { + foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll') { my $selstr = ''; if ($curr->{'chgcontext'} eq $chgtype) { $selstr = ' selected="selected"'; @@ -5370,18 +5135,17 @@ sub role_display_filter { .'</p>'; # Server version info - $output .= '<p style="font-size: smaller;" class="LC_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 LON-CAPA server is version [_1]',$version); } - $output .= '</p><hr /><br />'; + $output .= '</p><hr />'; return $output; } sub rolechg_contexts { - my ($crstype) = @_; my %lt = &Apache::lonlocal::texthash ( any => 'Any', auto => 'Automated enrollment', @@ -5389,14 +5153,8 @@ sub rolechg_contexts { createcourse => 'Course Creation', course => 'User Management in course', domain => 'User Management in domain', - selfenroll => 'Self-enrolled', - requestcourses => 'Course Request', + selfenroll => 'Self-enrolled', ); - if ($crstype eq 'Community') { - $lt{'createcourse'} = &mt('Community Creation'); - $lt{'course'} = &mt('User Management in community'); - $lt{'requestcourses'} = &mt('Community Request'); - } return %lt; } @@ -5791,7 +5549,7 @@ sub build_search_response { &Apache::lonuserutils::can_create_user($createdom,$context); my $targetdom = '<span class="LC_cusr_emph">'.$createdom.'</span>'; if ($cancreate) { - my $showdom = &display_domain_info($createdom); + my $showdom = &display_domain_info($createdom); $response .= '<br /><br />' .'<b>'.&mt('To add a new user:').'</b>' .'<br />'; @@ -5800,7 +5558,7 @@ sub build_search_response { } else { $response .= &mt("(You can only create new users in your current role's domain - [_1])",$targetdom); } - $response .= '<ul><li>' + $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>') @@ -5813,15 +5571,15 @@ sub build_search_response { my $helplink = ' href="javascript:helpMenu('."'display'".')"'; $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); + $response .= &mt("You are not authorized to defined 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.' + .&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.' ,' <a'.$helplink.'>' ,'</a>') - .'<br /><br />'; + .'<br /><br />'; } } } @@ -5907,13 +5665,12 @@ sub course_level_table { 'end' => "End" ); - foreach my $protectedcourse (sort(keys(%inccourses))) { + foreach my $protectedcourse (sort( keys(%inccourses))) { my $thiscourse=$protectedcourse; $thiscourse=~s:_:/:g; my %coursedata=&Apache::lonnet::coursedescription($thiscourse); - my $isowner = &is_courseowner($protectedcourse,$coursedata{'internal.courseowner'}); my $area=$coursedata{'description'}; - my $crstype=$coursedata{'type'}; + my $type=$coursedata{'type'}; if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; } my ($domain,$cnum)=split(/\//,$thiscourse); my %sections_count; @@ -5923,13 +5680,12 @@ sub course_level_table { &Apache::loncommon::get_sections($domain,$cnum); } } - my @roles = &Apache::lonuserutils::roles_by_context('course','',$crstype); + my @roles = &Apache::lonuserutils::roles_by_context('course'); foreach my $role (@roles) { - my $plrole=&Apache::lonnet::plaintext($role,$crstype); - if ((&Apache::lonnet::allowed('c'.$role,$thiscourse)) || - ((($role eq 'cc') || ($role eq 'co')) && ($isowner))) { + my $plrole=&Apache::lonnet::plaintext($role); + if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) { $table .= &course_level_row($protectedcourse,$role,$area,$domain, - $plrole,\%sections_count,\%lt); + $plrole,\%sections_count,\%lt); } elsif ($env{'request.course.sec'} ne '') { if (&Apache::lonnet::allowed('c'.$role,$thiscourse.'/'. $env{'request.course.sec'})) { @@ -5939,8 +5695,7 @@ sub course_level_table { } } if (&Apache::lonnet::allowed('ccr',$thiscourse)) { - foreach my $cust (sort(keys(%customroles))) { - next if ($crstype eq 'Community' && $customroles{$cust} =~ /bre\&S/); + foreach my $cust (sort keys %customroles) { my $role = 'cr_cr_'.$env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cust; $table .= &course_level_row($protectedcourse,$role,$area,$domain, $cust,\%sections_count,\%lt); @@ -5971,7 +5726,7 @@ sub course_level_row { $protectedcourse.'_'.$role.'" /></td>'."\n". ' <td>'.$plrole.'</td>'."\n". ' <td>'.$area.'<br />Domain: '.$domain.'</td>'."\n"; - if (($role eq 'cc') || ($role eq 'co')) { + if ($role eq 'cc') { $row .= '<td> </td>'; } elsif ($env{'request.course.sec'} ne '') { $row .= ' <td><input type="hidden" value="'. @@ -6020,7 +5775,7 @@ sub course_level_dc { '<input type="hidden" name="dccourse" value="" />'; my $courseform='<b>'.&Apache::loncommon::selectcourse_link ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').'</b>'; - my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu','role','Course/Community Browser'); + my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu'); my %lt=&Apache::lonlocal::texthash( 'rol' => "Role", 'grs' => "Section", @@ -6031,14 +5786,14 @@ sub course_level_dc { 'ssd' => "Set Start Date", 'sed' => "Set End Date" ); - my $header = '<h4>'.&mt('Course/Community Level').'</h4>'. + my $header = '<h4>'.&mt('Course Level').'</h4>'. &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). '<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><br /><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc','','','','crstype'".')" /></td>'."\n". - '<td valign><br /><select name="role">'."\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); $otheritems .= ' <option value="'.$role.'">'.$plrole; @@ -6058,14 +5813,13 @@ sub course_level_dc { '<td valign="top"> <b>'.$lt{'new'}.'</b><br />'. '<input type="text" name="newsec" value="" />'. '<input type="hidden" name="section" value="" />'. - '<input type="hidden" name="groups" value="" />'. - '<input type="hidden" name="crstype" value="" /></td>'. + '<input type="hidden" name="groups" value="" /></td>'. '</tr></table></td>'; $otheritems .= <<ENDTIMEENTRY; -<td><br /><input type="hidden" name="start" value='' /> +<td><input type="hidden" name="start" value='' /> <a href= "javascript:pjump('date_start','Start Date',document.cu.start.value,'start','cu.pres','dateset')">$lt{'ssd'}</a></td> -<td><br /><input type="hidden" name="end" value='' /> +<td><input type="hidden" name="end" value='' /> <a href= "javascript:pjump('date_end','End Date',document.cu.end.value,'end','cu.pres','dateset')">$lt{'sed'}</a></td> ENDTIMEENTRY @@ -6129,8 +5883,7 @@ sub update_selfenroll_config { $newnum ++; } } - for (my $j=0; $j<$env{'form.selfenroll_types_total'}; $j++) { - if ((!grep(/^$j$/,@deletedoms)) && (!grep(/^$j$/,@activations))) { + for (my $j=0; $j<$env{'form.selfenroll_types_total'}; $j++) { if ((!grep(/^$j$/,@deletedoms)) && (!grep(/^$j$/,@activations))) { my @types = &Apache::loncommon::get_env_multiple('form.selfenroll_types_'.$j); if (@types > 0) { @types = sort(@types); @@ -6433,21 +6186,6 @@ sub get_selfenroll_titles { return (\@row,\%lt); } -sub is_courseowner { - my ($thiscourse,$courseowner) = @_; - if ($courseowner eq '') { - if ($env{'request.course.id'} eq $thiscourse) { - $courseowner = $env{'course.'.$env{'request.course.id'}.'.internal.courseowner'}; - } - } - if ($courseowner ne '') { - if ($courseowner eq $env{'user.name'}.':'.$env{'user.domain'}) { - return 1; - } - } - return; -} - #---------------------------------------------- end functions for &phase_two #--------------------------------- functions for &phase_two and &phase_three