--- loncom/interface/loncreateuser.pm 2024/02/29 21:43:33 1.406.2.20.2.5
+++ loncom/interface/loncreateuser.pm 2024/08/24 15:09:55 1.406.2.20.2.6
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.406.2.20.2.5 2024/02/29 21:43:33 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.406.2.20.2.6 2024/08/24 15:09:55 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -70,6 +70,7 @@ use Apache::lonlocal;
use Apache::longroup;
use Apache::lonuserutils;
use Apache::loncoursequeueadmin;
+use Apache::lonviewcoauthors;
use LONCAPA qw(:DEFAULT :match);
use HTML::Entities;
@@ -241,7 +242,7 @@ function toggleCustom(form,item,name) {
if (radioname) {
if (radioname.length > 0) {
var setvis;
- var RegExp = /^customtext_(aboutme|blog|portfolio|timezone|webdav)\$/;
+ var RegExp = /^customtext_(aboutme|blog|portfolio|portaccess|timezone|webdav|archive)\$/;
for (var i=0; i<radioname.length; i++) {
if (radioname[i].checked == true) {
if (radioname[i].value == 1) {
@@ -273,13 +274,17 @@ END_SCRIPT
sub build_tools_display {
my ($ccuname,$ccdomain,$context) = @_;
my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay,
- $colspan,$isadv,%domconfig,@defaulteditors,@customeditors);
+ $colspan,$isadv,%domconfig,@defaulteditors,@customeditors,@custommanagers,
+ @possmanagers);
my %lt = &Apache::lonlocal::texthash (
'blog' => "Personal User Blog",
'aboutme' => "Personal Information Page",
'webdav' => "WebDAV access to Authoring Spaces (https)",
'editors' => "Available Editors",
+ 'managers' => "Co-authors who can add/revoke roles",
+ 'archive' => "Managers can download tar.gz file of Authoring Space",
'portfolio' => "Personal User Portfolio",
+ 'portaccess' => "Portfolio Shareable",
'timezone' => "Can set Time Zone",
'avai' => "Available",
'cusa' => "availability",
@@ -319,14 +324,15 @@ sub build_tools_display {
%domconfig =
&Apache::lonnet::get_dom('configuration',['quotas','authordefaults'],$ccdomain);
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,'tools.webdav',
- 'authoreditors');
- @usertools = ('webdav','editors');
+ 'authoreditors','authormanagers',
+ 'authorarchive','domcoord.author');
+ @usertools = ('webdav','editors','managers','archive');
$colspan = ' colspan="2"';
} else {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'tools.aboutme','tools.portfolio','tools.blog',
- 'tools.timezone');
- @usertools = ('aboutme','blog','portfolio','timezone');
+ 'tools.timezone','tools.portaccess');
+ @usertools = ('aboutme','blog','portfolio','portaccess','timezone');
$colspan = ' colspan="2"';
}
foreach my $item (@usertools) {
@@ -334,7 +340,7 @@ sub build_tools_display {
$currdisp,$custdisp,$custradio,$onclick,$customsty,$editorsty);
$cust_off = 'checked="checked" ';
$tool_on = 'checked="checked" ';
- unless (($context eq 'authordefaults') && ($item ne 'webdav')) {
+ unless (($context eq 'authordefaults') || ($item eq 'webdav')) {
$curr_access =
&Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
$context,\%userenv,'',
@@ -346,10 +352,18 @@ sub build_tools_display {
$cust_off = '';
}
} elsif ($context eq 'authordefaults') {
- if ($item eq 'editors') {
+ if (($item eq 'editors') || ($item eq 'archive')) {
if ($userenv{'author'.$item} ne '') {
$cust_on = ' checked="checked" ';
$cust_off = '';
+ if ($item eq 'archive') {
+ $curr_access = $userenv{'author'.$item};
+ }
+ } elsif ($item eq 'archive') {
+ $curr_access = 0;
+ if (ref($domconfig{'authordefaults'}) eq 'HASH') {
+ $curr_access = $domconfig{'authordefaults'}{'archive'};
+ }
}
} elsif ($item eq 'webdav') {
if ($userenv{'tools.'.$item} ne '') {
@@ -408,10 +422,46 @@ sub build_tools_display {
}
$editorsty = ' style="display:block;"';
}
+ } elsif ($item eq 'managers') {
+ my %ca_roles = &Apache::lonnet::get_my_roles($ccuname,$ccdomain,undef,
+ ['active','future'],['ca']);
+ if (keys(%ca_roles)) {
+ foreach my $entry (sort(keys(%ca_roles))) {
+ if ($entry =~ /^($match_username\:$match_domain):ca$/) {
+ my $user = $1;
+ unless ($user eq "$ccuname:$ccdomain") {
+ push(@possmanagers,$user);
+ }
+ }
+ }
+ }
+ if ($userenv{'author'.$item} eq '') {
+ $custom_access = &mt('Currently author manages co-author roles');
+ } else {
+ if (keys(%ca_roles)) {
+ foreach my $user (split(/,/,$userenv{'author'.$item})) {
+ if ($user =~ /^($match_username):($match_domain)$/) {
+ if (exists($ca_roles{$user.':ca'})) {
+ unless ($user eq "$ccuname:$ccdomain") {
+ push(@custommanagers,$user);
+ }
+ }
+ }
+ }
+ }
+ if (@custommanagers) {
+ $custom_access = &mt('Co-authors who manage co-author roles: [_1]',
+ join(', ',@custommanagers));
+ } else {
+ $custom_access = &mt('Currently author manages co-author roles');
+ }
+ }
} else {
my $current = $userenv{$context.'.'.$item};
if ($item eq 'webdav') {
$current = $userenv{'tools.webdav'};
+ } elsif ($item eq 'archive') {
+ $current = $userenv{'author'.$item};
}
if ($current eq '') {
$custom_access =
@@ -548,6 +598,33 @@ sub build_tools_display {
$output .= '</fieldset></td>'.
&Apache::loncommon::end_data_table_row()."\n";
}
+ } elsif ($item eq 'managers') {
+ $output .= '<td'.$colspan.'>'.$custom_access.'</td>'."\n".
+ &Apache::loncommon::end_data_table_row()."\n";
+ unless ((&Apache::lonnet::allowed('udp',$ccdomain)) ||
+ (($userenv{'domcoord.author'} eq 'blocked') &&
+ (($env{'user.name'} ne $ccuname) || ($env{'user.domain'} ne $ccdomain)))) {
+ $output .=
+ &Apache::loncommon::start_data_table_row()."\n".
+ '<td'.$colspan.'>';
+ if (@possmanagers) {
+ $output .= &mt('Select manager(s)').': ';
+ foreach my $user (@possmanagers) {
+ my $checked;
+ if (grep(/^\Q$user\E$/,@custommanagers)) {
+ $checked = ' checked="checked"';
+ }
+ $output .= '<span style="LC_nobreak"><label>'.
+ '<input type="checkbox" name="custommanagers" '.
+ 'value="'.&HTML::Entities::encode($user,'\'<>"&').'"'.$checked.' />'.
+ $user.'</label></span> ';
+ }
+ } else {
+ $output .= &mt('No co-author roles assignable as manager');
+ }
+ $output .= '</td>'.
+ &Apache::loncommon::end_data_table_row()."\n";
+ }
} else {
$currdisp = ($curr_access?&mt('Yes'):&mt('No'));
my $name = $context.'_'.$item;
@@ -560,7 +637,7 @@ sub build_tools_display {
$custradio = '<span id="customtext_'.$item.'"'.$customsty.' class="LC_nobreak">'.
'--'.$lt{'cusa'}.': '.$custdisp.'</span>';
}
- unless ($item eq 'editors') {
+ unless (($item eq 'editors') || ($item eq 'managers')) {
$output .= ' <td'.$colspan.'>'.$custom_access.(' 'x4).
$lt{'avai'}.': '.$currdisp.'</td>'."\n".
&Apache::loncommon::end_data_table_row()."\n";
@@ -1439,10 +1516,10 @@ sub print_user_modification_page {
unless ($isauthor) {
push(@toggles,'requestauthor');
}
- push(@toggles,('webdav','editors'));
+ push(@toggles,('webdav','editors','archive'));
}
if (&Apache::lonnet::allowed('mut',$ccdomain)) {
- push(@toggles,('aboutme','blog','portfolio','timezone'));
+ push(@toggles,('aboutme','blog','portfolio','portaccess','timezone'));
}
if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
push(@toggles,('official','unofficial','community','textbook'));
@@ -1965,7 +2042,12 @@ sub display_existing_roles {
next unless (($rnum eq $env{'course.'.$env{'request.course.id'}.'.num'})
&& ($rdom eq $env{'course.'.$env{'request.course.id'}.'.domain'}));
} elsif ($context eq 'author') {
- next unless (($rnum eq $env{'user.name'}) && ($rdom eq $env{'request.role.domain'}));
+ if ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) {
+ my ($audom,$auname) = ($1,$2);
+ next unless (($rnum eq $auname) && ($rdom eq $audom));
+ } else {
+ next unless (($rnum eq $env{'user.name'}) && ($rdom eq $env{'request.role.domain'}));
+ }
}
my ($newkey,$newvalue,$newrole);
$newkey = '/'.$rdom.'/'.$rnum;
@@ -2125,6 +2207,8 @@ sub display_existing_roles {
$area=~m{/($match_domain)/($match_username)};
if (&Apache::lonuserutils::authorpriv($2,$1)) {
$allowed=1;
+ } elsif (&Apache::lonuserutils::coauthorpriv($2,$1)) {
+ $allowed=1;
} else {
$allowed=0;
}
@@ -2227,6 +2311,9 @@ sub display_existing_roles {
}
} elsif ($env{'request.role'} =~ /^au\./) {
$contextrole = &mt('Existing Co-Author Roles in your Authoring Space');
+ } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)/$}) {
+ $contextrole = &mt('Existing Co-Author Roles in [_1] Authoring Space',
+ '<i>'.$1.'_'.$2.'</i>');
} else {
if ($showall) {
$contextrole = &mt('Existing Roles in this Domain');
@@ -2268,13 +2355,25 @@ sub new_coauthor_roles {
#
# Co-Author
#
- if (&Apache::lonuserutils::authorpriv($env{'user.name'},
- $env{'request.role.domain'}) &&
- ($env{'user.name'} ne $ccuname || $env{'user.domain'} ne $ccdomain)) {
+ my ($cuname,$cudom);
+ if (($env{'request.role'} eq "au./$env{'user.domain'}/") ||
+ ($env{'request.role'} eq "dc./$env{'user.domain'}/")) {
+ $cuname=$env{'user.name'};
+ $cudom=$env{'request.role.domain'};
# No sense in assigning co-author role to yourself
- $addrolesdisplay = 1;
- my $cuname=$env{'user.name'};
- my $cudom=$env{'request.role.domain'};
+ if ((&Apache::lonuserutils::authorpriv($cuname,$cudom)) &&
+ ($env{'user.name'} ne $ccuname || $env{'user.domain'} ne $ccdomain)) {
+ $addrolesdisplay = 1;
+ }
+ } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) {
+ ($cudom,$cuname) = ($1,$2);
+ if ((&Apache::lonuserutils::coauthorpriv($cuname,$cudom)) &&
+ ($env{'user.name'} ne $ccuname || $env{'user.domain'} ne $ccdomain) &&
+ ($cudom ne $ccdomain || $cuname ne $ccuname)) {
+ $addrolesdisplay = 1;
+ }
+ }
+ if ($addrolesdisplay) {
my %lt=&Apache::lonlocal::texthash(
'cs' => "Authoring Space",
'act' => "Activate",
@@ -2329,6 +2428,17 @@ sub new_coauthor_roles {
($env{'user.domain'} eq $ccdomain)) {
$r->print(&mt('Assigning yourself a co-author or assistant co-author role in your own author area in Authoring Space is not permitted'));
}
+ } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) {
+ if (!(&Apache::lonuserutils::coauthorpriv($2,$1))) {
+ $r->print('<span class="LC_error">'.
+ &mt('You do not have privileges to assign co-author roles.').
+ '</span>');
+ } elsif (($env{'user.name'} eq $ccuname) &&
+ ($env{'user.domain'} eq $ccdomain)) {
+ $r->print(&mt('Assigning yourself a co-author or assistant co-author role in an author area in Authoring Space in which you already have a co-author role is not permitted'));
+ } elsif (($cudom eq $ccdomain) && ($cuname eq $ccuname)) {
+ $r->print(&mt("Assigning a co-author or assistant co-author role to an Authoring Space's author is not permitted"));
+ }
}
return $addrolesdisplay;;
}
@@ -2601,9 +2711,9 @@ sub modify_login_block {
}
sub personal_data_display {
- my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,$now,
+ my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$readonly,$rolesarray,$now,
$captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded,$showsubmit) = @_;
- my ($output,%userenv,%canmodify,%canmodify_status);
+ my ($output,%userenv,%canmodify,%canmodify_status,$disabled);
my @userinfo = ('firstname','middlename','lastname','generation',
'permanentemail','id');
my $rowcount = 0;
@@ -2672,6 +2782,8 @@ sub personal_data_display {
%canmodify = &selfcreate_canmodify($context,$ccdomain,\@userinfo,
$inst_results,$rolesarray);
}
+ } elsif ($readonly) {
+ $disabled = ' disabled="disabled"';
}
my $genhelp=&Apache::loncommon::help_open_topic('Generation');
@@ -2759,7 +2871,7 @@ sub personal_data_display {
$hiderow = 1;
}
} else {
- $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+ $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value=""'.$disabled.' />';
}
}
} else {
@@ -2775,7 +2887,7 @@ sub personal_data_display {
$hiderow = 1;
}
} else {
- $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+ $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value=""'.$disabled.' />';
}
}
} else {
@@ -3069,10 +3181,10 @@ sub update_user_data {
my (%alerts,%rulematch,%inst_results,%curr_rules);
my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
- my @usertools = ('aboutme','blog','portfolio','timezone');
+ my @usertools = ('aboutme','blog','portfolio','portaccess','timezone');
my @requestcourses = ('official','unofficial','community','textbook');
my @requestauthor = ('requestauthor');
- my @authordefaults = ('webdav','editors');
+ my @authordefaults = ('webdav','editors','archive');
my ($othertitle,$usertypes,$types) =
&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
my %canmodify_status =
@@ -3202,7 +3314,13 @@ sub update_user_data {
if ($env{'form.customwebdav'} == 1) {
$newcustom{'webdav'} = $env{'form.authordefaults_webdav'};
$changed{'webdav'} = &tool_admin('webdav',$newcustom{'webdav'},
- \%changeHash,'authordefaults');
+ \%changeHash,'authordefaults');
+ }
+ if ($env{'form.customarchive'} == 1) {
+ $newcustom{'archive'} = $env{'form.authordefaults_archive'};
+ $changed{'archive'} = &tool_admin('archive',$newcustom{'archive'},
+ \%changeHash,'authordefaults');
+
}
}
if ($canmodify_status{'inststatus'}) {
@@ -3270,17 +3388,23 @@ sub update_user_data {
('environment',['firstname','middlename','lastname','generation',
'id','permanentemail','portfolioquota','authorquota','inststatus',
'tools.aboutme','tools.blog','tools.webdav',
- 'tools.portfolio','tools.timezone',
- 'authoreditors','requestauthor',
+ 'tools.portfolio','tools.timezone','tools.portaccess',
+ 'authormanagers','authoreditors','authorarchive','requestauthor',
'requestcourses.official','requestcourses.unofficial',
'requestcourses.community','requestcourses.textbook',
'reqcrsotherdom.official','reqcrsotherdom.unofficial',
- 'reqcrsotherdom.community','reqcrsotherdom.textbook'],
+ 'reqcrsotherdom.community','reqcrsotherdom.textbook',
+ 'domcoord.author'],
$env{'form.ccdomain'},$env{'form.ccuname'});
my ($tmp) = keys(%userenv);
if ($tmp =~ /^(con_lost|error)/i) {
%userenv = ();
}
+ unless (($userenv{'domcoord.author'} eq 'blocked') &&
+ (($env{'user.name'} ne $env{'form.ccuname'}) ||
+ ($env{'user.domain'} ne $env{'form.ccdomain'}))) {
+ push(@authordefaults,'managers');
+ }
my $no_forceid_alert;
# Check to see if user information can be changed
my %domconfig =
@@ -3565,10 +3689,55 @@ sub update_user_data {
if ((keys(%namechanged) > 0) || (keys(%changed) > 0)) {
my ($chgresult,$namechgresult);
if (keys(%changed) > 0) {
- $chgresult =
+ $chgresult =
&Apache::lonnet::put('environment',\%changeHash,
$env{'form.ccdomain'},$env{'form.ccuname'});
if ($chgresult eq 'ok') {
+ my ($ca_mgr_del,%ca_mgr_add);
+ if ($changed{'managers'}) {
+ my (@adds,@dels);
+ if ($changeHash{'authormanagers'} eq '') {
+ @dels = split(/,/,$userenv{'authormanagers'});
+ } elsif ($userenv{'authormanagers'} eq '') {
+ @adds = split(/,/,$changeHash{'authormanagers'});
+ } else {
+ my @old = split(/,/,$userenv{'authormanagers'});
+ my @new = split(/,/,$changeHash{'authormanagers'});
+ my @diffs = &Apache::loncommon::compare_arrays(\@old,\@new);
+ if (@diffs) {
+ foreach my $user (@diffs) {
+ if (grep(/^\Q$user\E$/,@old)) {
+ push(@dels,$user);
+ } elsif (grep(/^\Q$user\E$/,@new)) {
+ push(@adds,$user);
+ }
+ }
+ }
+ }
+ my $key = "internal.manager./$env{'form.ccdomain'}/$env{'form.ccuname'}";
+ if (@dels) {
+ foreach my $user (@dels) {
+ if ($user =~ /^($match_username):($match_domain)$/) {
+ &Apache::lonnet::del('environment',[$key],$2,$1);
+ }
+ }
+ my $curruser = $env{'user.name'}.':'.$env{'user.domain'};
+ if (grep(/^\Q$curruser\E$/,@dels)) {
+ $ca_mgr_del = $key;
+ }
+ }
+ if (@adds) {
+ foreach my $user (@adds) {
+ if ($user =~ /^($match_username):($match_domain)$/) {
+ &Apache::lonnet::put('environment',{$key => 1},$2,$1);
+ }
+ }
+ my $curruser = $env{'user.name'}.':'.$env{'user.domain'};
+ if (grep(/^\Q$curruser\E$/,@adds)) {
+ $ca_mgr_add{$key} = 1;
+ }
+ }
+ }
if (($env{'user.name'} eq $env{'form.ccuname'}) &&
($env{'user.domain'} eq $env{'form.ccdomain'})) {
my (%newenvhash,$got_domdefs,%domdefaults,$got_userenv,
@@ -3634,6 +3803,21 @@ sub update_user_data {
$newenvhash{'environment.editors'} = 'edit,xml';
}
}
+ } elsif ($key eq 'archive') {
+ $newenvhash{'environment.author.'.$key} =
+ $changeHash{'author.'.$key};
+ if ($changeHash{'author.'.$key} ne '') {
+ $newenvhash{'environment.canarchive'} =
+ $changeHash{'author.'.$key};
+ } else {
+ unless ($got_domdefs) {
+ %domdefaults =
+ &Apache::lonnet::get_domain_defaults($env{'user.domain'});
+ $got_domdefs = 1;
+ }
+ $newenvhash{'environment.canarchive'} =
+ $domdefaults{'archive'};
+ }
} elsif ($key ne 'quota') {
$newenvhash{'environment.tools.'.$key} =
$changeHash{'tools.'.$key};
@@ -3661,6 +3845,13 @@ sub update_user_data {
if (keys(%newenvhash)) {
&Apache::lonnet::appenv(\%newenvhash);
}
+ } else {
+ if ($ca_mgr_del) {
+ &Apache::lonnet::delenv($ca_mgr_del);
+ }
+ if (keys(%ca_mgr_add)) {
+ &Apache::lonnet::appenv(\%ca_mgr_add);
+ }
}
if ($changed{'aboutme'}) {
&Apache::loncommon::devalidate_aboutme_cache($env{'form.ccuname'},
@@ -3835,6 +4026,7 @@ sub display_userinfo {
'webdav' => 'WebDAV Availability',
'aboutme' => 'Personal Information Page Availability',
'portfolio' => 'Portfolio Availability',
+ 'portaccess' => 'Portfolio Shareable',
'timezone' => 'Can set own Time Zone',
'official' => 'Can Request Official Courses',
'unofficial' => 'Can Request Unofficial Courses',
@@ -3845,6 +4037,8 @@ sub display_userinfo {
'prvs' => 'Previous Value:',
'chto' => 'Changed To:',
'editors' => "Available Editors in Authoring Space",
+ 'managers' => "Co-authors who can add/revoke roles",
+ 'archive' => "Managers can download tar.gz file of Authoring Space",
'edit' => 'Standard editor (Edit)',
'xml' => 'Text editor (EditXML)',
'daxe' => 'Daxe editor (Daxe)',
@@ -3878,7 +4072,7 @@ sub display_userinfo {
if ($entry eq 'requestauthor') {
@items = ($entry);
} elsif ($entry eq 'authordefaults') {
- @items = ('webdav','editors');
+ @items = ('webdav','managers','editors','archive');
} else {
@items = @{$requestcourses};
}
@@ -3886,19 +4080,27 @@ sub display_userinfo {
if (($newsetting->{$item} ne $oldsetting->{$item}) ||
($newsettingtext->{$item} ne $oldsettingtext->{$item})) {
$r->print(&Apache::loncommon::start_data_table_row()."\n");
- $r->print("<td>$lt{$item}</td>\n");
- $r->print("<td>".$oldsetting->{$item});
+ $r->print("<td>$lt{$item}</td><td>\n");
+ unless ($item eq 'managers') {
+ $r->print($oldsetting->{$item});
+ }
if ($oldsettingtext->{$item}) {
if ($oldsetting->{$item}) {
- $r->print(' -- ');
+ unless ($item eq 'managers') {
+ $r->print(' -- ');
+ }
}
$r->print($oldsettingtext->{$item});
}
- $r->print("</td>\n");
- $r->print("<td>".$newsetting->{$item});
+ $r->print("</td>\n<td>");
+ unless ($item eq 'managers') {
+ $r->print($newsetting->{$item});
+ }
if ($newsettingtext->{$item}) {
if ($newsetting->{$item}) {
- $r->print(' -- ');
+ unless ($item eq 'managers') {
+ $r->print(' -- ');
+ }
}
$r->print($newsettingtext->{$item});
}
@@ -4096,9 +4298,34 @@ sub tool_changes {
$newval = join(',',(sort(@editors)));
}
}
+ } elsif ($tool eq 'managers') {
+ $envkey = 'authormanagers';
+ my @possibles = &Apache::loncommon::get_env_multiple('form.custommanagers');
+ if (@possibles) {
+ my %ca_roles = &Apache::lonnet::get_my_roles($env{'form.ccuname'},$env{'form.ccdomain'},
+ undef,['active','future'],['ca']);
+ if (keys(%ca_roles)) {
+ my @custommanagers;
+ foreach my $user (@possibles) {
+ if ($user =~ /^($match_username):($match_domain)$/) {
+ if (exists($ca_roles{$user.':ca'})) {
+ unless ($user eq $env{'form.ccuname'}.':'.$env{'form.ccdomain'}) {
+ push(@custommanagers,$user);
+ }
+ }
+ }
+ }
+ if (@custommanagers) {
+ $newval = join(',',sort(@custommanagers));
+ }
+ }
+ }
} elsif ($tool eq 'webdav') {
$envkey = 'tools.webdav';
$newval = $env{'form.'.$context.'_'.$tool};
+ } elsif ($tool eq 'archive') {
+ $envkey = 'authorarchive';
+ $newval = $env{'form.'.$context.'_'.$tool};
}
} else {
$newval = $env{'form.'.$context.'_'.$tool};
@@ -4119,10 +4346,18 @@ sub tool_changes {
$oldaccesstext->{$tool} = &mt("availability set to 'off'");
}
} elsif ($context eq 'authordefaults') {
- if ($tool eq 'editors') {
+ if ($tool eq 'managers') {
+ if ($userenv->{$envkey} eq '') {
+ $oldaccesstext->{$tool} = &mt('Only author may manage co-author roles');
+ } else {
+ my $managers = $userenv->{$envkey};
+ $managers =~ s/,/, /g;
+ $oldaccesstext->{$tool} = $managers;
+ }
+ } elsif ($tool eq 'editors') {
$oldaccesstext->{$tool} = &mt('can use: [_1]',
join(', ', map { $tooldesc{$_} } split(/,/,$userenv->{$envkey})));
- } elsif ($tool eq 'webdav') {
+ } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
if ($userenv->{$envkey}) {
$oldaccesstext->{$tool} = &mt("availability set to 'on'");
} else {
@@ -4137,7 +4372,8 @@ sub tool_changes {
}
}
$changeHash->{$envkey} = $userenv->{$envkey};
- if ($env{'form.custom'.$tool} == 1) {
+ if (($env{'form.custom'.$tool} == 1) ||
+ (($context eq 'authordefaults') && ($tool eq 'managers') && ($newval ne ''))) {
if ($newval ne $userenv->{$envkey}) {
$changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
$context);
@@ -4159,7 +4395,15 @@ sub tool_changes {
if ($tool eq 'editors') {
$newaccesstext->{$tool} = &mt('can use: [_1]',
join(', ', map { $tooldesc{$_} } split(/,/,$changeHash->{$envkey})));
- } elsif ($tool eq 'webdav') {
+ } elsif ($tool eq 'managers') {
+ if ($changeHash->{$envkey} eq '') {
+ $newaccesstext->{$tool} = &mt('Only author may manage co-author roles');
+ } else {
+ my $managers = $changeHash->{$envkey};
+ $managers =~ s/,/, /g;
+ $newaccesstext->{$tool} = $managers;
+ }
+ } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
if ($newval) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
} else {
@@ -4191,7 +4435,15 @@ sub tool_changes {
if ($tool eq 'editors') {
$newaccesstext->{$tool} = &mt('can use: [_1]',
join(', ', map { $tooldesc{$_} } split(/,/,$userenv->{$envkey})));
- } elsif ($tool eq 'webdav') {
+ } elsif ($tool eq 'managers') {
+ if ($userenv->{$envkey} eq '') {
+ $newaccesstext->{$tool} = &mt('Only author may manage co-author roles');
+ } else {
+ my $managers = $userenv->{$envkey};
+ $managers =~ s/,/, /g;
+ $newaccesstext->{$tool} = $managers;
+ }
+ } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
if ($userenv->{$envkey}) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
} else {
@@ -4232,8 +4484,16 @@ sub tool_changes {
if ($tool eq 'editors') {
$newaccesstext->{$tool} = &mt('can use: [_1]',
join(', ', map { $tooldesc{$_} } split(/,/,$newval)));
- } elsif ($tool eq 'webdav') {
- if ($userenv->{$envkey}) {
+ } elsif ($tool eq 'managers') {
+ if ($newval eq '') {
+ $newaccesstext->{$tool} = &mt('Only author may manage co-author roles');
+ } else {
+ my $managers = $newval;
+ $managers =~ s/,/, /g;
+ $newaccesstext->{$tool} = $managers;
+ }
+ } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
+ if ($newval) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
@@ -4250,7 +4510,8 @@ sub tool_changes {
}
} else {
$oldaccess->{$tool} = &mt('default');
- if ($env{'form.custom'.$tool} == 1) {
+ if (($env{'form.custom'.$tool} == 1) ||
+ (($context eq 'authordefaults') && ($tool eq 'managers') && ($newval ne ''))) {
$changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
$context);
if ($changed->{$tool}) {
@@ -4268,10 +4529,18 @@ sub tool_changes {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
}
} elsif ($context eq 'authordefaults') {
- if ($tool eq 'editors') {
+ if ($tool eq 'managers') {
+ if ($newval eq '') {
+ $newaccesstext->{$tool} = &mt('Only author may manage co-author roles');
+ } else {
+ my $managers = $newval;
+ $managers =~ s/,/, /g;
+ $newaccesstext->{$tool} = $managers;
+ }
+ } elsif ($tool eq 'editors') {
$newaccesstext->{$tool} = &mt('can use: [_1]',
join(', ', map { $tooldesc{$_} } split(/,/,$newval)));
- } elsif ($tool eq 'webdav') {
+ } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
if ($newval) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
} else {
@@ -4786,7 +5055,7 @@ sub tool_admin {
$toolchanged = 1;
if ($tool eq 'requestauthor') {
$changeHash->{$context} = $settool;
- } elsif ($tool eq 'editors') {
+ } elsif (($tool eq 'managers') || ($tool eq 'editors') || ($tool eq 'archive')) {
$changeHash->{'author'.$tool} = $settool;
} elsif ($tool eq 'webdav') {
$changeHash->{'tools.'.$tool} = $settool;
@@ -5032,6 +5301,164 @@ sub set_custom_role {
);
}
+sub display_coauthor_managers {
+ my ($permission) = @_;
+ my $output;
+ if ((ref($permission) eq 'HASH') && ($permission->{'author'})) {
+ $output = '<form action="/adm/createuser" method="post" name="camanagers">'.
+ '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
+ '<p>';
+ my (@possmanagers,@custommanagers);
+ my %userenv =
+ &Apache::lonnet::userenvironment($env{'user.domain'},
+ $env{'user.name'},
+ 'authormanagers');
+ my %ca_roles = &Apache::lonnet::get_my_roles(undef,undef,undef,
+ ['active','future'],['ca']);
+ if (keys(%ca_roles)) {
+ foreach my $entry (sort(keys(%ca_roles))) {
+ if ($entry =~ /^($match_username\:$match_domain):ca$/) {
+ my $user = $1;
+ unless ($user eq $env{'user.name'}.':'.$env{'user.domain'}) {
+ push(@possmanagers,$user);
+ }
+ }
+ }
+ }
+ if ($userenv{'authormanagers'} eq '') {
+ $output .= &mt('Currently author manages co-author roles');
+ } else {
+ if (keys(%ca_roles)) {
+ foreach my $user (split(/,/,$userenv{'authormanagers'})) {
+ if ($user =~ /^($match_username)\:($match_domain)$/) {
+ if (exists($ca_roles{$user.':ca'})) {
+ unless ($user eq $env{'user.name'}.':'.$env{'user.domain'}) {
+ push(@custommanagers,$user);
+ }
+ }
+ }
+ }
+ }
+ if (@custommanagers) {
+ $output .= &mt('Co-authors with active or future roles who currently manage co-author roles: [_1]',
+ '<br />'.join(', ',map { &Apache::loncommon::plainname(split(':',$_))." ($_)"; } @custommanagers));
+ } else {
+ $output .= &mt('Currently author manages co-author roles');
+ }
+ }
+ $output .= "</p>\n";
+ if (@possmanagers) {
+ $output .= '<p>'.&mt('If checked, can manage').': ';
+ foreach my $user (@possmanagers) {
+ my $checked;
+ if (grep(/^\Q$user\E$/,@custommanagers)) {
+ $checked = ' checked="checked"';
+ }
+ $output .= '<span style="LC_nobreak"><label>'.
+ '<input type="checkbox" name="custommanagers" '.
+ 'value="'.&HTML::Entities::encode($user,'\'<>"&').'"'.$checked.' />'.
+ &Apache::loncommon::plainname(split(/:/,$user))." ($user)".'</label></span> '."\n";
+ }
+ $output .= '<input type="hidden" name="state" value="process" /></p>'."\n".
+ '<p><input type="submit" value="'.&mt('Save changes').'" /></p>'."\n";
+ } else {
+ $output .= '<p>'.&mt('No co-author roles assignable as manager').'</p>';
+ }
+ $output .= '</form>';
+ } else {
+ $output = '<span class="LC_warning">'.
+ &mt('You do not have permission to perform this action').
+ '</span>';
+ }
+ return $output;
+}
+
+sub update_coauthor_managers {
+ my ($permission) = @_;
+ my $output;
+ if ((ref($permission) eq 'HASH') && ($permission->{'author'})) {
+ my ($current,$newval,@possibles,@managers);
+ my %userenv =
+ &Apache::lonnet::userenvironment($env{'user.domain'},
+ $env{'user.name'},
+ 'authormanagers');
+ $current = $userenv{'authormanagers'};
+ @possibles = &Apache::loncommon::get_env_multiple('form.custommanagers');
+ if (@possibles) {
+ my %ca_roles = &Apache::lonnet::get_my_roles(undef,undef,undef,
+ ['active','future'],['ca']);
+ if (keys(%ca_roles)) {
+ foreach my $user (@possibles) {
+ if ($user =~ /^($match_username):($match_domain)$/) {
+ if (exists($ca_roles{$user.':ca'})) {
+ unless ($user eq $env{'user.name'}.':'.$env{'user.domain'}) {
+ push(@managers,$user);
+ }
+ }
+ }
+ }
+ if (@managers) {
+ $newval = join(',',sort(@managers));
+ }
+ }
+ }
+ if ($current eq $newval) {
+ $output = &mt('No changes made to management of co-author roles');
+ } else {
+ my $chgresult =
+ &Apache::lonnet::put('environment',{'authormanagers' => $newval},
+ $env{'user.domain'},$env{'user.name'});
+ if ($chgresult eq 'ok') {
+ &Apache::lonnet::appenv({'environment.authormanagers' => $newval});
+ my (@adds,@dels);
+ if ($newval eq '') {
+ @dels = split(/,/,$current);
+ } elsif ($current eq '') {
+ @adds = @managers;
+ } else {
+ my @old = split(/,/,$current);
+ my @diffs = &Apache::loncommon::compare_arrays(\@old,\@managers);
+ if (@diffs) {
+ foreach my $user (@diffs) {
+ if (grep(/^\Q$user\E$/,@old)) {
+ push(@dels,$user);
+ } elsif (grep(/^\Q$user\E$/,@managers)) {
+ push(@adds,$user);
+ }
+ }
+ }
+ }
+ my $key = "internal.manager./$env{'user.domain'}/$env{'user.name'}";
+ if (@dels) {
+ foreach my $user (@dels) {
+ if ($user =~ /^($match_username):($match_domain)$/) {
+ &Apache::lonnet::del('environment',[$key],$2,$1);
+ }
+ }
+ }
+ if (@adds) {
+ foreach my $user (@adds) {
+ if ($user =~ /^($match_username):($match_domain)$/) {
+ &Apache::lonnet::put('environment',{$key => 1},$2,$1);
+ }
+ }
+ }
+ if ($newval eq '') {
+ $output = &mt('Management of co-authors set to be author-only');
+ } else {
+ $output .= &mt('Co-authors who can manage co-author roles set to: [_1]',
+ '<br />'.join(', ',map { &Apache::loncommon::plainname(split(':',$_))." ($_)"; } @managers));
+ }
+ }
+ }
+ } else {
+ $output = '<span class="LC_warning">'.
+ &mt('You do not have permission to perform this action').
+ '</span>';
+ }
+ return $output;
+}
+
# ================================================================ Main Handler
sub handler {
my $r = shift;
@@ -5047,12 +5474,17 @@ sub handler {
$crstype = &Apache::loncommon::course_type();
} elsif ($env{'request.role'} =~ /^au\./) {
$context = 'author';
+ } elsif ($env{'request.role'} =~ m{^(ca|aa)\./$match_domain/$match_username$}) {
+ $context = 'coauthor';
} else {
$context = 'domain';
}
my ($permission,$allowed) =
&Apache::lonuserutils::get_permission($context,$crstype);
+ if (($context eq 'coauthor') && ($allowed)) {
+ $context = 'author';
+ }
if ($allowed) {
my @allhelp;
@@ -5090,6 +5522,13 @@ sub handler {
} elsif ($context eq 'author') {
push(@allhelp,('Author_Change_Privileges','Author_Create_Coauthor_List',
'Author_View_Coauthor_List','Author_User_Logs'));
+ } elsif ($context eq 'coauthor') {
+ if ($permission->{'cusr'}) {
+ push(@allhelp,('Author_Change_Privileges','Author_Create_Coauthor_List',
+ 'Author_View_Coauthor_List','Author_User_Logs'));
+ } elsif ($permission->{'view'}) {
+ push(@allhelp,'Author_View_Coauthor_List');
+ }
} else {
if ($permission->{'cusr'}) {
push(@allhelp,'Domain_Change_Privileges');
@@ -5116,7 +5555,8 @@ sub handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['action','state','callingform','roletype','showrole','bulkaction','popup','phase',
- 'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue']);
+ 'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue',
+ 'forceedit']);
&Apache::lonhtmlcommon::clear_breadcrumbs();
my $args;
my $brcrum = [];
@@ -5131,6 +5571,9 @@ sub handler {
if ($context eq 'course') {
$r->internal_redirect('/adm/viewclasslist');
return OK;
+ } elsif ($context eq 'coauthor') {
+ $r->internal_redirect('/adm/viewcoauthors');
+ return OK;
}
$env{'user.error.msg'}=
"/adm/createuser:cst:0:0:Cannot create/modify user data ".
@@ -5725,6 +6168,64 @@ sub handler {
$r->print(&header(undef,{'no_nav_bar' => 1}).
'<span class="LC_error">'.&mt('You do not have permission to view helpdesk access').'</span>');
}
+ } elsif ($env{'form.action'} eq 'camanagers') {
+ if (($permission->{cusr}) && ($context eq 'author')) {
+ push(@{$brcrum},
+ {href => '/adm/createuser?action=camanagers',
+ text => 'Co-author Managers',
+ help => 'Author_Manage_Coauthors'});
+ if ($env{'form.state'} eq 'process') {
+ push(@{$brcrum},
+ {href => '/adm/createuser?action=camanagers',
+ text => 'Result',
+ help => 'Author_Manage_Coauthors'});
+ }
+ $args = { bread_crumbs => $brcrum };
+ $r->print(&header(undef,$args));
+ my $coursedesc = $env{'course.'.$cid.'.description'};
+ if (!exists($env{'form.state'})) {
+ $r->print('<h3>'.&mt('Co-author Management').'</h3>'."\n".
+ &display_coauthor_managers($permission));
+ } elsif ($env{'form.state'} eq 'process') {
+ $r->print('<h3>'.&mt('Co-author Management Update Result').'</h3>'."\n".
+ &update_coauthor_managers($permission));
+ }
+ }
+ } elsif (($env{'form.action'} eq 'calist') && ($context eq 'author')) {
+ if ($permission->{'cusr'}) {
+ my ($role,$audom,$auname,$canview,$canedit) =
+ &Apache::lonviewcoauthors::get_allowable();
+ if (($canedit) && ($env{'form.forceedit'})) {
+ &Apache::lonviewcoauthors::get_editor_crumbs($brcrum,'/adm/createuser');
+ my $args = { 'bread_crumbs' => $brcrum };
+ $r->print(&Apache::loncommon::start_page('Configure co-author listing',undef,
+ $args).
+ &Apache::lonviewcoauthors::edit_settings($audom,$auname,$role,
+ '/adm/createuser'));
+ } else {
+ push(@{$brcrum},
+ {href => '/adm/createuser?action=calist',
+ text => 'Coauthor-viewable list',
+ help => 'Author_List_Coauthors'});
+ my $args = { 'bread_crumbs' => $brcrum };
+ $r->print(&Apache::loncommon::start_page('Coauthor-viewable list',undef,
+ $args));
+ my %viewsettings =
+ &Apache::lonviewcoauthors::retrieve_view_settings($auname,$audom,$role);
+ if ($viewsettings{'show'} eq 'none') {
+ $r->print('<h3>'.&mt('Coauthor-viewable listing').'</h3>'.
+ '<p class="LC_info">'.
+ &mt('Listing of co-authors not enabled for this Authoring Space').
+ '</p>');
+ } else {
+ &Apache::lonviewcoauthors::print_coauthors($r,$auname,$audom,$role,
+ '/adm/createuser',\%viewsettings);
+ }
+ }
+ } else {
+ $r->internal_redirect('/adm/viewcoauthors');
+ return OK;
+ }
} else {
$bread_crumbs_component = 'User Management';
$args = { bread_crumbs => $brcrum,
@@ -5831,6 +6332,15 @@ function updateCols(caller) {
document.getElementById('showcolstart').checked = false;
document.getElementById('showcolend').checked = false;
}
+ if (context == 'author') {
+ if (document.studentform.Status.options[document.studentform.Status.selectedIndex].value == 'Expired') {
+ document.getElementById('showcolmanager').checked = false;
+ document.getElementById('showcolmanager').disabled = 'disabled';
+ } else if (document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value != 'aa') {
+ document.getElementById('showcolmanager').checked = true;
+ document.getElementById('showcolmanager').disabled = '';
+ }
+ }
}
}
if (caller == 'output') {
@@ -5916,6 +6426,15 @@ function updateCols(caller) {
}
}
}
+ if (context == 'author') {
+ if (document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'aa') {
+ document.getElementById('showcolmanager').checked = false;
+ document.getElementById('showcolmanager').disabled = 'disabled';
+ } else if (document.studentform.Status.options[document.studentform.Status.selectedIndex].value != 'Expired') {
+ document.getElementById('showcolmanager').checked = true;
+ document.getElementById('showcolmanager').disabled = '';
+ }
+ }
}
return;
}
@@ -6216,6 +6735,22 @@ sub print_main_menu {
permission => $permission->{'cusr'},
linktitle => 'View change log.',
},
+ {
+ linktext => 'Co-author Managers',
+ icon => 'camanager.png',
+ #help => 'Coauthor_Management',
+ url => '/adm/createuser?action=camanagers',
+ permission => $permission->{'author'},
+ linktitle => 'Assign/Revoke right to manage co-author roles',
+ },
+ {
+ linktext => 'Configure Co-author Listing',
+ icon => 'coauthors.png',
+ #help => 'Coauthor_Settings',
+ url => '/adm/createuser?action=calist&forceedit=1',
+ permission => ($permission->{'cusr'}),
+ linktitle => 'Set availability of coauthor-viewable user listing',
+ },
);
}
return Apache::lonhtmlcommon::generate_menu(@menu);
@@ -7151,9 +7686,11 @@ sub print_userchangelogs_display {
&Apache::loncommon::restore_course_settings('roles_log',
\%saveable_parameters);
} elsif ($context eq 'author') {
- $domain = $env{'user.domain'};
+ $domain = $env{'user.domain'};
if ($env{'request.role'} =~ m{^au\./\Q$domain\E/$}) {
$username = $env{'user.name'};
+ } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) {
+ ($domain,$username) = ($1,$2);
} else {
undef($domain);
}
@@ -7830,7 +8367,7 @@ sub role_display_filter {
} elsif ($context eq 'domain') {
@posscontexts = ('any','domain','requestauthor','domconfig','server');
} else {
- @posscontexts = ('any','author','domain');
+ @posscontexts = ('any','author','coauthor','domain');
}
foreach my $chgtype (@posscontexts) {
my $selstr = '';
@@ -7901,6 +8438,7 @@ sub rolechg_contexts {
any => 'Any',
domain => 'User Management in domain',
author => 'User Management by author',
+ coauthor => 'User Management by coauthor',
);
}
return %lt;