--- loncom/interface/loncreateuser.pm 2017/01/28 21:35:49 1.433
+++ loncom/interface/loncreateuser.pm 2017/03/30 14:08:18 1.438
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.433 2017/01/28 21:35:49 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.438 2017/03/30 14:08:18 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -755,6 +755,7 @@ sub print_username_entry_form {
}
} else {
my $actiontext = $lt{'srad'};
+ my $fixeddom;
if ($env{'form.action'} eq 'singlestudent') {
if ($crstype eq 'Community') {
$actiontext = $lt{'srme'};
@@ -763,6 +764,7 @@ sub print_username_entry_form {
}
} elsif ($env{'form.action'} eq 'accesslogs') {
$actiontext = $lt{'srva'};
+ $fixeddom = 1;
} elsif (($env{'form.action'} eq 'singleuser') &&
($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$defdom))) {
$actiontext = $lt{'srvu'};
@@ -774,7 +776,7 @@ sub print_username_entry_form {
'<br clear="all" />');
}
}
- $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,1));
+ $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,$fixeddom));
}
}
@@ -833,11 +835,16 @@ sub entry_form {
$inexact = 1;
}
}
- my $cancreate =
- &Apache::lonuserutils::can_create_user($dom,$context,$usertype);
+ my ($cancreate,$noinstd);
+ if ($env{'form.action'} eq 'accesslogs') {
+ $noinstd = 1;
+ } else {
+ $cancreate =
+ &Apache::lonuserutils::can_create_user($dom,$context,$usertype);
+ }
my ($userpicker,$cansearch) =
&Apache::loncommon::user_picker($dom,$srch,$forcenewuser,
- 'document.crtuser',$cancreate,$usertype,$context,$fixeddom);
+ 'document.crtuser',$cancreate,$usertype,$context,$fixeddom,$noinstd);
my $srchbutton = &mt('Search');
if ($env{'form.action'} eq 'singlestudent') {
$srchbutton = &mt('Search and Enroll');
@@ -1044,7 +1051,7 @@ ENDSCRIPT
$r->print('</h3>');
} elsif ($env{'form.action'} eq 'accesslogs') {
$r->print("<b>$lt{'srcva'}</b><br />");
- $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,'accesslogs',undef,undef,1));
+ $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,undef,1));
$r->print('<h3>'.$lt{'vacsel'}.'</h3>');
}
}
@@ -6765,6 +6772,24 @@ ENDSCRIPT
return;
}
+ if (&Apache::lonnet::privileged($uname,$udom,
+ [$env{'request.role.domain'}],['dc','su'])) {
+ unless (&Apache::lonnet::privileged($env{'user.name'},$env{'user.domain'},
+ [$env{'request.role.domain'}],['dc','su'])) {
+ $r->print('<p class="LC_warning">'
+ .&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))
+ .'</p>');
+ if ($env{'form.popup'}) {
+ $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>');
+ } else {
+ $r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom));
+ }
+ return;
+ }
+ }
+
# set defaults
my $now = time();
my $defstart = $now - (7*24*3600);
@@ -6851,7 +6876,7 @@ ENDSCRIPT
$showntableheader = 1;
}
my ($shown,$extra);
- my ($event,$data) = split(/\s+/,&unescape($event));
+ my ($event,$data) = split(/\s+/,&unescape($event),2);
if ($event eq 'Role') {
my ($rolecode,$extent) = split(/\./,$data,2);
next if ($extent eq '');
@@ -6903,8 +6928,17 @@ ENDSCRIPT
$shown = &mt('Role selection: [_1]',$rolename);
} else {
$shown = &mt($event);
- if ($data ne '') {
- $extra = &mt('Client IP address: [_1]',$data);
+ 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);
}
}
$r->print(
@@ -7207,7 +7241,7 @@ sub print_helpdeskaccess_display {
my $confname = $cdom.'-domainconfig';
my $crstype = &Apache::loncommon::course_type();
- my @accesstypes = ('all','anydh','anyda','none');
+ my @accesstypes = ('all','dh','da','none');
my ($numstatustypes,@jsarray);
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($cdom);
if (ref($types) eq 'ARRAY') {
@@ -7417,8 +7451,8 @@ ENDJS
'whi' => 'Which helpdesk personnel may use this role?',
'udd' => 'Use domain default',
'all' => 'All with domain helpdesk or helpdesk assistant role',
- 'anydh' => 'All with domain helpdesk role',
- 'anyda' => 'All with domain helpdesk assistant role',
+ 'dh' => 'All with domain helpdesk role',
+ 'da' => 'All with domain helpdesk assistant role',
'none' => 'None',
'status' => 'Determined based on institutional status',
'inc' => 'Include all, but exclude specific personnel',
@@ -7661,9 +7695,9 @@ sub domain_adhoc_access {
}
} elsif ($access eq 'none') {
$domusage{$role} = &mt('No one in the domain');
- } elsif ($access eq 'anydh') {
+ } elsif ($access eq 'dh') {
$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));
- } elsif ($access eq 'anyda') {
+ } 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',
@@ -7852,7 +7886,7 @@ sub update_helpdeskaccess {
$r->print('<p class="LC_error">'.&mt('You do not have permission to change helpdesk access.').'</p>');
return;
}
- my @accesstypes = ('all','anydh','anyda','none','status','inc','exc');
+ my @accesstypes = ('all','dh','da','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';
@@ -8103,10 +8137,10 @@ 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 'anydh') {
+ } 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 'anyda') {
+ } 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') {
@@ -8224,18 +8258,18 @@ sub user_search_result {
my $domd_chk = &domdirectorysrch_check($srch);
$response .= '<span class="LC_warning">'.$instd_chk.'</span><br />';
if ($domd_chk eq 'ok') {
- $response .= &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.');
+ $response .= &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.');
}
$response .= '<br />';
}
} else {
unless (($context eq 'requestcrs') && ($srch->{'srchtype'} eq 'exact')) {
my $domd_chk = &domdirectorysrch_check($srch);
- if ($domd_chk ne 'ok') {
+ if (($domd_chk ne 'ok') && ($env{'form.action'} ne 'accesslogs')) {
my $instd_chk = &instdirectorysrch_check($srch);
$response .= '<span class="LC_warning">'.$domd_chk.'</span><br />';
if ($instd_chk eq 'ok') {
- $response .= &mt('You may want to search in the institutional directory instead of the LON-CAPA domain.');
+ $response .= &mt('You may want to search in the institutional directory instead of in the LON-CAPA domain.');
}
$response .= '<br />';
}
@@ -8336,7 +8370,7 @@ sub user_search_result {
$response = '<span class="LC_warning">'.
&mt('Institutional directory search is not available in domain: [_1]',$showdom).
'</span><br />'.
- &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').
+ &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.').
'<br />';
}
}
@@ -8409,7 +8443,7 @@ sub user_search_result {
$response = '<span class="LC_warning">'.
&mt('Institutional directory search is not available in domain: [_1]',$showdom).
'</span><br />'.
- &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').
+ &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.').
'<br />';
}
}
@@ -8582,7 +8616,7 @@ sub build_search_response {
if ($srch->{'srchin'} ne 'alc') {
$forcenewuser = 1;
my $cansrchinst = 0;
- if ($srch->{'srchdomain'}) {
+ if (($srch->{'srchdomain'}) && ($env{'form.action'} ne 'accesslogs')) {
my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$srch->{'srchdomain'});
if (ref($domconfig{'directorysrch'}) eq 'HASH') {
if ($domconfig{'directorysrch'}{'available'}) {