--- loncom/interface/loncreateuser.pm 2017/03/26 23:33:46 1.406.2.13 +++ loncom/interface/loncreateuser.pm 2017/01/28 02:56:41 1.431 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.406.2.13 2017/03/26 23:33:46 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.431 2017/01/28 02:56:41 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -252,13 +252,15 @@ sub build_tools_display { 'unofficial' => 'Can request creation of unofficial courses', 'community' => 'Can request creation of communities', 'textbook' => 'Can request creation of textbook courses', + 'placement' => 'Can request creation of placement tests', 'requestauthor' => 'Can request author space', ); if ($context eq 'requestcourses') { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'requestcourses.official','requestcourses.unofficial', - 'requestcourses.community','requestcourses.textbook'); - @usertools = ('official','unofficial','community','textbook'); + 'requestcourses.community','requestcourses.textbook', + 'requestcourses.placement'); + @usertools = ('official','unofficial','community','textbook','placement'); @options =('norequest','approval','autolimit','validate'); %validations = &Apache::lonnet::auto_courserequest_checks($ccdomain); %reqtitles = &courserequest_titles(); @@ -333,6 +335,7 @@ sub build_tools_display { '
' - .&mt('You need to be a privileged user to display user access logs for [_1]', - &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom), - $uname,$udom)) - .'
'); - if ($env{'form.popup'}) { - $r->print(''); - } else { - $r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom)); - } - return; - } - } - # set defaults my $now = time(); my $defstart = $now - (7*24*3600); @@ -6859,7 +6851,7 @@ ENDSCRIPT $showntableheader = 1; } my ($shown,$extra); - my ($event,$data) = split(/\s+/,&unescape($event),2); + my ($event,$data) = split(/\s+/,&unescape($event)); if ($event eq 'Role') { my ($rolecode,$extent) = split(/\./,$data,2); next if ($extent eq ''); @@ -6911,17 +6903,8 @@ ENDSCRIPT $shown = &mt('Role selection: [_1]',$rolename); } else { $shown = &mt($event); - if ($data =~ /^webdav/) { - my ($path,$clientip) = split(/\s+/,$data,2); - $path =~ s/^webdav//; - if ($clientip ne '') { - $extra = &mt('Client IP address: [_1]',$clientip); - } - if ($path ne '') { - $shown .= ' '.&mt('(WebDAV access to [_1])',$path); - } - } elsif ($data ne '') { - $extra = &mt('Client IP address: [_1]',$data); + if ($data ne '') { + $extra = &mt('Client IP address: [_1]',$data); } } $r->print( @@ -7224,7 +7207,7 @@ sub print_helpdeskaccess_display { my $confname = $cdom.'-domainconfig'; my $crstype = &Apache::loncommon::course_type(); - my @accesstypes = ('all','dh','da','none'); + my @accesstypes = ('all','none'); my ($numstatustypes,@jsarray); my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($cdom); if (ref($types) eq 'ARRAY') { @@ -7235,7 +7218,7 @@ sub print_helpdeskaccess_display { } } my %customroles = &get_domain_customroles($cdom,$confname); - my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']); + my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh']); if (keys(%domhelpdesk)) { push(@accesstypes,('inc','exc')); push(@jsarray,('notinc','notexc')); @@ -7433,9 +7416,7 @@ ENDJS 'rou' => 'Role usage', 'whi' => 'Which helpdesk personnel may use this role?', 'udd' => 'Use domain default', - 'all' => 'All with domain helpdesk or helpdesk assistant role', - 'dh' => 'All with domain helpdesk role', - 'da' => 'All with domain helpdesk assistant role', + 'all' => 'All', 'none' => 'None', 'status' => 'Determined based on institutional status', 'inc' => 'Include all, but exclude specific personnel', @@ -7622,8 +7603,7 @@ sub domain_adhoc_access { my $access = $domcurrent->{$role}{'access'}; if (($access eq '') || (!grep(/^\Q$access\E$/,@{$accesstypes}))) { $access = 'all'; - $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',&Apache::lonnet::plaintext('dh'), - &Apache::lonnet::plaintext('da')); + $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh')); } elsif ($access eq 'status') { if (ref($domcurrent->{$role}{$access}) eq 'ARRAY') { my @shown; @@ -7639,8 +7619,8 @@ sub domain_adhoc_access { } if (@shown) { my $shownstatus = join(' '.&mt('or').' ',@shown); - $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role, and institutional status: [_3]', - &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownstatus); + $domusage{$role} = &mt('Any user in domain with active [_1] role, and institutional status: [_2]', + &Apache::lonnet::plaintext('dh'),$shownstatus); } else { $domusage{$role} = &mt('No one in the domain'); } @@ -7654,11 +7634,10 @@ sub domain_adhoc_access { } my $showninc = join(', ',@dominc); if ($showninc ne '') { - $domusage{$role} = &mt('Include any user in domain with active [_1] or [_2] role, except: [_3]', - &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$showninc); + $domusage{$role} = &mt('Include any user in domain with active [_1] role, except: [_2]', + &Apache::lonnet::plaintext('dh'),$showninc); } else { - $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role', - &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da')); + $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh')); } } } elsif ($access eq 'exc') { @@ -7671,24 +7650,18 @@ sub domain_adhoc_access { } my $shownexc = join(', ',@domexc); if ($shownexc ne '') { - $domusage{$role} = &mt('Only the following in the domain with active [_1] or [_2] role: [_3]', - &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownexc); + $domusage{$role} = &mt('Only the following in the domain with active [_1] role: [_2]', + &Apache::lonnet::plaintext('dh'),$shownexc); } else { $domusage{$role} = &mt('No one in the domain'); } } elsif ($access eq 'none') { $domusage{$role} = &mt('No one in the domain'); - } elsif ($access eq 'dh') { - $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh')); - } elsif ($access eq 'da') { - $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('da')); } elsif ($access eq 'all') { - $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role', - &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da')); + $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh')); } } else { - $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role', - &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da')); + $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh')); } } return %domusage; @@ -7869,7 +7842,7 @@ sub update_helpdeskaccess { $r->print(''.&mt('You do not have permission to change helpdesk access.').'
'); return; } - my @accesstypes = ('all','dh','da','none','status','inc','exc'); + my @accesstypes = ('all','none','status','inc','exc'); my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; my $confname = $cdom.'-domainconfig'; @@ -7879,7 +7852,7 @@ sub update_helpdeskaccess { my (%settings,%overridden); &get_adhocrole_settings($env{'request.course.id'},\@accesstypes, $types,\%customroles,\%settings,\%overridden); - my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']); + my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh']); my (%changed,%storehash,@todelete); if (keys(%customroles)) { @@ -8120,12 +8093,6 @@ sub update_helpdeskaccess { if ($env{'form.'.$role.'_incrs'}) { if ($newsettings{$role}{'access'} eq 'all') { $r->print(&mt('All helpdesk staff can access '.lc($crstype).' with this role.')); - } elsif ($newsettings{$role}{'access'} eq 'dh') { - $r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role', - &Apache::lonnet::plaintext('dh'))); - } elsif ($newsettings{$role}{'access'} eq 'da') { - $r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role', - &Apache::lonnet::plaintext('da'))); } elsif ($newsettings{$role}{'access'} eq 'none') { $r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.')); } elsif ($newsettings{$role}{'access'} eq 'status') {