version 1.430, 2017/01/24 05:34:37
|
version 1.432, 2017/01/28 03:48:44
|
Line 6684 sub print_useraccesslogs_display {
|
Line 6684 sub print_useraccesslogs_display {
|
|
|
# set breadcrumbs |
# set breadcrumbs |
my %breadcrumb_text = &singleuser_breadcrumb('','domain',$udom); |
my %breadcrumb_text = &singleuser_breadcrumb('','domain',$udom); |
push (@{$brcrum}, |
my $prevphasestr; |
{href => "javascript:backPage($form)", |
if ($env{'form.popup'}) { |
text => $breadcrumb_text{'search'}}); |
$brcrum = []; |
my (@prevphases,$prevphasestr); |
} else { |
if ($env{'form.prevphases'}) { |
push (@{$brcrum}, |
@prevphases = split(/,/,$env{'form.prevphases'}); |
{href => "javascript:backPage($form)", |
$prevphasestr = $env{'form.prevphases'}; |
text => $breadcrumb_text{'search'}}); |
} |
my @prevphases; |
if (($env{'form.phase'} eq 'userpicked') || (grep(/^userpicked$/,@prevphases))) { |
if ($env{'form.prevphases'}) { |
push(@{$brcrum}, |
@prevphases = split(/,/,$env{'form.prevphases'}); |
{href => "javascript:backPage($form,'get_user_info','select')", |
$prevphasestr = $env{'form.prevphases'}; |
text => $breadcrumb_text{'userpicked'}}); |
} |
if ($env{'form.phase'} eq 'userpicked') { |
if (($env{'form.phase'} eq 'userpicked') || (grep(/^userpicked$/,@prevphases))) { |
$prevphasestr = 'userpicked'; |
push(@{$brcrum}, |
|
{href => "javascript:backPage($form,'get_user_info','select')", |
|
text => $breadcrumb_text{'userpicked'}}); |
|
if ($env{'form.phase'} eq 'userpicked') { |
|
$prevphasestr = 'userpicked'; |
|
} |
} |
} |
} |
} |
push(@{$brcrum}, |
push(@{$brcrum}, |
Line 6709 sub print_useraccesslogs_display {
|
Line 6714 sub print_useraccesslogs_display {
|
bread_crumbs_component => 'User Management'}; |
bread_crumbs_component => 'User Management'}; |
if ($env{'form.popup'}) { |
if ($env{'form.popup'}) { |
$args->{'no_nav_bar'} = 1; |
$args->{'no_nav_bar'} = 1; |
|
$args->{'bread_crumbs_nomenu'} = 1; |
} |
} |
|
|
# set javascript |
# set javascript |
Line 6734 ENDSCRIPT
|
Line 6740 ENDSCRIPT
|
unless ($permission->{'activity'}) { |
unless ($permission->{'activity'}) { |
$r->print('<p class="LC_warning">' |
$r->print('<p class="LC_warning">' |
.&mt('You do not have rights to display user access logs.') |
.&mt('You do not have rights to display user access logs.') |
.'</p>' |
.'</p>'); |
.&earlyout_accesslog_form($formname,$prevphasestr,$udom)); |
if ($env{'form.popup'}) { |
|
$r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>'); |
|
} else { |
|
$r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom)); |
|
} |
return; |
return; |
} |
} |
|
|
Line 6801 ENDSCRIPT
|
Line 6811 ENDSCRIPT
|
my ($nav_script,$nav_links); |
my ($nav_script,$nav_links); |
|
|
# table header |
# table header |
my $tableheader = |
my $tableheader = '<h3>'. |
&Apache::loncommon::start_data_table_header_row() |
&mt('User access logs for: [_1]', |
|
&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)).'</h3>' |
|
.&Apache::loncommon::start_data_table_header_row() |
.'<th> </th>' |
.'<th> </th>' |
.'<th>'.&mt('When').'</th>' |
.'<th>'.&mt('When').'</th>' |
.'<th>'.&mt('HostID').'</th>' |
.'<th>'.&mt('HostID').'</th>' |
Line 7001 sub activity_display_filter {
|
Line 7013 sub activity_display_filter {
|
# Update Display button |
# Update Display button |
$output .= '<p>' |
$output .= '<p>' |
.'<input type="submit" value="'.&mt('Update Display').'" />' |
.'<input type="submit" value="'.&mt('Update Display').'" />' |
.'</p>'; |
.'</p><hr />'; |
return $output; |
return $output; |
} |
} |
|
|
Line 7206 sub print_helpdeskaccess_display {
|
Line 7218 sub print_helpdeskaccess_display {
|
} |
} |
} |
} |
my %customroles = &get_domain_customroles($cdom,$confname); |
my %customroles = &get_domain_customroles($cdom,$confname); |
my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh']); |
my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']); |
if (keys(%domhelpdesk)) { |
if (keys(%domhelpdesk)) { |
push(@accesstypes,('inc','exc')); |
push(@accesstypes,('inc','exc')); |
push(@jsarray,('notinc','notexc')); |
push(@jsarray,('notinc','notexc')); |
Line 7591 sub domain_adhoc_access {
|
Line 7603 sub domain_adhoc_access {
|
my $access = $domcurrent->{$role}{'access'}; |
my $access = $domcurrent->{$role}{'access'}; |
if (($access eq '') || (!grep(/^\Q$access\E$/,@{$accesstypes}))) { |
if (($access eq '') || (!grep(/^\Q$access\E$/,@{$accesstypes}))) { |
$access = 'all'; |
$access = 'all'; |
$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh')); |
$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') { |
} elsif ($access eq 'status') { |
if (ref($domcurrent->{$role}{$access}) eq 'ARRAY') { |
if (ref($domcurrent->{$role}{$access}) eq 'ARRAY') { |
my @shown; |
my @shown; |
Line 7607 sub domain_adhoc_access {
|
Line 7620 sub domain_adhoc_access {
|
} |
} |
if (@shown) { |
if (@shown) { |
my $shownstatus = join(' '.&mt('or').' ',@shown); |
my $shownstatus = join(' '.&mt('or').' ',@shown); |
$domusage{$role} = &mt('Any user in domain with active [_1] role, and institutional status: [_2]', |
$domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role, and institutional status: [_3]', |
&Apache::lonnet::plaintext('dh'),$shownstatus); |
&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownstatus); |
} else { |
} else { |
$domusage{$role} = &mt('No one in the domain'); |
$domusage{$role} = &mt('No one in the domain'); |
} |
} |
Line 7622 sub domain_adhoc_access {
|
Line 7635 sub domain_adhoc_access {
|
} |
} |
my $showninc = join(', ',@dominc); |
my $showninc = join(', ',@dominc); |
if ($showninc ne '') { |
if ($showninc ne '') { |
$domusage{$role} = &mt('Include any user in domain with active [_1] role, except: [_2]', |
$domusage{$role} = &mt('Include any user in domain with active [_1] or [_2] role, except: [_3]', |
&Apache::lonnet::plaintext('dh'),$showninc); |
&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$showninc); |
} else { |
} else { |
$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh')); |
$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') { |
} elsif ($access eq 'exc') { |
Line 7638 sub domain_adhoc_access {
|
Line 7652 sub domain_adhoc_access {
|
} |
} |
my $shownexc = join(', ',@domexc); |
my $shownexc = join(', ',@domexc); |
if ($shownexc ne '') { |
if ($shownexc ne '') { |
$domusage{$role} = &mt('Only the following in the domain with active [_1] role: [_2]', |
$domusage{$role} = &mt('Only the following in the domain with active [_1] or [_2] role: [_3]', |
&Apache::lonnet::plaintext('dh'),$shownexc); |
&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownexc); |
} else { |
} else { |
$domusage{$role} = &mt('No one in the domain'); |
$domusage{$role} = &mt('No one in the domain'); |
} |
} |
} elsif ($access eq 'none') { |
} elsif ($access eq 'none') { |
$domusage{$role} = &mt('No one in the domain'); |
$domusage{$role} = &mt('No one in the domain'); |
} elsif ($access eq 'all') { |
} elsif ($access eq 'all') { |
$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh')); |
$domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role', |
|
&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da')); |
} |
} |
} else { |
} else { |
$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh')); |
$domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role', |
|
&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da')); |
} |
} |
} |
} |
return %domusage; |
return %domusage; |
Line 7840 sub update_helpdeskaccess {
|
Line 7856 sub update_helpdeskaccess {
|
my (%settings,%overridden); |
my (%settings,%overridden); |
&get_adhocrole_settings($env{'request.course.id'},\@accesstypes, |
&get_adhocrole_settings($env{'request.course.id'},\@accesstypes, |
$types,\%customroles,\%settings,\%overridden); |
$types,\%customroles,\%settings,\%overridden); |
my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh']); |
my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']); |
my (%changed,%storehash,@todelete); |
my (%changed,%storehash,@todelete); |
|
|
if (keys(%customroles)) { |
if (keys(%customroles)) { |