--- loncom/interface/loncreateuser.pm 2010/04/23 17:51:42 1.295.2.33 +++ loncom/interface/loncreateuser.pm 2012/12/20 16:22:59 1.368 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.295.2.33 2010/04/23 17:51:42 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.368 2012/12/20 16:22:59 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -111,11 +111,11 @@ sub initialize_authen_forms { sub auth_abbrev { my %abv_auth = ( - krb5 => 'krb', - krb4 => 'krb', - internal => 'int', - localuth => 'loc', - unix => 'fsys', + krb5 => 'krb', + krb4 => 'krb', + internal => 'int', + localauth => 'loc', + unix => 'fsys', ); return %abv_auth; } @@ -223,6 +223,7 @@ sub build_tools_display { my %lt = &Apache::lonlocal::texthash ( 'blog' => "Personal User Blog", 'aboutme' => "Personal Information Page", + 'webdav' => "WebDAV access to authoring spaces (if SSL and author/co-author)", 'portfolio' => "Personal User Portfolio", 'avai' => "Available", 'cusa' => "availability", @@ -232,6 +233,7 @@ sub build_tools_display { 'official' => 'Can request creation of official courses', 'unofficial' => 'Can request creation of unofficial courses', 'community' => 'Can request creation of communities', + 'requestauthor' => 'Can request author space', ); if ($context eq 'requestcourses') { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, @@ -246,10 +248,21 @@ sub build_tools_display { %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$ccdomain); $isadv = &Apache::lonnet::is_advanced_user($ccuname,$ccdomain); + } elsif ($context eq 'requestauthor') { + %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, + 'requestauthor'); + @usertools = ('requestauthor'); + @options =('norequest','approval','automatic'); + %reqtitles = &requestauthor_titles(); + %reqdisplay = &requestauthor_display(); + $colspan = ' colspan="2"'; + %domconfig = + &Apache::lonnet::get_dom('configuration',['requestauthor'],$ccdomain); } else { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, - 'tools.aboutme','tools.portfolio','tools.blog'); - @usertools = ('aboutme','blog','portfolio'); + 'tools.aboutme','tools.portfolio','tools.blog', + 'tools.webdav'); + @usertools = ('aboutme','blog','webdav','portfolio'); } foreach my $item (@usertools) { my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off, @@ -259,7 +272,12 @@ sub build_tools_display { $curr_access = &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef, $context); - if ($userenv{$context.'.'.$item} ne '') { + if ($context eq 'requestauthor') { + if ($userenv{$context} ne '') { + $cust_on = ' checked="checked" '; + $cust_off = ''; + } + } elsif ($userenv{$context.'.'.$item} ne '') { $cust_on = ' checked="checked" '; $cust_off = ''; } @@ -269,6 +287,12 @@ sub build_tools_display { } else { $custom_access = &mt('Currently from custom setting.'); } + } elsif ($context eq 'requestauthor') { + if ($userenv{$context} eq '') { + $custom_access = &mt('Currently from default setting.'); + } else { + $custom_access = &mt('Currently from custom setting.'); + } } else { if ($userenv{$context.'.'.$item} eq '') { $custom_access = @@ -290,15 +314,27 @@ sub build_tools_display { ' <td'.$colspan.'>'.$lt{$item}.'</td>'."\n". ' </tr>'."\n". &Apache::loncommon::start_data_table_row()."\n"; - if ($context eq 'requestcourses') { + if (($context eq 'requestcourses') || ($context eq 'requestauthor')) { my ($curroption,$currlimit); - if ($userenv{$context.'.'.$item} ne '') { - $curroption = $userenv{$context.'.'.$item}; + my $envkey = $context.'.'.$item; + if ($context eq 'requestauthor') { + $envkey = $context; + } + if ($userenv{$envkey} ne '') { + $curroption = $userenv{$envkey}; } else { my (@inststatuses); - $curroption = - &Apache::loncoursequeueadmin::get_processtype($ccuname,$ccdomain,$isadv,$ccdomain, - $item,\@inststatuses,\%domconfig); + if ($context eq 'requestcourses') { + $curroption = + &Apache::loncoursequeueadmin::get_processtype('course',$ccuname,$ccdomain, + $isadv,$ccdomain,$item, + \@inststatuses,\%domconfig); + } else { + $curroption = + &Apache::loncoursequeueadmin::get_processtype('requestauthor',$ccuname,$ccdomain, + $isadv,$ccdomain,undef, + \@inststatuses,\%domconfig); + } } if (!$curroption) { $curroption = 'norequest'; @@ -336,28 +372,36 @@ sub build_tools_display { $checked = ' checked="checked"'; } } + my $name = 'crsreq_'.$item; + if ($context eq 'requestauthor') { + $name = $item; + } $custdisp .= '<tr><td><span class="LC_nobreak"><label>'. - '<input type="radio" name="crsreq_'.$item. - '" value="'.$val.'"'.$checked.' />'. + '<input type="radio" name="'.$name.'" '. + 'value="'.$val.'"'.$checked.' />'. $reqtitles{$option}.'</label> '; if ($option eq 'autolimit') { - $custdisp .= '<input type="text" name="crsreq_'. - $item.'_limit" size="1" '. + $custdisp .= '<input type="text" name="'.$name. + '_limit" size="1" '. 'value="'.$currlimit.'" /></span><br />'. $reqtitles{'unlimited'}; - } else { - $custdisp .= '</span>'; - } - $custdisp .= '</td></tr>'; + } 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')); + my $name = $context.'_'.$item; + if ($context eq 'requestauthor') { + $name = $context; + } $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" '. + '<input type="radio" name="'.$name.'"'. + ' value="1" '.$tool_on.'/>'.&mt('On').'</label> <label>'. + '<input type="radio" name="'.$name.'" value="0" '. $tool_off.'/>'.&mt('Off').'</label></span>'; $custradio = (' 'x2).'--'.$lt{'cusa'}.': '.$custdisp. '</span>'; @@ -453,6 +497,17 @@ sub coursereq_externaluser { return $output; } +sub domainrole_req { + my ($ccuname,$ccdomain) = @_; + return '<br /><h3>'. + &mt('User Can Request Assignment of Domain Roles?'). + '</h3>'."\n". + &Apache::loncommon::start_data_table(). + &build_tools_display($ccuname,$ccdomain, + 'requestauthor'). + &Apache::loncommon::end_data_table(); +} + sub courserequest_titles { my %titles = &Apache::lonlocal::texthash ( official => 'Official', @@ -476,10 +531,84 @@ sub courserequest_display { return %titles; } +sub requestauthor_titles { + my %titles = &Apache::lonlocal::texthash ( + norequest => 'Not allowed', + approval => 'Approval by Dom. Coord.', + automatic => 'Automatic approval', + ); + return %titles; + +} + +sub requestauthor_display { + my %titles = &Apache::lonlocal::texthash ( + approval => 'Yes, need approval', + automatic => 'Yes, automatic approval', + norequest => 'No', + ); + return %titles; +} + +sub curr_requestauthor { + my ($uname,$udom,$isadv,$inststatuses,$domconfig) = @_; + return unless ((ref($inststatuses) eq 'ARRAY') && (ref($domconfig) eq 'HASH')); + if ($uname eq '' || $udom eq '') { + $uname = $env{'user.name'}; + $udom = $env{'user.domain'}; + $isadv = $env{'user.adv'}; + } + my (%userenv,%settings,$val); + my @options = ('automatic','approval'); + %userenv = + &Apache::lonnet::userenvironment($udom,$uname,'requestauthor','inststatus'); + if ($userenv{'requestauthor'}) { + $val = $userenv{'requestauthor'}; + @{$inststatuses} = ('_custom_'); + } else { + my %alltasks; + if (ref($domconfig->{'requestauthor'}) eq 'HASH') { + %settings = %{$domconfig->{'requestauthor'}}; + if (($isadv) && ($settings{'_LC_adv'} ne '')) { + $val = $settings{'_LC_adv'}; + @{$inststatuses} = ('_LC_adv_'); + } else { + if ($userenv{'inststatus'} ne '') { + @{$inststatuses} = split(',',$userenv{'inststatus'}); + } else { + @{$inststatuses} = ('default'); + } + foreach my $status (@{$inststatuses}) { + if (exists($settings{$status})) { + my $value = $settings{$status}; + next unless ($value); + unless (exists($alltasks{$value})) { + if (ref($alltasks{$value}) eq 'ARRAY') { + unless(grep(/^\Q$status\E$/,@{$alltasks{$value}})) { + push(@{$alltasks{$value}},$status); + } + } else { + @{$alltasks{$value}} = ($status); + } + } + } + } + foreach my $option (@options) { + if ($alltasks{$option}) { + $val = $option; + last; + } + } + } + } + } + return $val; +} + # =================================================================== Phase one sub print_username_entry_form { - my ($r,$context,$response,$srch,$forcenewuser,$crstype) = @_; + my ($r,$context,$response,$srch,$forcenewuser,$crstype,$brcrum) = @_; my $defdom=$env{'request.role.domain'}; my $formtoset = 'crtuser'; if (exists($env{'form.startrolename'})) { @@ -503,31 +632,36 @@ sub print_username_entry_form { && (&Apache::lonnet::allowed('mcr','/'))) { $jscript .= &customrole_javascript(); } - my %loaditems = ( - 'onload' => "javascript:setFormElements(document.$formtoset)", - ); - my %breadcrumb_text = &singleuser_breadcrumb($crstype); - my $start_page = - &Apache::loncommon::start_page('User Management', - $jscript,{'add_entries' => \%loaditems,}); - if ($env{'form.action'} eq 'custom') { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:backPage(document.crtuser)", - text=>"Pick custom role",}); - } else { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:backPage(document.crtuser)", - text=>$breadcrumb_text{'search'}, - faq=>282,bug=>'Instructor Interface',}); - } my $helpitem = 'Course_Change_Privileges'; if ($env{'form.action'} eq 'custom') { $helpitem = 'Course_Editing_Custom_Roles'; } elsif ($env{'form.action'} eq 'singlestudent') { $helpitem = 'Course_Add_Student'; } - my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management', - $helpitem); + my %breadcrumb_text = &singleuser_breadcrumb($crstype); + if ($env{'form.action'} eq 'custom') { + push(@{$brcrum}, + {href=>"javascript:backPage(document.crtuser)", + text=>"Pick custom role", + help => $helpitem,} + ); + } else { + push (@{$brcrum}, + {href => "javascript:backPage(document.crtuser)", + text => $breadcrumb_text{'search'}, + help => $helpitem, + faq => 282, + bug => 'Instructor Interface',} + ); + } + my %loaditems = ( + 'onload' => "javascript:setFormElements(document.$formtoset)", + ); + my $args = {bread_crumbs => $brcrum, + bread_crumbs_component => 'User Management', + add_entries => \%loaditems,}; + $r->print(&Apache::loncommon::start_page('User Management',$jscript,$args)); + 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', @@ -538,7 +672,7 @@ sub print_username_entry_form { 'nr' => "role name", '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:'); @@ -591,7 +725,6 @@ sub print_username_entry_form { } $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype)); } - $r->print(&Apache::loncommon::end_page()); } sub customrole_javascript { @@ -634,7 +767,6 @@ END sub entry_form { my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype) = @_; - my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom); my ($usertype,$inexact); if (ref($srch) eq 'HASH') { if (($srch->{'srchin'} eq 'dom') && @@ -642,9 +774,10 @@ sub entry_form { ($srch->{'srchtype'} eq 'exact') && ($srch->{'srchdomain'} ne '') && ($srch->{'srchterm'} ne '')) { + my (%curr_rules,%got_rules); my ($rules,$ruleorder) = &Apache::lonnet::inst_userrules($srch->{'srchdomain'},'username'); - $usertype = &Apache::lonuserutils::check_usertype($srch->{'srchdomain'},$srch->{'srchterm'},$rules); + $usertype = &Apache::lonuserutils::check_usertype($srch->{'srchdomain'},$srch->{'srchterm'},$rules,\%curr_rules,\%got_rules); } else { $inexact = 1; } @@ -685,7 +818,7 @@ ENDBLOCK ); my $sellink=&Apache::loncommon::selectstudent_link('crtusername','srchterm','srchdomain'); my ($title,$buttontext,$showresponse); - if ($env{'form.action'} eq 'singlestudent') { + if ($env{'form.action'} eq 'singlestudent') { if ($crstype eq 'Community') { $title = $lt{'enrm'}; } else { @@ -738,19 +871,13 @@ sub user_modification_js { <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"); - parmwin.close(); - } - $pjump_def $dc_setcourse_code function dateset() { eval("document.cu."+document.cu.pres_marker.value+ ".value=document.cu.pres_value.value"); - pclose(); + modalWindow.close(); } $nondc_setsection_code @@ -761,7 +888,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,$crstype,$brcrum) = @_; my @fields = ('username','domain','lastname','firstname','permanentemail'); my $sortby = $env{'form.sortby'}; @@ -802,25 +929,30 @@ ENDSCRIPT if ($context eq 'requestcrs') { $r->print('<div>'); } else { - $r->print(&Apache::loncommon::start_page('User Management',$jscript)); - my %breadcrumb_text = &singleuser_breadcrumb($crstype); - &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',}); + my $helpitem; + if ($env{'form.action'} eq 'singleuser') { + $helpitem = 'Course_Change_Privileges'; + } elsif ($env{'form.action'} eq 'singlestudent') { + $helpitem = 'Course_Add_Student'; + } + push (@{$brcrum}, + {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', + help => $helpitem} + ); + $r->print(&Apache::loncommon::start_page('User Management',$jscript,{bread_crumbs => $brcrum})); 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,undef,$crstype)); $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'}); @@ -897,12 +1029,12 @@ ENDSCRIPT if ($context eq 'requestcrs') { $r->print($opener_elements.'</form></div>'); } else { - $r->print($response.'</form>'.&Apache::loncommon::end_page()); + $r->print($response.'</form>'); } } sub print_user_query_page { - my ($r,$caller) = @_; + my ($r,$caller,$brcrum) = @_; # FIXME - this is for a network-wide name search (similar to catalog search) # To use frames with similar behavior to catalog/portfolio search. # To be implemented. @@ -910,11 +1042,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,$crstype,$brcrum) = @_; 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,'','',$crstype,$brcrum); return; } my ($form,$formname); @@ -933,7 +1065,8 @@ sub print_user_modification_page { my ($rules,$ruleorder) = &Apache::lonnet::inst_userrules($ccdomain,'username'); $usertype = - &Apache::lonuserutils::check_usertype($ccdomain,$ccuname,$rules); + &Apache::lonuserutils::check_usertype($ccdomain,$ccuname,$rules, + \%curr_rules,\%got_rules); my $cancreate = &Apache::lonuserutils::can_create_user($ccdomain,$context, $usertype); @@ -945,7 +1078,9 @@ sub print_user_modification_page { ); my $response; if ($env{'form.origform'} eq 'crtusername') { - $response = '<span class="LC_warning">'.&mt('No match found for the username [_1] in LON-CAPA domain: [_2]','<b>'.$ccuname.'</b>',$ccdomain). + $response = '<span class="LC_warning">'. + &mt('No match found for the username [_1] in LON-CAPA domain: [_2]', + '<b>'.$ccuname.'</b>',$ccdomain). '</span><br />'; } $response .= '<p class="LC_warning">' @@ -955,7 +1090,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,undef,undef,$crstype,$brcrum); return; } $newuser = 1; @@ -979,7 +1114,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,undef,undef,$crstype,$brcrum); return; } } @@ -1000,34 +1135,37 @@ sub print_user_modification_page { my $js = &validation_javascript($context,$ccdomain,$pjump_def, $groupslist,$newuser,$formname,\%loaditem); - my $args = {'add_entries' => \%loaditem}; - if ($env{'form.popup'}) { - $args->{'no_nav_bar'} = 1; - } - my $start_page = - &Apache::loncommon::start_page('User Management',$js,$args); my %breadcrumb_text = &singleuser_breadcrumb($crstype); - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:backPage($form)", - text=>$breadcrumb_text{'search'}, - faq=>282,bug=>'Instructor Interface',}); - - if ($env{'form.phase'} eq 'userpicked') { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:backPage($form,'get_user_info','select')", - text=>$breadcrumb_text{'userpicked'}, - faq=>282,bug=>'Instructor Interface',}); - } - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:backPage($form,'$env{'form.phase'}','modify')", - text=>$breadcrumb_text{'modify'}, - faq=>282,bug=>'Instructor Interface',}); my $helpitem = 'Course_Change_Privileges'; if ($env{'form.action'} eq 'singlestudent') { $helpitem = 'Course_Add_Student'; } - my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management', - $helpitem); + push (@{$brcrum}, + {href => "javascript:backPage($form)", + text => $breadcrumb_text{'search'}, + faq => 282, + bug => 'Instructor Interface',}); + if ($env{'form.phase'} eq 'userpicked') { + push(@{$brcrum}, + {href => "javascript:backPage($form,'get_user_info','select')", + text => $breadcrumb_text{'userpicked'}, + faq => 282, + bug => 'Instructor Interface',}); + } + push(@{$brcrum}, + {href => "javascript:backPage($form,'$env{'form.phase'}','modify')", + text => $breadcrumb_text{'modify'}, + faq => 282, + bug => 'Instructor Interface', + help => $helpitem}); + my $args = {'add_entries' => \%loaditem, + 'bread_crumbs' => $brcrum, + 'bread_crumbs_component' => 'User Management'}; + if ($env{'form.popup'}) { + $args->{'no_nav_bar'} = 1; + } + my $start_page = + &Apache::loncommon::start_page('User Management',$js,$args); my $forminfo =<<"ENDFORMINFO"; <form action="/adm/createuser" method="post" name="$formname"> @@ -1053,18 +1191,21 @@ ENDFORMINFO } } else { foreach my $key (keys(%env)) { - if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) { - $inccourses{$1.'_'.$2}=1; + if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) { + $inccourses{$1.'_'.$2}=1; } } } if ($newuser) { - my $portfolioform; + my ($portfolioform,$domroleform); if ((&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) || (&Apache::lonnet::allowed('mut',$env{'request.role.domain'}))) { # Current user has quota or user tools modification privileges $portfolioform = '<br />'.&portfolio_quota($ccuname,$ccdomain); } + if (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) { + $domroleform = '<br />'.&domainrole_req($ccuname,$ccdomain); + } &initialize_authen_forms($ccdomain,$formname); my %lt=&Apache::lonlocal::texthash( 'cnu' => 'Create New User', @@ -1076,7 +1217,6 @@ ENDFORMINFO ); $r->print(<<ENDTITLE); $start_page -$crumbs $response $forminfo <script type="text/javascript" language="Javascript"> @@ -1111,7 +1251,8 @@ $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/Communities in this Domain?').'</h3>'. &Apache::loncommon::start_data_table(). &build_tools_display($ccuname,$ccdomain, 'requestcourses'). @@ -1175,7 +1316,7 @@ ENDAUTH } else { $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc)); } - $r->print($portfolioform); + $r->print($portfolioform.$domroleform); if ($env{'form.action'} eq 'singlestudent') { $r->print(&date_sections_select($context,$newuser,$formname, $permission)); @@ -1190,7 +1331,6 @@ ENDAUTH ); $r->print(<<ENDCHANGEUSER); $start_page -$crumbs $forminfo <h2> ENDCHANGEUSER @@ -1210,10 +1350,10 @@ ENDCHANGEUSER $inst_results{$ccuname.':'.$ccdomain}); $r->print($personal_table); if ($showforceid) { - $r->print(&Apache::lonuserutils::forceid_change($context)); + $r->print('<table>'.&Apache::lonuserutils::forceid_change($context).'</table>'); } 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('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'. &Apache::loncommon::start_data_table()); if ($env{'request.role.domain'} eq $ccdomain) { $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses')); @@ -1224,12 +1364,19 @@ ENDCHANGEUSER $r->print(&Apache::loncommon::end_data_table()); } $r->print('</div>'); - my $user_auth_text = &user_authentication($ccuname,$ccdomain,$formname); - my ($user_quota_text,$user_tools_text,$user_reqcrs_text); + my @order = ('auth','quota','tools','requestauthor'); + my %user_text; + my ($isadv,$isauthor) = + &Apache::lonnet::is_advanced_user($ccuname,$ccdomain); + if ((!$isauthor) && + (&Apache::lonnet::allowed('cau',$env{'request.role.domain'}))) { + $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain); + } + $user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname); if ((&Apache::lonnet::allowed('mpq',$ccdomain)) || (&Apache::lonnet::allowed('mut',$ccdomain))) { # Current user has quota modification privileges - $user_quota_text = &portfolio_quota($ccuname,$ccdomain); + $user_text{'quota'} = &portfolio_quota($ccuname,$ccdomain); } if (!&Apache::lonnet::allowed('mpq',$ccdomain)) { if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) { @@ -1241,7 +1388,7 @@ ENDCHANGEUSER 'youd' => "You do not have privileges to modify the portfolio quota for this user.", 'ichr' => "If a change is required, contact a domain coordinator for the domain", ); - $user_quota_text = <<ENDNOPORTPRIV; + $user_text{'quota'} = <<ENDNOPORTPRIV; <h3>$lt{'dska'}</h3> $lt{'youd'} $lt{'ichr'}: $ccdomain ENDNOPORTPRIV @@ -1251,46 +1398,34 @@ 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 Personal Information Page settings for this user.", + 'yodo' => "You do not have privileges to modify Portfolio, Blog, WebDAV, 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; + $user_text{'tools'} = <<ENDNOTOOLSPRIV; <h3>$lt{'utav'}</h3> $lt{'yodo'} $lt{'ifch'}: $ccdomain ENDNOTOOLSPRIV } } - if ($user_auth_text ne '') { - $r->print('<div class="LC_left_float">'.$user_auth_text); - if ($user_quota_text ne '') { - $r->print($user_quota_text); - } - if ($user_tools_text ne '') { - $r->print($user_tools_text); - } - if ($env{'form.action'} eq 'singlestudent') { - $r->print(&date_sections_select($context,$newuser,$formname)); - } - } elsif ($user_quota_text ne '') { - $r->print('<div class="LC_left_float">'.$user_quota_text); - if ($user_tools_text ne '') { - $r->print($user_tools_text); - } - if ($env{'form.action'} eq 'singlestudent') { - $r->print(&date_sections_select($context,$newuser,$formname)); - } - } elsif ($user_tools_text ne '') { - $r->print('<div class="LC_left_float">'.$user_tools_text); - if ($env{'form.action'} eq 'singlestudent') { - $r->print(&date_sections_select($context,$newuser,$formname)); - } - } else { - if ($env{'form.action'} eq 'singlestudent') { - $r->print('<div class="LC_left_float">'. - &date_sections_select($context,$newuser,$formname)); + my $gotdiv = 0; + foreach my $item (@order) { + if ($user_text{$item} ne '') { + unless ($gotdiv) { + $r->print('<div class="LC_left_float">'); + $gotdiv = 1; + } + $r->print('<br />'.$user_text{$item}); } } - $r->print('</div><div class="LC_clear_float_footer"></div>'); + if ($env{'form.action'} eq 'singlestudent') { + unless ($gotdiv) { + $r->print('<div class="LC_left_float">'); + } + $r->print(&date_sections_select($context,$newuser,$formname)); + } + if ($gotdiv) { + $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); @@ -1311,7 +1446,7 @@ ENDNOTOOLSPRIV $addrolesdisplay = &new_coauthor_roles($r,$ccuname,$ccdomain); } if ($context eq 'domain') { - my $add_domainroles = &new_domain_roles($r); + my $add_domainroles = &new_domain_roles($r,$ccdomain); if (!$addrolesdisplay) { $addrolesdisplay = $add_domainroles; } @@ -1336,8 +1471,7 @@ ENDNOTOOLSPRIV } $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain'])); $r->print('<input type="hidden" name="currstate" value="" />'); - $r->print('<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />'); - $r->print("</form>".&Apache::loncommon::end_page()); + $r->print('<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" /></form>'); return; } @@ -1428,7 +1562,7 @@ sub display_existing_roles { 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 = + my %roleshash = &Apache::lonnet::get_my_roles($ccuname,$ccdomain,'userroles', ['active','previous','future'],\@roles,$roledom,1); foreach my $key (keys(%roleshash)) { @@ -1499,7 +1633,7 @@ sub display_existing_roles { if (defined($coursedata{'description'})) { $carea=$coursedata{'description'}. '<br />'.&mt('Domain').': '.$coursedom.(' 'x8). - &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$coursedir,$coursedom); + &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$coursedir,$coursedom); $sortkey.="\0".$coursedata{'description'}; } else { if ($class eq 'Community') { @@ -1517,7 +1651,7 @@ sub display_existing_roles { $allowed=1; } unless ($allowed) { - my $isowner = &is_courseowner($cid,$coursedata{'internal.courseowner'}); + my $isowner = &Apache::lonuserutils::is_courseowner($cid,$coursedata{'internal.courseowner'}); if ($isowner) { if (($role_code eq 'co') && ($class eq 'Community')) { $allowed = 1; @@ -1525,10 +1659,10 @@ sub display_existing_roles { $allowed = 1; } } - } + } if ((&Apache::lonnet::allowed('dro',$coursedom)) || (&Apache::lonnet::allowed('dro',$ccdomain))) { - $delallowed=1; + $delallowed=1; } # - custom role. Needs more info, too if ($croletitle) { @@ -1541,11 +1675,11 @@ sub display_existing_roles { $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; - } - } + if ($env{'request.course.sec'} eq $3) { + if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2.'/'.$3)) { + $allowed = 1; + } + } } } $area=$carea; @@ -1554,8 +1688,8 @@ sub display_existing_roles { # 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; + (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) { + $allowed=1; } if (((&Apache::lonnet::allowed('dro',$1)) || (&Apache::lonnet::allowed('dro',$ccdomain))) && @@ -1567,7 +1701,7 @@ sub display_existing_roles { $allowed=1; } } - if ($role_code eq 'ca' || $role_code eq 'au') { + if ($role_code eq 'ca' || $role_code eq 'au' || $role_code eq 'aa') { $class='Construction Space'; } elsif ($role_code eq 'su') { $class='System'; @@ -1613,13 +1747,16 @@ sub display_existing_roles { $plaintext=&Apache::lonnet::plaintext($role_code,$class) } else { $plaintext= - "Customrole '$croletitle'<br />defined by $croleuname\@$croleudom"; + &mt('Customrole [_1][_2]defined by [_3]', + '"'.$croletitle.'"', + '<br />', + $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><td>'.($role_end_time ?&Apache::lonlocal::locallocaltime($role_end_time) : ' ' ) ."</td>"; $sortrole{$sortkey}=$envkey; @@ -1634,7 +1771,7 @@ sub display_existing_roles { $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}.= + $output{$type}.= &Apache::loncommon::start_data_table_row(). $roletext{$sortrole{$which}}. &Apache::loncommon::end_data_table_row(); @@ -1751,7 +1888,7 @@ sub new_coauthor_roles { } sub new_domain_roles { - my ($r) = @_; + my ($r,$ccdomain) = @_; my $addrolesdisplay = 0; # # Domain level @@ -1769,6 +1906,7 @@ sub new_domain_roles { foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) { foreach my $role (@allroles) { next if ($role eq 'ad'); + next if (($role eq 'au') && ($ccdomain ne $thisdomain)); if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) { my $plrole=&Apache::lonnet::plaintext($role); my %lt=&Apache::lonlocal::texthash( @@ -2176,7 +2314,7 @@ sub get_inststatuses { # ================================================================= Phase Three sub update_user_data { - my ($r,$context,$crstype) = @_; + my ($r,$context,$crstype,$brcrum) = @_; my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'}, $env{'form.ccdomain'}); # Error messages @@ -2201,36 +2339,39 @@ sub update_user_data { '// ]]>'."\n". '</script>'."\n"; my %breadcrumb_text = &singleuser_breadcrumb($crstype); - my $args; - if ($env{'form.popup'}) { - $args->{'no_nav_bar'} = 1; - } else { - $args = undef; - } - $r->print(&Apache::loncommon::start_page($title,$jscript,$args)); - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:backPage(document.userupdate)", - text=>$breadcrumb_text{'search'}, - faq=>282,bug=>'Instructor Interface',}); + push (@{$brcrum}, + {href => "javascript:backPage(document.userupdate)", + text => $breadcrumb_text{'search'}, + faq => 282, + bug => 'Instructor Interface',} + ); if ($env{'form.prevphase'} eq 'userpicked') { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:backPage(document.userupdate,'get_user_info','select')", - text=>$breadcrumb_text{'userpicked'}, - faq=>282,bug=>'Instructor Interface',}); - } - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:backPage(document.userupdate,'$env{'form.prevphase'}','modify')", - text=>$breadcrumb_text{'modify'}, - faq=>282,bug=>'Instructor Interface',}, - {href=>"/adm/createuser", - text=>"Result", - faq=>282,bug=>'Instructor Interface',}); + push(@{$brcrum}, + {href => "javascript:backPage(document.userupdate,'get_user_info','select')", + text => $breadcrumb_text{'userpicked'}, + faq => 282, + bug => 'Instructor Interface',}); + } my $helpitem = 'Course_Change_Privileges'; if ($env{'form.action'} eq 'singlestudent') { $helpitem = 'Course_Add_Student'; } - $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', - $helpitem)); + push(@{$brcrum}, + {href => "javascript:backPage(document.userupdate,'$env{'form.prevphase'}','modify')", + text => $breadcrumb_text{'modify'}, + faq => 282, + bug => 'Instructor Interface',}, + {href => "/adm/createuser", + text => "Result", + faq => 282, + bug => 'Instructor Interface', + help => $helpitem}); + my $args = {bread_crumbs => $brcrum, + bread_crumbs_component => 'User Management'}; + if ($env{'form.popup'}) { + $args->{'no_nav_bar'} = 1; + } + $r->print(&Apache::loncommon::start_page($title,$jscript,$args)); $r->print(&update_result_form($uhome)); # Check Inputs if (! $env{'form.ccuname'} ) { @@ -2291,16 +2432,20 @@ sub update_user_data { # If they are creating a new user but have not specified login # information this will be caught below. } else { - $r->print($error.&mt('Invalid login mode or password').$end.$rtnlink); - return; + $r->print($error.&mt('Invalid login mode or password').$end.$rtnlink); + return; } $r->print('<h3>'.&mt('User [_1] in domain [_2]', - $env{'form.ccuname'}, $env{'form.ccdomain'}).'</h3>'); + $env{'form.ccuname'}.' ('.&Apache::loncommon::plainname($env{'form.ccuname'}, + $env{'form.ccdomain'}).')', $env{'form.ccdomain'}).'</h3>'); + my %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,2); + my (%alerts,%rulematch,%inst_results,%curr_rules); my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id'); - my @usertools = ('aboutme','blog','portfolio'); + my @usertools = ('aboutme','blog','webdav','portfolio'); my @requestcourses = ('official','unofficial','community'); + my @requestauthor = ('requestauthor'); my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'}); my %canmodify_status = @@ -2355,6 +2500,7 @@ sub update_user_data { } } } + &Apache::lonhtmlcommon::Increment_PrgWin($r, \%prog_state); # Call modifyuser my $result = &Apache::lonnet::modifyuser ($env{'form.ccdomain'},$env{'form.ccuname'},$env{'form.cid'}, @@ -2381,7 +2527,7 @@ sub update_user_data { if ($env{'form.custom'.$item} == 1) { $newcustom{$item} = $env{'form.tools_'.$item}; $changed{$item} = &tool_admin($item,$newcustom{$item}, - \%changeHash,'tools'); + \%changeHash,'tools'); } } foreach my $item (@requestcourses) { @@ -2397,6 +2543,12 @@ sub update_user_data { \%changeHash,'requestcourses'); } } + if ($env{'form.customrequestauthor'} == 1) { + $newcustom{'requestauthor'} = $env{'form.requestauthor'}; + $changed{'requestauthor'} = &tool_admin('requestauthor', + $newcustom{'requestauthor'}, + \%changeHash,'requestauthor'); + } } if ($canmodify_status{'inststatus'}) { if (exists($env{'form.inststatus'})) { @@ -2438,8 +2590,10 @@ sub update_user_data { $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.'.$end); } } + $r->rflush(); # Finish display of header before time consuming actions start + &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state); ## - 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); @@ -2449,10 +2603,11 @@ sub update_user_data { my %userenv = &Apache::lonnet::get ('environment',['firstname','middlename','lastname','generation', 'id','permanentemail','portfolioquota','inststatus','tools.aboutme', - 'tools.blog','tools.portfolio','requestcourses.official', - 'requestcourses.unofficial','requestcourses.community', - 'reqcrsotherdom.official','reqcrsotherdom.unofficial', - 'reqcrsotherdom.community'], + 'tools.blog','tools.webdav','tools.portfolio', + 'requestcourses.official','requestcourses.unofficial', + 'requestcourses.community','reqcrsotherdom.official', + 'reqcrsotherdom.unofficial','reqcrsotherdom.community', + 'requestauthor'], $env{'form.ccdomain'},$env{'form.ccuname'}); my ($tmp) = keys(%userenv); if ($tmp =~ /^(con_lost|error)/i) { @@ -2580,13 +2735,13 @@ sub update_user_data { $olddefquota,$oldsettingstatus,$newdefquota,$newsettingstatus); @disporder = ('inststatus'); if ($env{'request.role.domain'} eq $env{'form.ccdomain'}) { - push(@disporder,'requestcourses'); + push(@disporder,'requestcourses','requestauthor'); } else { push(@disporder,'reqcrsotherdom'); } push(@disporder,('quota','tools')); $oldinststatus = $userenv{'inststatus'}; - ($olddefquota,$oldsettingstatus) = + ($olddefquota,$oldsettingstatus) = &Apache::loncommon::default_quota($env{'form.ccdomain'},$oldinststatus); ($newdefquota,$newsettingstatus) = ($olddefquota,$oldsettingstatus); my %canshow; @@ -2604,9 +2759,12 @@ sub update_user_data { if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) { $canshow{'inststatus'} = 1; } + if (&Apache::lonnet::allowed('cau',$env{'form.ccdomain'})) { + $canshow{'requestauthor'} = 1; + } my (%changeHash,%changed); if ($oldinststatus eq '') { - $oldsettings{'inststatus'} = $othertitle; + $oldsettings{'inststatus'} = $othertitle; } else { if (ref($usertypes) eq 'HASH') { $oldsettings{'inststatus'} = join(', ',map{ $usertypes->{ &unescape($_) }; } (split(/:/,$userenv{'inststatus'}))); @@ -2628,7 +2786,7 @@ sub update_user_data { &Apache::loncommon::default_quota($env{'form.ccdomain'},$newinststatus); } if (ref($usertypes) eq 'HASH') { - $newsettings{'inststatus'} = join(', ',map{ $usertypes->{$_}; } (@inststatuses)); + $newsettings{'inststatus'} = join(', ',map{ $usertypes->{$_}; } (@inststatuses)); } else { $newsettings{'inststatus'} = join(', ',@inststatuses); } @@ -2693,6 +2851,7 @@ sub update_user_data { if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) { &tool_changes('requestcourses',\@requestcourses,\%oldsettings,\%oldsettingstext, \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext); + &tool_changes('requestauthor',\@requestauthor,\%oldsettings,\%oldsettingstext,\%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext); } else { &tool_changes('reqcrsotherdom',\@requestcourses,\%oldsettings,\%oldsettingstext, \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext); @@ -2720,13 +2879,22 @@ sub update_user_data { || ($key eq 'community')) { $newenvhash{'environment.requestcourses.'.$key} = $changeHash{'requestcourses.'.$key}; - if ($changeHash{'requestcourses.'.$key} ne '') { + if ($changeHash{'requestcourses.'.$key}) { $newenvhash{'environment.canrequest.'.$key} = 1; } else { $newenvhash{'environment.canrequest.'.$key} = &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'}, $key,'reload','requestcourses'); } + } elsif ($key eq 'requestauthor') { + $newenvhash{'environment.'.$key} = $changeHash{$key}; + if ($changeHash{$key}) { + $newenvhash{'environment.canrequest.author'} = 1; + } else { + $newenvhash{'environment.canrequest.author'} = + &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'}, + $key,'reload','requestauthor'); + } } elsif ($key ne 'quota') { $newenvhash{'environment.tools.'.$key} = $changeHash{'tools.'.$key}; @@ -2735,7 +2903,8 @@ sub update_user_data { $changeHash{'tools.'.$key}; } else { $newenvhash{'environment.availabletools.'.$key} = - &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'}, $key,'reload','tools'); + &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'}, + $key,'reload','tools'); } } } @@ -2764,14 +2933,13 @@ sub update_user_data { id => $env{'form.cid'}, ); } - if (((keys(%namechanged) > 0) && $namechgresult eq 'ok') || + if (((keys(%namechanged) > 0) && $namechgresult eq 'ok') || ((keys(%changed) > 0) && $chgresult eq 'ok')) { # Tell the user we changed the name &display_userinfo($r,1,\@disporder,\%canshow,\@requestcourses, - \@usertools,\%userenv,\%changed,\%namechanged, + \@usertools,\@requestauthor,\%userenv,\%changed,\%namechanged, \%oldsettings, \%oldsettingstext,\%newsettings, \%newsettingstext); - if ($env{'form.cid'} ne $userenv{'id'}) { &Apache::lonnet::idput($env{'form.ccdomain'}, ($env{'form.ccuname'} => $env{'form.cid'})); @@ -2802,7 +2970,7 @@ sub update_user_data { # or ability to request creation of courses, # but we can still tell them what the name and quota and availabilities are &display_userinfo($r,undef,\@disporder,\%canshow,\@requestcourses, - \@usertools,\%userenv,\%changed,\%namechanged,\%oldsettings, + \@usertools,\@requestauthor,\%userenv,\%changed,\%namechanged,\%oldsettings, \%oldsettingstext,\%newsettings,\%newsettingstext); } if (@mod_disallowed) { @@ -2839,6 +3007,7 @@ sub update_user_data { .&Apache::lonuserutils::print_namespacing_alerts($env{'form.ccdomain'},\%alerts,\%curr_rules) .'</span>'); } + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); 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)">'); @@ -2870,23 +3039,22 @@ sub update_user_data { if ($env{'form.popup'}) { $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>'); } else { - $r->print('<p><a href="javascript:backPage(document.userupdate,'."'$env{'form.prevphase'}','modify'".')">' - .&mt('Modify this user: [_1]','<span class="LC_cusr_emph">'.$env{'form.ccuname'}.':'.$env{'form.ccdomain'}.' ('.$userinfo.')</span>').'</a>' - .(' 'x5).'<a href="javascript:backPage(document.userupdate)">' - .&mt('Create/Modify Another User').'</a></p>'); + $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(['<a href="javascript:backPage(document.userupdate,'."'$env{'form.prevphase'}','modify'".')">' + .&mt('Modify this user: [_1]','<span class="LC_cusr_emph">'.$env{'form.ccuname'}.':'.$env{'form.ccdomain'}.' ('.$userinfo.')</span>').'</a>', + '<a href="javascript:backPage(document.userupdate)">'.&mt('Create/Modify Another User').'</a>'])); } } - $r->print(&Apache::loncommon::end_page()); } sub display_userinfo { - my ($r,$changed,$order,$canshow,$requestcourses,$usertools,$userenv, - $changedhash,$namechangedhash,$oldsetting,$oldsettingtext, + my ($r,$changed,$order,$canshow,$requestcourses,$usertools,$requestauthor, + $userenv,$changedhash,$namechangedhash,$oldsetting,$oldsettingtext, $newsetting,$newsettingtext) = @_; return unless (ref($order) eq 'ARRAY' && - ref($canshow) eq 'HASH' && - ref($requestcourses) eq 'ARRAY' && - ref($usertools) eq 'ARRAY' && + ref($canshow) eq 'HASH' && + ref($requestcourses) eq 'ARRAY' && + ref($requestauthor) eq 'ARRAY' && + ref($usertools) eq 'ARRAY' && ref($userenv) eq 'HASH' && ref($changedhash) eq 'HASH' && ref($oldsetting) eq 'HASH' && @@ -2904,82 +3072,50 @@ sub display_userinfo { 'permanentemail' => 'Permanent e-mail address', 'quota' => 'Disk space allocated to portfolio files', 'blog' => 'Blog Availability', + 'webdav' => 'WebDAV Availability', 'aboutme' => 'Personal Information Page Availability', 'portfolio' => 'Portfolio Availability', 'official' => 'Can Request Official Courses', 'unofficial' => 'Can Request Unofficial Courses', 'community' => 'Can Request Communities', + 'requestauthor' => 'Can Request Author Role', 'inststatus' => "Affiliation", 'prvs' => 'Previous Value:', 'chto' => 'Changed To:' ); - my $title = $lt{'ui'}; + my $title = $lt{'ui'}; if ($changed) { $title = $lt{'uic'}; - } - $r->print('<h4>'.$title.'</h4>'. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row()); - if ($changed) { + $r->print('<h4>'.$title.'</h4>'. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row()); $r->print("<th> </th>\n"); - } - my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id'); - foreach my $item (@userinfo) { - $r->print("<th>$lt{$item}</th>\n"); - } - foreach my $entry (@{$order}) { - if ($canshow->{$entry}) { - if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom')) { - foreach my $item (@{$requestcourses}) { - $r->print("<th>$lt{$item}</th>\n"); - } - } elsif ($entry eq 'tools') { - foreach my $item (@{$usertools}) { - $r->print("<th>$lt{$item}</th>\n"); - } - } else { - $r->print("<th>$lt{$entry}</th>\n"); - } - } - } - $r->print(&Apache::loncommon::end_data_table_header_row(). - &Apache::loncommon::start_data_table_row()); - if ($changed) { - $r->print('<td><b>'.$lt{'prvs'}.'</b></td>'."\n"); - } - foreach my $item (@userinfo) { - $r->print('<td>'.$userenv->{$item}.' </td>'."\n"); - } - foreach my $entry (@{$order}) { - if ($canshow->{$entry}) { - if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom')) { - foreach my $item (@{$requestcourses}) { - $r->print("<td>$oldsetting->{$item} $oldsettingtext->{$item}</td>\n"); - } - } elsif ($entry eq 'tools') { - foreach my $item (@{$usertools}) { - $r->print("<td>$oldsetting->{$item} $oldsettingtext->{$item}</td>\n"); - } - } else { - $r->print("<td>$oldsetting->{$entry} $oldsettingtext->{$entry} </td>\n"); - } - } - } - $r->print(&Apache::loncommon::end_data_table_row()); - if ($changed) { - $r->print(&Apache::loncommon::start_data_table_row(). - '<td><span class="LC_nobreak"><b>'.$lt{'chto'}.'</b></span></td>'."\n"); + $r->print('<th><b>'.$lt{'prvs'}.'</b></th>'); + $r->print('<th><span class="LC_nobreak"><b>'.$lt{'chto'}.'</b></span></th>'); + $r->print(&Apache::loncommon::end_data_table_header_row()); + my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id'); + + foreach my $item (@userinfo) { my $value = $env{'form.c'.$item}; - if ($namechangedhash->{$item}) { - $value = '<span class="LC_cusr_emph">'.$value.'</span>'; + #show changes only: + unless($value eq $userenv->{$item}){ + $r->print(&Apache::loncommon::start_data_table_row()); + + $r->print("<td>$lt{$item}</td>\n"); + $r->print('<td>'.$userenv->{$item}.' </td>'); + $r->print("<td>$value </td>\n"); + + $r->print(&Apache::loncommon::end_data_table_row()); } - $r->print("<td>$value </td>\n"); } foreach my $entry (@{$order}) { - if ($canshow->{$entry}) { + if ($canshow->{$entry} && ($newsetting->{$entry} ne $newsetting->{$entry})) { + $r->print(&Apache::loncommon::start_data_table_row()); if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom')) { foreach my $item (@{$requestcourses}) { + $r->print("<td>$lt{$item}</td>\n"); + $r->print("<td>$oldsetting->{$item} $oldsettingtext->{$item}</td>\n"); my $value = $newsetting->{$item}.' '.$newsettingtext->{$item}; if ($changedhash->{$item}) { $value = '<span class="LC_cusr_emph">'.$value.'</span>'; @@ -2988,6 +3124,8 @@ sub display_userinfo { } } elsif ($entry eq 'tools') { foreach my $item (@{$usertools}) { + $r->print("<td>$lt{$item}</td>\n"); + $r->print("<td>$oldsetting->{$item} $oldsettingtext->{$item}</td>\n"); my $value = $newsetting->{$item}.' '.$newsettingtext->{$item}; if ($changedhash->{$item}) { $value = '<span class="LC_cusr_emph">'.$value.'</span>'; @@ -2995,17 +3133,19 @@ sub display_userinfo { $r->print("<td>$value </td>\n"); } } else { + $r->print("<td>$lt{$entry}</td>\n"); + $r->print("<td>$oldsetting->{$entry} $oldsettingtext->{$entry} </td>\n"); my $value = $newsetting->{$entry}.' '.$newsettingtext->{$entry}; if ($changedhash->{$entry}) { $value = '<span class="LC_cusr_emph">'.$value.'</span>'; } $r->print("<td>$value </td>\n"); } + $r->print(&Apache::loncommon::end_data_table_row()); } } - $r->print(&Apache::loncommon::end_data_table_row()); + $r->print(&Apache::loncommon::end_data_table().'<br />'); } - $r->print(&Apache::loncommon::end_data_table().'<br />'); return; } @@ -3104,25 +3244,29 @@ sub tool_changes { return; } foreach my $tool (@{$usertools}) { - my $newval; + my ($newval,$envkey); + $envkey = $context.'.'.$tool; if ($context eq 'requestcourses') { $newval = $env{'form.crsreq_'.$tool}; if ($newval eq 'autolimit') { $newval .= '='.$env{'form.crsreq_'.$tool.'_limit'}; } + } elsif ($context eq 'requestauthor') { + $newval = $env{'form.'.$context}; + $envkey = $context; } else { $newval = $env{'form.'.$context.'_'.$tool}; } - if ($userenv->{$context.'.'.$tool} ne '') { + if ($userenv->{$envkey} ne '') { $oldaccess->{$tool} = &mt('custom'); - if ($userenv->{$context.'.'.$tool}) { + if ($userenv->{$envkey}) { $oldaccesstext->{$tool} = &mt("availability set to 'on'"); } else { $oldaccesstext->{$tool} = &mt("availability set to 'off'"); } - $changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool}; + $changeHash->{$envkey} = $userenv->{$envkey}; if ($env{'form.custom'.$tool} == 1) { - if ($newval ne $userenv->{$context.'.'.$tool}) { + if ($newval ne $userenv->{$envkey}) { $changed->{$tool} = &tool_admin($tool,$newval,$changeHash, $context); if ($changed->{$tool}) { @@ -3198,14 +3342,15 @@ sub update_roles { &Apache::lonnet::revokerole($env{'form.ccdomain'}, $env{'form.ccuname'}, $scope,$role,'','',$context); - $r->print(&mt('Revoking [_1] in [_2]: [_3]', - $role,$scope,'<b>'.$result.'</b>').'<br />'); + $r->print(&Apache::lonhtmlcommon::confirm_success( + &mt('Revoking [_1] in [_2]', &Apache::lonnet::plaintext($role), '"'.&cid_to_cname($scope).'"<br />'), + $result ne "ok")); if ($role eq 'st') { my $result = &Apache::lonuserutils::classlist_drop($scope, $env{'form.ccuname'},$env{'form.ccdomain'}, $now); - $r->print($result); + $r->print(&Apache::lonhtmlcommon::confirm_success($result)); } if (!grep(/^\Q$role\E$/,@rolechanges)) { push(@rolechanges,$role); @@ -3213,11 +3358,10 @@ sub update_roles { } if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}s) { # Revoke custom role - $r->print(&mt('Revoking custom role:'). - ' '.$4.' by '.$3.':'.$2.' in '.$1.': <b>'. - &Apache::lonnet::revokecustomrole($env{'form.ccdomain'}, - $env{'form.ccuname'},$1,$2,$3,$4,'','',$context). - '</b><br />'); + $r->print(&Apache::lonhtmlcommon::confirm_success( + &mt('Revoking custom role [_1] by [_2]:[_3] in [_4]',$4,$3,$2,'"'.&cid_to_cname($1).'"<br />'), + &Apache::lonnet::revokecustomrole($env{'form.ccdomain'},$env{'form.ccuname'},$1,$2,$3,$4,'','',$context) ne 'ok')); + if (!grep(/^cr$/,@rolechanges)) { push(@rolechanges,'cr'); } @@ -3231,8 +3375,10 @@ sub update_roles { $env{'form.ccuname'}, $scope,$role,$now,0,1,'', $context); - $r->print(&mt('Deleting [_1] in [_2]: [_3]',$role,$scope, - '<b>'.$result.'</b>').'<br />'); + $r->print(&Apache::lonhtmlcommon::confirm_success( + &mt('Deleting [_1] in [_2]', + &Apache::lonnet::plaintext($role),'"'.&cid_to_cname($scope).'"<br />'),$result ne 'ok')); + if ($role eq 'st') { my $result = &Apache::lonuserutils::classlist_drop($scope, @@ -3247,11 +3393,12 @@ 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] in [_3]', - $rolename,$rnam.':'.$rdom,$url).': <b>'. + $r->print(&confirm_success(&mt('Deleting custom role [_1] by [_2] in [_3]', + $rolename,$rnam.':'.$rdom,'"'.&cid_to_cname($1).'"').'<br />')); &Apache::lonnet::assigncustomrole($env{'form.ccdomain'}, $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now, - 0,1,$context).'</b><br />'); + 0,1,$context); + if (!grep(/^cr$/,@rolechanges)) { push(@rolechanges,'cr'); } @@ -3275,18 +3422,16 @@ sub update_roles { $output = "Error: $result\n"; } } else { - $output = &mt('Assigning').' '.$role.' in '.$url. - &mt('starting').' '.localtime($now). - ': <br />'.$logmsg.'<br />'. - &mt('Add to classlist').': <b>ok</b><br />'; + $output = &Apache::lonhtmlcommon::confirm_success(&mt('Assigning [_1] in [_2] starting [_3]',&Apache::lonnet::plaintext($role), + '"'.&cid_to_cname($url).'"',&Apache::lonlocal::locallocaltime($now))).'<br />'.$logmsg.'<br />'; } } } else { my $result=&Apache::lonnet::assignrole($env{'form.ccdomain'}, $env{'form.ccuname'},$url,$role,0,$now,'','', $context); - $output = &mt('Re-enabling [_1] in [_2]: [_3]', - $role,$url,'<b>'.$result.'</b>').'<br />'; + $output = &Apache::lonhtmlcommon::confirm_success(&mt('Re-enabling [_1] in [_2]', + &Apache::lonnet::plaintext($role),'"'.&cid_to_cname($url).'"').'<br />',$result ne "ok"); } $r->print($output); if (!grep(/^\Q$role\E$/,@rolechanges)) { @@ -3299,8 +3444,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] in [_3]: [_4]', - $rolename,$rnam.':'.$rdom,$url,'<b>'.$result.'</b>').'<br />'); + $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Re-enabling custom role [_1] by [_2] in [_3]', + $rolename,$rnam.':'.$rdom,'"'.&cid_to_cname($1).'"').'<br />'),$result ne "ok"); if (!grep(/^cr$/,@rolechanges)) { push(@rolechanges,'cr'); } @@ -3438,7 +3583,7 @@ sub update_roles { } } # End of foreach (keys(%env)) # Flush the course logs so reverse user roles immediately updated - &Apache::lonnet::flushcourselogs(); + $r->register_cleanup(\&Apache::lonnet::flushcourselogs); if (@rolechanges == 0) { $r->print(&mt('No roles to modify')); } @@ -3491,8 +3636,8 @@ sub enroll_single_student { $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>'); } } else { $r->print(&mt('unable to enroll').": ".$enroll_result); @@ -3520,7 +3665,7 @@ sub get_defaultquota_text { sub update_result_form { my ($uhome) = @_; my $outcome = - '<form name="userupdate" method="post" />'."\n"; + '<form name="userupdate" method="post" action="">'."\n"; foreach my $item ('srchby','srchin','srchtype','srchterm','srchdomain','ccuname','ccdomain') { $outcome .= '<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n"; } @@ -3566,6 +3711,10 @@ sub tool_admin { if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { $canchange = 1; } + } elsif ($context eq 'requestauthor') { + if (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) { + $canchange = 1; + } } elsif (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) { # Current user has quota modification privileges $canchange = 1; @@ -3574,7 +3723,11 @@ sub tool_admin { if ($canchange) { if (ref($changeHash) eq 'HASH') { $toolchanged = 1; - $changeHash->{$context.'.'.$tool} = $settool; + if ($tool eq 'requestauthor') { + $changeHash->{$context} = $settool; + } else { + $changeHash->{$context.'.'.$tool} = $settool; + } } } return $toolchanged; @@ -3616,20 +3769,15 @@ sub build_roles { # ========================================================== Custom Role Editor sub custom_role_editor { - my ($r) = @_; + my ($r,$brcrum) = @_; my $action = $env{'form.customroleaction'}; - my $rolename; + my $rolename; if ($action eq 'new') { $rolename=$env{'form.newrolename'}; } else { $rolename=$env{'form.rolename'}; } - $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(); @@ -3638,6 +3786,13 @@ sub custom_role_editor { $context = 'domain'; $crstype = $env{'form.templatecrstype'}; } + + $rolename=~s/[^A-Za-z0-9]//gs; + if (!$rolename || $env{'form.phase'} eq 'pickrole') { + &print_username_entry_form($r,undef,undef,undef,undef,$crstype,$brcrum); + return; + } + # ------------------------------------------------------- What can be assigned? my %full=(); my %courselevel=(); @@ -3655,7 +3810,7 @@ sub custom_role_editor { # ------------------------------------------------- Get current role privileges ($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef); if ($crstype eq 'Community') { - $syspriv =~ s/bre\&S//; + $syspriv =~ s/bre\&S//; } } else { $body_top .= &mt('New Role').' "'; @@ -3696,8 +3851,8 @@ 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"; + $head_script .= '<script type="text/javascript">'."\n" + .'// <![CDATA['."\n"; my @template_roles = ("in","ta","ep"); if ($context eq 'domain') { push(@template_roles,"ad"); @@ -3741,21 +3896,26 @@ sub custom_role_editor { $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"; - $r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script)); - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:backPage(document.form1,'pickrole','')", - text=>"Pick custom role", - faq=>282,bug=>'Instructor Interface',}, - {href=>"javascript:backPage(document.form1,'','')", - text=>"Edit custom role", - faq=>282,bug=>'Instructor Interface',}); - $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', - 'Course_Editing_Custom_Roles')); - $r->print($body_top); + $head_script .= "\n".$jsback."\n" + .'// ]]>'."\n" + .'</script>'."\n"; + push (@{$brcrum}, + {href => "javascript:backPage(document.form1,'pickrole','')", + text => "Pick custom role", + faq => 282,bug=>'Instructor Interface',}, + {href => "javascript:backPage(document.form1,'','')", + text => "Edit custom role", + faq => 282, + bug => 'Instructor Interface', + help => 'Course_Editing_Custom_Roles'} + ); + my $args = { bread_crumbs => $brcrum, + bread_crumbs_component => 'User Management'}; + + $r->print(&Apache::loncommon::start_page('Custom Role Editor', + $head_script,$args). + $body_top); my %lt=&Apache::lonlocal::texthash( 'prv' => "Privilege", 'crl' => "Course Level", @@ -3799,7 +3959,7 @@ ENDCCF ($domainlevelcurrent{$priv}?' checked="checked"':'').' />':' '). '</td><td>'); if ($priv eq 'bre' && $crstype eq 'Community') { - $r->print(' '); + $r->print(' '); } else { $r->print($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s"'. ($systemlevelcurrent{$priv}?' checked="checked"':'').' />':' '); @@ -3812,8 +3972,7 @@ ENDCCF '<input type="hidden" name="startrolename" value="'.$env{'form.rolename'}. '" />'."\n".'<input type="hidden" name="currstate" value="" />'."\n". '<input type="reset" value="'.&mt("Reset").'" />'."\n". - '<input type="submit" value="'.&mt('Save').'" /></form>'. - &Apache::loncommon::end_page()); + '<input type="submit" value="'.&mt('Save').'" /></form>'); } # -------------------------------------------------------- sub make_script_template { @@ -3891,33 +4050,37 @@ sub make_button_code { } # ---------------------------------------------------------- Call to definerole sub set_custom_role { - my ($r,$context) = @_; + my ($r,$context,$brcrum) = @_; my $rolename=$env{'form.rolename'}; $rolename=~s/[^A-Za-z0-9]//gs; if (!$rolename) { - &custom_role_editor($r); + &custom_role_editor($r,$brcrum); return; } my ($jsback,$elements) = &crumb_utilities(); - my $jscript = '<script type="text/javascript">'. - '// <![CDATA['."\n". - $jsback."\n". - '// ]]>'."\n". - '</script>'; - - $r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript); - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:backPage(document.customresult,'pickrole','')", - text=>"Pick custom role", - faq=>282,bug=>'Instructor Interface',}, - {href=>"javascript:backPage(document.customresult,'selected_custom_edit','')", - text=>"Edit custom role", - faq=>282,bug=>'Instructor Interface',}, - {href=>"javascript:backPage(document.customresult,'set_custom_roles','')", - text=>"Result", - faq=>282,bug=>'Instructor Interface',}); - $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', - 'Course_Editing_Custom_Roles')); + my $jscript = '<script type="text/javascript">' + .'// <![CDATA['."\n" + .$jsback."\n" + .'// ]]>'."\n" + .'</script>'."\n"; + push(@{$brcrum}, + {href => "javascript:backPage(document.customresult,'pickrole','')", + text => "Pick custom role", + faq => 282, + bug => 'Instructor Interface',}, + {href => "javascript:backPage(document.customresult,'selected_custom_edit','')", + text => "Edit custom role", + faq => 282, + bug => 'Instructor Interface',}, + {href => "javascript:backPage(document.customresult,'set_custom_roles','')", + text => "Result", + faq => 282, + bug => 'Instructor Interface', + help => 'Course_Editing_Custom_Roles'}, + ); + my $args = { bread_crumbs => $brcrum, + bread_crumbs_component => 'User Management'}; + $r->print(&Apache::loncommon::start_page('Save Custom Role',$jscript,$args)); my ($rdummy,$roledef)= &Apache::lonnet::get('roles',["rolesdef_$rolename"]); @@ -3974,7 +4137,6 @@ sub set_custom_role { } $r->print('<p><a href="javascript:backPage(document.customresult,'."'pickrole'".')">'.&mt('Create or edit another custom role').'</a></p><form name="customresult" method="post">'); $r->print(&Apache::lonhtmlcommon::echo_form_input([]).'</form>'); - $r->print(&Apache::loncommon::end_page()); } # ================================================================ Main Handler @@ -3998,17 +4160,24 @@ sub handler { ['action','state','callingform','roletype','showrole','bulkaction','popup','phase', 'username','domain','srchterm','srchdomain','srchin','srchby','srchtype']); &Apache::lonhtmlcommon::clear_breadcrumbs(); + my $args; + my $brcrum = []; + my $bread_crumbs_component = 'User Management'; if ($env{'form.action'} ne 'dateselect') { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"/adm/createuser", - 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'}); + $brcrum = [{href=>"/adm/createuser", + 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,$crstype); if (!$allowed) { + if ($context eq 'course') { + $r->internal_redirect('/adm/viewclasslist'); + return OK; + } $env{'user.error.msg'}= "/adm/createuser:cst:0:0:Cannot create/modify user data ". "or view user status."; @@ -4020,17 +4189,20 @@ sub handler { # Main switch on form.action and form.state, as appropriate if (! exists($env{'form.action'})) { - $r->print(&header()); - $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); + $args = {bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component}; + $r->print(&header(undef,$args)); $r->print(&print_main_menu($permission,$context,$crstype)); - $r->print(&Apache::loncommon::end_page()); } elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) { - $r->print(&header()); - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/createuser?action=upload&state=', - text=>"Upload Users List"}); - $r->print(&Apache::lonhtmlcommon::breadcrumbs('Upload Users List', - 'Course_Create_Class_List')); + push(@{$brcrum}, + { href => '/adm/createuser?action=upload&state=', + text => 'Upload Users List', + help => 'Course_Create_Class_List', + }); + $bread_crumbs_component = 'Upload Users List'; + $args = {bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component}; + $r->print(&header(undef,$args)); $r->print('<form name="studentform" method="post" '. 'enctype="multipart/form-data" '. ' action="/adm/createuser">'."\n"); @@ -4046,7 +4218,6 @@ sub handler { } else { &Apache::lonuserutils::print_first_users_upload_form($r,$context); } - $r->print('</form>'.&Apache::loncommon::end_page()); } elsif ((($env{'form.action'} eq 'singleuser') || ($env{'form.action'} eq 'singlestudent')) && ($permission->{'cusr'})) { my $phase = $env{'form.phase'}; @@ -4061,15 +4232,19 @@ sub handler { if ($env{'form.phase'} eq 'createnewuser') { my $response; if ($env{'form.srchterm'} !~ /^$match_username$/) { - my $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @'); + my $response = + '<span class="LC_warning">' + .&mt('You must specify a valid username. Only the following are allowed:' + .' letters numbers - . @') + .'</span>'; $env{'form.phase'} = ''; - &print_username_entry_form($r,$context,$response,$srch,undef,$crstype); + &print_username_entry_form($r,$context,$response,$srch,undef,$crstype,$brcrum); } 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,$crstype,$brcrum); } } elsif ($env{'form.phase'} eq 'get_user_info') { my ($currstate,$response,$forcenewuser,$results) = @@ -4079,7 +4254,8 @@ sub handler { } if ($currstate eq 'select') { &print_user_selection_page($r,$response,$srch,$results, - \@search,$context,undef,$crstype); + \@search,$context,undef,$crstype, + $brcrum); } elsif ($currstate eq 'modify') { my ($ccuname,$ccdomain); if (($srch->{'srchby'} eq 'uname') && @@ -4097,66 +4273,99 @@ sub handler { } &print_user_modification_page($r,$ccuname,$ccdomain, $srch,$response,$context, - $permission,$crstype); + $permission,$crstype,$brcrum); } elsif ($currstate eq 'query') { - &print_user_query_page($r,'createuser'); + &print_user_query_page($r,'createuser',$brcrum); } else { $env{'form.phase'} = ''; &print_username_entry_form($r,$context,$response,$srch, - $forcenewuser,$crstype); + $forcenewuser,$crstype,$brcrum); } } 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,$crstype, + $brcrum); } } elsif ($env{'form.phase'} eq 'update_user_data') { - &update_user_data($r,$context,$crstype); + &update_user_data($r,$context,$crstype,$brcrum); } else { - &print_username_entry_form($r,$context,undef,$srch,undef,$crstype); + &print_username_entry_form($r,$context,undef,$srch,undef,$crstype, + $brcrum); } } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) { if ($env{'form.phase'} eq 'set_custom_roles') { - &set_custom_role($r,$context); + &set_custom_role($r,$context,$brcrum); } else { - &custom_role_editor($r); + &custom_role_editor($r,$brcrum); + } + } elsif (($env{'form.action'} eq 'processauthorreq') && + ($permission->{'cusr'}) && + (&Apache::lonnet::allowed('cau',$env{'request.role.domain'}))) { + push(@{$brcrum}, + {href => '/adm/createuser?action=processauthorreq', + text => 'Authoring space requests', + help => 'Domain_Role_Approvals'}); + $bread_crumbs_component = 'Authoring requests'; + if ($env{'form.state'} eq 'done') { + push(@{$brcrum}, + {href => '/adm/createuser?action=authorreqqueue', + text => 'Result', + help => 'Domain_Role_Approvals'}); + $bread_crumbs_component = 'Authoring request result'; + } + $args = { bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component}; + $r->print(&header(undef,$args)); + if (!exists($env{'form.state'})) { + $r->print(&Apache::loncoursequeueadmin::display_queued_requests('requestauthor', + $env{'request.role.domain'})); + } elsif ($env{'form.state'} eq 'done') { + $r->print('<h3>'.&mt('Authoring request processing').'</h3>'."\n"); + $r->print(&Apache::loncoursequeueadmin::update_request_queue('requestauthor', + $env{'request.role.domain'})); } } elsif (($env{'form.action'} eq 'listusers') && ($permission->{'view'} || $permission->{'cusr'})) { if ($env{'form.phase'} eq 'bulkchange') { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/createuser?action=listusers', - text=>"List Users"}, - {href=>"/adm/createuser", - text=>"Result"}); + push(@{$brcrum}, + {href => '/adm/createuser?action=listusers', + text => "List Users"}, + {href => "/adm/createuser", + text => "Result", + help => 'Course_View_Class_List'}); + $bread_crumbs_component = 'Update Users'; + $args = {bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component}; + $r->print(&header(undef,$args)); my $setting = $env{'form.roletype'}; my $choice = $env{'form.bulkaction'}; - $r->print(&header()); - $r->print(&Apache::lonhtmlcommon::breadcrumbs("Update Users", - 'Course_View_Class_List')); if ($permission->{'cusr'}) { &Apache::lonuserutils::update_user_list($r,$context,$setting,$choice,$crstype); - $r->print(&Apache::loncommon::end_page()); } else { $r->print(&mt('You are not authorized to make bulk changes to user roles')); $r->print('<p><a href="/adm/createuser?action=listusers">'.&mt('Display User Lists').'</a>'); - $r->print(&Apache::loncommon::end_page()); } } else { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/createuser?action=listusers', - text=>"List Users"}); + push(@{$brcrum}, + {href => '/adm/createuser?action=listusers', + text => "List Users", + help => 'Course_View_Class_List'}); + $bread_crumbs_component = 'List Users'; + $args = {bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component}; my ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles); my $formname = 'studentform'; + my $hidecall = "hide_searching();"; 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) = + ($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 = + $cb_jscript = &Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'}); my %elements = ( coursepick => 'radio', @@ -4165,155 +4374,219 @@ sub handler { ); $jscript = &Apache::lonhtmlcommon::set_form_elements(\%elements); } - $jscript .= &verify_user_display(); + $jscript .= &verify_user_display($context)."\n". + &Apache::loncommon::check_uncheck_jscript(); my $js = &add_script($jscript).$cb_jscript; my $loadcode = &Apache::lonuserutils::course_selector_loadcode($formname); if ($loadcode ne '') { - $r->print(&header($js,{'onload' => $loadcode,})); + $args->{add_entries} = {onload => "$loadcode;$hidecall"}; } else { - $r->print(&header($js)); + $args->{add_entries} = {onload => $hidecall}; } + $r->print(&header($js,$args)); } else { - $r->print(&header(&add_script(&verify_user_display()))); + $args->{add_entries} = {onload => $hidecall}; + $jscript = &verify_user_display($context). + &Apache::loncommon::check_uncheck_jscript(); + $r->print(&header(&add_script($jscript),$args)); } - $r->print(&Apache::lonhtmlcommon::breadcrumbs("List Users", - 'Course_View_Class_List')); &Apache::lonuserutils::print_userlist($r,undef,$permission,$context, $formname,$totcodes,$codetitles,$idlist,$idlist_titles); - $r->print(&Apache::loncommon::end_page()); } } 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}); + push(@{$brcrum}, + {href => '/adm/createuser?action=drop', + text => $brtext, + help => 'Course_Drop_Student'}); + if ($env{'form.state'} eq 'done') { + push(@{$brcrum}, + {href=>'/adm/createuser?action=drop', + text=>"Result"}); + } + $bread_crumbs_component = $brtext; + $args = {bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component}; + $r->print(&header(undef,$args)); if (!exists($env{'form.state'})) { - $r->print(&Apache::lonhtmlcommon::breadcrumbs($brtext, - 'Course_Drop_Student')); - &Apache::lonuserutils::print_drop_menu($r,$context,$permission,$crstype); } elsif ($env{'form.state'} eq 'done') { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/createuser?action=drop', - text=>"Result"}); - $r->print(&Apache::lonhtmlcommon::breadcrumbs($brtext, - 'Course_Drop_Student')); &Apache::lonuserutils::update_user_list($r,$context,undef, $env{'form.action'}); } - $r->print(&Apache::loncommon::end_page()); } elsif ($env{'form.action'} eq 'dateselect') { if ($permission->{'cusr'}) { - $r->print(&header(undef,undef,{'no_nav_bar' => 1}). + $r->print(&header(undef,{'no_nav_bar' => 1}). &Apache::lonuserutils::date_section_selector($context, - $permission,$crstype). - &Apache::loncommon::end_page()); + $permission,$crstype)); } else { - $r->print(&header(). - '<span class="LC_error">'.&mt('You do not have permission to modify dates or sections for users').'</span>'. - &Apache::loncommon::end_page()); + $r->print(&header(undef,{'no_nav_bar' => 1}). + '<span class="LC_error">'.&mt('You do not have permission to modify dates or sections for users').'</span>'); } } elsif ($env{'form.action'} eq 'selfenroll') { - $r->print(&header()); - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/createuser?action=selfenroll', - text=>"Configure Self-enrollment"}); + push(@{$brcrum}, + {href => '/adm/createuser?action=selfenroll', + text => "Configure Self-enrollment", + help => 'Course_Self_Enrollment'}); if (!exists($env{'form.state'})) { - $r->print(&Apache::lonhtmlcommon::breadcrumbs('Configure Self-enrollment', - 'Course_Self_Enrollment')); + $args = { bread_crumbs => $brcrum, + bread_crumbs_component => 'Configure Self-enrollment'}; + $r->print(&header(undef,$args)); $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n"); &print_selfenroll_menu($r,$context,$permission); } elsif ($env{'form.state'} eq 'done') { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/createuser?action=selfenroll', - text=>"Result"}); - $r->print(&Apache::lonhtmlcommon::breadcrumbs('Self-enrollment result', - 'Course_Self_Enrollment')); + push (@{$brcrum}, + {href=>'/adm/createuser?action=selfenroll', + text=>"Result"}); + $args = { bread_crumbs => $brcrum, + bread_crumbs_component => 'Self-enrollment result'}; + $r->print(&header(undef,$args)); $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n"); &update_selfenroll_config($r,$context,$permission); } - $r->print(&Apache::loncommon::end_page()); } elsif ($env{'form.action'} eq 'selfenrollqueue') { - $r->print(&header()); - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/createuser?action=selfenrollqueue', - text=>"Enrollment requests"}); + push(@{$brcrum}, + {href => '/adm/createuser?action=selfenrollqueue', + text => 'Enrollment requests', + help => 'Course_Self_Enrollment'}); + $bread_crumbs_component = 'Enrollment requests'; + if ($env{'form.state'} eq 'done') { + push(@{$brcrum}, + {href => '/adm/createuser?action=selfenrollqueue', + text => 'Result', + help => 'Course_Self_Enrollment'}); + $bread_crumbs_component = 'Enrollment result'; + } + $args = { bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component}; + $r->print(&header(undef,$args)); 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"); $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', - text=>"Result"}); - $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment result', - 'Course_Self_Enrollment')); $r->print('<h3>'.&mt('Enrollment request processing').'</h3>'."\n"); $r->print(&Apache::loncoursequeueadmin::update_request_queue($context, $cdom,$cnum,$coursedesc)); } - $r->print(&Apache::loncommon::end_page()); } elsif ($env{'form.action'} eq 'changelogs') { - $r->print(&header()); - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/createuser?action=changelogs', - text=>"User Management Logs"}); - $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Changes', - 'Course_User_Logs')); - &print_userchangelogs_display($r,$context,$permission); - $r->print(&Apache::loncommon::end_page()); + my $helpitem; + if ($context eq 'course') { + $helpitem = 'Course_User_Logs'; + } + push (@{$brcrum}, + {href => '/adm/createuser?action=changelogs', + text => 'User Management Logs', + help => $helpitem}); + $bread_crumbs_component = 'User Changes'; + $args = { bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component}; + $r->print(&header(undef,$args)); + &print_userchangelogs_display($r,$context,$permission); } else { - $r->print(&header()); - $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); + $bread_crumbs_component = 'User Management'; + $args = { bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component}; + $r->print(&header(undef,$args)); $r->print(&print_main_menu($permission,$context,$crstype)); - $r->print(&Apache::loncommon::end_page()); } + $r->print(&Apache::loncommon::end_page()); return OK; } sub header { - my ($jscript,$loaditems,$args) = @_; + my ($jscript,$args) = @_; my $start_page; - if (ref($loaditems) eq 'HASH') { - $start_page=&Apache::loncommon::start_page('User Management',$jscript,{'add_entries' => $loaditems}); - } else { + if (ref($args) eq 'HASH') { $start_page=&Apache::loncommon::start_page('User Management',$jscript,$args); + } else { + $start_page=&Apache::loncommon::start_page('User Management',$jscript); } return $start_page; } 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 { + my ($context) = @_; + my $photos; + if (($context eq 'course') && $env{'request.course.id'}) { + $photos = $env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}; + } my $output = <<"END"; +function hide_searching() { + if (document.getElementById('searching')) { + document.getElementById('searching').style.display = 'none'; + } + return; +} + function display_update() { document.studentform.action.value = 'listusers'; document.studentform.phase.value = 'display'; document.studentform.submit(); } +function updateCols(caller) { + var context = '$context'; + var photos = '$photos'; + if (caller == 'Status') { + if (document.studentform.Status.options[document.studentform.Status.selectedIndex].value == 'Any') { + document.getElementById('showcolstatus').checked = true; + document.getElementById('showcolstatus').disabled = ''; + document.getElementById('showcolstart').checked = true; + document.getElementById('showcolend').checked = true; + } else { + document.getElementById('showcolstatus').checked = false; + document.getElementById('showcolstatus').disabled = 'disabled'; + document.getElementById('showcolstart').checked = false; + document.getElementById('showcolend').checked = false; + } + } + if (caller == 'output') { + if (photos == 1) { + if (document.getElementById('showcolphoto')) { + var photoitem = document.getElementById('showcolphoto'); + if (document.studentform.output.options[document.studentform.output.selectedIndex].value == 'html') { + photoitem.checked = true; + photoitem.disabled = ''; + } else { + photoitem.checked = false; + photoitem.disabled = 'disabled'; + } + } + } + } + if (caller == 'showrole') { + if (document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'Any') { + document.getElementById('showcolrole').checked = true; + document.getElementById('showcolrole').disabled = ''; + } else { + document.getElementById('showcolrole').checked = false; + document.getElementById('showcolrole').disabled = 'disabled'; + } + } + return; +} + END return $output; @@ -4330,130 +4603,244 @@ sub print_main_menu { $linkcontext = lc($crstype); $stuterm = 'Members'; } - my %links = ( - 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 => '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 => 'List and Modify Multiple Course Users', + }, + community => { + upload => 'Upload a File of Community Users', + singleuser => 'Add/Modify a Community User', + listusers => 'List and Modify Multiple Community Users', + }, + ); + my %linktitles = ( + domain => { + singleuser => 'Add a user to the domain, and/or a course or community in the domain.', + listusers => 'Show and manage users in this domain.', + }, + author => { + singleuser => 'Add a user with a co- or assistant author role.', + listusers => 'Show and manage co- or assistant authors.', + }, + course => { + singleuser => 'Add a user with a certain role to this course.', + listusers => 'Show and manage users in this course.', + }, + community => { + singleuser => 'Add a user with a certain role to this community.', + listusers => 'Show and manage users in this community.', + }, ); - my @menu = - ( - { text => $links{$context}{'upload'}, - help => 'Course_Create_Class_List', - action => 'upload', - permission => $permission->{'cusr'}, + my @menu = ( {categorytitle => 'Single Users', + items => + [ + { + linktext => $links{$linkcontext}{'singleuser'}, + icon => 'edit-redo.png', + #help => 'Course_Change_Privileges', + url => '/adm/createuser?action=singleuser', + permission => $permission->{'cusr'}, + linktitle => $linktitles{$linkcontext}{'singleuser'}, + }, + ]}, + + {categorytitle => 'Multiple Users', + items => + [ + { + linktext => $links{$linkcontext}{'upload'}, + icon => 'uplusr.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{$linkcontext}{'listusers'}, + icon => 'mngcu.png', + #help => 'Course_View_Class_List', + url => '/adm/createuser?action=listusers', + permission => ($permission->{'view'} || $permission->{'cusr'}), + linktitle => $linktitles{$linkcontext}{'listusers'}, }, - { text => $links{$context}{'singleuser'}, - help => 'Course_Change_Privileges', - action => 'singleuser', - permission => $permission->{'cusr'}, + + ]}, + + {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.', + }, + { + linktext => 'Authoring Space Requests', + icon => 'selfenrl-queue.png', + #help => 'Domain_Role_Approvals', + url => '/adm/createuser?action=processauthorreq', + permission => $permission->{'cusr'}, + linktitle => 'Approve or reject author role requests', + }, + { + linktext => 'Change Log', + icon => 'document-properties.png', + #help => 'Course_User_Logs', + url => '/adm/createuser?action=changelogs', + permission => $permission->{'cusr'}, + linktitle => 'View change log.', }, - { 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'})) { + + my %linktext = ( + 'Course' => { + single => 'Add/Modify a Student', + drop => 'Drop Students', + groups => 'Course Groups', + }, + 'Community' => { + single => 'Add/Modify a Member', + drop => 'Drop Members', + groups => 'Community Groups', + }, + ); + + my %linktitle = ( + 'Course' => { + single => 'Add a user with the role of student to this course', + drop => 'Remove a student from this course.', + groups => 'Manage course groups', + }, + 'Community' => { + single => 'Add a user with the role of member to this community', + drop => 'Remove a member from this community.', + groups => 'Manage community groups', + }, + ); + + push(@{ $menu[0]->{items} }, #Category: Single Users + { + linktext => $linktext{$crstype}{'single'}, + #help => 'Course_Add_Student', + icon => 'list-add.png', + url => '/adm/createuser?action=singlestudent', + permission => $permission->{'cusr'}, + linktitle => $linktitle{$crstype}{'single'}, + }, + ); + + push(@{ $menu[1]->{items} }, #Category: Multiple Users + { + linktext => $linktext{$crstype}{'drop'}, + icon => 'edit-undo.png', + #help => 'Course_Drop_Student', + url => '/adm/createuser?action=drop', + permission => $permission->{'cusr'}, + linktitle => $linktitle{$crstype}{'drop'}, + }, + ); + 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 => $linktext{$crstype}{'groups'}, + icon => 'grps.png', + #help => 'Course_Manage_Group', + url => '/adm/coursegroups?refpage=cusr', + permission => $permission->{'grp_manage'}, + linktitle => $linktitle{$crstype}{'groups'}, + }, + { + linktext => 'Change Log', + 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[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'})){ if ($crstype ne 'Community') { - push(@courselinks, - { text => 'Automated Enrollment Manager', - help => 'Course_Automated_Enrollment', + push(@{ $menu[2]->{items} }, + { + linktext => 'Automated Enrollment', + icon => 'roles.png', + #help => 'Course_Automated_Enrollment', permission => (&Apache::lonnet::auto_run($cnum,$cdom) - && $permission->{'cusr'}), + && $permission->{'cusr'}), url => '/adm/populate', - }); - } - push(@courselinks, - { text => 'Configure User Self-enrollment', - help => 'Course_Self_Enrollment', - action => 'selfenroll', - permission => $permission->{'cusr'}, - }); - } - 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', + linktitle => 'Automated enrollment manager.', + } + ); + } + push(@{ $menu[2]->{items} }, + { + linktext => 'User Self-Enrollment', + icon => 'self_enroll.png', + #help => 'Course_Self_Enrollment', + url => '/adm/createuser?action=selfenroll', permission => $permission->{'cusr'}, - },); + linktitle => 'Configure user self-enrollment.', + }, + ); + } + } elsif ($context eq 'author') { + { + linktext => 'Change Log', + icon => 'document-properties.png', + #help => 'Course_User_Logs', + url => '/adm/createuser?action=changelogs', + permission => $permission->{'cusr'}, + linktitle => 'View change log.', + }, + } + return Apache::lonhtmlcommon::generate_menu(@menu); # { text => 'View Log-in History', # help => 'Course_User_Logins', # action => 'logins', # permission => $permission->{'cusr'}, # }); - push(@menu,@courselinks); - } - my $menu_html = ''; - foreach my $menu_item (@menu) { - next if (! $menu_item->{'permission'}); - $menu_html.='<p>'; - if (exists($menu_item->{'help'})) { - $menu_html.= - &Apache::loncommon::help_open_topic($menu_item->{'help'}); - } - $menu_html.='<font size="+1">'; - if (exists($menu_item->{'url'})) { - $menu_html.=qq{<a href="$menu_item->{'url'}">}; - } else { - $menu_html.= - qq{<a href="/adm/createuser?action=$menu_item->{'action'}">}; } - $menu_html.= &mt($menu_item->{'text'}).'</a></font>'; - $menu_html.='</p>'; - } - return $menu_html; } sub restore_prev_selections { @@ -4682,9 +5069,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; @@ -4867,7 +5252,7 @@ ENDSCRIPT '<input type="checkbox" name="selfenroll_notify"'.$notifyon.' value="'.$cc.'" />'. &Apache::loncommon::plainname($ccuname,$ccudom). '</label></span></td>'; - $count; + $count ++; } my $rem = $count%$numcols; if ($rem) { @@ -4884,7 +5269,7 @@ ENDSCRIPT my $cid = $env{'request.course.id'}; my $currlim = $env{'course.'.$cid.'.internal.selfenroll_limit'}; my $currcap = $env{'course.'.$cid.'.internal.selfenroll_cap'}; - my $nolimit = ' checked="checked" '; + $nolimit = ' checked="checked" '; if ($currlim eq 'allstudents') { $crslimit = ' checked="checked" '; $selflimit = ' '; @@ -4940,9 +5325,9 @@ sub visible_in_cat { dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain', dc_addcat => 'Ask a domain coordinator to assign a category to the course.', ); - $visactions{'unhide'} = &mt('Use [_1]Set course environment[_2] to change the "Exclude from course catalog" setting.','"<a href="/adm/parmset?action=crsenv">','</a>"'); - $visactions{'chgcat'} = &mt('Use [_1]Set course environment[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"<a href="/adm/parmset?action=crsenv">','</a>"'); - $visactions{'addcat'} = &mt('Use [_1]Set course environment[_2] to assign a category to the course.','"<a href="/adm/parmset?action=crsenv">','</a>"'); + $visactions{'unhide'} = &mt('Use [_1]Categorize course[_2] to change the "Exclude from course catalog" setting.','<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"'); + $visactions{'chgcat'} = &mt('Use [_1]Categorize course[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"'); + $visactions{'addcat'} = &mt('Use [_1]Categorize course[_2] to assign a category to the course.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"'); if (ref($domconf{'coursecategories'}) eq 'HASH') { if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') { $settable{'togglecats'} = 1; @@ -5140,19 +5525,35 @@ sub selfenroll_date_forms { sub print_userchangelogs_display { my ($r,$context,$permission) = @_; - 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); + my $formname = 'rolelog'; + my ($username,$domain,$crstype,%roleslog); + if ($context eq 'domain') { + $domain = $env{'request.role.domain'}; + %roleslog=&Apache::lonnet::dump_dom('nohist_rolelog',$domain); + } else { + if ($context eq 'course') { + $domain = $env{'course.'.$env{'request.course.id'}.'.domain'}; + $username = $env{'course.'.$env{'request.course.id'}.'.num'}; + $crstype = &Apache::loncommon::course_type(); + my %saveable_parameters = ('show' => 'scalar',); + &Apache::loncommon::store_course_settings('roles_log', + \%saveable_parameters); + &Apache::loncommon::restore_course_settings('roles_log', + \%saveable_parameters); + } elsif ($context eq 'author') { + $domain = $env{'user.domain'}; + if ($env{'request.role'} =~ m{^au\./\Q$domain\E/$}) { + $username = $env{'user.name'}; + } else { + undef($domain); + } + } + if ($domain ne '' && $username ne '') { + %roleslog=&Apache::lonnet::dump('nohist_rolelog',$domain,$username); + } + } if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); } - $r->print('<form action="/adm/createuser" method="post" name="'.$formname.'">'); - my %saveable_parameters = ('show' => 'scalar',); - &Apache::loncommon::store_course_settings('roles_log', - \%saveable_parameters); - &Apache::loncommon::restore_course_settings('roles_log', - \%saveable_parameters); # set defaults my $now = time(); my $defstart = $now - (7*24*3600); #7 days ago @@ -5182,14 +5583,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,$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(); my ($minshown,$maxshown); $minshown = 1; my $count = 0; @@ -5199,6 +5592,35 @@ sub print_userchangelogs_display { $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'}; } } + + # Form Header + $r->print('<form action="/adm/createuser" method="post" name="'.$formname.'">'. + &role_display_filter($context,$formname,$domain,$username,\%curr, + $version,$crstype)); + + # Create navigation + my ($nav_script,$nav_links) = &userlogdisplay_nav($formname,\%curr,$more_records); + my $showntableheader = 0; + + # 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>'; + + if ($context eq 'course') { + $tableheader .= '<th>'.&mt('Section').'</th>'; + } + $tableheader .= + '<th>'.&mt('Context').'</th>' + .'<th>'.&mt('Start').'</th>' + .'<th>'.&mt('End').'</th>' + .&Apache::loncommon::end_data_table_header_row(); + + # Display user change log data 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'})); @@ -5220,9 +5642,13 @@ sub print_userchangelogs_display { } $count ++; next if ($count < $minshown); - if (!$showntablehdr) { - $r->print($tablehdr); - $showntablehdr = 1; + unless ($showntableheader) { + $r->print($nav_script + .$nav_links + .&Apache::loncommon::start_data_table() + .$tableheader); + $r->rflush(); + $showntableheader = 1; } if ($whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} eq '') { $whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} = @@ -5258,24 +5684,52 @@ sub print_userchangelogs_display { if ($roleslog{$id}{'logentry'}{'selfenroll'}) { $chgcontext = 'selfenroll'; } - my %lt = &rolechg_contexts($crstype); + my %lt = &rolechg_contexts($context,$crstype); 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"); + $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>'); + if ($context eq 'course') { + $r->print('<td>'.$sec.'</td>'); + } + $r->print( + '<td>'.$chgcontext.'</td>' + .'<td>'.$rolestart.'</td>' + .'<td>'.$roleend.'</td>' + .&Apache::loncommon::end_data_table_row()."\n"); + } + + if ($showntableheader) { # Table footer, if content displayed above + $r->print(&Apache::loncommon::end_data_table() + .$nav_links); + } else { # No content displayed above + $r->print('<p class="LC_info">' + .&mt('There are no records to display.') + .'</p>' + ); } - 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"); + + # Form Footer + $r->print( + '<input type="hidden" name="page" value="'.$curr{'page'}.'" />' + .'<input type="hidden" name="action" value="changelogs" />' + .'</form>'); + return; +} + +sub userlogdisplay_nav { + my ($formname,$curr,$more_records) = @_; + my ($nav_script,$nav_links); + if (ref($curr) eq 'HASH') { + # Create Navigation: + # Navigation Script + $nav_script = <<"ENDSCRIPT"; <script type="text/javascript"> // <![CDATA[ function chgPage(caller) { @@ -5285,27 +5739,39 @@ function chgPage(caller) { if (caller == 'next') { document.$formname.page.value ++; } - document.$formname.submit(); + document.$formname.submit(); return; } // ]]> </script> ENDSCRIPT + # Navigation Buttons + $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'}) + .'" />'; + } } - } else { - $r->print('<p class="LC_info">'. - &mt('There are no records to display'). - '</p>'); + $nav_links .= '</p>'; } - $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'. - '<input type="hidden" name="action" value="changelogs" /></form>'); - return; + return ($nav_script,$nav_links); } sub role_display_filter { - my ($formname,$cdom,$cnum,$curr,$version,$crstype) = @_; - my $context = 'course'; - my $lctype = lc($crstype); + my ($context,$formname,$cdom,$cnum,$curr,$version,$crstype) = @_; + my $lctype; + if ($context eq 'course') { + $lctype = lc($crstype); + } my $nolink = 1; my $output = '<table><tr><td valign="top">'. '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b></span><br />'. @@ -5320,17 +5786,21 @@ 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($context,$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>'. '<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::roles_by_context($context,1,$crstype); foreach my $role (@roles) { my $plrole; if ($role eq 'cr') { @@ -5344,15 +5814,27 @@ 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') { + my @posscontexts; + if ($context eq 'course') { + @posscontexts = ('any','auto','updatenow','createcourse','course','domain','selfenroll','requestcourses'); + } elsif ($context eq 'domain') { + @posscontexts = ('any','domain','requestauthor','domconfig','server'); + } else { + @posscontexts = ('any','author','domain'); + } + foreach my $chgtype (@posscontexts) { my $selstr = ''; if ($curr->{'chgcontext'} eq $chgtype) { $selstr = ' selected="selected"'; } - if (($chgtype eq 'auto') || ($chgtype eq 'updatenow')) { - next if (!&Apache::lonnet::auto_run($cnum,$cdom)); + if ($context eq 'course') { + if (($chgtype eq 'auto') || ($chgtype eq 'updatenow')) { + next if (!&Apache::lonnet::auto_run($cnum,$cdom)); + } } $output .= '<option value="'.$chgtype.'"'.$selstr.'>'.$lt{$chgtype}.'</option>'."\n"; } @@ -5365,19 +5847,26 @@ sub role_display_filter { .'</p>'; # Server version info - $output .= '<p style="font-size: smaller;" class="LC_info">' + my $needsrev = '2.11.0'; + if ($context eq 'course') { + $needsrev = '2.7.0'; + } + + $output .= '<p class="LC_info">' .&mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.' - ,'2.6.99.0'); + ,$needsrev); 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 ( + my ($context,$crstype) = @_; + my %lt; + if ($context eq 'course') { + %lt = &Apache::lonlocal::texthash ( any => 'Any', auto => 'Automated enrollment', updatenow => 'Roster Update', @@ -5387,11 +5876,26 @@ sub rolechg_contexts { selfenroll => 'Self-enrolled', requestcourses => 'Course Request', ); - if ($crstype eq 'Community') { - $lt{'createcourse'} = &mt('Community Creation'); - $lt{'course'} = &mt('User Management in community'); - $lt{'requestcourses'} = &mt('Community Request'); - } + if ($crstype eq 'Community') { + $lt{'createcourse'} = &mt('Community Creation'); + $lt{'course'} = &mt('User Management in community'); + $lt{'requestcourses'} = &mt('Community Request'); + } + } elsif ($context eq 'domain') { + %lt = &Apache::lonlocal::texthash ( + any => 'Any', + domain => 'User Management in domain', + requestauthor => 'Authoring Request', + server => 'Command line script (DC role)', + domconfig => 'Self-enrolled', + ); + } else { + %lt = &Apache::lonlocal::texthash ( + any => 'Any', + domain => 'User Management in domain', + author => 'User Management by author', + ); + } return %lt; } @@ -5720,12 +6224,12 @@ sub build_search_response { my ($context,$srch,%srch_results) = @_; my ($currstate,$response,$forcenewuser); my %names = ( - 'uname' => 'username', - 'lastname' => 'last name', + 'uname' => 'username', + 'lastname' => 'last name', 'lastfirst' => 'last name, first name', - 'crs' => 'this course', - 'dom' => 'LON-CAPA domain: ', - 'instd' => 'the institutional directory for domain: ', + 'crs' => 'this course', + 'dom' => 'LON-CAPA domain', + 'instd' => 'the institutional directory for domain', ); my %single = ( @@ -5745,14 +6249,20 @@ sub build_search_response { $currstate = 'modify'; $response = &mt("$single{$srch->{'srchtype'}} was found for the $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}.",$srch->{'srchterm'}); if ($srch->{'srchin'} eq 'dom' || $srch->{'srchin'} eq 'instd') { - $response .= &display_domain_info($srch->{'srchdomain'}); + $response .= ': '.&display_domain_info($srch->{'srchdomain'}); } - } else { - $response = '<span class="LC_warning">'.&mt("$nomatch{$srch->{'srchtype'}} found for the $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}",$srch->{'srchterm'}); + } else { # Search has nothing found. Prepare message to user. + $response = '<span class="LC_warning">'; if ($srch->{'srchin'} eq 'dom' || $srch->{'srchin'} eq 'instd') { - $response .= &display_domain_info($srch->{'srchdomain'}); + $response .= &mt("$nomatch{$srch->{'srchtype'}} found for the $names{$srch->{'srchby'}} [_1] in $names{$srch->{'srchin'}}: [_2]", + '<b>'.$srch->{'srchterm'}.'</b>', + &display_domain_info($srch->{'srchdomain'})); + } else { + $response .= &mt("$nomatch{$srch->{'srchtype'}} found for the $names{$srch->{'srchby'}} [_1] in $names{$srch->{'srchin'}}.", + '<b>'.$srch->{'srchterm'}.'</b>'); } $response .= '</span>'; + if ($srch->{'srchin'} ne 'alc') { $forcenewuser = 1; my $cansrchinst = 0; @@ -5786,7 +6296,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 />'; @@ -5795,7 +6305,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,10 +6323,10 @@ sub build_search_response { $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 />'; } } } @@ -5906,7 +6416,7 @@ sub course_level_table { my $thiscourse=$protectedcourse; $thiscourse=~s:_:/:g; my %coursedata=&Apache::lonnet::coursedescription($thiscourse); - my $isowner = &is_courseowner($protectedcourse,$coursedata{'internal.courseowner'}); + my $isowner = &Apache::lonuserutils::is_courseowner($protectedcourse,$coursedata{'internal.courseowner'}); my $area=$coursedata{'description'}; my $crstype=$coursedata{'type'}; if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; } @@ -5921,7 +6431,7 @@ sub course_level_table { my @roles = &Apache::lonuserutils::roles_by_context('course','',$crstype); foreach my $role (@roles) { my $plrole=&Apache::lonnet::plaintext($role,$crstype); - if ((&Apache::lonnet::allowed('c'.$role,$thiscourse)) || + if ((&Apache::lonnet::allowed('c'.$role,$thiscourse)) || ((($role eq 'cc') || ($role eq 'co')) && ($isowner))) { $table .= &course_level_row($protectedcourse,$role,$area,$domain, $plrole,\%sections_count,\%lt); @@ -6013,8 +6523,8 @@ sub course_level_dc { my $hiddenitems = '<input type="hidden" name="dcdomain" value="'.$dcdom.'" />'. '<input type="hidden" name="origdom" value="'.$dcdom.'" />'. '<input type="hidden" name="dccourse" value="" />'; - my $courseform='<b>'.&Apache::loncommon::selectcourse_link - ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course/Community','crstype').'</b>'; + my $courseform=&Apache::loncommon::selectcourse_link + ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Select','crstype'); my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu','role','Course/Community Browser'); my %lt=&Apache::lonlocal::texthash( 'rol' => "Role", @@ -6024,15 +6534,17 @@ sub course_level_dc { 'sta' => "Start", 'end' => "End", 'ssd' => "Set Start Date", - 'sed' => "Set End Date" + 'sed' => "Set End Date", + 'scc' => "Course/Community" ); my $header = '<h4>'.&mt('Course/Community 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>'. + '<th>'.$lt{'scc'}.'</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><br /><span class="LC_nobreak"><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc','','','','crstype'".')" />'. + $courseform.(' ' x4).'</span></td>'."\n". '<td valign><br /><select name="role">'."\n"; foreach my $role (@roles) { my $plrole=&Apache::lonnet::plaintext($role); @@ -6398,7 +6910,7 @@ sub update_selfenroll_config { my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum); if (ref($visactions) eq 'HASH') { if (!$visible) { - $r->print('<br />'.$visactions->{'miss'}.'<br />'.$visactions->{'yous'}. + $r->print('<br /><span class="LC_warning">'.$visactions->{'miss'}.'</span><br />'.$visactions->{'yous'}. '<br />'); if (ref($vismsgs) eq 'ARRAY') { $r->print('<br />'.$visactions->{'take'}.'<ul>'); @@ -6428,27 +6940,17 @@ 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 #--------------------------end of functions for &phase_two and &phase_three - +sub cid_to_cname(){ + my $courseid = shift; + $courseid =~ s/^\///; + $courseid =~ s/\//_/; + return $env{'course.'.$courseid.'.description'}; +} 1; __END__