'
+ .&mt('Unable to determine home server for [_1] in domain [_2].',
+ '"'.$env{'form.ccuname'}.'"','"'.$env{'form.ccdomain'}.'"')
+ .'
');
return;
}
}
@@ -2487,7 +2844,7 @@ sub update_user_data {
my (%alerts,%rulematch,%inst_results,%curr_rules);
my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
my @usertools = ('aboutme','blog','webdav','portfolio');
- my @requestcourses = ('official','unofficial','community');
+ my @requestcourses = ('official','unofficial','community','textbook');
my @requestauthor = ('requestauthor');
my ($othertitle,$usertypes,$types) =
&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
@@ -2557,14 +2914,18 @@ sub update_user_data {
my (%changeHash,%newcustom,%changed,%changedinfo);
if ($uhome ne 'no_host') {
if ($context eq 'domain') {
- if ($env{'form.customquota'} == 1) {
- if ($env{'form.portfolioquota'} eq '') {
- $newcustom{'quota'} = 0;
- } else {
- $newcustom{'quota'} = $env{'form.portfolioquota'};
- $newcustom{'quota'} =~ s/[^\d\.]//g;
+ foreach my $name ('portfolio','author') {
+ if ($env{'form.custom_'.$name.'quota'} == 1) {
+ if ($env{'form.'.$name.'quota'} eq '') {
+ $newcustom{$name.'quota'} = 0;
+ } else {
+ $newcustom{$name.'quota'} = $env{'form.'.$name.'quota'};
+ $newcustom{$name.'quota'} =~ s/[^\d\.]//g;
+ }
+ if ("a_admin($newcustom{$name.'quota'},\%changeHash,$name)) {
+ $changed{$name.'quota'} = 1;
+ }
}
- $changed{'quota'} = "a_admin($newcustom{'quota'},\%changeHash);
}
foreach my $item (@usertools) {
if ($env{'form.custom'.$item} == 1) {
@@ -2578,7 +2939,8 @@ sub update_user_data {
$newcustom{$item} = $env{'form.crsreq_'.$item};
if ($env{'form.crsreq_'.$item} eq 'autolimit') {
$newcustom{$item} .= '=';
- unless ($env{'form.crsreq_'.$item.'_limit'} =~ /\D/) {
+ $env{'form.crsreq_'.$item.'_limit'} =~ s/\D+//g;
+ if ($env{'form.crsreq_'.$item.'_limit'}) {
$newcustom{$item} .= $env{'form.crsreq_'.$item.'_limit'};
}
}
@@ -2620,7 +2982,7 @@ sub update_user_data {
$r->print($error.'Invalid login mode or password'.$end.$rtnlink);
return;
}
- # Only allow authentification modification if the person has authority
+ # Only allow authentication modification if the person has authority
if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) {
$r->print('Modifying authentication: '.
&Apache::lonnet::modifyuserauth(
@@ -2630,8 +2992,15 @@ sub update_user_data {
($env{'form.ccuname'},$env{'form.ccdomain'}));
} else {
# Okay, this is a non-fatal error.
- $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.'.$end);
+ $r->print($error.&mt('You do not have privileges to modify the authentication configuration for this user.').$end);
}
+ } elsif (($env{'form.intarg'} ne '') &&
+ (&Apache::lonnet::queryauthenticate($env{'form.ccuname'},$env{'form.ccdomain'}) =~ /^internal:/) &&
+ (&Apache::lonuserutils::can_change_internalpass($env{'form.ccuname'},$env{'form.ccdomain'},$crstype,$permission))) {
+ $r->print('Modifying authentication: '.
+ &Apache::lonnet::modifyuserauth(
+ $env{'form.ccdomain'},$env{'form.ccuname'},
+ 'internal',$env{'form.intarg'}));
}
$r->rflush(); # Finish display of header before time consuming actions start
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state);
@@ -2649,11 +3018,12 @@ sub update_user_data {
# Check for need to change
my %userenv = &Apache::lonnet::get
('environment',['firstname','middlename','lastname','generation',
- 'id','permanentemail','portfolioquota','inststatus','tools.aboutme',
- 'tools.blog','tools.webdav','tools.portfolio',
+ 'id','permanentemail','portfolioquota','authorquota','inststatus',
+ 'tools.aboutme','tools.blog','tools.webdav','tools.portfolio',
'requestcourses.official','requestcourses.unofficial',
- 'requestcourses.community','reqcrsotherdom.official',
- 'reqcrsotherdom.unofficial','reqcrsotherdom.community',
+ 'requestcourses.community','requestcourses.textbook',
+ 'reqcrsotherdom.official','reqcrsotherdom.unofficial',
+ 'reqcrsotherdom.community','reqcrsotherdom.textbook',
'requestauthor'],
$env{'form.ccdomain'},$env{'form.ccuname'});
my ($tmp) = keys(%userenv);
@@ -2776,10 +3146,10 @@ sub update_user_data {
}
}
}
- my ($quotachanged,$oldportfolioquota,$newportfolioquota,$oldinststatus,
- $newinststatus,$oldisdefault,$newisdefault,%oldsettings,
+ my (%quotachanged,%oldquota,%newquota,%olddefquota,%newdefquota,
+ $oldinststatus,$newinststatus,%oldisdefault,%newisdefault,%oldsettings,
%oldsettingstext,%newsettings,%newsettingstext,@disporder,
- $olddefquota,$oldsettingstatus,$newdefquota,$newsettingstatus);
+ %oldsettingstatus,%newsettingstatus);
@disporder = ('inststatus');
if ($env{'request.role.domain'} eq $env{'form.ccdomain'}) {
push(@disporder,'requestcourses','requestauthor');
@@ -2788,9 +3158,11 @@ sub update_user_data {
}
push(@disporder,('quota','tools'));
$oldinststatus = $userenv{'inststatus'};
- ($olddefquota,$oldsettingstatus) =
- &Apache::loncommon::default_quota($env{'form.ccdomain'},$oldinststatus);
- ($newdefquota,$newsettingstatus) = ($olddefquota,$oldsettingstatus);
+ foreach my $name ('portfolio','author') {
+ ($olddefquota{$name},$oldsettingstatus{$name}) =
+ &Apache::loncommon::default_quota($env{'form.ccdomain'},$oldinststatus,$name);
+ ($newdefquota{$name},$newsettingstatus{$name}) = ($olddefquota{$name},$oldsettingstatus{$name});
+ }
my %canshow;
if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
$canshow{'quota'} = 1;
@@ -2829,8 +3201,10 @@ sub update_user_data {
$changeHash{'inststatus'} = $newinststatus;
if ($newinststatus ne $oldinststatus) {
$changed{'inststatus'} = $newinststatus;
- ($newdefquota,$newsettingstatus) =
- &Apache::loncommon::default_quota($env{'form.ccdomain'},$newinststatus);
+ foreach my $name ('portfolio','author') {
+ ($newdefquota{$name},$newsettingstatus{$name}) =
+ &Apache::loncommon::default_quota($env{'form.ccdomain'},$newinststatus,$name);
+ }
}
if (ref($usertypes) eq 'HASH') {
$newsettings{'inststatus'} = join(', ',map{ $usertypes->{$_}; } (@inststatuses));
@@ -2844,61 +3218,78 @@ sub update_user_data {
$newsettings{'inststatus'} = $othertitle;
if ($newinststatus ne $oldinststatus) {
$changed{'inststatus'} = $changeHash{'inststatus'};
- ($newdefquota,$newsettingstatus) =
- &Apache::loncommon::default_quota($env{'form.ccdomain'},$newinststatus);
+ foreach my $name ('portfolio','author') {
+ ($newdefquota{$name},$newsettingstatus{$name}) =
+ &Apache::loncommon::default_quota($env{'form.ccdomain'},$newinststatus,$name);
+ }
}
}
} elsif ($context ne 'selfcreate') {
$canshow{'inststatus'} = 1;
$newsettings{'inststatus'} = $oldsettings{'inststatus'};
}
- $changeHash{'portfolioquota'} = $userenv{'portfolioquota'};
+ foreach my $name ('portfolio','author') {
+ $changeHash{$name.'quota'} = $userenv{$name.'quota'};
+ }
if ($context eq 'domain') {
- if ($userenv{'portfolioquota'} ne '') {
- $oldportfolioquota = $userenv{'portfolioquota'};
- if ($env{'form.customquota'} == 1) {
- if ($env{'form.portfolioquota'} eq '') {
- $newportfolioquota = 0;
+ foreach my $name ('portfolio','author') {
+ if ($userenv{$name.'quota'} ne '') {
+ $oldquota{$name} = $userenv{$name.'quota'};
+ if ($env{'form.custom_'.$name.'quota'} == 1) {
+ if ($env{'form.'.$name.'quota'} eq '') {
+ $newquota{$name} = 0;
+ } else {
+ $newquota{$name} = $env{'form.'.$name.'quota'};
+ $newquota{$name} =~ s/[^\d\.]//g;
+ }
+ if ($newquota{$name} != $oldquota{$name}) {
+ if ("a_admin($newquota{$name},\%changeHash,$name)) {
+ $changed{$name.'quota'} = 1;
+ }
+ }
} else {
- $newportfolioquota = $env{'form.portfolioquota'};
- $newportfolioquota =~ s/[^\d\.]//g;
- }
- if ($newportfolioquota != $oldportfolioquota) {
- $changed{'quota'} = "a_admin($newportfolioquota,\%changeHash);
+ if ("a_admin('',\%changeHash,$name)) {
+ $changed{$name.'quota'} = 1;
+ $newquota{$name} = $newdefquota{$name};
+ $newisdefault{$name} = 1;
+ }
}
} else {
- $changed{'quota'} = "a_admin('',\%changeHash);
- $newportfolioquota = $newdefquota;
- $newisdefault = 1;
- }
- } else {
- $oldisdefault = 1;
- $oldportfolioquota = $olddefquota;
- if ($env{'form.customquota'} == 1) {
- if ($env{'form.portfolioquota'} eq '') {
- $newportfolioquota = 0;
+ $oldisdefault{$name} = 1;
+ $oldquota{$name} = $olddefquota{$name};
+ if ($env{'form.custom_'.$name.'quota'} == 1) {
+ if ($env{'form.'.$name.'quota'} eq '') {
+ $newquota{$name} = 0;
+ } else {
+ $newquota{$name} = $env{'form.'.$name.'quota'};
+ $newquota{$name} =~ s/[^\d\.]//g;
+ }
+ if ("a_admin($newquota{$name},\%changeHash,$name)) {
+ $changed{$name.'quota'} = 1;
+ }
} else {
- $newportfolioquota = $env{'form.portfolioquota'};
- $newportfolioquota =~ s/[^\d\.]//g;
+ $newquota{$name} = $newdefquota{$name};
+ $newisdefault{$name} = 1;
}
- $changed{'quota'} = "a_admin($newportfolioquota,\%changeHash);
+ }
+ if ($oldisdefault{$name}) {
+ $oldsettingstext{'quota'}{$name} = &get_defaultquota_text($oldsettingstatus{$name});
+ } else {
+ $oldsettingstext{'quota'}{$name} = &mt('custom quota: [_1] MB',$oldquota{$name});
+ }
+ if ($newisdefault{$name}) {
+ $newsettingstext{'quota'}{$name} = &get_defaultquota_text($newsettingstatus{$name});
} else {
- $newportfolioquota = $newdefquota;
- $newisdefault = 1;
+ $newsettingstext{'quota'}{$name} = &mt('custom quota: [_1] MB',$newquota{$name});
}
}
- if ($oldisdefault) {
- $oldsettingstext{'quota'} = &get_defaultquota_text($oldsettingstatus);
- }
- if ($newisdefault) {
- $newsettingstext{'quota'} = &get_defaultquota_text($newsettingstatus);
- }
&tool_changes('tools',\@usertools,\%oldsettings,\%oldsettingstext,\%userenv,
\%changeHash,\%changed,\%newsettings,\%newsettingstext);
if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) {
&tool_changes('requestcourses',\@requestcourses,\%oldsettings,\%oldsettingstext,
\%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
- &tool_changes('requestauthor',\@requestauthor,\%oldsettings,\%oldsettingstext,\%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
+ &tool_changes('requestauthor',\@requestauthor,\%oldsettings,\%oldsettingstext,
+ \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
} else {
&tool_changes('reqcrsotherdom',\@requestcourses,\%oldsettings,\%oldsettingstext,
\%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
@@ -2909,8 +3300,10 @@ sub update_user_data {
$namechanged{$item} = 1;
}
}
- $oldsettings{'quota'} = $oldportfolioquota.' Mb';
- $newsettings{'quota'} = $newportfolioquota.' Mb';
+ foreach my $name ('portfolio','author') {
+ $oldsettings{'quota'}{$name} = &mt('[_1] MB',$oldquota{$name});
+ $newsettings{'quota'}{$name} = &mt('[_1] MB',$newquota{$name});
+ }
if ((keys(%namechanged) > 0) || (keys(%changed) > 0)) {
my ($chgresult,$namechgresult);
if (keys(%changed) > 0) {
@@ -2923,7 +3316,7 @@ sub update_user_data {
my %newenvhash;
foreach my $key (keys(%changed)) {
if (($key eq 'official') || ($key eq 'unofficial')
- || ($key eq 'community')) {
+ || ($key eq 'community') || ($key eq 'textbook')) {
$newenvhash{'environment.requestcourses.'.$key} =
$changeHash{'requestcourses.'.$key};
if ($changeHash{'requestcourses.'.$key}) {
@@ -2989,7 +3382,7 @@ sub update_user_data {
\%newsettingstext);
if ($env{'form.cid'} ne $userenv{'id'}) {
&Apache::lonnet::idput($env{'form.ccdomain'},
- ($env{'form.ccuname'} => $env{'form.cid'}));
+ {$env{'form.ccuname'} => $env{'form.cid'}});
if (($recurseid) &&
(&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) {
my $idresult =
@@ -3008,9 +3401,12 @@ sub update_user_data {
&Apache::lonnet::appenv(\%newenvhash);
}
} else { # error occurred
- $r->print(''
+ .&mt('Unable to successfully change environment for [_1] in domain [_2].',
+ '"'.$env{'form.ccuname'}.'"',
+ '"'.$env{'form.ccdomain'}.'"')
+ .'
');
}
} else { # End of if ($env ... ) logic
# They did not want to change the users name, quota, tool availability,
@@ -3028,9 +3424,9 @@ sub update_user_data {
$rolestr = &mt('No roles');
}
if ($context eq 'course') {
- $contextname = &mt('course');
+ $contextname = 'course';
} elsif ($context eq 'author') {
- $contextname = &mt('co-author');
+ $contextname = 'co-author';
}
$r->print(&mt('The following fields were not updated: ').'');
if ($crstype eq 'Community') {
- $r->print(&mt('If the member is currently logged-in to LON-CAPA, the new role will be available when the member next logs in.'));
+ $r->print(&mt('If the member is currently logged-in to LON-CAPA, the new role can be displayed by using the "Check for changes" link on the Roles/Courses page.'));
} else {
- $r->print(&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.'));
+ $r->print(&mt('If the student is currently logged-in to LON-CAPA, the new role can be displayed by using the "Check for changes" link on the Roles/Courses page.'));
}
$r->print('
');
}
@@ -3783,14 +4301,14 @@ sub get_defaultquota_text {
my ($settingstatus) = @_;
my $defquotatext;
if ($settingstatus eq '') {
- $defquotatext = &mt('(default)');
+ $defquotatext = &mt('default');
} else {
my ($usertypes,$order) =
&Apache::lonnet::retrieve_inst_usertypes($env{'form.ccdomain'});
if ($usertypes->{$settingstatus} eq '') {
- $defquotatext = &mt('(default)');
+ $defquotatext = &mt('default');
} else {
- $defquotatext = &mt('(default for [_1])',$usertypes->{$settingstatus});
+ $defquotatext = &mt('default for [_1]',$usertypes->{$settingstatus});
}
}
return $defquotatext;
@@ -3815,20 +4333,20 @@ sub update_result_form {
$outcome .= ''.&Apache::lonhtmlcommon::start_pick_box());
+ my ($num,$count);
+ $count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}}));
+ $count += $numextras;
+ foreach my $field (@{$infofields}) {
+ next unless ($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}{$field});
+ next unless ($infotitles->{$field});
+ $r->print(&Apache::lonhtmlcommon::row_title($infotitles->{$field}).
+ $info{$uname}{$field});
+ $num ++;
+ unless ($count == $num) {
+ $r->print(&Apache::lonhtmlcommon::row_closure());
+ }
+ }
+ }
+ }
+ if ($numextras) {
+ unless ($pickstart) {
+ $r->print('
'.&Apache::lonhtmlcommon::start_pick_box());
+ $pickstart = 1;
+ }
+ if ($showemail) {
+ my $closure = '';
+ unless ($showstatus) {
+ $closure = 1;
+ }
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('E-mail address')).
+ $showemail.
+ &Apache::lonhtmlcommon::row_closure($closure));
+ }
+ if ($showstatus) {
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type[_1](self-reported)','
');
+ } else {
+ $r->print('
'.&mt('No information to display for this account request.').'
');
+ }
+ } else {
+ $r->print('
'.&mt('No information available for this account request.').'
');
+ }
+ }
+ }
+ }
+ }
+ $r->print(&close_popup_form());
} elsif (($env{'form.action'} eq 'listusers') &&
($permission->{'view'} || $permission->{'cusr'})) {
+ my $helpitem = 'Course_View_Class_List';
+ if ($context eq 'author') {
+ $helpitem = 'Author_View_Coauthor_List';
+ } elsif ($context eq 'domain') {
+ $helpitem = 'Domain_View_Users_List';
+ }
if ($env{'form.phase'} eq 'bulkchange') {
push(@{$brcrum},
{href => '/adm/createuser?action=listusers',
text => "List Users"},
{href => "/adm/createuser",
text => "Result",
- help => 'Course_View_Class_List'});
+ help => $helpitem});
$bread_crumbs_component = 'Update Users';
$args = {bread_crumbs => $brcrum,
bread_crumbs_component => $bread_crumbs_component};
@@ -4499,7 +5124,7 @@ sub handler {
push(@{$brcrum},
{href => '/adm/createuser?action=listusers',
text => "List Users",
- help => 'Course_View_Class_List'});
+ help => $helpitem});
$bread_crumbs_component = 'List Users';
$args = {bread_crumbs => $brcrum,
bread_crumbs_component => $bread_crumbs_component};
@@ -4579,69 +5204,100 @@ sub handler {
'
'.&mt('You do not have permission to modify dates or sections for users').' ');
}
} elsif ($env{'form.action'} eq 'selfenroll') {
- push(@{$brcrum},
- {href => '/adm/createuser?action=selfenroll',
- text => "Configure Self-enrollment",
- help => 'Course_Self_Enrollment'});
- if (!exists($env{'form.state'})) {
- $args = { bread_crumbs => $brcrum,
- bread_crumbs_component => 'Configure Self-enrollment'};
- $r->print(&header(undef,$args));
- $r->print('
'.&mt('Self-enrollment with a student role').' '."\n");
- &print_selfenroll_menu($r,$context,$permission);
- } elsif ($env{'form.state'} eq 'done') {
- push (@{$brcrum},
- {href=>'/adm/createuser?action=selfenroll',
- text=>"Result"});
- $args = { bread_crumbs => $brcrum,
- bread_crumbs_component => 'Self-enrollment result'};
- $r->print(&header(undef,$args));
- $r->print('
'.&mt('Self-enrollment with a student role').' '."\n");
- &update_selfenroll_config($r,$context,$permission);
+ if ($permission->{selfenrolladmin}) {
+ my %currsettings = (
+ selfenroll_types => $env{'course.'.$cid.'.internal.selfenroll_types'},
+ selfenroll_registered => $env{'course.'.$cid.'.internal.selfenroll_registered'},
+ selfenroll_section => $env{'course.'.$cid.'.internal.selfenroll_section'},
+ selfenroll_notifylist => $env{'course.'.$cid.'.internal.selfenroll_notifylist'},
+ selfenroll_approval => $env{'course.'.$cid.'.internal.selfenroll_approval'},
+ selfenroll_limit => $env{'course.'.$cid.'.internal.selfenroll_limit'},
+ selfenroll_cap => $env{'course.'.$cid.'.internal.selfenroll_cap'},
+ selfenroll_start_date => $env{'course.'.$cid.'.internal.selfenroll_start_date'},
+ selfenroll_end_date => $env{'course.'.$cid.'.internal.selfenroll_end_date'},
+ selfenroll_start_access => $env{'course.'.$cid.'.internal.selfenroll_start_access'},
+ selfenroll_end_access => $env{'course.'.$cid.'.internal.selfenroll_end_access'},
+ default_enrollment_start_date => $env{'course.'.$cid.'.default_enrollment_start_date'},
+ default_enrollment_end_date => $env{'course.'.$cid.'.default_enrollment_end_date'},
+ uniquecode => $env{'course.'.$cid.'.internal.uniquecode'},
+ );
+ push(@{$brcrum},
+ {href => '/adm/createuser?action=selfenroll',
+ text => "Configure Self-enrollment",
+ help => 'Course_Self_Enrollment'});
+ if (!exists($env{'form.state'})) {
+ $args = { bread_crumbs => $brcrum,
+ bread_crumbs_component => 'Configure Self-enrollment'};
+ $r->print(&header(undef,$args));
+ $r->print('
'.&mt('Self-enrollment with a student role').' '."\n");
+ &print_selfenroll_menu($r,'course',$cid,$cdom,$cnum,\%currsettings);
+ } elsif ($env{'form.state'} eq 'done') {
+ push (@{$brcrum},
+ {href=>'/adm/createuser?action=selfenroll',
+ text=>"Result"});
+ $args = { bread_crumbs => $brcrum,
+ bread_crumbs_component => 'Self-enrollment result'};
+ $r->print(&header(undef,$args));
+ $r->print('
'.&mt('Self-enrollment with a student role').' '."\n");
+ &update_selfenroll_config($r,$cid,$cdom,$cnum,$context,$crstype,\%currsettings);
+ }
+ } else {
+ $r->print(&header(undef,{'no_nav_bar' => 1}).
+ '
'.&mt('You do not have permission to configure self-enrollment').' ');
}
} 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',
- 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('
'.&mt('Pending enrollment requests').' '."\n");
- $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context,
- $cdom,$cnum));
- } elsif ($env{'form.state'} eq 'done') {
- $r->print('
'.&mt('Enrollment request processing').' '."\n");
- $r->print(&Apache::loncoursequeueadmin::update_request_queue($context,
- $cdom,$cnum,$coursedesc));
+ text => 'Enrollment requests',
+ help => 'Course_Approve_Selfenroll'});
+ $bread_crumbs_component = 'Enrollment requests';
+ if ($env{'form.state'} eq 'done') {
+ push(@{$brcrum},
+ {href => '/adm/createuser?action=selfenrollqueue',
+ text => 'Result',
+ help => 'Course_Approve_Selfenroll'});
+ $bread_crumbs_component = 'Enrollment result';
+ }
+ $args = { bread_crumbs => $brcrum,
+ bread_crumbs_component => $bread_crumbs_component};
+ $r->print(&header(undef,$args));
+ my $coursedesc = $env{'course.'.$cid.'.description'};
+ if (!exists($env{'form.state'})) {
+ $r->print('
'.&mt('Pending enrollment requests').' '."\n");
+ $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context,
+ $cdom,$cnum));
+ } elsif ($env{'form.state'} eq 'done') {
+ $r->print('
'.&mt('Enrollment request processing').' '."\n");
+ $r->print(&Apache::loncoursequeueadmin::update_request_queue($context,
+ $cdom,$cnum,$coursedesc));
+ }
+ } else {
+ $r->print(&header(undef,{'no_nav_bar' => 1}).
+ '
'.&mt('You do not have permission to manage self-enrollment').' ');
}
} 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}).
+ '
'.&mt('You do not have permission to view change logs').' ');
+ }
+ } elsif ($env{'form.action'} eq 'helpdesk') {
+ if (($permission->{'owner'}) || ($permission->{'co-owner'})) {
+ if ($env{'form.state'} eq 'process') {
+ if ($permission->{'owner'}) {
+ &update_helpdeskaccess($r,$permission,$brcrum);
+ } else {
+ &print_helpdeskaccess_display($r,$permission,$brcrum);
+ }
+ } else {
+ &print_helpdeskaccess_display($r,$permission,$brcrum);
+ }
+ } else {
+ $r->print(&header(undef,{'no_nav_bar' => 1}).
+ '
'.&mt('You do not have permission to view helpdesk access').' ');
}
- 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,
@@ -4673,6 +5329,32 @@ sub add_script {
.''."\n";
}
+sub usernamerequest_javascript {
+ my $js = <
+END
+}
+
sub verify_user_display {
my ($context) = @_;
my %lt = &Apache::lonlocal::texthash (
@@ -4748,6 +5430,7 @@ function updateCols(caller) {
document.getElementById('showcolrole').disabled = 'disabled';
}
if (context == 'domain') {
+ var quotausageshow = 0;
if ((document.studentform.roletype.options[document.studentform.roletype.selectedIndex].value == 'course') ||
(document.studentform.roletype.options[document.studentform.roletype.selectedIndex].value == 'community')) {
document.getElementById('showcolstatus').checked = false;
@@ -4767,6 +5450,16 @@ function updateCols(caller) {
document.getElementById('showcolextent').checked = 'false';
document.getElementById('showextent').style.display='none';
document.getElementById('showcoltextextent').innerHTML = '';
+ if ((document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'au') ||
+ (document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'Any')) {
+ if (document.getElementById('showcolauthorusage')) {
+ document.getElementById('showcolauthorusage').disabled = '';
+ }
+ if (document.getElementById('showcolauthorquota')) {
+ document.getElementById('showcolauthorquota').disabled = '';
+ }
+ quotausageshow = 1;
+ }
} else {
document.getElementById('showextent').style.display='block';
document.getElementById('showextent').style.textAlign='left';
@@ -4785,6 +5478,16 @@ function updateCols(caller) {
}
}
}
+ if (quotausageshow == 0) {
+ if (document.getElementById('showcolauthorusage')) {
+ document.getElementById('showcolauthorusage').checked = false;
+ document.getElementById('showcolauthorusage').disabled = 'disabled';
+ }
+ if (document.getElementById('showcolauthorquota')) {
+ document.getElementById('showcolauthorquota').checked = false;
+ document.getElementById('showcolauthorquota').disabled = 'disabled';
+ }
+ }
}
}
return;
@@ -4846,6 +5549,26 @@ 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 =>
[
@@ -4854,7 +5577,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'},
},
]},
@@ -4884,8 +5607,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 => 'Domain_User_Access_Logs',
+ url => '/adm/createuser?action=accesslogs',
+ permission => $permission->{'activity'},
+ linktitle => 'View user access log.',
+ }
+ );
push(@{ $menu[2]->{items} }, #Category: Administration
{
@@ -4905,11 +5638,19 @@ sub print_main_menu {
linktitle => 'Approve or reject author role requests',
},
{
+ linktext => 'LON-CAPA Account Requests',
+ icon => 'list-add.png',
+ #help => 'Domain_Username_Approvals',
+ url => '/adm/createuser?action=processusernamereq',
+ permission => $permission->{'cusr'},
+ linktitle => 'Approve or reject LON-CAPA account requests',
+ },
+ {
linktext => 'Change Log',
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.',
},
);
@@ -4965,7 +5706,15 @@ sub print_main_menu {
},
);
push(@{ $menu[2]->{items} }, #Category: Administration
- {
+ {
+ linktext => 'Helpdesk Access',
+ icon => 'helpdesk-access.png',
+ #help => 'Course_Helpdesk_Access',
+ url => '/adm/createuser?action=helpdesk',
+ permission => ($permission->{'owner'} || $permission->{'co-owner'}),
+ linktitle => 'Helpdesk access options',
+ },
+ {
linktext => 'Custom Roles',
icon => 'emblem-photos.png',
#help => 'Course_Editing_Custom_Roles',
@@ -4986,18 +5735,18 @@ 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.',
},
);
if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {
push(@{ $menu[2]->{items} },
- {
+ {
linktext => 'Enrollment Requests',
icon => 'selfenrl-queue.png',
#help => 'Course_Approve_Selfenroll',
url => '/adm/createuser?action=selfenrollqueue',
- permission => $permission->{'cusr'},
+ permission => $permission->{'selfenrolladmin'},
linktitle =>'Approve or reject enrollment requests.',
},
);
@@ -5011,7 +5760,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.',
}
@@ -5023,7 +5773,7 @@ sub print_main_menu {
icon => 'self_enroll.png',
#help => 'Course_Self_Enrollment',
url => '/adm/createuser?action=selfenroll',
- permission => $permission->{'cusr'},
+ permission => $permission->{'selfenrolladmin'},
linktitle => 'Configure user self-enrollment.',
},
);
@@ -5060,11 +5810,11 @@ sub restore_prev_selections {
}
sub print_selfenroll_menu {
- my ($r,$context,$permission) = @_;
+ my ($r,$context,$cid,$cdom,$cnum,$currsettings,$additional,$readonly) = @_;
my $crstype = &Apache::loncommon::course_type();
- my $formname = 'enrollstudent';
+ my $formname = 'selfenroll';
my $nolink = 1;
- my ($row,$lt) = &get_selfenroll_titles();
+ my ($row,$lt) = &Apache::lonuserutils::get_selfenroll_titles();
my $groupslist = &Apache::lonuserutils::get_groupslist();
my $setsec_js =
&Apache::lonuserutils::setsections_javascript($formname,$groupslist);
@@ -5073,6 +5823,11 @@ 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) {
var delidx = getIndexByName('selfenroll_delete');
@@ -5183,7 +5938,7 @@ function validate_types(form) {
}
} else {
if (document.$formname.selfenroll_activate.checked) {
- var num = document.enrollstudent.selfenroll_activate.value;
+ var num = document.$formname.selfenroll_activate.value;
countfail = check_types(num,countfail,needaction)
}
}
@@ -5204,12 +5959,13 @@ function validate_types(form) {
}
function check_types(num,countfail,needaction) {
- var typeidx = getIndexByName('selfenroll_types_'+num);
+ var boxname = 'selfenroll_types_'+num;
+ var typeidx = getIndexByName(boxname);
var count = 0;
if (typeidx != -1) {
- if (document.$formname.elements[typeidx].length) {
- for (var k=0; k'."\n".
''."\n".
''.$lt->{'selfenroll'}.' '."\n";
- my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum);
- if (ref($visactions) eq 'HASH') {
- if ($visible) {
- $output .= ''.$visactions->{'vis'}.'
';
+
+ my $visactions = &cat_visibility();
+ my ($cathash,%cattype);
+ my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
+ if (ref($domconfig{'coursecategories'}) eq 'HASH') {
+ $cathash = $domconfig{'coursecategories'}{'cats'};
+ $cattype{'auth'} = $domconfig{'coursecategories'}{'auth'};
+ $cattype{'unauth'} = $domconfig{'coursecategories'}{'unauth'};
+ if ($cattype{'auth'} eq '') {
+ $cattype{'auth'} = 'std';
+ }
+ if ($cattype{'unauth'} eq '') {
+ $cattype{'unauth'} = 'std';
+ }
+ } else {
+ $cathash = {};
+ $cattype{'auth'} = 'std';
+ $cattype{'unauth'} = 'std';
+ }
+ if (($cattype{'auth'} eq 'none') && ($cattype{'unauth'} eq 'none')) {
+ $r->print(''.$visactions->{'miss'}.' '.
+ ''.$visactions->{'dc_chgconf'}.' '.
+ ' ');
+ } elsif (($cattype{'auth'} !~ /^(std|domonly)$/) && ($cattype{'unauth'} !~ /^(std|domonly)$/)) {
+ if ($currsettings->{'uniquecode'}) {
+ $r->print(''.$visactions->{'vis'}.' ');
} else {
- $output .= ''.$visactions->{'miss'}.'
'
- .$visactions->{'yous'}.
- ''.$visactions->{'gen'}.'
';
- foreach my $item (@{$vismsgs}) {
- $output .= ''.$visactions->{$item}.' ';
+ $r->print(''.$visactions->{'miss'}.' '.
+ ''.$visactions->{'dc_setcode'}.' '.
+ ' '.$visactions->{'vis'}.'
';
+ } else {
+ $output .= ''.$visactions->{'miss'}.'
'
+ .$visactions->{'yous'}.
+ ''.$visactions->{'gen'}.'
';
+ foreach my $item (@{$vismsgs}) {
+ $output .= ''.$visactions->{$item}.' ';
+ }
+ $output .= ' ';
}
- $output .= ' ';
+ $output .= '';
}
- $output .= '';
}
}
- $output .= '';
+ $output .= &Apache::lonhtmlcommon::end_pick_box().'',' "');
- $visactions{'chgcat'} = &mt('Use [_1]Categorize course[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"',' "');
- $visactions{'addcat'} = &mt('Use [_1]Categorize course[_2] to assign a category to the course.','"',' "');
- if (ref($domconf{'coursecategories'}) eq 'HASH') {
- if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
+sub get_noedit_fields {
+ my ($cdom,$cnum,$crstype,$row) = @_;
+ my %noedit;
+ if (ref($row) eq 'ARRAY') {
+ my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook',
+ 'internal.selfenrollmgrdc',
+ 'internal.selfenrollmgrcc'],$cdom,$cnum);
+ my $type = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$crstype,\%settings);
+ my (%specific_managebydc,%specific_managebycc,%default_managebydc);
+ map { $specific_managebydc{$_} = 1; } (split(/,/,$settings{'internal.selfenrollmgrdc'}));
+ map { $specific_managebycc{$_} = 1; } (split(/,/,$settings{'internal.selfenrollmgrcc'}));
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
+ map { $default_managebydc{$_} = 1; } (split(/,/,$domdefaults{$type.'selfenrolladmdc'}));
+
+ foreach my $item (@{$row}) {
+ next if ($specific_managebycc{$item});
+ if (($specific_managebydc{$item}) || ($default_managebydc{$item})) {
+ $noedit{$item} = 1;
+ }
+ }
+ }
+ return %noedit;
+}
+
+sub visible_in_stdcat {
+ my ($cdom,$cnum,$domconf) = @_;
+ my ($cathash,%settable,@vismsgs,$cansetvis,$visible);
+ unless (ref($domconf) eq 'HASH') {
+ return ($visible,$cansetvis,\@vismsgs);
+ }
+ if (ref($domconf->{'coursecategories'}) eq 'HASH') {
+ if ($domconf->{'coursecategories'}{'togglecats'} eq 'crs') {
$settable{'togglecats'} = 1;
}
- if ($domconf{'coursecategories'}{'categorize'} eq 'crs') {
+ if ($domconf->{'coursecategories'}{'categorize'} eq 'crs') {
$settable{'categorize'} = 1;
}
- $cathash = $domconf{'coursecategories'}{'cats'};
+ $cathash = $domconf->{'coursecategories'}{'cats'};
}
if ($settable{'togglecats'} && $settable{'categorize'}) {
$cansetvis = &mt('You are able to both assign a course category and choose to exclude this course from the catalog.');
@@ -5555,10 +6490,10 @@ sub visible_in_cat {
my %currsettings =
&Apache::lonnet::get('environment',['hidefromcat','categories','internal.coursecode'],
$cdom,$cnum);
- my $visible = 0;
+ $visible = 0;
if ($currsettings{'internal.coursecode'} ne '') {
- if (ref($domconf{'coursecategories'}) eq 'HASH') {
- $cathash = $domconf{'coursecategories'}{'cats'};
+ if (ref($domconf->{'coursecategories'}) eq 'HASH') {
+ $cathash = $domconf->{'coursecategories'}{'cats'};
if (ref($cathash) eq 'HASH') {
if ($cathash->{'instcode::0'} eq '') {
push(@vismsgs,'dc_addinst');
@@ -5582,8 +6517,8 @@ sub visible_in_cat {
}
if ($currsettings{'categories'} ne '') {
my $cathash;
- if (ref($domconf{'coursecategories'}) eq 'HASH') {
- $cathash = $domconf{'coursecategories'}{'cats'};
+ if (ref($domconf->{'coursecategories'}) eq 'HASH') {
+ $cathash = $domconf->{'coursecategories'}{'cats'};
if (ref($cathash) eq 'HASH') {
if (keys(%{$cathash}) == 0) {
push(@vismsgs,'dc_catalog');
@@ -5629,7 +6564,33 @@ sub visible_in_cat {
unshift(@vismsgs,'dc_unhide')
}
}
- return ($visible,$cansetvis,\@vismsgs,\%visactions);
+ return ($visible,$cansetvis,\@vismsgs);
+}
+
+sub cat_visibility {
+ my %visactions = &Apache::lonlocal::texthash(
+ vis => 'This course/community currently appears in the Course/Community Catalog for this domain.',
+ gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.',
+ miss => 'This course/community does not currently appear in the Course/Community Catalog for this domain.',
+ none => 'Display of a course catalog is disabled for this domain.',
+ yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding this course.',
+ coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.',
+ make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:',
+ take => 'Take the following action to ensure the course appears in the Catalog:',
+ dc_chgconf => 'Ask a domain coordinator to change the Catalog type for this domain.',
+ dc_setcode => 'Ask a domain coordinator to assign a six character code to the course',
+ dc_unhide => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.',
+ dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".',
+ dc_instcode => 'Ask a domain coordinator to assign an institutional code (if this is an official course).',
+ dc_catalog => 'Ask a domain coordinator to enable or create at least one course category in the domain.',
+ dc_categories => 'Ask a domain coordinator to create a hierarchy of categories and sub categories for courses in the domain.',
+ dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain',
+ dc_addcat => 'Ask a domain coordinator to assign a category to the course.',
+ );
+ $visactions{'unhide'} = &mt('Use [_1]Categorize course[_2] to change the "Exclude from course catalog" setting.','',' "');
+ $visactions{'chgcat'} = &mt('Use [_1]Categorize course[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"',' "');
+ $visactions{'addcat'} = &mt('Use [_1]Categorize course[_2] to assign a category to the course.','"',' "');
+ return \%visactions;
}
sub new_selfenroll_dom_row {
@@ -5655,12 +6616,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';
@@ -5685,7 +6650,7 @@ sub selfenroll_inst_types {
$output .= 'checked="checked"';
}
}
- $output .= ' name="selfenroll_types_'.$num.'" />'.$usertypes->{$type}.'';
+ $output .= ' name="selfenroll_types_'.$num.'"'.$disabled.' />'.$usertypes->{$type}.'';
}
$count ++;
}
@@ -5708,7 +6673,7 @@ sub selfenroll_inst_types {
} else {
$output .= ' checked="checked"';
}
- $output .= ' name="selfenroll_types_'.$num.'" />'.$othertitle.'';
+ $output .= ' name="selfenroll_types_'.$num.'"'.$disabled.' />'.$othertitle.'';
}
return $output;
}
@@ -5729,9 +6694,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);
@@ -5740,6 +6705,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);
@@ -5759,6 +6725,36 @@ sub print_userchangelogs_display {
}
if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); }
+ my $helpitem;
+ if ($context eq 'course') {
+ $helpitem = 'Course_User_Logs';
+ } elsif ($context eq 'domain') {
+ $helpitem = 'Domain_Role_Logs';
+ } elsif ($context eq 'author') {
+ $helpitem = 'Author_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
+
+ # print page header
+ $r->print(&header($jscript,$args));
+
# set defaults
my $now = time();
my $defstart = $now - (7*24*3600); #7 days ago
@@ -5791,7 +6787,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'};
@@ -5803,8 +6801,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
@@ -5829,7 +6825,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;
@@ -5845,12 +6841,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;
@@ -5911,8 +6908,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(''
.&mt('There are no records to display.')
@@ -5928,15 +6925,377 @@ 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('','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:').' ';
+ 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 .= ''
+ .'
';
- if (($curr->{'page'} > 1) || ($more_records)) {
- if ($curr->{'page'} > 1) {
- $nav_links .= '
';
+ if (($curr->{'page'} > 1) || ($more_records)) {
+ if (($curr->{'page'} > 1) && ($curr->{'show'} !~ /\D/)) {
+ $nav_links .= '
';
}
- return ($nav_script,$nav_links);
+ $nav_links .= '
';
+ return $nav_links;
}
sub role_display_filter {
@@ -6104,6 +7465,988 @@ 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 = ''.$privtext.' '.
+ ''.$default.' ';
+ if (($levelscurrent->{'course'}{$priv}) && ($off{$priv})) {
+ if ($permission->{'owner'}) {
+ $checked = ' checked="checked"';
+ }
+ $customstatus = ' '.$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').'');
+ 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) = @_;
@@ -6148,13 +8491,29 @@ sub user_search_result {
}
}
if ($response ne '') {
- $response = ''.$response.' ';
+ $response = ''.$response.' '.$instd_chk.' '.
- ''.$instd_chk.' '.$domd_chk.' '.
+ my $showdom = &display_domain_info($srch->{'srchdomain'});
+ $response = ''.
&mt('Institutional directory search is not available in domain: [_1]',$showdom).
' '.$createdom.' ';
@@ -6520,18 +8907,20 @@ sub build_search_response {
.&mt("Click 'Search'")
.' '
+ ,'')
+ .''
- ,'')
- .''.$lt{'act'}.' '.$lt{'rol'}.' '."\n".
-''.$lt{'ext'}.' '.$lt{'crd'}.' '."\n".
+''.$lt{'ext'}.' '."\n";
+ if ($showcredits) {
+ $result .= $lt{'crd'}.' ';
+ }
+ $result .=
''.$lt{'grs'}.' '.$lt{'sta'}.' '."\n".
''.$lt{'end'}.' '.
&Apache::loncommon::end_data_table_header_row().
@@ -6682,14 +9076,14 @@ $table.
sub course_level_row {
my ($protectedcourse,$role,$area,$domain,$plrole,$sections_count,
- $lt,$defaultcredits,$crstype) = @_;
+ $lt,$showcredits,$defaultcredits,$crstype) = @_;
my $creditem;
my $row = &Apache::loncommon::start_data_table_row().
' '.$plrole.' '."\n".
' '.$area.' '."\n";
- if (($role eq 'st') && ($crstype eq 'Course')) {
+ if (($showcredits) && ($role eq 'st') && ($crstype eq 'Course')) {
$row .=
''.$lt{'scc'}.' '.$lt{'rol'}.' '."\n".
- ''.$lt{'grs'}.' '.$lt{'crd'}.' '."\n".
- ''.$lt{'sta'}.' '.$lt{'end'}.' '."\n".
+ ''.$lt{'grs'}.' '."\n";
+ $header .= ''.$lt{'crd'}.' '."\n" if ($showcredits);
+ $header .= ''.$lt{'sta'}.' '.$lt{'end'}.' '."\n".
&Apache::loncommon::end_data_table_header_row();
my $otheritems = &Apache::loncommon::start_data_table_row()."\n".
''."\n";
+ ''."\n";
foreach my $role (@roles) {
my $plrole=&Apache::lonnet::plaintext($role);
- $otheritems .= ' '.$plrole;
+ $otheritems .= ' '.$plrole.' ';
}
- if ( keys %customroles > 0) {
- foreach my $cust (sort keys %customroles) {
+ if ( keys(%customroles) > 0) {
+ foreach my $cust (sort(keys(%customroles))) {
my $custrole='cr_cr_'.$env{'user.domain'}.
'_'.$env{'user.name'}.'_'.$cust;
- $otheritems .= ' '.$cust;
+ $otheritems .= ' '.$cust.' ';
}
}
$otheritems .= ' '.
' '."\n";
if ($showcredits) {
$otheritems .= ''.&mt('"[_1]" set to "[_2]".',$title,$newval));
if ($newnotify) {
@@ -7124,13 +9523,16 @@ sub update_selfenroll_config {
}
}
$r->print('');
- my %newenvhash;
- foreach my $key (keys(%changes)) {
- $newenvhash{'course.'.$env{'request.course.id'}.'.'.$key} = $changes{$key};
+ if ($env{'course.'.$cid.'.description'} ne '') {
+ my %newenvhash;
+ foreach my $key (keys(%changes)) {
+ $newenvhash{'course.'.$cid.'.'.$key} = $changes{$key};
+ }
+ &Apache::lonnet::appenv(\%newenvhash);
}
- &Apache::lonnet::appenv(\%newenvhash);
} else {
- $r->print(&mt('An error occurred when saving changes to self-enrollment settings in this course.').''.$visactions->{'miss'}.' '.
+ ''.$visactions->{'dc_chgconf'}.' '.
+ ' ');
+ } elsif (($cattype{'auth'} !~ /^(std|domonly)$/) && ($cattype{'unauth'} !~ /^(std|domonly)$/)) {
+ if ($currsettings->{'uniquecode'}) {
+ $r->print(''.$visactions->{'vis'}.' ');
+ } else {
$r->print(''.$visactions->{'miss'}.' ');
- foreach my $item (@{$vismsgs}) {
- $r->print(''.$visactions->{$item}.' ');
+ ''.
+ ''.$visactions->{'dc_setcode'}.' '.
+ ' '.$visactions->{'miss'}.' ');
+ foreach my $item (@{$vismsgs}) {
+ $r->print(''.$visactions->{$item}.' ');
+ }
+ $r->print(' ');
}
- $r->print(' ');
+ $r->print($cansetvis);
}
- $r->print($cansetvis);
}
}
return;
}
-sub get_selfenroll_titles {
- my @row = ('types','registered','enroll_dates','access_dates','section',
- 'approval','limit');
- my %lt = &Apache::lonlocal::texthash (
- types => 'Users allowed to self-enroll in this course',
- registered => 'Restrict self-enrollment to students officially registered for the course',
- enroll_dates => 'Dates self-enrollment available',
- access_dates => 'Course access dates assigned to self-enrolling users',
- section => 'Section assigned to self-enrolling users',
- approval => 'Self-enrollment requests need approval?',
- limit => 'Enrollment limit',
- );
- return (\@row,\%lt);
-}
-
#---------------------------------------------- end functions for &phase_two
#--------------------------------- functions for &phase_two and &phase_three