--- loncom/interface/loncreateuser.pm 2016/10/04 21:02:16 1.414
+++ loncom/interface/loncreateuser.pm 2016/11/12 00:16:24 1.421
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.414 2016/10/04 21:02:16 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.421 2016/11/12 00:16:24 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -160,7 +160,8 @@ END_SCRIPT
'<h3>'.$lt{'usrt'}.'</h3>'."\n".
&Apache::loncommon::start_data_table();
- if (&Apache::lonnet::allowed('mut',$ccdomain)) {
+ if ((&Apache::lonnet::allowed('mut',$ccdomain)) ||
+ (&Apache::lonnet::allowed('udp',$ccdomain))) {
$output .= &build_tools_display($ccuname,$ccdomain,'tools');
}
@@ -267,7 +268,7 @@ sub build_tools_display {
$colspan = ' colspan="2"';
%domconfig =
&Apache::lonnet::get_dom('configuration',['requestcourses'],$ccdomain);
- $isadv = &Apache::lonnet::is_advanced_user($ccuname,$ccdomain);
+ $isadv = &Apache::lonnet::is_advanced_user($ccdomain,$ccuname);
} elsif ($context eq 'requestauthor') {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'requestauthor');
@@ -334,6 +335,7 @@ sub build_tools_display {
' <td'.$colspan.'>'.$lt{$item}.'</td>'."\n".
' </tr>'."\n".
&Apache::loncommon::start_data_table_row()."\n";
+
if (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
my ($curroption,$currlimit);
my $envkey = $context.'.'.$item;
@@ -428,7 +430,9 @@ sub build_tools_display {
}
$output .= ' <td'.$colspan.'>'.$custom_access.(' 'x4).
$lt{'avai'}.': '.$currdisp.'</td>'."\n".
- &Apache::loncommon::end_data_table_row()."\n".
+ &Apache::loncommon::end_data_table_row()."\n";
+ unless (&Apache::lonnet::allowed('udp',$ccdomain)) {
+ $output .=
&Apache::loncommon::start_data_table_row()."\n".
' <td style="vertical-align:top;"><span class="LC_nobreak">'.
$lt{'chse'}.': <label>'.
@@ -437,6 +441,7 @@ sub build_tools_display {
'<label><input type="radio" name="custom'.$item.'" value="1" '.
$cust_on.'/>'.$lt{'uscu'}.'</label>'.$custradio.'</td>'.
&Apache::loncommon::end_data_table_row()."\n";
+ }
}
return $output;
}
@@ -533,17 +538,23 @@ sub domainrole_req {
sub domadhocroles {
my ($ccuname,$ccdomain) = @_;
- my $confname = &Apache::lonnet::get_domainconfiguser($env{'request.role.domain'});
+ my $confname = &Apache::lonnet::get_domainconfiguser($env{'request.role.domain'});
my %existing=&Apache::lonnet::dump('roles',$env{'request.role.domain'},
$confname,'rolesdef_');
- my $output;
+ my ($output,$canmodify);
+ if (&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) {
+ $canmodify = 1;
+ }
if (keys(%existing) > 0) {
my @current;
- my $curradhoc = 'adhocroles.'.$env{'request.role.domain'};
+ my $curradhoc = 'adhocroles.'.$env{'request.role.domain'};
my %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,$curradhoc);
if ($userenv{$curradhoc}) {
@current = split(/,/,$userenv{$curradhoc});
}
+ if (!$canmodify && !@current) {
+ return;
+ }
my %customroles;
foreach my $key (keys(%existing)) {
if ($key=~/^rolesdef\_(\w+)$/) {
@@ -557,22 +568,28 @@ sub domadhocroles {
&mt('Ad Hoc Course Roles Selectable via Helpdesk Role').
'</h3>'."\n".
&Apache::loncommon::start_data_table().
- &Apache::loncommon::start_data_table_header_row().
- '<th>'.&mt('Action').'</th><th>'.&mt('Role').'</th>'.
- '<th>'.&mt('Privileges in Course').'<th>'.
- &Apache::loncommon::end_data_table_header_row();
+ &Apache::loncommon::start_data_table_header_row();
+ if ($canmodify) {
+ $output .= '<th>'.&mt('Action').'</th>';
+ }
+ $output .= '<th>'.&mt('Role').'</th>'.
+ '<th>'.&mt('Privileges in Course').'<th>'.
+ &Apache::loncommon::end_data_table_header_row();
foreach my $key (sort(keys(%customroles))) {
+ next if ((!$canmodify) && (!grep(/^\Q$key\E$/,@current)));
$output .= &Apache::loncommon::start_data_table_row();
- if (grep(/^\Q$key\E$/,@current)) {
- $output .= '<td><label>'.
- '<input type="checkbox" name="adhocroledel" value="'.$key.'" />'.
- &mt('Delete').'</label>'.
- '</td>';
- } else {
- $output .= '<td><label>'.
- '<input type="checkbox" name="adhocroleadd" value="'.$key.'" />'.
- &mt('Add').'</label>'.
- '</td>';
+ if ($canmodify) {
+ if (grep(/^\Q$key\E$/,@current)) {
+ $output .= '<td><label>'.
+ '<input type="checkbox" name="adhocroledel" value="'.$key.'" />'.
+ &mt('Delete').'</label>'.
+ '</td>';
+ } else {
+ $output .= '<td><label>'.
+ '<input type="checkbox" name="adhocroleadd" value="'.$key.'" />'.
+ &mt('Add').'</label>'.
+ '</td>';
+ }
}
$output .= '<td>'.$key.'</td><td>';
foreach my $level ('course','domain','system') {
@@ -583,7 +600,7 @@ sub domadhocroles {
}
my @privs = split(/:/,$customroles{$key}{$level});
foreach my $item (@privs) {
- next if ($item eq '');
+ next if ($item eq '');
my ($priv,$cond) = split(/\&/,$item);
$output .= &Apache::lonnet::plaintext($priv,'Course').$suffix.'<br />';
}
@@ -737,6 +754,8 @@ sub print_username_entry_form {
$helpitem = 'Course_Editing_Custom_Roles';
} elsif ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';
+ } elsif ($env{'form.action'} eq 'accesslogs') {
+ $helpitem = 'Domain_User_Access_Logs';
}
my %breadcrumb_text = &singleuser_breadcrumb($crstype);
if ($env{'form.action'} eq 'custom') {
@@ -766,6 +785,7 @@ sub print_username_entry_form {
'srst' => 'Search for a user and enroll as a student',
'srme' => 'Search for a user and enroll as a member',
'srad' => 'Search for a user and modify/add user information or roles',
+ 'srva' => 'Search for a user and view access log information',
'usr' => "Username",
'dom' => "Domain",
'ecrp' => "Define or Edit Custom Role",
@@ -818,12 +838,17 @@ sub print_username_entry_form {
} else {
$actiontext = $lt{'srst'};
}
+ } elsif ($env{'form.action'} eq 'accesslogs') {
+ $actiontext = $lt{'srva'};
}
$r->print("<h3>$actiontext</h3>");
if ($env{'form.origform'} ne 'crtusername') {
- $r->print("\n".$response);
+ if ($response) {
+ $r->print("\n<div>$response</div>".
+ '<br clear="all" />');
+ }
}
- $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype));
+ $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,1));
}
}
@@ -866,7 +891,7 @@ END
}
sub entry_form {
- my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype) = @_;
+ my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype,$fixeddom) = @_;
my ($usertype,$inexact);
if (ref($srch) eq 'HASH') {
if (($srch->{'srchin'} eq 'dom') &&
@@ -886,10 +911,12 @@ sub entry_form {
&Apache::lonuserutils::can_create_user($dom,$context,$usertype);
my ($userpicker,$cansearch) =
&Apache::loncommon::user_picker($dom,$srch,$forcenewuser,
- 'document.crtuser',$cancreate,$usertype);
+ 'document.crtuser',$cancreate,$usertype,$context,$fixeddom);
my $srchbutton = &mt('Search');
if ($env{'form.action'} eq 'singlestudent') {
$srchbutton = &mt('Search and Enroll');
+ } elsif ($env{'form.action'} eq 'accesslogs') {
+ $srchbutton = &mt('Search');
} elsif ($cancreate && $responsemsg ne '' && $inexact) {
$srchbutton = &mt('Search or Add New User');
}
@@ -906,7 +933,7 @@ ENDBLOCK
} else {
$output = '<p>'.$userpicker.'</p>';
}
- if ($env{'form.phase'} eq '') {
+ if (($env{'form.phase'} eq '') && ($env{'form.action'} ne 'accesslogs')) {
my $defdom=$env{'request.role.domain'};
my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');
my %lt=&Apache::lonlocal::texthash(
@@ -1022,9 +1049,11 @@ ENDSCRIPT
'usrch' => "User Search to add/modify roles",
'stusrch' => "User Search to enroll student",
'memsrch' => "User Search to enroll member",
+ 'srcva' => "Search for a user and view access log information",
'usel' => "Select a user to add/modify roles",
'stusel' => "Select a user to enroll as a student",
'memsel' => "Select a user to enroll as a member",
+ 'vacsel' => "Select a user to view access log",
'username' => "username",
'domain' => "domain",
'lastname' => "last name",
@@ -1073,6 +1102,10 @@ ENDSCRIPT
$r->print($lt{'stusel'});
}
$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('<h3>'.$lt{'vacsel'}.'</h3>');
}
}
$r->print('<form name="usersrchform" method="post" action="">'.
@@ -1191,10 +1224,15 @@ sub print_user_modification_page {
}
$response .= '<p class="LC_warning">'
.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.")
- .' '
- .&mt('Please contact the [_1]helpdesk[_2] for assistance.'
- ,'<a href="'.$helplink.'">','</a>')
- .'</p><br />';
+ .' ';
+ if ($context eq 'domain') {
+ $response .= &mt('Please contact a [_1] for assistance.',
+ &Apache::lonnet::plaintext('dc'));
+ } else {
+ $response .= &mt('Please contact the [_1]helpdesk[_2] for assistance.'
+ ,'<a href="'.$helplink.'">','</a>');
+ }
+ $response .= '</p><br />';
$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response,undef,undef,$crstype,$brcrum);
return;
@@ -1451,14 +1489,20 @@ ENDAUTH
'"'.$ccuname.'"','"'.$ccdomain.'"');
}
} else {
- $title = &mt('Modify existing user: [_1] in domain [_2]',
+ if ($permission->{'cusr'}) {
+ $title = &mt('Modify existing user: [_1] in domain [_2]',
+ '"'.$ccuname.'"','"'.$ccdomain.'"');
+ } else {
+ $title = &mt('Existing user: [_1] in domain [_2]',
'"'.$ccuname.'"','"'.$ccdomain.'"');
+ }
}
$r->print('<h2>'.$title.'</h2>'."\n");
$r->print('<div class="LC_left_float">');
$r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context,
$inst_results{$ccuname.':'.$ccdomain}));
- if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
+ if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) ||
+ (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) {
$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) {
@@ -1473,18 +1517,21 @@ ENDAUTH
my @order = ('auth','quota','tools','requestauthor','adhocroles');
my %user_text;
my ($isadv,$isauthor) =
- &Apache::lonnet::is_advanced_user($ccuname,$ccdomain);
+ &Apache::lonnet::is_advanced_user($ccdomain,$ccuname);
if ((!$isauthor) &&
- (&Apache::lonnet::allowed('cau',$env{'request.role.domain'}))
- && ($env{'request.role.domain'} eq $ccdomain)) {
+ ((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) ||
+ (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) &&
+ ($env{'request.role.domain'} eq $ccdomain)) {
$user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain);
}
- if (&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) {
+ if ((&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) ||
+ (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) {
$user_text{'adhocroles'} = &domadhocroles($ccuname,$ccdomain);
}
$user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname);
if ((&Apache::lonnet::allowed('mpq',$ccdomain)) ||
- (&Apache::lonnet::allowed('mut',$ccdomain))) {
+ (&Apache::lonnet::allowed('mut',$ccdomain)) ||
+ (&Apache::lonnet::allowed('udp',$ccdomain))) {
# Current user has quota modification privileges
$user_text{'quota'} = &user_quotas($ccuname,$ccdomain);
}
@@ -1542,9 +1589,18 @@ ENDNOTOOLSPRIV
if ($gotdiv) {
$r->print('</div><div class="LC_clear_float_footer"></div>');
}
+ my $statuses;
+ if (($context eq 'domain') && (&Apache::lonnet::allowed('udp',$ccdomain)) &&
+ (!&Apache::lonnet::allowed('mau',$ccdomain))) {
+ $statuses = ['active'];
+ } elsif (($context eq 'course') && ((&Apache::lonnet::allowed('vcl',$env{'request.course.id'})) ||
+ ($env{'request.course.sec'} &&
+ &Apache::lonnet::allowed('vcl',$env{'request.course.id'}.'/'.$env{'request.course.sec'})))) {
+ $statuses = ['active'];
+ }
if ($env{'form.action'} ne 'singlestudent') {
&display_existing_roles($r,$ccuname,$ccdomain,\%inccourses,$context,
- $roledom,$crstype);
+ $roledom,$crstype,$showcredits,$statuses);
}
} ## End of new user/old user logic
if ($env{'form.action'} eq 'singlestudent') {
@@ -1555,7 +1611,7 @@ ENDNOTOOLSPRIV
$btntxt = &mt('Enroll Student');
}
$r->print('<br /><input type="button" value="'.$btntxt.'" onclick="setSections(this.form)" />'."\n");
- } else {
+ } elsif ($permission->{'cusr'}) {
$r->print('<div class="LC_left_float">'.
'<fieldset><legend>'.&mt('Add Roles').'</legend>');
my $addrolesdisplay = 0;
@@ -1608,6 +1664,10 @@ sub singleuser_breadcrumb {
}
$breadcrumb_text{'userpicked'} = 'Select a user',
$breadcrumb_text{'modify'} = 'Set section/dates',
+ } elsif ($env{'form.action'} eq 'accesslogs') {
+ $breadcrumb_text{'search'} = 'View access logs for a user';
+ $breadcrumb_text{'userpicked'} = 'Select a user',
+ $breadcrumb_text{'activity'} = 'Activity',
} else {
$breadcrumb_text{'search'} = 'Create/modify a user';
$breadcrumb_text{'userpicked'} = 'Select a user',
@@ -1681,8 +1741,22 @@ sub validation_javascript {
sub display_existing_roles {
my ($r,$ccuname,$ccdomain,$inccourses,$context,$roledom,$crstype,
- $showcredits) = @_;
+ $showcredits,$statuses) = @_;
my $now=time;
+ my $showall = 1;
+ my ($showexpired,$showactive);
+ if ((ref($statuses) eq 'ARRAY') && (@{$statuses} > 0)) {
+ $showall = 0;
+ if (grep(/^expired$/,@{$statuses})) {
+ $showexpired = 1;
+ }
+ if (grep(/^active$/,@{$statuses})) {
+ $showactive = 1;
+ }
+ if ($showexpired && $showactive) {
+ $showall = 1;
+ }
+ }
my %lt=&Apache::lonlocal::texthash(
'rer' => "Existing Roles",
'rev' => "Revoke",
@@ -1746,6 +1820,13 @@ sub display_existing_roles {
$area =~ s/\_\w\w$//;
my ($role_code,$role_end_time,$role_start_time) =
split(/_/,$role);
+ my $active=1;
+ $active=0 if (($role_end_time) && ($now>$role_end_time));
+ if ($active) {
+ next unless($showall || $showactive);
+ } else {
+ next unless($showall || $showexpired);
+ }
# Is this a custom role? Get role owner and title.
my ($croleudom,$croleuname,$croletitle)=
($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$});
@@ -1754,11 +1835,13 @@ sub display_existing_roles {
my $sortkey=$role_code;
my $class='Unknown';
my $credits='';
- if ($area =~ m{^/($match_domain)/($match_courseid)} ) {
+ my $csec;
+ if ($area =~ m{^/($match_domain)/($match_courseid)}) {
$class='Course';
my ($coursedom,$coursedir) = ($1,$2);
my $cid = $1.'_'.$2;
# $1.'_'.$2 is the course id (eg. 103_12345abcef103l3).
+ next if ($envkey =~ m{^/$match_domain/$match_courseid/[A-Za-z0-9]+_gr$});
my %coursedata=
&Apache::lonnet::coursedescription($cid);
if ($coursedir =~ /^$match_community$/) {
@@ -1816,12 +1899,13 @@ sub display_existing_roles {
$thisrole.='.'.$role_code;
}
}
- if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) {
- $carea.='<br />'.&mt('Section: [_1]',$3);
- $sortkey.="\0$3";
+ if ($area=~m{^/($match_domain/$match_courseid/(\w+))}) {
+ $csec = $2;
+ $carea.='<br />'.&mt('Section: [_1]',$csec);
+ $sortkey.="\0$csec";
if (!$allowed) {
- if ($env{'request.course.sec'} eq $3) {
- if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2.'/'.$3)) {
+ if ($env{'request.course.sec'} eq $csec) {
+ if (&Apache::lonnet::allowed('c'.$role_code,$1)) {
$allowed = 1;
}
}
@@ -1863,29 +1947,30 @@ sub display_existing_roles {
}
}
my $row = '';
- $row.= '<td>';
- my $active=1;
- $active=0 if (($role_end_time) && ($now>$role_end_time));
- if (($active) && ($allowed)) {
- $row.= '<input type="checkbox" name="rev:'.$thisrole.'" />';
- } else {
- if ($active) {
- $row.=' ';
+ if ($showall) {
+ $row.= '<td>';
+ if (($active) && ($allowed)) {
+ $row.= '<input type="checkbox" name="rev:'.$thisrole.'" />';
} else {
- $row.=&mt('expired or revoked');
+ if ($active) {
+ $row.=' ';
+ } else {
+ $row.=&mt('expired or revoked');
+ }
}
- }
- $row.='</td><td>';
- if ($allowed && !$active) {
- $row.= '<input type="checkbox" name="ren:'.$thisrole.'" />';
- } else {
- $row.=' ';
- }
- $row.='</td><td>';
- if ($delallowed) {
- $row.= '<input type="checkbox" name="del:'.$thisrole.'" />';
- } else {
- $row.=' ';
+ $row.='</td><td>';
+ if ($allowed && !$active) {
+ $row.= '<input type="checkbox" name="ren:'.$thisrole.'" />';
+ } else {
+ $row.=' ';
+ }
+ $row.='</td><td>';
+ if ($delallowed) {
+ $row.= '<input type="checkbox" name="del:'.$thisrole.'" />';
+ } else {
+ $row.=' ';
+ }
+ $row.= '</td>';
}
my $plaintext='';
if (!$croletitle) {
@@ -1903,17 +1988,31 @@ sub display_existing_roles {
'<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>";
+ $row.= '<td>'.$plaintext.'</td>'.
+ '<td>'.$area.'</td>'.
+ '<td>'.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time)
+ : ' ' ).'</td>'.
+ '<td>'.($role_end_time ?&Apache::lonlocal::locallocaltime($role_end_time)
+ : ' ' ).'</td>';
$sortrole{$sortkey}=$envkey;
$roletext{$envkey}=$row;
$roleclass{$envkey}=$class;
- $rolepriv{$envkey}=$allowed;
+ if ($allowed) {
+ $rolepriv{$envkey}='edit';
+ } else {
+ if ($context eq 'domain') {
+ if ((&Apache::lonnet::allowed('vur',$ccdomain)) &&
+ ($envkey=~m{^/$ccdomain/})) {
+ $rolepriv{$envkey}='view';
+ }
+ } elsif ($context eq 'course') {
+ if ((&Apache::lonnet::allowed('vcl',$env{'request.course.id'})) ||
+ ($env{'request.course.sec'} && ($env{'request.course.sec'} eq $csec) &&
+ &Apache::lonnet::allowed('vcl',$env{'request.course.id'}.'/'.$env{'request.course.sec'}))) {
+ $rolepriv{$envkey}='view';
+ }
+ }
+ }
} # end of foreach (table building loop)
my $rolesdisplay = 0;
@@ -1946,15 +2045,28 @@ sub display_existing_roles {
} elsif ($env{'request.role'} =~ /^au\./) {
$contextrole = &mt('Existing Co-Author Roles in your Authoring Space');
} else {
- $contextrole = &mt('Existing Roles in this Domain');
+ if ($showall) {
+ $contextrole = &mt('Existing Roles in this Domain');
+ } elsif ($showactive) {
+ $contextrole = &mt('Unexpired Roles in this Domain');
+ } elsif ($showexpired) {
+ $contextrole = &mt('Expired or Revoked Roles in this Domain');
+ }
}
$r->print('<div class="LC_left_float">'.
'<fieldset><legend>'.$contextrole.'</legend>'.
&Apache::loncommon::start_data_table("LC_createuser").
-&Apache::loncommon::start_data_table_header_row().
-'<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}.
-'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.
-'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
+&Apache::loncommon::start_data_table_header_row());
+ if ($showall) {
+ $r->print(
+'<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}.'</th>'
+ );
+ } elsif ($showexpired) {
+ $r->print('<th>'.$lt{'rev'}.'</th>');
+ }
+ $r->print(
+'<th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.'</th>'.
+'<th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
&Apache::loncommon::end_data_table_header_row());
foreach my $type ('Authoring Space','Course','Community','Domain','System','Unknown') {
if ($output{$type}) {
@@ -2092,16 +2204,16 @@ sub user_authentication {
my ($ccuname,$ccdomain,$formname) = @_;
my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
my $outcome;
+ my %lt=&Apache::lonlocal::texthash(
+ 'err' => "ERROR",
+ 'uuas' => "This user has an unrecognized authentication scheme",
+ 'adcs' => "Please alert a domain coordinator of this situation",
+ 'sldb' => "Please specify login data below",
+ 'ld' => "Login Data"
+ );
# Check for a bad authentication type
if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) {
# bad authentication scheme
- my %lt=&Apache::lonlocal::texthash(
- 'err' => "ERROR",
- 'uuas' => "This user has an unrecognized authentication scheme",
- 'adcs' => "Please alert a domain coordinator of this situation",
- 'sldb' => "Please specify login data below",
- 'ld' => "Login Data"
- );
if (&Apache::lonnet::allowed('mau',$ccdomain)) {
&initialize_authen_forms($ccdomain,$formname);
@@ -2127,16 +2239,12 @@ $lt{'uuas'} ($currentauth). $lt{'adcs'}.
ENDBADAUTH
}
} else { # Authentication type is valid
+
&initialize_authen_forms($ccdomain,$formname,$currentauth,'modifyuser');
my ($authformcurrent,$can_modify,@authform_others) =
&modify_login_block($ccdomain,$currentauth);
if (&Apache::lonnet::allowed('mau',$ccdomain)) {
# Current user has login modification privileges
- my %lt=&Apache::lonlocal::texthash (
- 'ld' => "Login Data",
- 'ccld' => "Change Current Login Data",
- 'enld' => "Enter New Login Data"
- );
$outcome =
'<script type="text/javascript" language="Javascript">'."\n".
'// <![CDATA['."\n".
@@ -2147,7 +2255,7 @@ ENDBADAUTH
&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_row().
'<td>'.$authformnop;
- if ($can_modify) {
+ if (($can_modify) && (&Apache::lonnet::allowed('mau',$ccdomain))) {
$outcome .= '</td>'."\n".
&Apache::loncommon::end_data_table_row().
&Apache::loncommon::start_data_table_row().
@@ -2157,14 +2265,40 @@ ENDBADAUTH
$outcome .= ' ('.$authformcurrent.')</td>'.
&Apache::loncommon::end_data_table_row()."\n";
}
- foreach my $item (@authform_others) {
- $outcome .= &Apache::loncommon::start_data_table_row().
- '<td>'.$item.'</td>'.
- &Apache::loncommon::end_data_table_row()."\n";
+ if (&Apache::lonnet::allowed('mau',$ccdomain)) {
+ foreach my $item (@authform_others) {
+ $outcome .= &Apache::loncommon::start_data_table_row().
+ '<td>'.$item.'</td>'.
+ &Apache::loncommon::end_data_table_row()."\n";
+ }
}
$outcome .= &Apache::loncommon::end_data_table();
} else {
- if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {
+ if (&Apache::lonnet::allowed('udp',$ccdomain)) {
+ # Current user has rights to view domain preferences for user's domain
+ my $result;
+ if ($currentauth =~ /^krb(4|5):([^:]*)$/) {
+ my ($krbver,$krbrealm) = ($1,$2);
+ if ($krbrealm eq '') {
+ $result = &mt('Currently Kerberos authenticated, Version [_1].',$krbver);
+ } else {
+ $result = &mt('Currently Kerberos authenticated with domain [_1] Version [_2].',
+ $krbver,$krbrealm);
+ }
+ } elsif ($currentauth =~ /^internal:/) {
+ $result = &mt('Currently internally authenticated.');
+ } elsif ($currentauth =~ /^localauth:/) {
+ $result = &mt('Currently using local (institutional) authentication.');
+ } elsif ($currentauth =~ /^unix:/) {
+ $result = &mt('Currently Filesystem Authenticated.');
+ }
+ $outcome = '<h3>'.$lt{'ld'}.'</h3>'.
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_row().
+ '<td>'.$result.'</td>'.
+ &Apache::loncommon::end_data_table_row()."\n".
+ &Apache::loncommon::end_data_table();
+ } elsif (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {
my %lt=&Apache::lonlocal::texthash(
'ccld' => "Change Current Login Data",
'yodo' => "You do not have privileges to modify the authentication configuration for this user.",
@@ -2778,7 +2912,7 @@ sub update_user_data {
my @adds = &Apache::loncommon::get_env_multiple('form.adhocroleadd');
if (&adhocrole_changes(\%changeHash)) {
$changed{'adhocroles.'.$env{'request.role.domain'}} = $changeHash{'adhocroles.'.$env{'request.role.domain'}};
- }
+ }
}
}
if ($canmodify_status{'inststatus'}) {
@@ -3124,7 +3258,7 @@ sub update_user_data {
if (&adhocrole_changes(\%changeHash,\%userenv)) {
$changed{'adhocroles'} = 1;
$oldsettings{'adhocroles'} = $userenv{'adhocroles.'.$env{'request.role.domain'}};
- $newsettings{'adhocroles'} = $changeHash{'adhocroles.'.$env{'request.role.domain'}};
+ $newsettings{'adhocroles'} = $changeHash{'adhocroles.'.$env{'request.role.domain'}};
}
}
foreach my $item (@userinfo) {
@@ -3742,7 +3876,7 @@ sub adhocrole_changes {
@current = split(/,/,$userenv->{$adhoc_key});
if (@dels) {
foreach my $curr (@current) {
- next if ($curr eq '');
+ next if ($curr eq '');
unless (grep(/\Q$curr\E$/,@dels)) {
push(@saved,$curr);
}
@@ -3780,7 +3914,7 @@ sub adhocrole_changes {
push(@alladhoc,@saved);
}
if (@alladhoc) {
- my $adhocstr = join(',',sort(@alladhoc));
+ my $adhocstr = join(',',sort(@alladhoc));
$changehashref->{$adhoc_key} = $adhocstr;
} elsif (@dels) {
&Apache::lonnet::del('environment',[$adhoc_key],$env{'form.ccdomain'},$env{'form.ccuname'});
@@ -4359,7 +4493,7 @@ sub custom_role_editor {
($privs{'system'},$privs{'domain'},$privs{'course'})=split(/\_/,$roledef);
if ($privs{'system'} =~ /bre\&S/) {
if ($context eq 'domain') {
- $crstype = 'Course';
+ $crstype = 'Course';
} elsif ($crstype eq 'Community') {
$privs{'system'} =~ s/bre\&S//;
}
@@ -4374,7 +4508,7 @@ sub custom_role_editor {
# ------------------------------------------------------- What can be assigned?
my %full=();
- my %levels=(
+ my %levels=(
course => {},
domain => {},
system => {},
@@ -4387,7 +4521,7 @@ sub custom_role_editor {
&Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent);
my ($jsback,$elements) = &crumb_utilities();
my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype);
- my $head_script =
+ my $head_script =
&Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname,
\%full,\@templateroles,$jsback);
push (@{$brcrum},
@@ -4419,7 +4553,7 @@ ENDCCF
$r->print(&Apache::loncommon::end_data_table().
'<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.
'<input type="hidden" name="startrolename" value="'.$env{'form.rolename'}.
- '" />'."\n".'<input type="hidden" name="currstate" value="" />'."\n".
+ '" />'."\n".'<input type="hidden" name="currstate" value="" />'."\n".
'<input type="reset" value="'.&mt("Reset").'" />'."\n".
'<input type="submit" value="'.&mt('Save').'" /></form>');
}
@@ -4606,8 +4740,10 @@ sub handler {
} else {
&Apache::lonuserutils::print_first_users_upload_form($r,$context);
}
- } elsif ((($env{'form.action'} eq 'singleuser') || ($env{'form.action'}
- eq 'singlestudent')) && ($permission->{'cusr'})) {
+ } elsif (((($env{'form.action'} eq 'singleuser') || ($env{'form.action'}
+ eq 'singlestudent')) && ($permission->{'cusr'})) ||
+ (($env{'form.action'} eq 'singleuser') && ($permission->{'view'})) ||
+ (($env{'form.action'} eq 'accesslogs') && ($permission->{'activity'}))) {
my $phase = $env{'form.phase'};
my @search = ('srchterm','srchby','srchin','srchtype','srchdomain');
&Apache::loncreateuser::restore_prev_selections();
@@ -4616,7 +4752,7 @@ sub handler {
$srch->{$item} = $env{'form.'.$item};
}
if (($phase eq 'get_user_info') || ($phase eq 'userpicked') ||
- ($phase eq 'createnewuser')) {
+ ($phase eq 'createnewuser') || ($phase eq 'activity')) {
if ($env{'form.phase'} eq 'createnewuser') {
my $response;
if ($env{'form.srchterm'} !~ /^$match_username$/) {
@@ -4646,8 +4782,8 @@ sub handler {
&print_user_selection_page($r,$response,$srch,$results,
\@search,$context,undef,$crstype,
$brcrum);
- } elsif ($currstate eq 'modify') {
- my ($ccuname,$ccdomain);
+ } elsif (($currstate eq 'modify') || ($env{'form.action'} eq 'accesslogs')) {
+ my ($ccuname,$ccdomain,$uhome);
if (($srch->{'srchby'} eq 'uname') &&
($srch->{'srchtype'} eq 'exact')) {
$ccuname = $srch->{'srchterm'};
@@ -4658,12 +4794,32 @@ sub handler {
}
$ccuname =&LONCAPA::clean_username($ccuname);
$ccdomain=&LONCAPA::clean_domain($ccdomain);
- if ($env{'form.forcenewuser'}) {
- $response = '';
+ if ($env{'form.action'} eq 'accesslogs') {
+ my $uhome;
+ if (($ccuname ne '') && ($ccdomain ne '')) {
+ $uhome = &Apache::lonnet::homeserver($ccuname,$ccdomain);
+ }
+ if (($uhome eq '') || ($uhome eq 'no_host')) {
+ $env{'form.phase'} = '';
+ undef($forcenewuser);
+ #if ($response) {
+ # unless ($response =~ m{\Q<br /><br />\E$}) {
+ # $response .= '<br /><br />';
+ # }
+ #}
+ &print_username_entry_form($r,$context,$response,$srch,
+ $forcenewuser,$crstype,$brcrum);
+ } else {
+ &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);
+ }
+ } else {
+ if ($env{'form.forcenewuser'}) {
+ $response = '';
+ }
+ &print_user_modification_page($r,$ccuname,$ccdomain,
+ $srch,$response,$context,
+ $permission,$crstype,$brcrum);
}
- &print_user_modification_page($r,$ccuname,$ccdomain,
- $srch,$response,$context,
- $permission,$crstype,$brcrum);
} elsif ($currstate eq 'query') {
&print_user_query_page($r,'createuser',$brcrum);
} else {
@@ -4674,9 +4830,17 @@ sub handler {
} 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,
- $brcrum);
+ if ($env{'form.action'} eq 'accesslogs') {
+ &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);
+ } else {
+ &print_user_modification_page($r,$ccuname,$ccdomain,$srch,'',
+ $context,$permission,$crstype,
+ $brcrum);
+ }
+ } elsif ($env{'form.action'} eq 'accesslogs') {
+ my $ccuname = &LONCAPA::clean_username($env{'form.accessuname'});
+ my $ccdomain = &LONCAPA::clean_domain($env{'form.accessudom'});
+ &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);
}
} elsif ($env{'form.phase'} eq 'update_user_data') {
&update_user_data($r,$context,$crstype,$brcrum,$showcredits);
@@ -4986,48 +5150,46 @@ sub handler {
'<span class="LC_error">'.&mt('You do not have permission to configure self-enrollment').'</span>');
}
} elsif ($env{'form.action'} eq 'selfenrollqueue') {
- 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') {
+ if ($permission->{selfenrolladmin}) {
push(@{$brcrum},
{href => '/adm/createuser?action=selfenrollqueue',
- text => 'Result',
+ text => 'Enrollment requests',
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('<h3>'.&mt('Pending enrollment requests').'</h3>'."\n");
- $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context,
- $cdom,$cnum));
- } elsif ($env{'form.state'} eq 'done') {
- $r->print('<h3>'.&mt('Enrollment request processing').'</h3>'."\n");
- $r->print(&Apache::loncoursequeueadmin::update_request_queue($context,
- $cdom,$cnum,$coursedesc));
+ $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('<h3>'.&mt('Pending enrollment requests').'</h3>'."\n");
+ $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context,
+ $cdom,$cnum));
+ } elsif ($env{'form.state'} eq 'done') {
+ $r->print('<h3>'.&mt('Enrollment request processing').'</h3>'."\n");
+ $r->print(&Apache::loncoursequeueadmin::update_request_queue($context,
+ $cdom,$cnum,$coursedesc));
+ }
+ } else {
+ $r->print(&header(undef,{'no_nav_bar' => 1}).
+ '<span class="LC_error">'.&mt('You do not have permission to manage self-enrollment').'</span>');
}
} elsif ($env{'form.action'} eq 'changelogs') {
- my $helpitem;
- if ($context eq 'course') {
- $helpitem = 'Course_User_Logs';
+ if ($permission->{cusr} || $permission->{view}) {
+ &print_userchangelogs_display($r,$context,$permission,$brcrum);
+ } else {
+ $r->print(&header(undef,{'no_nav_bar' => 1}).
+ '<span class="LC_error">'.&mt('You do not have permission to view change logs').'</span>');
}
- 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 {
$bread_crumbs_component = 'User Management';
$args = { bread_crumbs => $brcrum,
@@ -5279,6 +5441,27 @@ sub print_main_menu {
listusers => 'Show and manage users in this community.',
},
);
+ if ($linkcontext eq 'domain') {
+ unless ($permission->{'cusr'}) {
+ $links{'domain'}{'singleuser'} = 'View a User';
+ $linktitles{'domain'}{'singleuser'} = 'View information about a user in the domain';
+
+ }
+ } elsif ($linkcontext eq 'course') {
+ unless ($permission->{'cusr'}) {
+ $links{'course'}{'singleuser'} = 'View a Course User';
+ $linktitles{'course'}{'singleuser'} = 'View information about a user in this course';
+ $links{'course'}{'listusers'} = 'List Course Users';
+ $linktitles{'course'}{'listusers'} = 'Show information about users in this course';
+ }
+ } elsif ($linkcontext eq 'community') {
+ unless ($permission->{'cusr'}) {
+ $links{'community'}{'singleuser'} = 'View a Community User';
+ $linktitles{'community'}{'singleuser'} = 'View information about a user in this community';
+ $links{'community'}{'listusers'} = 'List Community Users';
+ $linktitles{'community'}{'listusers'} = 'Show information about users in this community';
+ }
+ }
my @menu = ( {categorytitle => 'Single Users',
items =>
[
@@ -5287,7 +5470,7 @@ sub print_main_menu {
icon => 'edit-redo.png',
#help => 'Course_Change_Privileges',
url => '/adm/createuser?action=singleuser',
- permission => $permission->{'cusr'},
+ permission => ($permission->{'view'} || $permission->{'cusr'}),
linktitle => $linktitles{$linkcontext}{'singleuser'},
},
]},
@@ -5317,8 +5500,18 @@ sub print_main_menu {
{categorytitle => 'Administration',
items => [ ]},
);
-
+
if ($context eq 'domain'){
+ push(@{ $menu[0]->{items} }, # Single Users
+ {
+ linktext => 'User Access Log',
+ icon => 'document-properties.png',
+ #help => 'User_Access_Logs',
+ url => '/adm/createuser?action=accesslogs',
+ permission => $permission->{'activity'},
+ linktitle => 'View user access log.',
+ }
+ );
push(@{ $menu[2]->{items} }, #Category: Administration
{
@@ -5350,7 +5543,7 @@ sub print_main_menu {
icon => 'document-properties.png',
#help => 'Course_User_Logs',
url => '/adm/createuser?action=changelogs',
- permission => $permission->{'cusr'},
+ permission => ($permission->{'cusr'} || $permission->{'view'}),
linktitle => 'View change log.',
},
);
@@ -5430,7 +5623,7 @@ sub print_main_menu {
icon => 'document-properties.png',
#help => 'Course_User_Logs',
url => '/adm/createuser?action=changelogs',
- permission => $permission->{'cusr'},
+ permission => ($permission->{'view'} || $permission->{'cusr'}),
linktitle => 'View change log.',
},
);
@@ -5455,7 +5648,8 @@ sub print_main_menu {
icon => 'roles.png',
#help => 'Course_Automated_Enrollment',
permission => (&Apache::lonnet::auto_run($cnum,$cdom)
- && $permission->{'cusr'}),
+ && (($permission->{'cusr'}) ||
+ ($permission->{'view'}))),
url => '/adm/populate',
linktitle => 'Automated enrollment manager.',
}
@@ -5504,7 +5698,7 @@ sub restore_prev_selections {
}
sub print_selfenroll_menu {
- my ($r,$context,$cid,$cdom,$cnum,$currsettings,$additional) = @_;
+ my ($r,$context,$cid,$cdom,$cnum,$currsettings,$additional,$readonly) = @_;
my $crstype = &Apache::loncommon::course_type();
my $formname = 'selfenroll';
my $nolink = 1;
@@ -5517,6 +5711,10 @@ sub print_selfenroll_menu {
butn => 'but no user types have been checked.',
wilf => "Please uncheck 'activate' or check at least one type.",
);
+ my $disabled;
+ if ($readonly) {
+ $disabled = ' disabled="disabled"';
+ }
&js_escape(\%alerts);
my $selfenroll_js = <<"ENDSCRIPT";
function update_types(caller,num) {
@@ -5832,13 +6030,13 @@ ENDSCRIPT
$output .= ' checked="checked" ';
}
$output .= 'onchange="javascript:update_types('.
- "'selfenroll_all'".');" />'.&mt('Yes').'</label>'.
+ "'selfenroll_all'".');"'.$disabled.' />'.&mt('Yes').'</label>'.
' <input type="radio" name="selfenroll_all" value="0" ';
if ($curr_types ne '*') {
$output .= ' checked="checked" ';
}
$output .= ' onchange="javascript:update_types('.
- "'selfenroll_all'".');"/>'.&mt('No').'</label></td>'.
+ "'selfenroll_all'".');"'.$disabled.' />'.&mt('No').'</label></td>'.
&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table().
&mt('Or').'<br />'.
@@ -5860,10 +6058,10 @@ ENDSCRIPT
.'</b><input type="hidden" name="selfenroll_dom_'.$num
.'" value="'.$currdom.'" /></span><br />'
.'<span class="LC_nobreak"><label><input type="checkbox" '
- .'name="selfenroll_delete" value="'.$num.'" onchange="javascript:update_types('."'selfenroll_delete','$num'".');" />'
+ .'name="selfenroll_delete" value="'.$num.'" onchange="javascript:update_types('."'selfenroll_delete','$num'".');"'.$disabled.' />'
.&mt('Delete').'</label></span></td>';
$output .= '<td valign="top"> '.&mt('User types:').'<br />'
- .&selfenroll_inst_types($num,$currdom,\@currinsttypes).'</td>'
+ .&selfenroll_inst_types($num,$currdom,\@currinsttypes,$readonly).'</td>'
.&Apache::loncommon::end_data_table_row();
$num ++;
}
@@ -5878,7 +6076,7 @@ ENDSCRIPT
$output .= &Apache::loncommon::start_data_table_row()
.'<td colspan="2"><span class="LC_nobreak">'.$add_domtitle.'</span><br />'
.&Apache::loncommon::select_dom_form('','selfenroll_newdom',
- $includeempty,$showdomdesc)
+ $includeempty,$showdomdesc,'','','',$readonly)
.'<input type="hidden" name="selfenroll_types_total" value="'.$num.'" />'
.'</td>'.&Apache::loncommon::end_data_table_row()
.&Apache::loncommon::end_data_table();
@@ -5899,15 +6097,15 @@ ENDSCRIPT
}
if ($registered) {
$regon = ' checked="checked" ';
- $regoff = ' ';
+ $regoff = '';
} else {
- $regon = ' ';
+ $regon = '';
$regoff = ' checked="checked" ';
}
$output .= '<label>'.
- '<input type="radio" name="selfenroll_registered" value="1"'.$regon.'/>'.
+ '<input type="radio" name="selfenroll_registered" value="1"'.$regon.$disabled.' />'.
&mt('Yes').'</label> <label>'.
- '<input type="radio" name="selfenroll_registered" value="0"'.$regoff.'/>'.
+ '<input type="radio" name="selfenroll_registered" value="0"'.$regoff.$disabled.' />'.
&mt('No').'</label>';
} elsif ($item eq 'enroll_dates') {
my ($starttime,$endtime);
@@ -5929,10 +6127,10 @@ ENDSCRIPT
}
my $startform =
&Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_date',$starttime,
- undef,undef,undef,undef,undef,undef,undef,$nolink);
+ $disabled,undef,undef,undef,undef,undef,undef,$nolink);
my $endform =
&Apache::lonhtmlcommon::date_setter($formname,'selfenroll_end_date',$endtime,
- undef,undef,undef,undef,undef,undef,undef,$nolink);
+ $disabled,undef,undef,undef,undef,undef,undef,$nolink);
$output .= &selfenroll_date_forms($startform,$endform);
} elsif ($item eq 'access_dates') {
my ($starttime,$endtime);
@@ -5954,10 +6152,10 @@ ENDSCRIPT
}
my $startform =
&Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_access',$starttime,
- undef,undef,undef,undef,undef,undef,undef,$nolink);
+ $disabled,undef,undef,undef,undef,undef,undef,$nolink);
my $endform =
&Apache::lonhtmlcommon::date_setter($formname,'selfenroll_end_access',$endtime,
- undef,undef,undef,undef,undef,undef,undef,$nolink);
+ $disabled,undef,undef,undef,undef,undef,undef,$nolink);
$output .= &selfenroll_date_forms($startform,$endform);
} elsif ($item eq 'section') {
my $currsec;
@@ -5981,13 +6179,13 @@ ENDSCRIPT
next;
}
my $sections_select =
- &Apache::lonuserutils::course_sections(\%sections_count,'st',$currsec);
+ &Apache::lonuserutils::course_sections(\%sections_count,'st',$currsec,$disabled);
$output .= '<table class="LC_createuser">'."\n".
'<tr class="LC_section_row">'."\n".
'<td align="center">'.&mt('Existing sections')."\n".
'<br />'.$sections_select.'</td><td align="center">'.
&mt('New section').'<br />'."\n".
- '<input type="text" name="newsec" size="15" value="'.$newsecval.'" />'."\n".
+ '<input type="text" name="newsec" size="15" value="'.$newsecval.'"'.$disabled.' />'."\n".
'<input type="hidden" name="sections" value="" />'."\n".
'</td></tr></table>'."\n";
} elsif ($item eq 'approval') {
@@ -6009,8 +6207,8 @@ ENDSCRIPT
for my $i (0..2) {
$output .= '<label>'.
'<input type="radio" name="selfenroll_approval" value="'.$i.'"'.
- $appchecked{$i}.' onclick="toggleNotify();" />'.$selfdescs{'approval'}{$i}.
- '</label>'.(' 'x2);
+ $appchecked{$i}.' onclick="toggleNotify();"'.$disabled.' />'.
+ $selfdescs{'approval'}{$i}.'</label>'.(' 'x2);
}
my %advhash = &Apache::lonnet::get_course_adv_roles($cid,1);
my (@ccs,%notified);
@@ -6051,7 +6249,7 @@ ENDSCRIPT
&Apache::loncommon::start_data_table_row()
}
$output .= '<td><span class="LC_nobreak"><label>'.
- '<input type="checkbox" name="selfenroll_notify"'.$notifyon.' value="'.$cc.'" />'.
+ '<input type="checkbox" name="selfenroll_notify"'.$notifyon.' value="'.$cc.'"'.$disabled.' />'.
&Apache::loncommon::plainname($ccuname,$ccudom).
'</label></span></td>';
$count ++;
@@ -6101,26 +6299,28 @@ ENDSCRIPT
$nolimit = ' checked="checked" ';
}
$output .= '<table><tr><td><label>'.
- '<input type="radio" name="selfenroll_limit" value="none"'.$nolimit.'/>'.
+ '<input type="radio" name="selfenroll_limit" value="none"'.$nolimit.$disabled.'/>'.
&mt('No limit').'</label></td><td><label>'.
- '<input type="radio" name="selfenroll_limit" value="allstudents"'.$crslimit.'/>'.
+ '<input type="radio" name="selfenroll_limit" value="allstudents"'.$crslimit.$disabled.'/>'.
&mt('Limit by total students').'</label></td><td><label>'.
- '<input type="radio" name="selfenroll_limit" value="selfenrolled"'.$selflimit.'/>'.
+ '<input type="radio" name="selfenroll_limit" value="selfenrolled"'.$selflimit.$disabled.'/>'.
&mt('Limit by total self-enrolled students').
'</td></tr><tr>'.
'<td> </td><td colspan="2"><span class="LC_nobreak">'.
(' 'x3).&mt('Maximum number allowed: ').
- '<input type="text" name="selfenroll_cap" size = "5" value="'.$currcap.'" /></td></tr></table>';
+ '<input type="text" name="selfenroll_cap" size = "5" value="'.$currcap.'"'.$disabled.' /></td></tr></table>';
}
$output .= &Apache::lonhtmlcommon::row_closure(1);
}
}
- $output .= &Apache::lonhtmlcommon::end_pick_box().
- '<br /><input type="button" name="selfenrollconf" value="'
- .&mt('Save').'" onclick="validate_types(this.form);" />'
- .'<input type="hidden" name="action" value="selfenroll" />'
- .'<input type="hidden" name="state" value="done" />'."\n".
- $additional.'</form>';
+ $output .= &Apache::lonhtmlcommon::end_pick_box().'<br />';
+ unless ($readonly) {
+ $output .= '<input type="button" name="selfenrollconf" value="'
+ .&mt('Save').'" onclick="validate_types(this.form);" />';
+ }
+ $output .= '<input type="hidden" name="action" value="selfenroll" />'
+ .'<input type="hidden" name="state" value="done" />'."\n"
+ .$additional.'</form>';
$r->print($output);
return;
}
@@ -6303,12 +6503,16 @@ sub new_selfenroll_dom_row {
}
sub selfenroll_inst_types {
- my ($num,$currdom,$currinsttypes) = @_;
+ my ($num,$currdom,$currinsttypes,$readonly) = @_;
my $output;
my $numinrow = 4;
my $count = 0;
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($currdom);
my $othervalue = 'any';
+ my $disabled;
+ if ($readonly) {
+ $disabled = ' disabled="disabled"';
+ }
if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
if (keys(%{$usertypes}) > 0) {
$othervalue = 'other';
@@ -6333,7 +6537,7 @@ sub selfenroll_inst_types {
$output .= 'checked="checked"';
}
}
- $output .= ' name="selfenroll_types_'.$num.'" />'.$usertypes->{$type}.'</label></span></td>';
+ $output .= ' name="selfenroll_types_'.$num.'"'.$disabled.' />'.$usertypes->{$type}.'</label></span></td>';
}
$count ++;
}
@@ -6356,7 +6560,7 @@ sub selfenroll_inst_types {
} else {
$output .= ' checked="checked"';
}
- $output .= ' name="selfenroll_types_'.$num.'" />'.$othertitle.'</label></span></td></tr></table>';
+ $output .= ' name="selfenroll_types_'.$num.'"'.$disabled.' />'.$othertitle.'</label></span></td></tr></table>';
}
return $output;
}
@@ -6377,9 +6581,9 @@ sub selfenroll_date_forms {
}
sub print_userchangelogs_display {
- my ($r,$context,$permission) = @_;
+ my ($r,$context,$permission,$brcrum) = @_;
my $formname = 'rolelog';
- my ($username,$domain,$crstype,%roleslog);
+ my ($username,$domain,$crstype,$viewablesec,%roleslog);
if ($context eq 'domain') {
$domain = $env{'request.role.domain'};
%roleslog=&Apache::lonnet::dump_dom('nohist_rolelog',$domain);
@@ -6388,6 +6592,7 @@ sub print_userchangelogs_display {
$domain = $env{'course.'.$env{'request.course.id'}.'.domain'};
$username = $env{'course.'.$env{'request.course.id'}.'.num'};
$crstype = &Apache::loncommon::course_type();
+ $viewablesec = &Apache::lonuserutils::viewable_section($permission);
my %saveable_parameters = ('show' => 'scalar',);
&Apache::loncommon::store_course_settings('roles_log',
\%saveable_parameters);
@@ -6407,6 +6612,32 @@ sub print_userchangelogs_display {
}
if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); }
+ my $helpitem;
+ if ($context eq 'course') {
+ $helpitem = 'Course_User_Logs';
+ }
+ push (@{$brcrum},
+ {href => '/adm/createuser?action=changelogs',
+ text => 'User Management Logs',
+ help => $helpitem});
+ my $bread_crumbs_component = 'User Changes';
+ my $args = { bread_crumbs => $brcrum,
+ bread_crumbs_component => $bread_crumbs_component};
+
+ # Create navigation javascript
+ my $jsnav = &userlogdisplay_js($formname);
+
+ my $jscript = (<<ENDSCRIPT);
+<script type="text/javascript">
+// <![CDATA[
+$jsnav
+// ]]>
+</script>
+ENDSCRIPT
+
+ # print page header
+ $r->print(&header($jscript,$args));
+
# set defaults
my $now = time();
my $defstart = $now - (7*24*3600); #7 days ago
@@ -6439,7 +6670,9 @@ sub print_userchangelogs_display {
my ($minshown,$maxshown);
$minshown = 1;
my $count = 0;
- if ($curr{'show'} ne &mt('all')) {
+ if ($curr{'show'} =~ /\D/) {
+ $curr{'page'} = 1;
+ } else {
$maxshown = $curr{'page'} * $curr{'show'};
if ($curr{'page'} > 1) {
$minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
@@ -6451,8 +6684,6 @@ sub print_userchangelogs_display {
&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
@@ -6477,7 +6708,7 @@ sub print_userchangelogs_display {
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'}));
- if ($curr{'show'} ne &mt('all')) {
+ if ($curr{'show'} !~ /\D/) {
if ($count >= $curr{'page'} * $curr{'show'}) {
$more_records = 1;
last;
@@ -6493,12 +6724,13 @@ sub print_userchangelogs_display {
next if ($roleslog{$id}{'logentry'}{'context'} ne $curr{'chgcontext'});
}
}
+ if (($context eq 'course') && ($viewablesec ne '')) {
+ next if ($roleslog{$id}{'logentry'}{'section'} ne $viewablesec);
+ }
$count ++;
next if ($count < $minshown);
unless ($showntableheader) {
- $r->print($nav_script
- .$nav_links
- .&Apache::loncommon::start_data_table()
+ $r->print(&Apache::loncommon::start_data_table()
.$tableheader);
$r->rflush();
$showntableheader = 1;
@@ -6559,8 +6791,8 @@ sub print_userchangelogs_display {
}
if ($showntableheader) { # Table footer, if content displayed above
- $r->print(&Apache::loncommon::end_data_table()
- .$nav_links);
+ $r->print(&Apache::loncommon::end_data_table().
+ &userlogdisplay_navlinks(\%curr,$more_records));
} else { # No content displayed above
$r->print('<p class="LC_info">'
.&mt('There are no records to display.')
@@ -6576,15 +6808,331 @@ sub print_userchangelogs_display {
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";
+sub print_useraccesslogs_display {
+ my ($r,$uname,$udom,$permission,$brcrum) = @_;
+ my $formname = 'accesslog';
+ my $form = 'document.accesslog';
+
+# set breadcrumbs
+ my %breadcrumb_text = &singleuser_breadcrumb();
+ push (@{$brcrum},
+ {href => "javascript:backPage($form)",
+ text => $breadcrumb_text{'search'}});
+ my (@prevphases,$prevphasestr);
+ if ($env{'form.prevphases'}) {
+ @prevphases = split(/,/,$env{'form.prevphases'});
+ $prevphasestr = $env{'form.prevphases'};
+ }
+ if (($env{'form.phase'} eq 'userpicked') || (grep(/^userpicked$/,@prevphases))) {
+ push(@{$brcrum},
+ {href => "javascript:backPage($form,'get_user_info','select')",
+ text => $breadcrumb_text{'userpicked'}});
+ if ($env{'form.phase'} eq 'userpicked') {
+ $prevphasestr = 'userpicked';
+ }
+ }
+ push(@{$brcrum},
+ {href => '/adm/createuser?action=accesslogs',
+ text => 'User access logs',
+ help => 'User_Access_Logs'});
+ my $bread_crumbs_component = 'User Access Logs';
+ my $args = { bread_crumbs => $brcrum,
+ bread_crumbs_component => 'User Management'};
+
+# set javascript
+ my ($jsback,$elements) = &crumb_utilities();
+ my $jsnav = &userlogdisplay_js($formname);
+
+ my $jscript = (<<ENDSCRIPT);
<script type="text/javascript">
// <![CDATA[
+
+$jsback
+$jsnav
+
+// ]]>
+</script>
+
+ENDSCRIPT
+
+# print page header
+ $r->print(&header($jscript,$args));
+
+# early out unless log data can be displayed.
+ unless ($permission->{'activity'}) {
+ $r->print('<p class="LC_warning">'
+ .&mt('You do not have rights to display user access logs.')
+ .'</p>'
+ .&earlyout_accesslog_form($formname,$prevphasestr,$udom));
+ return;
+ }
+
+ unless ($udom eq $env{'request.role.domain'}) {
+ $r->print('<p class="LC_warning">'
+ .&mt("User's domain must match role's domain")
+ .'</p>'
+ .&earlyout_accesslog_form($formname,$prevphasestr,$udom));
+ return;
+ }
+
+ if (($uname eq '') || ($udom eq '')) {
+ $r->print('<p class="LC_warning">'
+ .&mt('Invalid username or domain')
+ .'</p>'
+ .&earlyout_accesslog_form($formname,$prevphasestr,$udom));
+ return;
+ }
+
+# set defaults
+ my $now = time();
+ my $defstart = $now - (7*24*3600);
+ my %defaults = (
+ page => '1',
+ show => '10',
+ activity => 'any',
+ accesslog_start_date => $defstart,
+ accesslog_end_date => $now,
+ );
+ my $more_records = 0;
+
+# set current
+ my %curr;
+ foreach my $item ('show','page','activity') {
+ $curr{$item} = $env{'form.'.$item};
+ }
+ my ($startdate,$enddate) =
+ &Apache::lonuserutils::get_dates_from_form('accesslog_start_date','accesslog_end_date');
+ $curr{'accesslog_start_date'} = $startdate;
+ $curr{'accesslog_end_date'} = $enddate;
+ foreach my $key (keys(%defaults)) {
+ if ($curr{$key} eq '') {
+ $curr{$key} = $defaults{$key};
+ }
+ }
+ my ($minshown,$maxshown);
+ $minshown = 1;
+ my $count = 0;
+ if ($curr{'show'} =~ /\D/) {
+ $curr{'page'} = 1;
+ } else {
+ $maxshown = $curr{'page'} * $curr{'show'};
+ if ($curr{'page'} > 1) {
+ $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
+ }
+ }
+
+# form header
+ $r->print('<form action="/adm/createuser" method="post" name="'.$formname.'">'.
+ &activity_display_filter($formname,\%curr));
+
+ my $showntableheader = 0;
+ my ($nav_script,$nav_links);
+
+# table header
+ my $tableheader =
+ &Apache::loncommon::start_data_table_header_row()
+ .'<th> </th>'
+ .'<th>'.&mt('When').'</th>'
+ .'<th>'.&mt('HostID').'</th>'
+ .'<th>'.&mt('Event').'</th>'
+ .'<th>'.&mt('Other data').'</th>'
+ .&Apache::loncommon::end_data_table_header_row();
+
+ my %filters=(
+ start => $curr{'accesslog_start_date'},
+ end => $curr{'accesslog_end_date'},
+ action => $curr{'activity'},
+ );
+
+ my $reply = &Apache::lonnet::userlog_query($uname,$udom,%filters);
+ unless ( ($reply =~/^timeout/) || ($reply =~/^error/) ) {
+ my (%courses,%missing);
+ my @results = split(/\&/,$reply);
+ foreach my $item (reverse(@results)) {
+ my ($timestamp,$host,$event) = split(/:/,$item);
+ next unless ($event =~ /^(Log|Role)/);
+ if ($curr{'show'} !~ /\D/) {
+ if ($count >= $curr{'page'} * $curr{'show'}) {
+ $more_records = 1;
+ last;
+ }
+ }
+ $count ++;
+ next if ($count < $minshown);
+ unless ($showntableheader) {
+ $r->print($nav_script
+ .&Apache::loncommon::start_data_table()
+ .$tableheader);
+ $r->rflush();
+ $showntableheader = 1;
+ }
+ my ($shown,$extra);
+ my ($event,$data) = split(/\s+/,&unescape($event));
+ if ($event eq 'Role') {
+ my ($rolecode,$extent) = split(/\./,$data,2);
+ next if ($extent eq '');
+ my ($crstype,$desc,$info);
+ if ($extent =~ m{^/($match_domain)/($match_courseid)(?:/(\w+)|)$}) {
+ my ($cdom,$cnum,$sec) = ($1,$2,$3);
+ my $cid = $cdom.'_'.$cnum;
+ if (exists($courses{$cid})) {
+ $crstype = $courses{$cid}{'type'};
+ $desc = $courses{$cid}{'description'};
+ } elsif ($missing{$cid}) {
+ $crstype = 'Course';
+ $desc = 'Course/Community';
+ } else {
+ my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,undef,undef,'.');
+ if (ref($crsinfo{$cdom.'_'.$cnum}) eq 'HASH') {
+ $courses{$cid} = $crsinfo{$cid};
+ $crstype = $crsinfo{$cid}{'type'};
+ $desc = $crsinfo{$cid}{'description'};
+ } else {
+ $missing{$cid} = 1;
+ }
+ }
+ $extra = &mt($crstype).': <a href="/public/'.$cdom.'/'.$cnum.'/syllabus">'.$desc.'</a>';
+ if ($sec ne '') {
+ $extra .= ' ('.&mt('Section: [_1]',$sec).')';
+ }
+ } elsif ($extent =~ m{^/($match_domain)/($match_username|$)}) {
+ my ($dom,$name) = ($1,$2);
+ if ($rolecode eq 'au') {
+ $extra = '';
+ } elsif ($rolecode =~ /^(ca|aa)$/) {
+ $extra = &mt('Authoring Space: [_1]',$name.':'.$dom);
+ } elsif ($rolecode =~ /^(li|dg|dh|dc|sc)$/) {
+ $extra = &mt('Domain: [_1]',$dom);
+ }
+ }
+ my $rolename;
+ if ($rolecode =~ m{^cr/($match_domain)/($match_username)/(\w+)}) {
+ my $role = $3;
+ my $owner = "($2:$1)";
+ if ($2 eq $1.'-domainconfig') {
+ $owner = '(ad hoc)';
+ }
+ $rolename = &mt('Custom role: [_1]',$role.' '.$owner);
+ } else {
+ $rolename = &Apache::lonnet::plaintext($rolecode,$crstype);
+ }
+ $shown = &mt('Role selection: [_1]',$rolename);
+ } else {
+ $shown = &mt($event);
+ if ($data ne '') {
+ $extra = &mt('Client IP address: [_1]',$data);
+ }
+ }
+ $r->print(
+ &Apache::loncommon::start_data_table_row()
+ .'<td>'.$count.'</td>'
+ .'<td>'.&Apache::lonlocal::locallocaltime($timestamp).'</td>'
+ .'<td>'.$host.'</td>'
+ .'<td>'.$shown.'</td>'
+ .'<td>'.$extra.'</td>'
+ .&Apache::loncommon::end_data_table_row()."\n");
+ }
+ }
+
+ if ($showntableheader) { # Table footer, if content displayed above
+ $r->print(&Apache::loncommon::end_data_table().
+ &userlogdisplay_navlinks(\%curr,$more_records));
+ } else { # No content displayed above
+ $r->print('<p class="LC_info">'
+ .&mt('There are no records to display.')
+ .'</p>');
+ }
+
+ # Form Footer
+ $r->print(
+ '<input type="hidden" name="currstate" value="" />'
+ .'<input type="hidden" name="accessuname" value="'.$uname.'" />'
+ .'<input type="hidden" name="accessudom" value="'.$udom.'" />'
+ .'<input type="hidden" name="page" value="'.$curr{'page'}.'" />'
+ .'<input type="hidden" name="prevphases" value="'.$prevphasestr.'" />'
+ .'<input type="hidden" name="phase" value="activity" />'
+ .'<input type="hidden" name="action" value="accesslogs" />'
+ .'<input type="hidden" name="srchdomain" value="'.$udom.'" />'
+ .'<input type="hidden" name="srchby" value="'.$env{'form.srchby'}.'" />'
+ .'<input type="hidden" name="srchtype" value="'.$env{'form.srchtype'}.'" />'
+ .'<input type="hidden" name="srchterm" value="'.&HTML::Entities::encode($env{'form.srchterm'},'<>"&').'" />'
+ .'<input type="hidden" name="srchin" value="'.$env{'form.srchin'}.'" />'
+ .'</form>');
+ return;
+}
+
+sub earlyout_accesslog_form {
+ my ($formname,$prevphasestr,$udom) = @_;
+ my $srchterm = &HTML::Entities::encode($env{'form.srchterm'},'<>"&');
+ return <<"END";
+<form action="/adm/createuser" method="post" name="$formname">
+<input type="hidden" name="currstate" value="" />
+<input type="hidden" name="prevphases" value="$prevphasestr" />
+<input type="hidden" name="phase" value="activity" />
+<input type="hidden" name="action" value="accesslogs" />
+<input type="hidden" name="srchdomain" value="$udom" />
+<input type="hidden" name="srchby" value="$env{'form.srchby'}" />
+<input type="hidden" name="srchtype" value="$env{'form.srchtype'}" />
+<input type="hidden" name="srchterm" value="$srchterm" />
+<input type="hidden" name="srchin" value="$env{'form.srchin'}" />
+</form>
+END
+}
+
+sub activity_display_filter {
+ my ($formname,$curr) = @_;
+ my $nolink = 1;
+ my $output = '<table><tr><td valign="top">'.
+ '<span class="LC_nobreak"><b>'.&mt('Actions/page:').'</b></span><br />'.
+ &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
+ (&mt('all'),5,10,20,50,100,1000,10000)).
+ '</td><td> </td>';
+ my $startform =
+ &Apache::lonhtmlcommon::date_setter($formname,'accesslog_start_date',
+ $curr->{'accesslog_start_date'},undef,
+ undef,undef,undef,undef,undef,undef,$nolink);
+ my $endform =
+ &Apache::lonhtmlcommon::date_setter($formname,'accesslog_end_date',
+ $curr->{'accesslog_end_date'},undef,
+ undef,undef,undef,undef,undef,undef,$nolink);
+ my %lt = &Apache::lonlocal::texthash (
+ activity => 'Activity',
+ Role => 'Role selection',
+ log => 'Log-in or Logout',
+ );
+ $output .= '<td valign="top"><b>'.&mt('Window during which actions 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('Activities').'</b><br />'.
+ '<select name="activity"><option value="any"';
+ if ($curr->{'activity'} eq 'any') {
+ $output .= ' selected="selected"';
+ }
+ $output .= '>'.&mt('Any').'</option>'."\n";
+ foreach my $activity ('Role','log') {
+ my $selstr = '';
+ if ($activity eq $curr->{'activity'}) {
+ $selstr = ' selected="selected"';
+ }
+ $output .= '<option value="'.$activity.'"'.$selstr.'>'.$lt{$activity}.'</option>';
+ }
+ $output .= '</select></td>'.
+ '</tr></table>';
+ # Update Display button
+ $output .= '<p>'
+ .'<input type="submit" value="'.&mt('Update Display').'" />'
+ .'</p>';
+ return $output;
+}
+
+sub userlogdisplay_js {
+ my ($formname) = @_;
+ return <<"ENDSCRIPT";
+
function chgPage(caller) {
if (caller == 'previous') {
document.$formname.page.value --;
@@ -6595,28 +7143,30 @@ function chgPage(caller) {
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'})
- .'" />';
- }
+}
+
+sub userlogdisplay_navlinks {
+ my ($curr,$more_records) = @_;
+ return unless(ref($curr) eq 'HASH');
+ # Navigation Buttons
+ my $nav_links = '<p>';
+ if (($curr->{'page'} > 1) || ($more_records)) {
+ if (($curr->{'page'} > 1) && ($curr->{'show'} !~ /\D/)) {
+ $nav_links .= '<input type="button"'
+ .' onclick="javascript:chgPage('."'previous'".');"'
+ .' value="'.&mt('Previous [_1] changes',$curr->{'show'})
+ .'" /> ';
+ }
+ if ($more_records) {
+ $nav_links .= '<input type="button"'
+ .' onclick="javascript:chgPage('."'next'".');"'
+ .' value="'.&mt('Next [_1] changes',$curr->{'show'})
+ .'" />';
}
- $nav_links .= '</p>';
}
- return ($nav_script,$nav_links);
+ $nav_links .= '</p>';
+ return $nav_links;
}
sub role_display_filter {
@@ -6806,10 +7356,10 @@ sub user_search_result {
if ($domd_chk eq 'ok') {
$response .= &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.');
}
- $response .= '<br /><br />';
+ $response .= '<br />';
}
} else {
- unless (($context eq 'requestcrs') && ($srch->{'srchtype'} eq 'exact')) {
+ unless (($context eq 'requestcrs') && ($srch->{'srchtype'} eq 'exact')) {
my $domd_chk = &domdirectorysrch_check($srch);
if ($domd_chk ne 'ok') {
my $instd_chk = &instdirectorysrch_check($srch);
@@ -6817,7 +7367,7 @@ sub user_search_result {
if ($instd_chk eq 'ok') {
$response .= &mt('You may want to search in the institutional directory instead of the LON-CAPA domain.');
}
- $response .= '<br /><br />';
+ $response .= '<br />';
}
}
}
@@ -6848,6 +7398,9 @@ sub user_search_result {
&build_search_response($context,$srch,%srch_results);
} else {
$currstate = 'modify';
+ if ($env{'form.action'} eq 'accesslogs') {
+ $currstate = 'activity';
+ }
my $uname = $srch->{'srchterm'};
my $udom = $srch->{'srchdomain'};
$srch_results{$uname.':'.$udom} =
@@ -6914,7 +7467,7 @@ sub user_search_result {
&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.').
- '<br /><br />';
+ '<br />';
}
}
} else {
@@ -6987,7 +7540,7 @@ sub user_search_result {
&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.').
- '<br /><br />';
+ '<br />';
}
}
}
@@ -7135,7 +7688,11 @@ sub build_search_response {
$currstate = 'select';
} else {
if (keys(%srch_results) == 1) {
- $currstate = 'modify';
+ if ($env{'form.action'} eq 'accesslogs') {
+ $currstate = 'activity';
+ } else {
+ $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'});
@@ -7180,7 +7737,8 @@ sub build_search_response {
$createdom = $env{'form.coursedom'};
}
}
- if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $createdom)) {
+ unless (($env{'form.action'} eq 'accesslogs') || (($srch->{'srchby'} eq 'uname') && ($srch->{'srchin'} eq 'dom') &&
+ ($srch->{'srchtype'} eq 'exact') && ($srch->{'srchdomain'} eq $createdom))) {
my $cancreate =
&Apache::lonuserutils::can_create_user($createdom,$context);
my $targetdom = '<span class="LC_cusr_emph">'.$createdom.'</span>';
@@ -7215,7 +7773,7 @@ sub build_search_response {
.&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.'
,' <a'.$helplink.'>'
,'</a>')
- .'<br /><br />';
+ .'<br />';
}
}
}