-//
-
-ENDSCRIPT
-
- # print page header
- $r->print(&header($jscript,$args));
-
# set defaults
my $now = time();
my $defstart = $now - (7*24*3600); #7 days ago
@@ -6818,9 +6466,7 @@ ENDSCRIPT
my ($minshown,$maxshown);
$minshown = 1;
my $count = 0;
- if ($curr{'show'} =~ /\D/) {
- $curr{'page'} = 1;
- } else {
+ if ($curr{'show'} ne &mt('all')) {
$maxshown = $curr{'page'} * $curr{'show'};
if ($curr{'page'} > 1) {
$minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
@@ -6832,6 +6478,8 @@ ENDSCRIPT
&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
@@ -6856,7 +6504,7 @@ ENDSCRIPT
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'} !~ /\D/) {
+ if ($curr{'show'} ne &mt('all')) {
if ($count >= $curr{'page'} * $curr{'show'}) {
$more_records = 1;
last;
@@ -6872,13 +6520,12 @@ ENDSCRIPT
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(&Apache::loncommon::start_data_table()
+ $r->print($nav_script
+ .$nav_links
+ .&Apache::loncommon::start_data_table()
.$tableheader);
$r->rflush();
$showntableheader = 1;
@@ -6939,8 +6586,8 @@ ENDSCRIPT
}
if ($showntableheader) { # Table footer, if content displayed above
- $r->print(&Apache::loncommon::end_data_table().
- &userlogdisplay_navlinks(\%curr,$more_records));
+ $r->print(&Apache::loncommon::end_data_table()
+ .$nav_links);
} else { # No content displayed above
$r->print(''
.&mt('There are no records to display.')
@@ -6956,378 +6603,15 @@ ENDSCRIPT
return;
}
-sub print_useraccesslogs_display {
- my ($r,$uname,$udom,$permission,$brcrum) = @_;
- my $formname = 'accesslog';
- my $form = 'document.accesslog';
-
-# set breadcrumbs
- my %breadcrumb_text = &singleuser_breadcrumb('','domain',$udom);
- my $prevphasestr;
- if ($env{'form.popup'}) {
- $brcrum = [];
- } else {
- push (@{$brcrum},
- {href => "javascript:backPage($form)",
- text => $breadcrumb_text{'search'}});
- my @prevphases;
- 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 => 'Domain_User_Access_Logs'});
- my $bread_crumbs_component = 'User Access Logs';
- my $args = { bread_crumbs => $brcrum,
- bread_crumbs_component => 'User Management'};
- if ($env{'form.popup'}) {
- $args->{'no_nav_bar'} = 1;
- $args->{'bread_crumbs_nomenu'} = 1;
- }
-
-# set javascript
- my ($jsback,$elements) = &crumb_utilities();
- my $jsnav = &userlogdisplay_js($formname);
-
- my $jscript = (<
//
-
-
-ENDSCRIPT
-
-# print page header
- $r->print(&header($jscript,$args));
-
-# early out unless log data can be displayed.
- unless ($permission->{'activity'}) {
- $r->print(''
- .&mt('You do not have rights to display user access logs.')
- .'
');
- if ($env{'form.popup'}) {
- $r->print(''.&mt('Close window').'
');
- } else {
- $r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom));
- }
- return;
- }
-
- unless ($udom eq $env{'request.role.domain'}) {
- $r->print(''
- .&mt("User's domain must match role's domain")
- .'
'
- .&earlyout_accesslog_form($formname,$prevphasestr,$udom));
- return;
- }
-
- if (($uname eq '') || ($udom eq '')) {
- $r->print(''
- .&mt('Invalid username or domain')
- .'
'
- .&earlyout_accesslog_form($formname,$prevphasestr,$udom));
- 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(''
- .&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(''.&mt('Close window').'
');
- } else {
- $r->print(&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('');
- return;
-}
-
-sub earlyout_accesslog_form {
- my ($formname,$prevphasestr,$udom) = @_;
- my $srchterm = &HTML::Entities::encode($env{'form.srchterm'},'<>"&');
- return <<"END";
-
-END
-}
-
-sub activity_display_filter {
- my ($formname,$curr) = @_;
- my $nolink = 1;
- my $output = ''.
- ''.&mt('Actions/page:').' '.
- &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
- (&mt('all'),5,10,20,50,100,1000,10000)).
- ' ';
- 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 .= ''.&mt('Window during which actions occurred:').' '.
- ''.&mt('After:').
- ' '.$startform.' '.
- ''.&mt('Before:').' '.
- ''.$endform.'
'.
- ' '.
- ' '.
- ''.&mt('Activities').' '.
- '{'activity'} eq 'any') {
- $output .= ' selected="selected"';
- }
- $output .= '>'.&mt('Any').' '."\n";
- foreach my $activity ('Role','log') {
- my $selstr = '';
- if ($activity eq $curr->{'activity'}) {
- $selstr = ' selected="selected"';
- }
- $output .= ''.$lt{$activity}.' ';
- }
- $output .= ' '.
- '
';
- # Update Display button
- $output .= ''
- .' '
- .'
';
- return $output;
-}
-
-sub userlogdisplay_js {
- my ($formname) = @_;
- return <<"ENDSCRIPT";
-
function chgPage(caller) {
if (caller == 'previous') {
document.$formname.page.value --;
@@ -7338,30 +6622,28 @@ function chgPage(caller) {
document.$formname.submit();
return;
}
+// ]]>
+
ENDSCRIPT
-}
-
-sub userlogdisplay_navlinks {
- my ($curr,$more_records) = @_;
- return unless(ref($curr) eq 'HASH');
- # Navigation Buttons
- my $nav_links = '';
- if (($curr->{'page'} > 1) || ($more_records)) {
- if (($curr->{'page'} > 1) && ($curr->{'show'} !~ /\D/)) {
- $nav_links .= ' ';
- }
- if ($more_records) {
- $nav_links .= ' ';
+ # Navigation Buttons
+ $nav_links = '
';
+ if (($curr->{'page'} > 1) || ($more_records)) {
+ if ($curr->{'page'} > 1) {
+ $nav_links .= ' ';
+ }
+ if ($more_records) {
+ $nav_links .= ' ';
+ }
}
+ $nav_links .= '
';
}
- $nav_links .= '
';
- return $nav_links;
+ return ($nav_script,$nav_links);
}
sub role_display_filter {
@@ -7418,12 +6700,12 @@ sub role_display_filter {
&mt('Context:').'';
my @posscontexts;
if ($context eq 'course') {
- @posscontexts = ('any','automated','updatenow','createcourse','course','domain','selfenroll','requestcourses','chgtype');
+ @posscontexts = ('any','automated','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) {
@@ -7467,7 +6749,6 @@ sub rolechg_contexts {
%lt = &Apache::lonlocal::texthash (
any => 'Any',
automated => 'Automated Enrollment',
- chgtype => 'Enrollment Type/Lock Change',
updatenow => 'Roster Update',
createcourse => 'Course Creation',
course => 'User Management in course',
@@ -7498,988 +6779,6 @@ sub rolechg_contexts {
return %lt;
}
-sub print_helpdeskaccess_display {
- my ($r,$permission,$brcrum) = @_;
- my $formname = 'helpdeskaccess';
- my $helpitem = 'Course_Helpdesk_Access';
- push (@{$brcrum},
- {href => '/adm/createuser?action=helpdesk',
- text => 'Helpdesk Access',
- help => $helpitem});
- my $bread_crumbs_component = 'Helpdesk Staff Access';
- my $args = { bread_crumbs => $brcrum,
- bread_crumbs_component => $bread_crumbs_component};
-
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- my $confname = $cdom.'-domainconfig';
- my $crstype = &Apache::loncommon::course_type();
-
- my @accesstypes = ('all','dh','da','none');
- my ($numstatustypes,@jsarray);
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($cdom);
- if (ref($types) eq 'ARRAY') {
- if (@{$types} > 0) {
- $numstatustypes = scalar(@{$types});
- push(@accesstypes,'status');
- @jsarray = ('bystatus');
- }
- }
- my %customroles = &get_domain_customroles($cdom,$confname);
- my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']);
- if (keys(%domhelpdesk)) {
- push(@accesstypes,('inc','exc'));
- push(@jsarray,('notinc','notexc'));
- }
- push(@jsarray,'privs');
- my $hiddenstr = join("','",@jsarray);
- my $rolestr = join("','",sort(keys(%customroles)));
-
- my $jscript;
- my (%settings,%overridden);
- if (keys(%customroles)) {
- &get_adhocrole_settings($env{'request.course.id'},\@accesstypes,
- $types,\%customroles,\%settings,\%overridden);
- my %jsfull=();
- my %jslevels= (
- course => {},
- domain => {},
- system => {},
- );
- my %jslevelscurrent=(
- course => {},
- domain => {},
- system => {},
- );
- my (%privs,%jsprivs);
- &Apache::lonuserutils::custom_role_privs(\%privs,\%jsfull,\%jslevels,\%jslevelscurrent);
- foreach my $priv (keys(%jsfull)) {
- if ($jslevels{'course'}{$priv}) {
- $jsprivs{$priv} = 1;
- }
- }
- my (%elements,%stored);
- foreach my $role (keys(%customroles)) {
- $elements{$role.'_access'} = 'radio';
- $elements{$role.'_incrs'} = 'radio';
- if ($numstatustypes) {
- $elements{$role.'_status'} = 'checkbox';
- }
- if (keys(%domhelpdesk) > 0) {
- $elements{$role.'_staff_inc'} = 'checkbox';
- $elements{$role.'_staff_exc'} = 'checkbox';
- }
- $elements{$role.'_override'} = 'checkbox';
- if (ref($settings{$role}) eq 'HASH') {
- if ($settings{$role}{'access'} ne '') {
- my $curraccess = $settings{$role}{'access'};
- $stored{$role.'_access'} = $curraccess;
- $stored{$role.'_incrs'} = 1;
- if ($curraccess eq 'status') {
- if (ref($settings{$role}{'status'}) eq 'ARRAY') {
- $stored{$role.'_status'} = $settings{$role}{'status'};
- }
- } elsif (($curraccess eq 'exc') || ($curraccess eq 'inc')) {
- if (ref($settings{$role}{$curraccess}) eq 'ARRAY') {
- $stored{$role.'_staff_'.$curraccess} = $settings{$role}{$curraccess};
- }
- }
- } else {
- $stored{$role.'_incrs'} = 0;
- }
- $stored{$role.'_override'} = [];
- if ($env{'course.'.$env{'request.course.id'}.'.internal.adhocpriv.'.$role}) {
- if (ref($settings{$role}{'off'}) eq 'ARRAY') {
- foreach my $priv (@{$settings{$role}{'off'}}) {
- push(@{$stored{$role.'_override'}},$priv);
- }
- }
- if (ref($settings{$role}{'on'}) eq 'ARRAY') {
- foreach my $priv (@{$settings{$role}{'on'}}) {
- unless (grep(/^$priv$/,@{$stored{$role.'_override'}})) {
- push(@{$stored{$role.'_override'}},$priv);
- }
- }
- }
- }
- } else {
- $stored{$role.'_incrs'} = 0;
- }
- }
- $jscript = &Apache::lonhtmlcommon::set_form_elements(\%elements,\%stored);
- }
-
- my $js = <<"ENDJS";
-
-ENDJS
-
- $args->{add_entries} = {onload => "javascript:setFormElements(document.$formname)"};
-
- # print page header
- $r->print(&header($js,$args));
- # print form header
- $r->print('');
- return;
-}
-
-sub domain_adhoc_access {
- my ($roles,$domcurrent,$accesstypes,$usertypes,$othertitle) = @_;
- my %domusage;
- return unless ((ref($roles) eq 'HASH') && (ref($domcurrent) eq 'HASH') && (ref($accesstypes) eq 'ARRAY'));
- foreach my $role (keys(%{$roles})) {
- if (ref($domcurrent->{$role}) eq 'HASH') {
- 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'));
- } elsif ($access eq 'status') {
- if (ref($domcurrent->{$role}{$access}) eq 'ARRAY') {
- my @shown;
- foreach my $type (@{$domcurrent->{$role}{$access}}) {
- unless ($type eq 'default') {
- if ($usertypes->{$type}) {
- push(@shown,$usertypes->{$type});
- }
- }
- }
- if (grep(/^default$/,@{$domcurrent->{$role}{$access}})) {
- push(@shown,$othertitle);
- }
- 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);
- } else {
- $domusage{$role} = &mt('No one in the domain');
- }
- }
- } elsif ($access eq 'inc') {
- my @dominc = ();
- if (ref($domcurrent->{$role}{'inc'}) eq 'ARRAY') {
- foreach my $user (@{$domcurrent->{$role}{'inc'}}) {
- my ($uname,$udom) = split(/:/,$user);
- push(@dominc,&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom));
- }
- 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);
- } else {
- $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',
- &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'));
- }
- }
- } elsif ($access eq 'exc') {
- my @domexc = ();
- if (ref($domcurrent->{$role}{'exc'}) eq 'ARRAY') {
- foreach my $user (@{$domcurrent->{$role}{'exc'}}) {
- my ($uname,$udom) = split(/:/,$user);
- push(@domexc,&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom));
- }
- }
- 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);
- } 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'));
- }
- } else {
- $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',
- &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'));
- }
- }
- return %domusage;
-}
-
-sub get_domain_customroles {
- my ($cdom,$confname) = @_;
- my %existing=&Apache::lonnet::dump('roles',$cdom,$confname,'rolesdef_');
- my %customroles;
- foreach my $key (keys(%existing)) {
- if ($key=~/^rolesdef\_(\w+)$/) {
- my $rolename = $1;
- my %privs;
- ($privs{'system'},$privs{'domain'},$privs{'course'}) = split(/\_/,$existing{$key});
- $customroles{$rolename} = \%privs;
- }
- }
- return %customroles;
-}
-
-sub role_priv_table {
- my ($role,$permission,$crstype,$full,$levels,$levelscurrent,$overridden) = @_;
- return unless ((ref($full) eq 'HASH') && (ref($levels) eq 'HASH') &&
- (ref($levelscurrent) eq 'HASH'));
- my %lt=&Apache::lonlocal::texthash (
- 'crl' => 'Course Level Privilege',
- 'def' => 'Domain Defaults',
- 'ove' => 'Override in Course',
- 'ine' => 'In effect',
- 'dis' => 'Disabled',
- 'ena' => 'Enabled',
- );
- if ($crstype eq 'Community') {
- $lt{'ove'} = 'Override in Community',
- }
- my @status = ('Disabled','Enabled');
- my (%on,%off);
- if (ref($overridden) eq 'HASH') {
- if (ref($overridden->{'on'}) eq 'ARRAY') {
- map { $on{$_} = 1; } (@{$overridden->{'on'}});
- }
- if (ref($overridden->{'off'}) eq 'ARRAY') {
- map { $off{$_} = 1; } (@{$overridden->{'off'}});
- }
- }
- my $output=&Apache::loncommon::start_data_table().
- &Apache::loncommon::start_data_table_header_row().
- ''.$lt{'crl'}.' '.$lt{'def'}.' '.$lt{'ove'}.
- ' '.$lt{'ine'}.' '.
- &Apache::loncommon::end_data_table_header_row();
- foreach my $priv (sort(keys(%{$full}))) {
- next unless ($levels->{'course'}{$priv});
- my $privtext = &Apache::lonnet::plaintext($priv,$crstype);
- my ($default,$ineffect);
- if ($levelscurrent->{'course'}{$priv}) {
- $default = ' ';
- $ineffect = $default;
- }
- my ($customstatus,$checked);
- $output .= &Apache::loncommon::start_data_table_row().
- ''.$privtext.' '.
- ''.$default.' ';
- if (($levelscurrent->{'course'}{$priv}) && ($off{$priv})) {
- if ($permission->{'owner'}) {
- $checked = ' checked="checked"';
- }
- $customstatus = ' ';
- $ineffect = $customstatus;
- } elsif ((!$levelscurrent->{'course'}{$priv}) && ($on{$priv})) {
- if ($permission->{'owner'}) {
- $checked = ' checked="checked"';
- }
- $customstatus = ' ';
- $ineffect = $customstatus;
- }
- if ($permission->{'owner'}) {
- $output .= ' ';
- } else {
- $output .= $customstatus;
- }
- $output .= ' '.$ineffect.' '.
- &Apache::loncommon::end_data_table_row();
- }
- $output .= &Apache::loncommon::end_data_table();
- return $output;
-}
-
-sub get_adhocrole_settings {
- my ($cid,$accesstypes,$types,$customroles,$settings,$overridden) = @_;
- return unless ((ref($accesstypes) eq 'ARRAY') && (ref($customroles) eq 'HASH') &&
- (ref($settings) eq 'HASH') && (ref($overridden) eq 'HASH'));
- foreach my $role (split(/,/,$env{'course.'.$cid.'.internal.adhocaccess'})) {
- my ($curraccess,$rest) = split(/=/,$env{'course.'.$cid.'.internal.adhoc.'.$role});
- if (($curraccess ne '') && (grep(/^\Q$curraccess\E$/,@{$accesstypes}))) {
- $settings->{$role}{'access'} = $curraccess;
- if (($curraccess eq 'status') && (ref($types) eq 'ARRAY')) {
- my @status = split(/,/,$rest);
- my @currstatus;
- foreach my $type (@status) {
- if ($type eq 'default') {
- push(@currstatus,$type);
- } elsif (grep(/^\Q$type\E$/,@{$types})) {
- push(@currstatus,$type);
- }
- }
- if (@currstatus) {
- $settings->{$role}{$curraccess} = \@currstatus;
- } elsif (($curraccess eq 'exc') || ($curraccess eq 'inc')) {
- my @personnel = split(/,/,$rest);
- $settings->{$role}{$curraccess} = \@personnel;
- }
- }
- }
- }
- foreach my $role (keys(%{$customroles})) {
- if ($env{'course.'.$cid.'.internal.adhocpriv.'.$role}) {
- my %currentprivs;
- if (ref($customroles->{$role}) eq 'HASH') {
- if (exists($customroles->{$role}{'course'})) {
- my %full=();
- my %levels= (
- course => {},
- domain => {},
- system => {},
- );
- my %levelscurrent=(
- course => {},
- domain => {},
- system => {},
- );
- &Apache::lonuserutils::custom_role_privs($customroles->{$role},\%full,\%levels,\%levelscurrent);
- %currentprivs = %{$levelscurrent{'course'}};
- }
- }
- foreach my $item (split(/,/,$env{'course.'.$cid.'.internal.adhocpriv.'.$role})) {
- next if ($item eq '');
- my ($rule,$rest) = split(/=/,$item);
- next unless (($rule eq 'off') || ($rule eq 'on'));
- foreach my $priv (split(/:/,$rest)) {
- if ($priv ne '') {
- if ($rule eq 'off') {
- push(@{$overridden->{$role}{'off'}},$priv);
- if ($currentprivs{$priv}) {
- push(@{$settings->{$role}{'off'}},$priv);
- }
- } else {
- push(@{$overridden->{$role}{'on'}},$priv);
- unless ($currentprivs{$priv}) {
- push(@{$settings->{$role}{'on'}},$priv);
- }
- }
- }
- }
- }
- }
- }
- return;
-}
-
-sub update_helpdeskaccess {
- my ($r,$permission,$brcrum) = @_;
- my $helpitem = 'Course_Helpdesk_Access';
- push (@{$brcrum},
- {href => '/adm/createuser?action=helpdesk',
- text => 'Helpdesk Access',
- help => $helpitem},
- {href => '/adm/createuser?action=helpdesk',
- text => 'Result',
- help => $helpitem}
- );
- my $bread_crumbs_component = 'Helpdesk Staff Access';
- my $args = { bread_crumbs => $brcrum,
- bread_crumbs_component => $bread_crumbs_component};
-
- # print page header
- $r->print(&header('',$args));
- unless ((ref($permission) eq 'HASH') && ($permission->{'owner'})) {
- $r->print(''.&mt('You do not have permission to change helpdesk access.').'
');
- return;
- }
- 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';
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($cdom);
- my $crstype = &Apache::loncommon::course_type();
- my %customroles = &get_domain_customroles($cdom,$confname);
- 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 (%changed,%storehash,@todelete);
-
- if (keys(%customroles)) {
- my (%newsettings,@incrs);
- foreach my $role (keys(%customroles)) {
- $newsettings{$role} = {
- access => '',
- status => '',
- exc => '',
- inc => '',
- on => '',
- off => '',
- };
- my %current;
- if (ref($settings{$role}) eq 'HASH') {
- %current = %{$settings{$role}};
- }
- if (ref($overridden{$role}) eq 'HASH') {
- $current{'overridden'} = $overridden{$role};
- }
- if ($env{'form.'.$role.'_incrs'}) {
- my $access = $env{'form.'.$role.'_access'};
- if (grep(/^\Q$access\E$/,@accesstypes)) {
- push(@incrs,$role);
- unless ($current{'access'} eq $access) {
- $changed{$role}{'access'} = 1;
- $storehash{'internal.adhoc.'.$role} = $access;
- }
- if ($access eq 'status') {
- my @statuses = &Apache::loncommon::get_env_multiple('form.'.$role.'_status');
- my @stored;
- my @shownstatus;
- if (ref($types) eq 'ARRAY') {
- foreach my $type (sort(@statuses)) {
- if ($type eq 'default') {
- push(@stored,$type);
- } elsif (grep(/^\Q$type\E$/,@{$types})) {
- push(@stored,$type);
- push(@shownstatus,$usertypes->{$type});
- }
- }
- if (grep(/^default$/,@statuses)) {
- push(@shownstatus,$othertitle);
- }
- $storehash{'internal.adhoc.'.$role} .= '='.join(',',@stored);
- }
- $newsettings{$role}{'status'} = join(' '.&mt('or').' ',@shownstatus);
- if (ref($current{'status'}) eq 'ARRAY') {
- my @diffs = &Apache::loncommon::compare_arrays(\@stored,$current{'status'});
- if (@diffs) {
- $changed{$role}{'status'} = 1;
- }
- } elsif (@stored) {
- $changed{$role}{'status'} = 1;
- }
- } elsif (($access eq 'inc') || ($access eq 'exc')) {
- my @personnel = &Apache::loncommon::get_env_multiple('form.'.$role.'_staff_'.$access);
- my @newspecstaff;
- my @stored;
- my @currstaff;
- foreach my $person (sort(@personnel)) {
- if ($domhelpdesk{$person}) {
- push(@stored,$person);
- }
- }
- if (ref($current{$access}) eq 'ARRAY') {
- my @diffs = &Apache::loncommon::compare_arrays(\@stored,$current{$access});
- if (@diffs) {
- $changed{$role}{$access} = 1;
- }
- } elsif (@stored) {
- $changed{$role}{$access} = 1;
- }
- $storehash{'internal.adhoc.'.$role} .= '='.join(',',@stored);
- foreach my $person (@stored) {
- my ($uname,$udom) = split(/:/,$person);
- push(@newspecstaff,&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom,'lastname'),$uname,$udom));
- }
- $newsettings{$role}{$access} = join(', ',sort(@newspecstaff));
- }
- $newsettings{$role}{'access'} = $access;
- }
- } else {
- if (($current{'access'} ne '') && (grep(/^\Q$current{'access'}\E$/,@accesstypes))) {
- $changed{$role}{'access'} = 1;
- $newsettings{$role} = {};
- push(@todelete,'internal.adhoc.'.$role);
- }
- }
- if (($env{'form.'.$role.'_incrs'}) && ($env{'form.'.$role.'_access'} eq 'none')) {
- if (ref($current{'overridden'}) eq 'HASH') {
- push(@todelete,'internal.adhocpriv.'.$role);
- }
- } else {
- my %full=();
- my %levels= (
- course => {},
- domain => {},
- system => {},
- );
- my %levelscurrent=(
- course => {},
- domain => {},
- system => {},
- );
- &Apache::lonuserutils::custom_role_privs($customroles{$role},\%full,\%levels,\%levelscurrent);
- my (@updatedon,@updatedoff,@override);
- @override = &Apache::loncommon::get_env_multiple('form.'.$role.'_override');
- if (@override) {
- foreach my $priv (sort(keys(%full))) {
- next unless ($levels{'course'}{$priv});
- if (grep(/^\Q$priv\E$/,@override)) {
- if ($levelscurrent{'course'}{$priv}) {
- push(@updatedoff,$priv);
- } else {
- push(@updatedon,$priv);
- }
- }
- }
- }
- if (@updatedon) {
- $newsettings{$role}{'on'} = join('', map { &Apache::lonnet::plaintext($_,$crstype) } (@updatedon));
- }
- if (@updatedoff) {
- $newsettings{$role}{'off'} = join(' ', map { &Apache::lonnet::plaintext($_,$crstype) } (@updatedoff));
- }
- if (ref($current{'overridden'}) eq 'HASH') {
- if (ref($current{'overridden'}{'on'}) eq 'ARRAY') {
- if (@updatedon) {
- my @diffs = &Apache::loncommon::compare_arrays(\@updatedon,$current{'overridden'}{'on'});
- if (@diffs) {
- $changed{$role}{'on'} = 1;
- }
- } else {
- $changed{$role}{'on'} = 1;
- }
- } elsif (@updatedon) {
- $changed{$role}{'on'} = 1;
- }
- if (ref($current{'overridden'}{'off'}) eq 'ARRAY') {
- if (@updatedoff) {
- my @diffs = &Apache::loncommon::compare_arrays(\@updatedoff,$current{'overridden'}{'off'});
- if (@diffs) {
- $changed{$role}{'off'} = 1;
- }
- } else {
- $changed{$role}{'off'} = 1;
- }
- } elsif (@updatedoff) {
- $changed{$role}{'off'} = 1;
- }
- } else {
- if (@updatedon) {
- $changed{$role}{'on'} = 1;
- }
- if (@updatedoff) {
- $changed{$role}{'off'} = 1;
- }
- }
- if (ref($changed{$role}) eq 'HASH') {
- if (($changed{$role}{'on'} || $changed{$role}{'off'})) {
- my $newpriv;
- if (@updatedon) {
- $newpriv = 'on='.join(':',@updatedon);
- }
- if (@updatedoff) {
- $newpriv .= ($newpriv ? ',' : '' ).'off='.join(':',@updatedoff);
- }
- if ($newpriv eq '') {
- push(@todelete,'internal.adhocpriv.'.$role);
- } else {
- $storehash{'internal.adhocpriv.'.$role} = $newpriv;
- }
- }
- }
- }
- }
- if (@incrs) {
- $storehash{'internal.adhocaccess'} = join(',',@incrs);
- } elsif (@todelete) {
- push(@todelete,'internal.adhocaccess');
- }
- if (keys(%changed)) {
- my ($putres,$delres);
- if (keys(%storehash)) {
- $putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
- my %newenvhash;
- foreach my $key (keys(%storehash)) {
- $newenvhash{'course.'.$env{'request.course.id'}.'.'.$key} = $storehash{$key};
- }
- &Apache::lonnet::appenv(\%newenvhash);
- }
- if (@todelete) {
- $delres = &Apache::lonnet::del('environment',\@todelete,$cdom,$cnum);
- foreach my $key (@todelete) {
- &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.'.$key);
- }
- }
- if (($putres eq 'ok') || ($delres eq 'ok')) {
- my %domconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$cdom);
- my (%domcurrent,%ordered,%description,%domusage);
- if (ref($domconfig{'helpsettings'}) eq 'HASH') {
- if (ref($domconfig{'helpsettings'}{'adhoc'}) eq 'HASH') {
- %domcurrent = %{$domconfig{'helpsettings'}{'adhoc'}};
- }
- }
- my $count = 0;
- foreach my $role (sort(keys(%customroles))) {
- my ($order,$desc);
- if (ref($domcurrent{$role}) eq 'HASH') {
- $order = $domcurrent{$role}{'order'};
- $desc = $domcurrent{$role}{'desc'};
- }
- if ($order eq '') {
- $order = $count;
- }
- $ordered{$order} = $role;
- if ($desc ne '') {
- $description{$role} = $desc;
- } else {
- $description{$role}= $role;
- }
- $count++;
- }
- my @roles_by_num = ();
- foreach my $item (sort {$a <=> $b } (keys(%ordered))) {
- push(@roles_by_num,$ordered{$item});
- }
- %domusage = &domain_adhoc_access(\%changed,\%domcurrent,\@accesstypes,$usertypes,$othertitle);
- $r->print(&mt('Helpdesk access settings have been changed as follows').' ');
- $r->print('');
- foreach my $role (@roles_by_num) {
- next unless (ref($changed{$role}) eq 'HASH');
- $r->print(''.&mt('Ad hoc role').': '.$description{$role}.' '.
- '');
- if ($changed{$role}{'access'} || $changed{$role}{'status'} || $changed{$role}{'inc'} || $changed{$role}{'exc'}) {
- $r->print('');
- 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') {
- if ($newsettings{$role}{'status'}) {
- my ($access,$rest) = split(/=/,$storehash{'internal.adhoc.'.$role});
- if (split(/,/,$rest) > 1) {
- $r->print(&mt('Helpdesk staff can use this role if their institutional type is one of: [_1].',
- $newsettings{$role}{'status'}));
- } else {
- $r->print(&mt('Helpdesk staff can use this role if their institutional type is: [_1].',
- $newsettings{$role}{'status'}));
- }
- } else {
- $r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.'));
- }
- } elsif ($newsettings{$role}{'access'} eq 'exc') {
- if ($newsettings{$role}{'exc'}) {
- $r->print(&mt('Helpdesk staff who can use this role are as follows:').' '.$newsettings{$role}{'exc'}.'.');
- } else {
- $r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.'));
- }
- } elsif ($newsettings{$role}{'access'} eq 'inc') {
- if ($newsettings{$role}{'inc'}) {
- $r->print(&mt('All helpdesk staff may use this role except the following:').' '.$newsettings{$role}{'inc'}.'.');
- } else {
- $r->print(&mt('All helpdesk staff may use this role.'));
- }
- }
- } else {
- $r->print(&mt('Default access set in the domain now applies.').' '.
- ''.$domusage{$role}.' ');
- }
- $r->print(' ');
- }
- unless ($newsettings{$role}{'access'} eq 'none') {
- if ($changed{$role}{'off'}) {
- if ($newsettings{$role}{'off'}) {
- $r->print(''.&mt('Privileges which are available by default for this ad hoc role, but are disabled for this specific '.lc($crstype).':').
- ''.$newsettings{$role}{'off'}.' ');
- } else {
- $r->print(''.&mt('All privileges available by default for this ad hoc role are enabled.').' ');
- }
- }
- if ($changed{$role}{'on'}) {
- if ($newsettings{$role}{'on'}) {
- $r->print(''.&mt('Privileges which are not available by default for this ad hoc role, but are enabled for this specific '.lc($crstype).':').
- ''.$newsettings{$role}{'on'}.' ');
- } else {
- $r->print(''.&mt('None of the privileges unavailable by default for this ad hoc role are enabled.').' ');
- }
- }
- }
- $r->print(' ');
- }
- $r->print(' ');
- }
- } else {
- $r->print(&mt('No changes made to helpdesk access settings.'));
- }
- }
- return;
-}
-
#-------------------------------------------------- functions for &phase_two
sub user_search_result {
my ($context,$srch) = @_;
@@ -8524,29 +6823,13 @@ sub user_search_result {
}
}
if ($response ne '') {
- $response = ''.$response.' ';
+ $response = ''.$response.' ';
}
if ($srch->{'srchin'} eq 'instd') {
- my $instd_chk = &instdirectorysrch_check($srch);
+ my $instd_chk = &directorysrch_check($srch);
if ($instd_chk ne 'ok') {
- my $domd_chk = &domdirectorysrch_check($srch);
- $response .= ''.$instd_chk.' ';
- if ($domd_chk eq 'ok') {
- $response .= &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.');
- }
- $response .= ' ';
- }
- } else {
- unless (($context eq 'requestcrs') && ($srch->{'srchtype'} eq 'exact')) {
- my $domd_chk = &domdirectorysrch_check($srch);
- if (($domd_chk ne 'ok') && ($env{'form.action'} ne 'accesslogs')) {
- my $instd_chk = &instdirectorysrch_check($srch);
- $response .= ''.$domd_chk.' ';
- if ($instd_chk eq 'ok') {
- $response .= &mt('You may want to search in the institutional directory instead of the LON-CAPA domain.');
- }
- $response .= ' ';
- }
+ $response = ''.$instd_chk.' '.
+ ' '.&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').' ';
}
}
if ($response ne '') {
@@ -8576,9 +6859,6 @@ 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} =
@@ -8645,7 +6925,7 @@ sub user_search_result {
&mt('Institutional directory search is not available in domain: [_1]',$showdom).
' '.
&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').
- ' ';
+ ' ';
}
}
} else {
@@ -8713,38 +6993,18 @@ sub user_search_result {
($currstate,$response,$forcenewuser) =
&build_search_response($context,$srch,%srch_results);
} else {
- my $showdom = &display_domain_info($srch->{'srchdomain'});
- $response = ''.
+ my $showdom = &display_domain_info($srch->{'srchdomain'}); $response = ''.
&mt('Institutional directory search is not available in domain: [_1]',$showdom).
' '.
&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').
- ' ';
+ ' ';
}
}
}
return ($currstate,$response,$forcenewuser,\%srch_results);
}
-sub domdirectorysrch_check {
- my ($srch) = @_;
- my $response;
- my %dom_inst_srch = &Apache::lonnet::get_dom('configuration',
- ['directorysrch'],$srch->{'srchdomain'});
- my $showdom = &display_domain_info($srch->{'srchdomain'});
- if (ref($dom_inst_srch{'directorysrch'}) eq 'HASH') {
- if ($dom_inst_srch{'directorysrch'}{'lcavailable'} eq '0') {
- return &mt('LON-CAPA directory search is not available in domain: [_1]',$showdom);
- }
- if ($dom_inst_srch{'directorysrch'}{'lclocalonly'}) {
- if ($env{'request.role.domain'} ne $srch->{'srchdomain'}) {
- return &mt('LON-CAPA directory search in domain: [_1] is only allowed for users with a current role in the domain.',$showdom);
- }
- }
- }
- return 'ok';
-}
-
-sub instdirectorysrch_check {
+sub directorysrch_check {
my ($srch) = @_;
my $can_search = 0;
my $response;
@@ -8866,11 +7126,7 @@ sub build_search_response {
$currstate = 'select';
} else {
if (keys(%srch_results) == 1) {
- if ($env{'form.action'} eq 'accesslogs') {
- $currstate = 'activity';
- } else {
- $currstate = 'modify';
- }
+ $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'});
@@ -8890,7 +7146,7 @@ sub build_search_response {
if ($srch->{'srchin'} ne 'alc') {
$forcenewuser = 1;
my $cansrchinst = 0;
- if (($srch->{'srchdomain'}) && ($env{'form.action'} ne 'accesslogs')) {
+ if ($srch->{'srchdomain'}) {
my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$srch->{'srchdomain'});
if (ref($domconfig{'directorysrch'}) eq 'HASH') {
if ($domconfig{'directorysrch'}{'available'}) {
@@ -8915,8 +7171,7 @@ sub build_search_response {
$createdom = $env{'form.coursedom'};
}
}
- unless (($env{'form.action'} eq 'accesslogs') || (($srch->{'srchby'} eq 'uname') && ($srch->{'srchin'} eq 'dom') &&
- ($srch->{'srchtype'} eq 'exact') && ($srch->{'srchdomain'} eq $createdom))) {
+ if (!($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 = ''.$createdom.' ';
@@ -8940,20 +7195,18 @@ sub build_search_response {
.&mt("Click 'Search'")
.' ';
} else {
- unless (($context eq 'domain') && ($env{'form.action'} eq 'singleuser')) {
- my $helplink = ' href="javascript:helpMenu('."'display'".')"';
- $response .= ' ';
- if ($context eq 'requestcrs') {
- $response .= &mt("You are not authorized to define new users in the new course's domain - [_1].",$targetdom);
- } else {
- $response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom);
- }
- $response .= ' '
- .&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.'
- ,' '
- ,' ')
- .' ';
+ my $helplink = ' href="javascript:helpMenu('."'display'".')"';
+ $response .= ' ';
+ if ($context eq 'requestcrs') {
+ $response .= &mt("You are not authorized to define new users in the new course's domain - [_1].",$targetdom);
+ } else {
+ $response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom);
}
+ $response .= ' '
+ .&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.'
+ ,' '
+ ,' ')
+ .' ';
}
}
}
@@ -9573,7 +7826,7 @@ sub update_selfenroll_config {
} else {
$r->print(&mt('No changes were made to the existing self-enrollment settings in this course.'));
}
- my $visactions = &cat_visibility($cdom);
+ my $visactions = &cat_visibility();
my ($cathash,%cattype);
my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
if (ref($domconfig{'coursecategories'}) eq 'HASH') {