--- loncom/interface/loncreateuser.pm 2017/08/15 23:42:33 1.406.2.14.2.1
+++ loncom/interface/loncreateuser.pm 2016/11/09 16:35:46 1.418
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.406.2.14.2.1 2017/08/15 23:42:33 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.418 2016/11/09 16:35:46 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -252,13 +252,15 @@ sub build_tools_display {
'unofficial' => 'Can request creation of unofficial courses',
'community' => 'Can request creation of communities',
'textbook' => 'Can request creation of textbook courses',
+ 'placement' => 'Can request creation of placement tests',
'requestauthor' => 'Can request author space',
);
if ($context eq 'requestcourses') {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'requestcourses.official','requestcourses.unofficial',
- 'requestcourses.community','requestcourses.textbook');
- @usertools = ('official','unofficial','community','textbook');
+ 'requestcourses.community','requestcourses.textbook',
+ 'requestcourses.placement');
+ @usertools = ('official','unofficial','community','textbook','placement');
@options =('norequest','approval','autolimit','validate');
%validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);
%reqtitles = &courserequest_titles();
@@ -333,6 +335,7 @@ sub build_tools_display {
'
');
} else {
- my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$srch->{'srchdomain'});
+ my %breadcrumb_text = &singleuser_breadcrumb($crstype);
my $helpitem;
if ($env{'form.action'} eq 'singleuser') {
$helpitem = 'Course_Change_Privileges';
} elsif ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';
- } elsif ($context eq 'author') {
- $helpitem = 'Author_Change_Privileges';
- } elsif ($context eq 'domain') {
- $helpitem = 'Domain_Change_Privileges';
}
push (@{$brcrum},
{href => "javascript:backPage(document.usersrchform,'','')",
@@ -1034,19 +1083,9 @@ ENDSCRIPT
);
$r->print(&Apache::loncommon::start_page('User Management',$jscript,{bread_crumbs => $brcrum}));
if ($env{'form.action'} eq 'singleuser') {
- my $readonly;
- if (($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$srch->{'srchdomain'}))) {
- $readonly = 1;
- $r->print("
$lt{'usrvu'} ");
- } else {
- $r->print("
$lt{'usrch'} ");
- }
+ $r->print("
$lt{'usrch'} ");
$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,$crstype));
- if ($readonly) {
- $r->print('
'.$lt{'suvr'}.' ');
- } else {
- $r->print('
'.$lt{'usel'}.' ');
- }
+ $r->print('
'.$lt{'usel'}.' ');
} elsif ($env{'form.action'} eq 'singlestudent') {
$r->print($jscript."
");
if ($crstype eq 'Community') {
@@ -1065,7 +1104,7 @@ ENDSCRIPT
$r->print('');
} elsif ($env{'form.action'} eq 'accesslogs') {
$r->print("$lt{'srcva'} ");
- $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,undef,1));
+ $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,'accesslogs',undef,undef,1));
$r->print(''.$lt{'vacsel'}.' ');
}
}
@@ -1146,8 +1185,7 @@ sub print_user_modification_page {
if (($ccuname eq '') || ($ccdomain eq '')) {
my $usermsg = &mt('No username and/or domain provided.');
$env{'form.phase'} = '';
- &print_username_entry_form($r,$context,$usermsg,'','',$crstype,$brcrum,
- $permission);
+ &print_username_entry_form($r,$context,$usermsg,'','',$crstype,$brcrum);
return;
}
my ($form,$formname);
@@ -1196,8 +1234,7 @@ sub print_user_modification_page {
}
$response .= ' ';
$env{'form.phase'} = '';
- &print_username_entry_form($r,$context,$response,undef,undef,$crstype,$brcrum,
- $permission);
+ &print_username_entry_form($r,$context,$response,undef,undef,$crstype,$brcrum);
return;
}
$newuser = 1;
@@ -1221,8 +1258,7 @@ sub print_user_modification_page {
'username');
}
$env{'form.phase'} = '';
- &print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype,$brcrum,
- $permission);
+ &print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype,$brcrum);
return;
}
}
@@ -1243,14 +1279,10 @@ sub print_user_modification_page {
my $js = &validation_javascript($context,$ccdomain,$pjump_def,$crstype,
$groupslist,$newuser,$formname,\%loaditem);
- my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$ccdomain);
+ my %breadcrumb_text = &singleuser_breadcrumb($crstype);
my $helpitem = 'Course_Change_Privileges';
if ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';
- } elsif ($context eq 'author') {
- $helpitem = 'Author_Change_Privileges';
- } elsif ($context eq 'domain') {
- $helpitem = 'Domain_Change_Privileges';
}
push (@{$brcrum},
{href => "javascript:backPage($form)",
@@ -1313,7 +1345,7 @@ ENDFORMINFO
}
my $title = '';
if ($newuser) {
- my ($portfolioform,$domroleform);
+ my ($portfolioform,$domroleform,$adhocroleform);
if ((&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) ||
(&Apache::lonnet::allowed('mut',$env{'request.role.domain'}))) {
# Current user has quota or user tools modification privileges
@@ -1323,6 +1355,12 @@ ENDFORMINFO
($ccdomain eq $env{'request.role.domain'})) {
$domroleform = ' '.&domainrole_req($ccuname,$ccdomain);
}
+ if (&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) {
+ $adhocroleform = &domadhocroles($ccuname,$ccdomain);
+ if ($adhocroleform) {
+ $adhocroleform = ' '.$adhocroleform;
+ }
+ }
&initialize_authen_forms($ccdomain,$formname);
my %lt=&Apache::lonlocal::texthash(
'lg' => 'Login Data',
@@ -1433,7 +1471,7 @@ ENDAUTH
} else {
$r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc));
}
- $r->print($portfolioform.$domroleform);
+ $r->print($portfolioform.$domroleform.$adhocroleform);
if ($env{'form.action'} eq 'singlestudent') {
$r->print(&date_sections_select($context,$newuser,$formname,
$permission,$crstype,$ccuname,
@@ -1463,7 +1501,7 @@ ENDAUTH
$r->print(' ');
$r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context,
$inst_results{$ccuname.':'.$ccdomain}));
- if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) ||
+ if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) ||
(&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) {
$r->print('
'.&mt('User Can Request Creation of Courses/Communities in this Domain?').' '.
&Apache::loncommon::start_data_table());
@@ -1476,16 +1514,20 @@ ENDAUTH
$r->print(&Apache::loncommon::end_data_table());
}
$r->print('');
- my @order = ('auth','quota','tools','requestauthor');
+ my @order = ('auth','quota','tools','requestauthor','adhocroles');
my %user_text;
my ($isadv,$isauthor) =
&Apache::lonnet::is_advanced_user($ccdomain,$ccuname);
if ((!$isauthor) &&
((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) ||
(&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) &&
- ($env{'request.role.domain'} eq $ccdomain)) {
+ ($env{'request.role.domain'} eq $ccdomain)) {
$user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain);
}
+ if ((&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) ||
+ (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) {
+ $user_text{'adhocroles'} = &domadhocroles($ccuname,$ccdomain);
+ }
$user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname);
if ((&Apache::lonnet::allowed('mpq',$ccdomain)) ||
(&Apache::lonnet::allowed('mut',$ccdomain)) ||
@@ -1554,7 +1596,7 @@ ENDNOTOOLSPRIV
} elsif (($context eq 'course') && ((&Apache::lonnet::allowed('vcl',$env{'request.course.id'})) ||
($env{'request.course.sec'} &&
&Apache::lonnet::allowed('vcl',$env{'request.course.id'}.'/'.$env{'request.course.sec'})))) {
- $statuses = ['active'];
+ $statuses = ['active'];
}
if ($env{'form.action'} ne 'singlestudent') {
&display_existing_roles($r,$ccuname,$ccdomain,\%inccourses,$context,
@@ -1612,7 +1654,7 @@ ENDNOTOOLSPRIV
}
sub singleuser_breadcrumb {
- my ($crstype,$context,$domain) = @_;
+ my ($crstype) = @_;
my %breadcrumb_text;
if ($env{'form.action'} eq 'singlestudent') {
if ($crstype eq 'Community') {
@@ -1620,21 +1662,16 @@ sub singleuser_breadcrumb {
} else {
$breadcrumb_text{'search'} = 'Enroll a student';
}
- $breadcrumb_text{'userpicked'} = 'Select a user';
- $breadcrumb_text{'modify'} = 'Set section/dates';
+ $breadcrumb_text{'userpicked'} = 'Select a user',
+ $breadcrumb_text{'modify'} = 'Set section/dates',
} elsif ($env{'form.action'} eq 'accesslogs') {
$breadcrumb_text{'search'} = 'View access logs for a user';
- $breadcrumb_text{'userpicked'} = 'Select a user';
- $breadcrumb_text{'activity'} = 'Activity';
- } elsif (($env{'form.action'} eq 'singleuser') && ($context eq 'domain') &&
- (!&Apache::lonnet::allowed('mau',$domain))) {
- $breadcrumb_text{'search'} = "View user's roles";
- $breadcrumb_text{'userpicked'} = 'Select a user';
- $breadcrumb_text{'modify'} = 'User roles';
+ $breadcrumb_text{'userpicked'} = 'Select a user',
+ $breadcrumb_text{'activity'} = 'Activity',
} else {
$breadcrumb_text{'search'} = 'Create/modify a user';
- $breadcrumb_text{'userpicked'} = 'Select a user';
- $breadcrumb_text{'modify'} = 'Set user role';
+ $breadcrumb_text{'userpicked'} = 'Select a user',
+ $breadcrumb_text{'modify'} = 'Set user role',
}
return %breadcrumb_text;
}
@@ -1788,7 +1825,7 @@ sub display_existing_roles {
if ($active) {
next unless($showall || $showactive);
} else {
- next unless($showall || $showexpired);
+ next unless($showall || $showexpired);
}
# Is this a custom role? Get role owner and title.
my ($croleudom,$croleuname,$croletitle)=
@@ -1799,12 +1836,11 @@ sub display_existing_roles {
my $class='Unknown';
my $credits='';
my $csec;
- if ($area =~ m{^/($match_domain)/($match_courseid)}) {
+ if ($area =~ m{^/($match_domain)/($match_courseid)} ) {
$class='Course';
my ($coursedom,$coursedir) = ($1,$2);
my $cid = $1.'_'.$2;
# $1.'_'.$2 is the course id (eg. 103_12345abcef103l3).
- next if ($envkey =~ m{^/$match_domain/$match_courseid/[A-Za-z0-9]+_gr$});
my %coursedata=
&Apache::lonnet::coursedescription($cid);
if ($coursedir =~ /^$match_community$/) {
@@ -1863,6 +1899,7 @@ sub display_existing_roles {
}
}
if ($area=~m{^/($match_domain/$match_courseid/(\w+))}) {
+
$csec = $2;
$carea.=' '.&mt('Section: [_1]',$csec);
$sortkey.="\0$csec";
@@ -1933,7 +1970,7 @@ sub display_existing_roles {
} else {
$row.=' ';
}
- $row.= '';
+ $row.= '';
}
my $plaintext='';
if (!$croletitle) {
@@ -1964,8 +2001,7 @@ sub display_existing_roles {
$rolepriv{$envkey}='edit';
} else {
if ($context eq 'domain') {
- if ((&Apache::lonnet::allowed('vur',$ccdomain)) &&
- ($envkey=~m{^/$ccdomain/})) {
+ if (&Apache::lonnet::allowed('vur',$ccdomain)) {
$rolepriv{$envkey}='view';
}
} elsif ($context eq 'course') {
@@ -2022,14 +2058,14 @@ sub display_existing_roles {
&Apache::loncommon::start_data_table_header_row());
if ($showall) {
$r->print(
-''.$lt{'rev'}.' '.$lt{'ren'}.' '.$lt{'del'}.' '
+'
'.$lt{'rev'}.' '.$lt{'ren'}.' '.$lt{'del'}
);
} elsif ($showexpired) {
$r->print(' '.$lt{'rev'}.' ');
}
$r->print(
-'
'.$lt{'rol'}.' '.$lt{'ext'}.' '.
-'
'.$lt{'sta'}.' '.$lt{'end'}.' '.
+'
'.$lt{'rol'}.' '.$lt{'ext'}.
+' '.$lt{'sta'}.' '.$lt{'end'}.' '.
&Apache::loncommon::end_data_table_header_row());
foreach my $type ('Authoring Space','Course','Community','Domain','System','Unknown') {
if ($output{$type}) {
@@ -2202,6 +2238,7 @@ $lt{'uuas'} ($currentauth). $lt{'adcs'}.
ENDBADAUTH
}
} else { # Authentication type is valid
+
&initialize_authen_forms($ccdomain,$formname,$currentauth,'modifyuser');
my ($authformcurrent,$can_modify,@authform_others) =
&modify_login_block($ccdomain,$currentauth);
@@ -2245,7 +2282,7 @@ ENDBADAUTH
$result = &mt('Currently Kerberos authenticated, Version [_1].',$krbver);
} else {
$result = &mt('Currently Kerberos authenticated with domain [_1] Version [_2].',
- $krbrealm,$krbver);
+ $krbver,$krbrealm);
}
} elsif ($currentauth =~ /^internal:/) {
$result = &mt('Currently internally authenticated.');
@@ -2345,7 +2382,7 @@ sub modify_login_block {
sub personal_data_display {
my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,
- $now,$captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded) = @_;
+ $now,$captchaform,$emailusername,$usertype) = @_;
my ($output,%userenv,%canmodify,%canmodify_status);
my @userinfo = ('firstname','middlename','lastname','generation',
'permanentemail','id');
@@ -2372,7 +2409,6 @@ sub personal_data_display {
'inststatus' => "Affiliation",
'email' => 'E-mail address',
'valid' => 'Validation',
- 'username' => 'Username',
);
%canmodify_status =
@@ -2391,7 +2427,7 @@ sub personal_data_display {
if (ref($emailusername) eq 'HASH') {
if (ref($emailusername->{$usertype}) eq 'HASH') {
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
- @userinfo = ();
+ @userinfo = ();
if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
foreach my $field (@{$infofields}) {
if ($emailusername->{$usertype}->{$field}) {
@@ -2421,38 +2457,9 @@ sub personal_data_display {
$output = '
'.$lt{'pd'}.' '.
&Apache::lonhtmlcommon::start_pick_box();
if (($context eq 'selfcreate') && ($newuser eq 'email')) {
- my $size = 25;
- if ($condition) {
- if ($condition =~ /^\@[^\@]+$/) {
- $size = 10;
- } else {
- undef($condition);
- }
- }
- if ($excluded) {
- unless ($excluded =~ /^\@[^\@]+$/) {
- undef($condition);
- }
- }
$output .= &Apache::lonhtmlcommon::row_title($lt{'email'}.'
* ',undef,
'LC_oddrow_value')."\n".
- '
';
- if ($condition) {
- $output .= $condition;
- } elsif ($excluded) {
- $output .= '
'.&mt('You must use an e-mail address that does not end with [_1]',
- $excluded).' ';
- }
- if ($usernameset eq 'first') {
- $output .= '
';
- if ($condition) {
- $output .= &mt('Your username in LON-CAPA will be the part of your e-mail address before [_1]',
- $condition);
- } else {
- $output .= &mt('Your username in LON-CAPA will be the part of your e-mail address before the @');
- }
- $output .= ' ';
- }
+ '
';
$rowcount ++;
$output .= &Apache::lonhtmlcommon::row_closure(1);
my $upassone = '
';
@@ -2467,19 +2474,6 @@ sub personal_data_display {
'LC_oddrow_value')."\n".
$upasstwo.
&Apache::lonhtmlcommon::row_closure()."\n";
- if ($usernameset eq 'free') {
- my $onclick = "toggleUsernameDisp(this,'selfcreateusername');";
- $output .= &Apache::lonhtmlcommon::row_title($lt{'username'},undef,'LC_oddrow_value')."\n".
- &mt('Use e-mail address: ').
- '
'.&mt('Yes').''."\n".
- (' 'x2).
- '
'.&mt('No').''."\n".
- '
'.
- ''.&mt('Preferred username').
- ' '.
- '
'."\n".&Apache::lonhtmlcommon::row_closure(1);
- $rowcount ++;
- }
}
foreach my $item (@userinfo) {
my $rowtitle = $lt{$item};
@@ -2694,7 +2688,7 @@ sub update_user_data {
$jsback."\n".
'// ]]>'."\n".
''."\n";
- my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$env{'form.ccdomain'});
+ my %breadcrumb_text = &singleuser_breadcrumb($crstype);
push (@{$brcrum},
{href => "javascript:backPage(document.userupdate)",
text => $breadcrumb_text{'search'},
@@ -2711,10 +2705,6 @@ sub update_user_data {
my $helpitem = 'Course_Change_Privileges';
if ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';
- } elsif ($context eq 'author') {
- $helpitem = 'Author_Change_Privileges';
- } elsif ($context eq 'domain') {
- $helpitem = 'Domain_Change_Privileges';
}
push(@{$brcrum},
{href => "javascript:backPage(document.userupdate,'$env{'form.prevphase'}','modify')",
@@ -2807,7 +2797,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','textbook');
+ my @requestcourses = ('official','unofficial','community','textbook','placement');
my @requestauthor = ('requestauthor');
my ($othertitle,$usertypes,$types) =
&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
@@ -2917,6 +2907,12 @@ sub update_user_data {
$newcustom{'requestauthor'},
\%changeHash,'requestauthor');
}
+ if (&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) {
+ my @adds = &Apache::loncommon::get_env_multiple('form.adhocroleadd');
+ if (&adhocrole_changes(\%changeHash)) {
+ $changed{'adhocroles.'.$env{'request.role.domain'}} = $changeHash{'adhocroles.'.$env{'request.role.domain'}};
+ }
+ }
}
if ($canmodify_status{'inststatus'}) {
if (exists($env{'form.inststatus'})) {
@@ -2980,7 +2976,8 @@ sub update_user_data {
'requestcourses.community','requestcourses.textbook',
'reqcrsotherdom.official','reqcrsotherdom.unofficial',
'reqcrsotherdom.community','reqcrsotherdom.textbook',
- 'requestauthor'],
+ 'reqcrsotherdom.placement','requestauthor',
+ 'adhocroles.'.$env{'request.role.domain'}],
$env{'form.ccdomain'},$env{'form.ccuname'});
my ($tmp) = keys(%userenv);
if ($tmp =~ /^(con_lost|error)/i) {
@@ -3119,6 +3116,7 @@ sub update_user_data {
&Apache::loncommon::default_quota($env{'form.ccdomain'},$oldinststatus,$name);
($newdefquota{$name},$newsettingstatus{$name}) = ($olddefquota{$name},$oldsettingstatus{$name});
}
+ push(@disporder,'adhocroles');
my %canshow;
if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
$canshow{'quota'} = 1;
@@ -3137,6 +3135,9 @@ sub update_user_data {
if (&Apache::lonnet::allowed('cau',$env{'form.ccdomain'})) {
$canshow{'requestauthor'} = 1;
}
+ if (&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) {
+ $canshow{'adhocroles'} = 1;
+ }
my (%changeHash,%changed);
if ($oldinststatus eq '') {
$oldsettings{'inststatus'} = $othertitle;
@@ -3250,6 +3251,14 @@ sub update_user_data {
&tool_changes('reqcrsotherdom',\@requestcourses,\%oldsettings,\%oldsettingstext,
\%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
}
+ if ($userenv{'adhocroles.'.$env{'request.role.domain'}}) {
+ $changeHash{'adhocroles.'.$env{'request.role.domain'}} = $userenv{'adhocroles.'.$env{'request.role.domain'}};
+ }
+ if (&adhocrole_changes(\%changeHash,\%userenv)) {
+ $changed{'adhocroles'} = 1;
+ $oldsettings{'adhocroles'} = $userenv{'adhocroles.'.$env{'request.role.domain'}};
+ $newsettings{'adhocroles'} = $changeHash{'adhocroles.'.$env{'request.role.domain'}};
+ }
}
foreach my $item (@userinfo) {
if ($env{'form.c'.$item} ne $userenv{$item}) {
@@ -3271,8 +3280,9 @@ sub update_user_data {
($env{'user.domain'} eq $env{'form.ccdomain'})) {
my %newenvhash;
foreach my $key (keys(%changed)) {
- if (($key eq 'official') || ($key eq 'unofficial')
- || ($key eq 'community') || ($key eq 'textbook')) {
+ if (($key eq 'official') || ($key eq 'unofficial') ||
+ ($key eq 'community') || ($key eq 'textbook') ||
+ ($key eq 'placement')) {
$newenvhash{'environment.requestcourses.'.$key} =
$changeHash{'requestcourses.'.$key};
if ($changeHash{'requestcourses.'.$key}) {
@@ -3291,6 +3301,9 @@ sub update_user_data {
&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
$key,'reload','requestauthor');
}
+ } elsif ($key eq 'adhocroles') {
+ $newenvhash{'adhocroles.'.$env{'request.role.domain'}} =
+ $changeHash{'adhocroles.'.$env{'request.role.domain'}};
} elsif ($key ne 'quota') {
$newenvhash{'environment.tools.'.$key} =
$changeHash{'tools.'.$key};
@@ -3338,7 +3351,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'}},$uhome,'ids');
if (($recurseid) &&
(&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) {
my $idresult =
@@ -3481,7 +3494,9 @@ sub display_userinfo {
'unofficial' => 'Can Request Unofficial Courses',
'community' => 'Can Request Communities',
'textbook' => 'Can Request Textbook Courses',
+ 'placement' => 'Can Request Placement Tests',
'requestauthor' => 'Can Request Author Role',
+ 'adhocroles' => 'Ad Hoc Roles Selectable via Helpdesk Role',
'inststatus' => "Affiliation",
'prvs' => 'Previous Value:',
'chto' => 'Changed To:'
@@ -3847,6 +3862,70 @@ sub tool_changes {
return;
}
+sub adhocrole_changes {
+ my ($changehashref,$userenv) = @_;
+ my @adds = &Apache::loncommon::get_env_multiple('form.adhocroleadd');
+ my @dels = &Apache::loncommon::get_env_multiple('form.adhocroledel');
+ my (@saved,@added,@alladhoc,$changed);
+ my $adhoc_key = 'adhocroles.'.$env{'request.role.domain'};
+ if (!$env{'form.makeuser'}) {
+ if (ref($userenv) eq 'HASH') {
+ my @current;
+ if ($userenv->{$adhoc_key}) {
+ @current = split(/,/,$userenv->{$adhoc_key});
+ if (@dels) {
+ foreach my $curr (@current) {
+ next if ($curr eq '');
+ unless (grep(/\Q$curr\E$/,@dels)) {
+ push(@saved,$curr);
+ }
+ }
+ $changed = 1;
+ } else {
+ @saved = @current;
+ }
+ }
+ }
+ }
+ if (@adds) {
+ my $confname = &Apache::lonnet::get_domainconfiguser($env{'request.role.domain'});
+ my %existing=&Apache::lonnet::dump('roles',$env{'request.role.domain'},
+ $confname,'rolesdef_');
+ foreach my $poss (@adds) {
+ if (exists($existing{'rolesdef_'.$poss})) {
+ push(@added,$poss);
+ $changed = 1;
+ }
+ }
+ }
+ if (@added) {
+ if (@saved) {
+ foreach my $add (@added) {
+ unless (grep(/^\Q$add\E$/,@saved)) {
+ push(@alladhoc,$add);
+ }
+ }
+ } else {
+ push(@alladhoc,@added);
+ }
+ }
+ if (@saved) {
+ push(@alladhoc,@saved);
+ }
+ if (@alladhoc) {
+ my $adhocstr = join(',',sort(@alladhoc));
+ $changehashref->{$adhoc_key} = $adhocstr;
+ } elsif (@dels) {
+ &Apache::lonnet::del('environment',[$adhoc_key],$env{'form.ccdomain'},$env{'form.ccuname'});
+ delete($changehashref->{$adhoc_key});
+ if (($env{'form.ccdomain'} eq $env{'user.domain'}) &&
+ ($env{'form.ccuname'} eq $env{'user.name'})) {
+ &Apache::lonnet::delenv($adhoc_key);
+ }
+ }
+ return $changed;
+}
+
sub update_roles {
my ($r,$context,$showcredits) = @_;
my $now=time;
@@ -4377,9 +4456,9 @@ sub build_roles {
# ========================================================== Custom Role Editor
sub custom_role_editor {
- my ($r,$context,$brcrum,$prefix,$permission) = @_;
+ my ($r,$brcrum,$prefix) = @_;
my $action = $env{'form.customroleaction'};
- my ($rolename,$helpitem);
+ my $rolename;
if ($action eq 'new') {
$rolename=$env{'form.newrolename'};
} else {
@@ -4390,17 +4469,14 @@ sub custom_role_editor {
if ($env{'request.course.id'}) {
$crstype = &Apache::loncommon::course_type();
$context = 'course';
- $helpitem = 'Course_Editing_Custom_Roles';
} else {
$context = 'domain';
$crstype = 'course';
- $helpitem = 'Domain_Editing_Custom_Roles';
}
$rolename=~s/[^A-Za-z0-9]//gs;
if (!$rolename || $env{'form.phase'} eq 'pickrole') {
- &print_username_entry_form($r,$context,undef,undef,undef,$crstype,$brcrum,
- $permission);
+ &print_username_entry_form($r,undef,undef,undef,undef,$crstype,$brcrum);
return;
}
@@ -4455,10 +4531,11 @@ sub custom_role_editor {
text => "Edit custom role",
faq => 282,
bug => 'Instructor Interface',
- help => $helpitem}
+ help => 'Course_Editing_Custom_Roles'}
);
my $args = { bread_crumbs => $brcrum,
bread_crumbs_component => 'User Management'};
+
$r->print(&Apache::loncommon::start_page('Custom Role Editor',
$head_script,$args).
$body_top);
@@ -4482,11 +4559,11 @@ ENDCCF
# ---------------------------------------------------------- Call to definerole
sub set_custom_role {
- my ($r,$context,$brcrum,$prefix,$permission) = @_;
+ my ($r,$context,$brcrum,$prefix) = @_;
my $rolename=$env{'form.rolename'};
$rolename=~s/[^A-Za-z0-9]//gs;
if (!$rolename) {
- &custom_role_editor($r,$context,$brcrum,$prefix,$permission);
+ &custom_role_editor($r,$brcrum,$prefix);
return;
}
my ($jsback,$elements) = &crumb_utilities();
@@ -4495,10 +4572,6 @@ sub set_custom_role {
.$jsback."\n"
.'// ]]>'."\n"
.''."\n";
- my $helpitem = 'Course_Editing_Custom_Roles';
- if ($context eq 'domain') {
- $helpitem = 'Domain_Editing_Custom_Roles';
- }
push(@{$brcrum},
{href => "javascript:backPage(document.customresult,'pickrole','')",
text => "Pick custom role",
@@ -4512,7 +4585,7 @@ sub set_custom_role {
text => "Result",
faq => 282,
bug => 'Instructor Interface',
- help => $helpitem,}
+ help => 'Course_Editing_Custom_Roles'},
);
my $args = { bread_crumbs => $brcrum,
bread_crumbs_component => 'User Management'};
@@ -4583,8 +4656,7 @@ sub handler {
$r->send_http_header;
return OK;
}
- my ($context,$crstype,$cid,$cnum,$cdom,$allhelpitems);
-
+ my ($context,$crstype);
if ($env{'request.course.id'}) {
$context = 'course';
$crstype = &Apache::loncommon::course_type();
@@ -4594,69 +4666,6 @@ sub handler {
$context = 'domain';
}
- my ($permission,$allowed) =
- &Apache::lonuserutils::get_permission($context,$crstype);
-
- if ($allowed) {
- my @allhelp;
- if ($context eq 'course') {
- $cid = $env{'request.course.id'};
- $cdom = $env{'course.'.$cid.'.domain'};
- $cnum = $env{'course.'.$cid.'.num'};
-
- if ($permission->{'cusr'}) {
- push(@allhelp,'Course_Create_Class_List');
- }
- if ($permission->{'view'} || $permission->{'cusr'}) {
- push(@allhelp,('Course_Change_Privileges','Course_View_Class_List'));
- }
- if ($permission->{'custom'}) {
- push(@allhelp,'Course_Editing_Custom_Roles');
- }
- if ($permission->{'cusr'}) {
- push(@allhelp,('Course_Add_Student','Course_Drop_Student'));
- }
- unless ($permission->{'cusr_section'}) {
- if (&Apache::lonnet::auto_run($cnum,$cdom) && (($permission->{'cusr'}) || ($permission->{'view'}))) {
- push(@allhelp,'Course_Automated_Enrollment');
- }
- if ($permission->{'selfenrolladmin'}) {
- push(@allhelp,'Course_Approve_Selfenroll');
- }
- }
- if ($permission->{'grp_manage'}) {
- push(@allhelp,'Course_Manage_Group');
- }
- if ($permission->{'view'} || $permission->{'cusr'}) {
- push(@allhelp,'Course_User_Logs');
- }
- } elsif ($context eq 'author') {
- push(@allhelp,('Author_Change_Privileges','Author_Create_Coauthor_List',
- 'Author_View_Coauthor_List','Author_User_Logs'));
- } else {
- if ($permission->{'cusr'}) {
- push(@allhelp,'Domain_Change_Privileges');
- if ($permission->{'activity'}) {
- push(@allhelp,'Domain_User_Access_Logs');
- }
- push(@allhelp,('Domain_Create_Users','Domain_View_Users_List'));
- if ($permission->{'custom'}) {
- push(@allhelp,'Domain_Editing_Custom_Roles');
- }
- push(@allhelp,('Domain_Role_Approvals','Domain_Username_Approvals','Domain_Change_Logs'));
- } elsif ($permission->{'view'}) {
- push(@allhelp,'Domain_View_Privileges');
- if ($permission->{'activity'}) {
- push(@allhelp,'Domain_User_Access_Logs');
- }
- push(@allhelp,('Domain_View_Users_List','Domain_Change_Logs'));
- }
- }
- if (@allhelp) {
- $allhelpitems = join(',',@allhelp);
- }
- }
-
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['action','state','callingform','roletype','showrole','bulkaction','popup','phase',
'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue']);
@@ -4667,9 +4676,13 @@ sub handler {
if (($env{'form.action'} ne 'dateselect') && ($env{'form.action'} ne 'displayuserreq')) {
$brcrum = [{href=>"/adm/createuser",
text=>"User Management",
- help=>$allhelpitems}
+ help=>'Course_Create_Class_List,Course_Change_Privileges,Course_View_Class_List,Course_Editing_Custom_Roles,Course_Add_Student,Course_Drop_Student,Course_Automated_Enrollment,Course_Self_Enrollment,Course_Manage_Group'}
];
}
+ #SD Following files not added to help, because the corresponding .tex-files seem to
+ #be missing: Course_Approve_Selfenroll,Course_User_Logs,
+ my ($permission,$allowed) =
+ &Apache::lonuserutils::get_permission($context,$crstype);
if (!$allowed) {
if ($context eq 'course') {
$r->internal_redirect('/adm/viewclasslist');
@@ -4701,16 +4714,10 @@ sub handler {
$r->print(&header(undef,$args));
$r->print(&print_main_menu($permission,$context,$crstype));
} elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) {
- my $helpitem = 'Course_Create_Class_List';
- if ($context eq 'author') {
- $helpitem = 'Author_Create_Coauthor_List';
- } elsif ($context eq 'domain') {
- $helpitem = 'Domain_Create_Users';
- }
push(@{$brcrum},
{ href => '/adm/createuser?action=upload&state=',
text => 'Upload Users List',
- help => $helpitem,
+ help => 'Course_Create_Class_List',
});
$bread_crumbs_component = 'Upload Users List';
$args = {bread_crumbs => $brcrum,
@@ -4755,7 +4762,7 @@ sub handler {
.'';
$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response,$srch,undef,
- $crstype,$brcrum,$permission);
+ $crstype,$brcrum,$showcredits);
} else {
my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'});
my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'});
@@ -4800,8 +4807,7 @@ sub handler {
# }
#}
&print_username_entry_form($r,$context,$response,$srch,
- $forcenewuser,$crstype,$brcrum,
- $permission);
+ $forcenewuser,$crstype,$brcrum);
} else {
&print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);
}
@@ -4818,8 +4824,7 @@ sub handler {
} else {
$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response,$srch,
- $forcenewuser,$crstype,$brcrum,
- $permission);
+ $forcenewuser,$crstype,$brcrum);
}
} elsif ($env{'form.phase'} eq 'userpicked') {
my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
@@ -4840,14 +4845,14 @@ sub handler {
&update_user_data($r,$context,$crstype,$brcrum,$showcredits);
} else {
&print_username_entry_form($r,$context,undef,$srch,undef,$crstype,
- $brcrum,$permission);
+ $brcrum);
}
} elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
my $prefix;
if ($env{'form.phase'} eq 'set_custom_roles') {
- &set_custom_role($r,$context,$brcrum,$prefix,$permission);
+ &set_custom_role($r,$context,$brcrum,$prefix);
} else {
- &custom_role_editor($r,$context,$brcrum,$prefix,$permission);
+ &custom_role_editor($r,$brcrum,$prefix);
}
} elsif (($env{'form.action'} eq 'processauthorreq') &&
($permission->{'cusr'}) &&
@@ -4953,92 +4958,56 @@ sub handler {
unless ($usertype) {
$usertype = 'default';
}
- my ($showstatus,$showemail,$pickstart);
- my $numextras = 0;
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
- if ((ref($types) eq 'ARRAY') && (@{$types} > 0)) {
- if (ref($usertypes) eq 'HASH') {
- if ($usertypes->{$usertype}) {
- $showstatus = $usertypes->{$usertype};
- } else {
- $showstatus = $othertitle;
- }
- if ($showstatus) {
- $numextras ++;
- }
- }
- }
- if (($info{$uname}{'email'} ne '') && ($info{$uname}{'email'} ne $uname)) {
- $showemail = $info{$uname}{'email'};
- $numextras ++;
- }
if (ref($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}) eq 'HASH') {
if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
- $pickstart = 1;
$r->print('
'.&Apache::lonhtmlcommon::start_pick_box());
- my ($num,$count);
+ my ($num,$count,$showstatus);
$count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}}));
- $count += $numextras;
+ unless ($usertype eq 'default') {
+ my ($othertitle,$usertypes,$types) =
+ &Apache::loncommon::sorted_inst_types($dom);
+ if (ref($usertypes) eq 'HASH') {
+ if ($usertypes->{$usertype}) {
+ $showstatus = $usertypes->{$usertype};
+ $count ++;
+ }
+ }
+ }
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) {
+ if ($count == $num) {
+ $r->print(&Apache::lonhtmlcommon::row_closure(1));
+ } else {
$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;
+ if ($showstatus) {
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type (self-reported)')).
+ $showstatus.
+ &Apache::lonhtmlcommon::row_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)',' ')).
- $showstatus.
- &Apache::lonhtmlcommon::row_closure(1));
+ $r->print(&Apache::lonhtmlcommon::end_pick_box().'
');
}
}
- if ($pickstart) {
- $r->print(&Apache::lonhtmlcommon::end_pick_box().'
');
- } 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());
}
- $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 => $helpitem});
+ help => 'Course_View_Class_List'});
$bread_crumbs_component = 'Update Users';
$args = {bread_crumbs => $brcrum,
bread_crumbs_component => $bread_crumbs_component};
@@ -5055,7 +5024,7 @@ sub handler {
push(@{$brcrum},
{href => '/adm/createuser?action=listusers',
text => "List Users",
- help => $helpitem});
+ help => 'Course_View_Class_List'});
$bread_crumbs_component = 'List Users';
$args = {bread_crumbs => $brcrum,
bread_crumbs_component => $bread_crumbs_component};
@@ -5136,6 +5105,9 @@ sub handler {
}
} elsif ($env{'form.action'} eq 'selfenroll') {
if ($permission->{selfenrolladmin}) {
+ my $cid = $env{'request.course.id'};
+ my $cdom = $env{'course.'.$cid.'.domain'};
+ my $cnum = $env{'course.'.$cid.'.num'};
my %currsettings = (
selfenroll_types => $env{'course.'.$cid.'.internal.selfenroll_types'},
selfenroll_registered => $env{'course.'.$cid.'.internal.selfenroll_registered'},
@@ -5181,18 +5153,21 @@ sub handler {
push(@{$brcrum},
{href => '/adm/createuser?action=selfenrollqueue',
text => 'Enrollment requests',
- help => 'Course_Approve_Selfenroll'});
+ help => 'Course_Self_Enrollment'});
$bread_crumbs_component = 'Enrollment requests';
if ($env{'form.state'} eq 'done') {
push(@{$brcrum},
{href => '/adm/createuser?action=selfenrollqueue',
text => 'Result',
- help => 'Course_Approve_Selfenroll'});
+ 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");
@@ -5201,7 +5176,7 @@ sub handler {
} elsif ($env{'form.state'} eq 'done') {
$r->print('
'.&mt('Enrollment request processing').' '."\n");
$r->print(&Apache::loncoursequeueadmin::update_request_queue($context,
- $cdom,$cnum,$coursedesc));
+ $cdom,$cnum,$coursedesc));
}
} else {
$r->print(&header(undef,{'no_nav_bar' => 1}).
@@ -5214,21 +5189,6 @@ sub handler {
$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').' ');
- }
} else {
$bread_crumbs_component = 'User Management';
$args = { bread_crumbs => $brcrum,
@@ -5482,8 +5442,9 @@ sub print_main_menu {
);
if ($linkcontext eq 'domain') {
unless ($permission->{'cusr'}) {
- $links{'domain'}{'singleuser'} = 'View a User';
+ $links{'domain'}{'singleuser'} = 'View a User';
$linktitles{'domain'}{'singleuser'} = 'View information about a user in the domain';
+
}
} elsif ($linkcontext eq 'course') {
unless ($permission->{'cusr'}) {
@@ -5544,7 +5505,7 @@ sub print_main_menu {
{
linktext => 'User Access Log',
icon => 'document-properties.png',
- #help => 'Domain_User_Access_Logs',
+ #help => 'User_Access_Logs',
url => '/adm/createuser?action=accesslogs',
permission => $permission->{'activity'},
linktitle => 'View user access log.',
@@ -5601,6 +5562,7 @@ sub print_main_menu {
groups => 'Community Groups',
},
);
+ $linktext{'Placement'} = $linktext{'Course'};
my %linktitle = (
'Course' => {
@@ -5615,6 +5577,8 @@ sub print_main_menu {
},
);
+ $linktitle{'Placement'} = $linktitle{'Course'};
+
push(@{ $menu[0]->{items} }, #Category: Single Users
{
linktext => $linktext{$crstype}{'single'},
@@ -5637,15 +5601,7 @@ 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',
@@ -5890,13 +5846,12 @@ function validate_types(form) {
}
function check_types(num,countfail,needaction) {
- var boxname = 'selfenroll_types_'+num;
- var typeidx = getIndexByName(boxname);
+ var typeidx = getIndexByName('selfenroll_types_'+num);
var count = 0;
if (typeidx != -1) {
- if (document.$formname.elements[boxname].length) {
- for (var k=0; k
'.
+ '
'.
&mt('Yes').'
'.
- ' '.
+ ' '.
&mt('No').' ';
} elsif ($item eq 'enroll_dates') {
my ($starttime,$endtime);
@@ -6235,7 +6190,7 @@ ENDSCRIPT
} elsif ($item eq 'approval') {
my ($currnotified,$currapproval,%appchecked);
my %selfdescs = &Apache::lonuserutils::selfenroll_default_descs();
- if (ref($currsettings) eq 'HASH') {
+ if (ref($currsettings) eq 'HASH') {
$currnotified = $currsettings->{'selfenroll_notifylist'};
$currapproval = $currsettings->{'selfenroll_approval'};
}
@@ -6659,10 +6614,6 @@ sub print_userchangelogs_display {
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',
@@ -6773,7 +6724,7 @@ ENDSCRIPT
}
}
if (($context eq 'course') && ($viewablesec ne '')) {
- next if ($roleslog{$id}{'logentry'}{'section'} ne $viewablesec);
+ next if ($roleslog{$id}{'logentry'}{'section'} ne $viewablesec);
}
$count ++;
next if ($count < $minshown);
@@ -6862,39 +6813,30 @@ sub print_useraccesslogs_display {
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';
- }
+ my %breadcrumb_text = &singleuser_breadcrumb();
+ push (@{$brcrum},
+ {href => "javascript:backPage($form)",
+ text => $breadcrumb_text{'search'}});
+ my (@prevphases,$prevphasestr);
+ if ($env{'form.prevphases'}) {
+ @prevphases = split(/,/,$env{'form.prevphases'});
+ $prevphasestr = $env{'form.prevphases'};
+ }
+ if (($env{'form.phase'} eq 'userpicked') || (grep(/^userpicked$/,@prevphases))) {
+ push(@{$brcrum},
+ {href => "javascript:backPage($form,'get_user_info','select')",
+ text => $breadcrumb_text{'userpicked'}});
+ if ($env{'form.phase'} eq 'userpicked') {
+ $prevphasestr = 'userpicked';
}
}
push(@{$brcrum},
{href => '/adm/createuser?action=accesslogs',
text => 'User access logs',
- help => 'Domain_User_Access_Logs'});
+ help => '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();
@@ -6919,12 +6861,8 @@ ENDSCRIPT
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));
- }
+ .''
+ .&earlyout_accesslog_form($formname,$prevphasestr,$udom));
return;
}
@@ -6944,24 +6882,6 @@ ENDSCRIPT
return;
}
- if (&Apache::lonnet::privileged($uname,$udom,
- [$env{'request.role.domain'}],['dc','su'])) {
- unless (&Apache::lonnet::privileged($env{'user.name'},$env{'user.domain'},
- [$env{'request.role.domain'}],['dc','su'])) {
- $r->print('
'
- .&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);
@@ -7008,10 +6928,8 @@ ENDSCRIPT
my ($nav_script,$nav_links);
# table header
- my $tableheader = '
'.
- &mt('User access logs for: [_1]',
- &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)).' '
- .&Apache::loncommon::start_data_table_header_row()
+ my $tableheader =
+ &Apache::loncommon::start_data_table_header_row()
.'
'
.'
'.&mt('When').' '
.'
'.&mt('HostID').' '
@@ -7048,7 +6966,7 @@ ENDSCRIPT
$showntableheader = 1;
}
my ($shown,$extra);
- my ($event,$data) = split(/\s+/,&unescape($event),2);
+ my ($event,$data) = split(/\s+/,&unescape($event));
if ($event eq 'Role') {
my ($rolecode,$extent) = split(/\./,$data,2);
next if ($extent eq '');
@@ -7100,17 +7018,8 @@ ENDSCRIPT
$shown = &mt('Role selection: [_1]',$rolename);
} else {
$shown = &mt($event);
- if ($data =~ /^webdav/) {
- my ($path,$clientip) = split(/\s+/,$data,2);
- $path =~ s/^webdav//;
- if ($clientip ne '') {
- $extra = &mt('Client IP address: [_1]',$clientip);
- }
- if ($path ne '') {
- $shown .= ' '.&mt('(WebDAV access to [_1])',$path);
- }
- } elsif ($data ne '') {
- $extra = &mt('Client IP address: [_1]',$data);
+ if ($data ne '') {
+ $extra = &mt('Client IP address: [_1]',$data);
}
}
$r->print(
@@ -7133,10 +7042,6 @@ ENDSCRIPT
.'');
}
- if ($env{'form.popup'} == 1) {
- $r->print('
'."\n");
- }
-
# Form Footer
$r->print(
'
'
@@ -7219,7 +7124,7 @@ sub activity_display_filter {
# Update Display button
$output .= '
'
.' '
- .'
';
+ .'';
return $output;
}
@@ -7396,988 +7301,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) = @_;
@@ -8437,7 +7360,7 @@ sub user_search_result {
} 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')) {
+ if ($domd_chk ne 'ok') {
my $instd_chk = &instdirectorysrch_check($srch);
$response .= ''.$domd_chk.' ';
if ($instd_chk eq 'ok') {
@@ -8788,7 +7711,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'}) {
@@ -8838,20 +7761,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.'
+ ,'
'
+ ,' ')
+ .'
';
}
}
}