print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
$r->print(''.$1.'_'.$2.' ');
} else {
if ($showall) {
$contextrole = &mt('Existing Roles in this Domain');
@@ -2076,13 +2386,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",
@@ -2137,6 +2459,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(''.
+ &mt('You do not have privileges to assign co-author roles.').
+ ' ');
+ } 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;;
}
@@ -2444,9 +2777,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;
@@ -2515,10 +2848,12 @@ 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');
- $output = ''.$lt{'pd'}.' '.
+ $output = ''.$lt{'pd'}.' '.
&Apache::lonhtmlcommon::start_pick_box();
if (($context eq 'selfcreate') && ($newuser eq 'email')) {
my $size = 25;
@@ -2534,9 +2869,9 @@ sub personal_data_display {
undef($condition);
}
}
- $output .= &Apache::lonhtmlcommon::row_title($lt{'email'}.'* ',undef,
+ $output .= &Apache::lonhtmlcommon::row_title(''.$lt{'email'}.' * ',undef,
'LC_oddrow_value')."\n".
- '* ',
+ my $upassone = ''.&mt('Password').' * ',
'LC_pick_box_title',
'LC_oddrow_value')."\n".
$upassone."\n".
&Apache::lonhtmlcommon::row_closure(1)."\n".
- &Apache::lonhtmlcommon::row_title(&mt('Confirm password').'* ',
+ &Apache::lonhtmlcommon::row_title(''.&mt('Confirm password').' * ',
'LC_pick_box_title',
'LC_oddrow_value')."\n".
$upasstwo.
@@ -2576,59 +2911,85 @@ sub personal_data_display {
''.
- ''.&mt('Preferred username').
+ ''.&mt('Preferred username').
'
'."\n".&Apache::lonhtmlcommon::row_closure(1);
+ ''."\n".&Apache::lonhtmlcommon::row_closure(1);
$rowcount ++;
}
}
+ my %shownfields;
+ if ($env{'request.role.domain'} ne $ccdomain) {
+ my %shownfields_by_type =
+ &Apache::lonuserutils::get_othdom_shownfields($ccdomain,\@userinfo);
+ my @types = split(/:/,$userenv{'inststatus'});
+ if (@types == 0) {
+ @types = ('default');
+ }
+ foreach my $type (@types) {
+ if (ref($shownfields_by_type{$type}) eq 'HASH') {
+ foreach my $field (keys(%{$shownfields_by_type{$type}})) {
+ if ($shownfields_by_type{$type}{$field}) {
+ $shownfields{$field} = 1;
+ }
+ }
+ }
+ }
+ }
foreach my $item (@userinfo) {
my $rowtitle = $lt{$item};
my $hiderow = 0;
if ($item eq 'generation') {
$rowtitle = $genhelp.$rowtitle;
}
- my $row = &Apache::lonhtmlcommon::row_title($rowtitle,undef,'LC_oddrow_value')."\n";
+ my $row = &Apache::lonhtmlcommon::row_title(''.$rowtitle.' ',undef,'LC_oddrow_value')."\n";
if ($newuser) {
if (ref($inst_results) eq 'HASH') {
if ($inst_results->{$item} ne '') {
- $row .= ''.
+ &mt('Submit').' ','','','',1)."\n".
''.$lt{'uic'}.' '.
@@ -3635,10 +4166,13 @@ sub display_userinfo {
}
foreach my $entry (@{$order}) {
if ($canshow->{$entry}) {
- if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom') || ($entry eq 'requestauthor')) {
+ if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom') ||
+ ($entry eq 'requestauthor') || ($entry eq 'authordefaults')) {
my @items;
if ($entry eq 'requestauthor') {
@items = ($entry);
+ } elsif ($entry eq 'authordefaults') {
+ @items = ('webdav','managers','editors','archive');
} else {
@items = @{$requestcourses};
}
@@ -3646,19 +4180,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("$lt{$item} \n");
- $r->print("".$oldsetting->{$item});
+ $r->print(" $lt{$item} \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(" \n");
- $r->print("".$newsetting->{$item});
+ $r->print(" \n");
+ 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});
}
@@ -3819,6 +4361,11 @@ sub tool_changes {
}
return;
}
+ my %tooldesc = &Apache::lonlocal::texthash(
+ 'edit' => 'Standard editor (Edit)',
+ 'xml' => 'Text editor (EditXML)',
+ 'daxe' => 'Daxe editor (Daxe)',
+ );
foreach my $tool (@{$usertools}) {
my ($newval,$limit,$envkey);
$envkey = $context.'.'.$tool;
@@ -3832,6 +4379,54 @@ sub tool_changes {
} elsif ($context eq 'requestauthor') {
$newval = $env{'form.'.$context};
$envkey = $context;
+ } elsif ($context eq 'authordefaults') {
+ if ($tool eq 'editors') {
+ $envkey = 'authoreditors';
+ if ($env{'form.customeditors'} == 1) {
+ my @editors;
+ my @posseditors = &Apache::loncommon::get_env_multiple('form.custom_editor');
+ if (@posseditors) {
+ foreach my $editor (@posseditors) {
+ if (grep(/^\Q$editor\E$/,@posseditors)) {
+ unless (grep(/^\Q$editor\E$/,@editors)) {
+ push(@editors,$editor);
+ }
+ }
+ }
+ }
+ if (@editors) {
+ $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};
}
@@ -3850,6 +4445,25 @@ sub tool_changes {
} else {
$oldaccesstext->{$tool} = &mt("availability set to 'off'");
}
+ } elsif ($context eq 'authordefaults') {
+ 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') || ($tool eq 'archive')) {
+ if ($userenv->{$envkey}) {
+ $oldaccesstext->{$tool} = &mt("availability set to 'on'");
+ } else {
+ $oldaccesstext->{$tool} = &mt("availability set to 'off'");
+ }
+ }
} else {
if ($userenv->{$envkey}) {
$oldaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -3858,7 +4472,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);
@@ -3876,6 +4491,25 @@ sub tool_changes {
} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
}
+ } elsif ($context eq 'authordefaults') {
+ if ($tool eq 'editors') {
+ $newaccesstext->{$tool} = &mt('can use: [_1]',
+ join(', ', map { $tooldesc{$_} } split(/,/,$changeHash->{$envkey})));
+ } 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 {
+ $newaccesstext->{$tool} = &mt("availability set to 'off'");
+ }
+ }
} else {
if ($newval) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -3886,17 +4520,36 @@ sub tool_changes {
} else {
$newaccess->{$tool} = $oldaccess->{$tool};
if (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
- if ($newval =~ /^autolimit/) {
+ if ($userenv->{$envkey} =~ /^autolimit/) {
if ($limit) {
$newaccesstext->{$tool} = &mt('available with automatic approval, up to limit of [quant,_1,request] per user',$limit);
} else {
$newaccesstext->{$tool} = &mt('available with automatic approval (unlimited)');
}
- } elsif ($newval) {
- $newaccesstext->{$tool} = $reqdisplay{$newval};
+ } elsif ($userenv->{$envkey}) {
+ $newaccesstext->{$tool} = $reqdisplay{$userenv->{$envkey}};
} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
}
+ } elsif ($context eq 'authordefaults') {
+ if ($tool eq 'editors') {
+ $newaccesstext->{$tool} = &mt('can use: [_1]',
+ join(', ', map { $tooldesc{$_} } split(/,/,$userenv->{$envkey})));
+ } 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 {
+ $newaccesstext->{$tool} = &mt("availability set to 'off'");
+ }
+ }
} else {
if ($userenv->{$context.'.'.$tool}) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -3927,6 +4580,25 @@ sub tool_changes {
} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
}
+ } elsif ($context eq 'authordefaults') {
+ if ($tool eq 'editors') {
+ $newaccesstext->{$tool} = &mt('can use: [_1]',
+ join(', ', map { $tooldesc{$_} } split(/,/,$newval)));
+ } 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 ($userenv->{$envkey}) {
+ $newaccesstext->{$tool} = &mt("availability set to 'on'");
+ } else {
+ $newaccesstext->{$tool} = &mt("availability set to 'off'");
+ }
+ }
} else {
if ($userenv->{$context.'.'.$tool}) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -3938,7 +4610,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}) {
@@ -3955,6 +4628,25 @@ sub tool_changes {
} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
}
+ } elsif ($context eq 'authordefaults') {
+ 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') || ($tool eq 'archive')) {
+ if ($newval) {
+ $newaccesstext->{$tool} = &mt("availability set to 'on'");
+ } else {
+ $newaccesstext->{$tool} = &mt("availability set to 'off'");
+ }
+ }
} else {
if ($newval) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -4598,6 +5290,10 @@ sub tool_admin {
if (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) {
$canchange = 1;
}
+ } elsif ($context eq 'authordefaults') {
+ if (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) {
+ $canchange = 1;
+ }
} elsif (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) {
# Current user has quota modification privileges
$canchange = 1;
@@ -4608,6 +5304,10 @@ sub tool_admin {
$toolchanged = 1;
if ($tool eq 'requestauthor') {
$changeHash->{$context} = $settool;
+ } elsif (($tool eq 'managers') || ($tool eq 'editors') || ($tool eq 'archive')) {
+ $changeHash->{'author'.$tool} = $settool;
+ } elsif ($tool eq 'webdav') {
+ $changeHash->{'tools.'.$tool} = $settool;
} else {
$changeHash->{$context.'.'.$tool} = $settool;
}
@@ -4875,6 +5575,164 @@ sub show_role_requests {
return $showrolereqs;
}
+sub display_coauthor_managers {
+ my ($permission) = @_;
+ my $output;
+ if ((ref($permission) eq 'HASH') && ($permission->{'author'})) {
+ $output = '';
+ } else {
+ $output = ''.
+ &mt('You do not have permission to perform this action').
+ ' ';
+ }
+ 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]',
+ ''.
+ &mt('You do not have permission to perform this action').
+ ' ';
+ }
+ return $output;
+}
+
# ================================================================ Main Handler
sub handler {
my $r = shift;
@@ -4890,12 +5748,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;
@@ -4933,6 +5796,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');
@@ -4959,7 +5829,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 = [];
@@ -4974,6 +5845,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 ".
@@ -5588,6 +6462,85 @@ sub handler {
$r->print(&header(undef,{'no_nav_bar' => 1}).
''.&mt('You do not have permission to view queued requests from other domains for assignment of roles to users from this domain.').' ');
}
+ } 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(''.&mt('Co-author Management').' '."\n".
+ &display_coauthor_managers($permission));
+ } elsif ($env{'form.state'} eq 'process') {
+ $r->print(''.&mt('Co-author Management Update Result').' '."\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(''.&mt('Coauthor-viewable listing').' '.
+ ''.
+ &mt('Listing of co-authors not enabled for this Authoring Space').
+ '
');
+ } else {
+ &Apache::lonviewcoauthors::print_coauthors($r,$auname,$audom,$role,
+ '/adm/createuser',\%viewsettings);
+ }
+ }
+ } else {
+ $r->internal_redirect('/adm/viewcoauthors');
+ return OK;
+ }
+ } elsif (($env{'form.action'} eq 'setenv') && ($context eq 'author')) {
+ my ($role,$audom,$auname,$canview,$canedit) =
+ &Apache::lonviewcoauthors::get_allowable();
+ 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(''.&mt('Coauthor-viewable listing').' '.
+ ''.
+ &mt('Listing of co-authors not enabled for this Authoring Space').
+ '
');
+ } else {
+ &Apache::lonviewcoauthors::print_coauthors($r,$auname,$audom,$role,
+ '/adm/createuser',\%viewsettings);
+ }
} else {
$bread_crumbs_component = 'User Management';
$args = { bread_crumbs => $brcrum,
@@ -5694,6 +6647,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') {
@@ -5779,6 +6741,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;
}
@@ -6074,6 +7045,27 @@ sub print_main_menu {
);
}
} elsif ($context eq 'author') {
+ my $coauthorlist;
+ if ($env{'request.role'} =~ m{^(?:ca|aa)\./($match_domain)/($match_username)$}) {
+ if ($env{'environment.internal.coauthorlist./'.$1.'/'.$2}) {
+ $coauthorlist = 1;
+ }
+ } elsif ($env{'request.role'} eq "au./$env{'user.domain'}/") {
+ if ($env{'environment.coauthorlist'}) {
+ $coauthorlist = 1;
+ }
+ }
+ if ($coauthorlist) {
+ push(@{ $menu[1]->{items} },
+ {
+ linktext => 'Co-author-viewable list',
+ icon => 'clst.png',
+ #help => 'Coauthor_Listing',
+ url => '/adm/createuser?action=calist&forceedit=0',
+ permission => $permission->{'cusr'},
+ linktitle => 'Co-author-viewable listing',
+ });
+ }
push(@{ $menu[2]->{items} }, #Category: Administration
{
linktext => 'Change Log',
@@ -6083,6 +7075,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',
+ },
);
}
push(@{ $menu[2]->{items} },
@@ -6777,7 +7785,7 @@ sub get_noedit_fields {
}
}
return %noedit;
-}
+}
sub visible_in_stdcat {
my ($cdom,$cnum,$domconf) = @_;
@@ -7041,9 +8049,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);
}
@@ -7602,7 +8612,7 @@ sub activity_display_filter {
my $nolink = 1;
my $output = ''.
''.&mt('Actions/page:').' ';
my $startform =
@@ -7692,7 +8702,7 @@ sub role_display_filter {
my $nolink = 1;
my $output = ''.
''.&mt('Changes/page:').' ';
my $startform =
@@ -7741,7 +8751,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 = '';
@@ -7825,6 +8835,7 @@ sub rolechg_contexts {
any => 'Any',
domain => 'User Management in domain',
author => 'User Management by author',
+ coauthor => 'User Management by coauthor',
);
}
return %lt;
@@ -9639,7 +10650,7 @@ sub course_level_dc {
ENDTIMEENTRY
$otheritems .= &Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table()."\n";
- return $cb_jscript.$header.$hiddenitems.$otheritems;
+ return $cb_jscript.$hiddenitems.$header.$otheritems;
}
sub update_selfenroll_config {