'.$authformcurrent.
@@ -2711,9 +2444,9 @@ sub modify_login_block {
}
sub personal_data_display {
- my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$readonly,$rolesarray,$now,
+ my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,$now,
$captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded,$showsubmit) = @_;
- my ($output,%userenv,%canmodify,%canmodify_status,$disabled);
+ my ($output,%userenv,%canmodify,%canmodify_status);
my @userinfo = ('firstname','middlename','lastname','generation',
'permanentemail','id');
my $rowcount = 0;
@@ -2782,8 +2515,6 @@ 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');
@@ -2797,7 +2528,7 @@ sub personal_data_display {
} else {
undef($condition);
}
- }
+ }
if ($excluded) {
unless ($excluded =~ /^\@[^\@]+$/) {
undef($condition);
@@ -2837,7 +2568,7 @@ sub personal_data_display {
$upasstwo.
&Apache::lonhtmlcommon::row_closure()."\n";
if ($usernameset eq 'free') {
- my $onclick = "toggleUsernameDisp(this,'selfcreateusername');";
+ my $onclick = "toggleUsernameDisp(this,'selfcreateusername');";
$output .= &Apache::lonhtmlcommon::row_title($lt{'username'},undef,'LC_oddrow_value')."\n".
''.&mt('Use e-mail address: ').
' '.
@@ -2871,7 +2602,7 @@ sub personal_data_display {
$hiderow = 1;
}
} else {
- $row .= ' ';
+ $row .= ' ';
}
}
} else {
@@ -2887,7 +2618,7 @@ sub personal_data_display {
$hiderow = 1;
}
} else {
- $row .= ' ';
+ $row .= ' ';
}
}
} else {
@@ -3163,6 +2894,9 @@ sub update_user_data {
$amode='localauth';
$genpwd=$env{'form.locarg'};
$genpwd=" " if (!$genpwd);
+ } elsif ($env{'form.login'} eq 'lti') {
+ $amode='lti';
+ $genpwd=" ";
} elsif (($env{'form.login'} eq 'nochange') ||
($env{'form.login'} eq '' )) {
# There is no need to tell the user we did not change what they
@@ -3181,10 +2915,9 @@ sub update_user_data {
my (%alerts,%rulematch,%inst_results,%curr_rules);
my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
- my @usertools = ('aboutme','blog','portfolio','portaccess','timezone');
- my @requestcourses = ('official','unofficial','community','textbook');
+ my @usertools = ('aboutme','blog','webdav','portfolio','timezone');
+ my @requestcourses = ('official','unofficial','community','textbook','placement','lti');
my @requestauthor = ('requestauthor');
- my @authordefaults = ('webdav','editors','archive');
my ($othertitle,$usertypes,$types) =
&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
my %canmodify_status =
@@ -3293,35 +3026,6 @@ sub update_user_data {
$newcustom{'requestauthor'},
\%changeHash,'requestauthor');
}
- 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) {
- @editors = sort(@editors);
- $changed{'editors'} = &tool_admin('editors',join(',',@editors),
- \%changeHash,'authordefaults');
- }
- }
- if ($env{'form.customwebdav'} == 1) {
- $newcustom{'webdav'} = $env{'form.authordefaults_webdav'};
- $changed{'webdav'} = &tool_admin('webdav',$newcustom{'webdav'},
- \%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'}) {
if (exists($env{'form.inststatus'})) {
@@ -3360,7 +3064,7 @@ sub update_user_data {
($env{'form.ccuname'},$env{'form.ccdomain'}));
} else {
# Okay, this is a non-fatal error.
- $r->print($error.&mt('You do not have privileges to modify the authentication configuration for this user.').$end);
+ $r->print($error.&mt('You do not have privileges to modify the authentication configuration for this user.').$end);
}
} elsif (($env{'form.intarg'} ne '') &&
(&Apache::lonnet::queryauthenticate($env{'form.ccuname'},$env{'form.ccdomain'}) =~ /^internal:/) &&
@@ -3388,23 +3092,18 @@ sub update_user_data {
('environment',['firstname','middlename','lastname','generation',
'id','permanentemail','portfolioquota','authorquota','inststatus',
'tools.aboutme','tools.blog','tools.webdav',
- 'tools.portfolio','tools.timezone','tools.portaccess',
- 'authormanagers','authoreditors','authorarchive','requestauthor',
+ 'tools.portfolio','tools.timezone',
'requestcourses.official','requestcourses.unofficial',
'requestcourses.community','requestcourses.textbook',
+ 'requestcourses.lti','requestauthor',
'reqcrsotherdom.official','reqcrsotherdom.unofficial',
'reqcrsotherdom.community','reqcrsotherdom.textbook',
- 'domcoord.author'],
+ 'reqcrsotherdom.placement'],
$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 =
@@ -3429,7 +3128,7 @@ sub update_user_data {
}
} elsif ($context eq 'author') {
if ($rolenum eq $auname && $roledom eq $audom) {
- if (!grep(/^\Q$role\E$/,@userroles)) {
+ if (!grep(/^\Q$role\E$/,@userroles)) {
push(@userroles,$role);
}
}
@@ -3527,7 +3226,7 @@ sub update_user_data {
%oldsettingstatus,%newsettingstatus);
@disporder = ('inststatus');
if ($env{'request.role.domain'} eq $env{'form.ccdomain'}) {
- push(@disporder,('requestcourses','requestauthor','authordefaults'));
+ push(@disporder,'requestcourses','requestauthor');
} else {
push(@disporder,'reqcrsotherdom');
}
@@ -3555,7 +3254,6 @@ sub update_user_data {
}
if (&Apache::lonnet::allowed('cau',$env{'form.ccdomain'})) {
$canshow{'requestauthor'} = 1;
- $canshow{'authordefaults'} = 1;
}
my (%changeHash,%changed);
if ($oldinststatus eq '') {
@@ -3664,14 +3362,8 @@ sub update_user_data {
if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) {
&tool_changes('requestcourses',\@requestcourses,\%oldsettings,\%oldsettingstext,
\%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
- my ($isadv,$isauthor) =
- &Apache::lonnet::is_advanced_user($env{'form.ccdomain'},$env{'form.ccuname'});
- unless ($isauthor) {
- &tool_changes('requestauthor',\@requestauthor,\%oldsettings,\%oldsettingstext,
- \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
- }
- &tool_changes('authordefaults',\@authordefaults,\%oldsettings,\%oldsettingstext,
- \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
+ &tool_changes('requestauthor',\@requestauthor,\%oldsettings,\%oldsettingstext,
+ \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
} else {
&tool_changes('reqcrsotherdom',\@requestcourses,\%oldsettings,\%oldsettingstext,
\%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
@@ -3689,134 +3381,34 @@ 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,
- %userenv);
- my @fromenv = keys(%changed);
- push(@fromenv,'inststatus');
+ 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') || ($key eq 'lti')) {
$newenvhash{'environment.requestcourses.'.$key} =
$changeHash{'requestcourses.'.$key};
if ($changeHash{'requestcourses.'.$key}) {
$newenvhash{'environment.canrequest.'.$key} = 1;
} else {
- unless ($got_domdefs) {
- %domdefaults =
- &Apache::lonnet::get_domain_defaults($env{'user.domain'});
- $got_domdefs = 1;
- }
- unless ($got_userenv) {
- %userenv =
- &Apache::lonnet::userenvironment($env{'user.domain'},
- $env{'user.name'},@fromenv);
- $got_userenv = 1;
- }
$newenvhash{'environment.canrequest.'.$key} =
&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
- $key,'reload','requestcourses',\%userenv,\%domdefaults);
+ $key,'reload','requestcourses');
}
} elsif ($key eq 'requestauthor') {
$newenvhash{'environment.'.$key} = $changeHash{$key};
if ($changeHash{$key}) {
$newenvhash{'environment.canrequest.author'} = 1;
} else {
- unless ($got_domdefs) {
- %domdefaults =
- &Apache::lonnet::get_domain_defaults($env{'user.domain'});
- $got_domdefs = 1;
- }
- unless ($got_userenv) {
- %userenv =
- &Apache::lonnet::userenvironment($env{'user.domain'},
- $env{'user.name'},@fromenv);
- $got_userenv = 1;
- }
$newenvhash{'environment.canrequest.author'} =
&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
- $key,'reload','requestauthor',\%userenv,\%domdefaults);
- }
- } elsif ($key eq 'editors') {
- $newenvhash{'environment.author'.$key} = $changeHash{'author'.$key};
- if ($env{'form.customeditors'}) {
- $newenvhash{'environment.editors'} = $changeHash{'author'.$key};
- } else {
- unless ($got_domdefs) {
- %domdefaults =
- &Apache::lonnet::get_domain_defaults($env{'user.domain'});
- $got_domdefs = 1;
- }
- if ($domdefaults{'editors'} ne '') {
- $newenvhash{'environment.editors'} = $domdefaults{'editors'};
- } else {
- $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'};
+ $key,'reload','requestauthor');
}
} elsif ($key ne 'quota') {
$newenvhash{'environment.tools.'.$key} =
@@ -3825,33 +3417,15 @@ sub update_user_data {
$newenvhash{'environment.availabletools.'.$key} =
$changeHash{'tools.'.$key};
} else {
- unless ($got_domdefs) {
- %domdefaults =
- &Apache::lonnet::get_domain_defaults($env{'user.domain'});
- $got_domdefs = 1;
- }
- unless ($got_userenv) {
- %userenv =
- &Apache::lonnet::userenvironment($env{'user.domain'},
- $env{'user.name'},@fromenv);
- $got_userenv = 1;
- }
$newenvhash{'environment.availabletools.'.$key} =
&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
- $key,'reload','tools',\%userenv,\%domdefaults);
+ $key,'reload','tools');
}
}
}
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'},
@@ -3887,7 +3461,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 =
@@ -4026,22 +3600,17 @@ 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',
'community' => 'Can Request Communities',
'textbook' => 'Can Request Textbook Courses',
+ 'placement' => 'Can Request Placement Tests',
+ 'lti' => 'Can Request LTI Courses',
'requestauthor' => 'Can Request Author Role',
'inststatus' => "Affiliation",
'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)',
+ 'chto' => 'Changed To:'
);
if ($changed) {
$r->print(''.$lt{'uic'}.' '.
@@ -4066,13 +3635,10 @@ sub display_userinfo {
}
foreach my $entry (@{$order}) {
if ($canshow->{$entry}) {
- if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom') ||
- ($entry eq 'requestauthor') || ($entry eq 'authordefaults')) {
+ if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom') || ($entry eq 'requestauthor')) {
my @items;
if ($entry eq 'requestauthor') {
@items = ($entry);
- } elsif ($entry eq 'authordefaults') {
- @items = ('webdav','managers','editors','archive');
} else {
@items = @{$requestcourses};
}
@@ -4080,27 +3646,19 @@ 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");
- unless ($item eq 'managers') {
- $r->print($oldsetting->{$item});
- }
+ $r->print(" $lt{$item} \n");
+ $r->print("".$oldsetting->{$item});
if ($oldsettingtext->{$item}) {
if ($oldsetting->{$item}) {
- unless ($item eq 'managers') {
- $r->print(' -- ');
- }
+ $r->print(' -- ');
}
$r->print($oldsettingtext->{$item});
}
- $r->print(" \n");
- unless ($item eq 'managers') {
- $r->print($newsetting->{$item});
- }
+ $r->print(" \n");
+ $r->print("".$newsetting->{$item});
if ($newsettingtext->{$item}) {
if ($newsetting->{$item}) {
- unless ($item eq 'managers') {
- $r->print(' -- ');
- }
+ $r->print(' -- ');
}
$r->print($newsettingtext->{$item});
}
@@ -4261,11 +3819,6 @@ 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;
@@ -4279,54 +3832,6 @@ 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};
}
@@ -4345,25 +3850,6 @@ 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'");
@@ -4372,8 +3858,7 @@ sub tool_changes {
}
}
$changeHash->{$envkey} = $userenv->{$envkey};
- if (($env{'form.custom'.$tool} == 1) ||
- (($context eq 'authordefaults') && ($tool eq 'managers') && ($newval ne ''))) {
+ if ($env{'form.custom'.$tool} == 1) {
if ($newval ne $userenv->{$envkey}) {
$changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
$context);
@@ -4391,25 +3876,6 @@ 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'");
@@ -4420,36 +3886,17 @@ sub tool_changes {
} else {
$newaccess->{$tool} = $oldaccess->{$tool};
if (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
- if ($userenv->{$envkey} =~ /^autolimit/) {
+ if ($newval =~ /^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 ($userenv->{$envkey}) {
- $newaccesstext->{$tool} = $reqdisplay{$userenv->{$envkey}};
+ } elsif ($newval) {
+ $newaccesstext->{$tool} = $reqdisplay{$newval};
} 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'");
@@ -4480,25 +3927,6 @@ 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 ($newval) {
- $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'");
@@ -4510,8 +3938,7 @@ sub tool_changes {
}
} else {
$oldaccess->{$tool} = &mt('default');
- if (($env{'form.custom'.$tool} == 1) ||
- (($context eq 'authordefaults') && ($tool eq 'managers') && ($newval ne ''))) {
+ if ($env{'form.custom'.$tool} == 1) {
$changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
$context);
if ($changed->{$tool}) {
@@ -4528,25 +3955,6 @@ 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'");
@@ -4569,7 +3977,13 @@ sub update_roles {
my ($r,$context,$showcredits) = @_;
my $now=time;
my @rolechanges;
- my %disallowed;
+ my (%disallowed,%got_role_approvals,%got_instdoms,%process_by,%instdoms,
+ %pending,%reject,%notifydc);
+ $got_role_approvals{$context} = '';
+ $process_by{$context} = {};
+ my @domroles = &Apache::lonuserutils::domain_roles();
+ my @cstrroles = &Apache::lonuserutils::construction_space_roles();
+ my @courseroles = &Apache::lonuserutils::roles_by_context('course',1);
$r->print(''.&mt('Modifying Roles').' ');
foreach my $key (keys(%env)) {
next if (! $env{$key});
@@ -4671,6 +4085,7 @@ sub update_roles {
if ($key=~/^form\.ren\:([^\_]+)\_([^\_\.]+)$/) {
my $url = $1;
my $role = $2;
+ my $id = $url.'_'.$role;
my $logmsg;
my $output;
if ($role eq 'st') {
@@ -4678,10 +4093,16 @@ sub update_roles {
my ($cdom,$cnum,$csec) = ($1,$2,$3);
my $credits;
if ($showcredits) {
- my $defaultcredits =
+ my $defaultcredits =
&Apache::lonuserutils::get_defaultcredits($cdom,$cnum);
$credits = &get_user_credits($defaultcredits,$cdom,$cnum);
}
+ unless ($udom eq $cdom) {
+ next if (&Apache::lonuserutils::restricted_dom($context,$id,$udom,
+ $uname,$role,$now,0,$cdom,$cnum,$csec,$credits,
+ \%process_by,\%instdoms,\%got_role_approvals,
+ \%got_instdoms,\%reject,\%pending,\%notifydc));
+ }
my $result = &Apache::loncommon::commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$cdom,$cnum,$csec,$context,$credits);
if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course') || ($result eq 'refused')) {
if ($result eq 'refused' && $logmsg) {
@@ -4697,12 +4118,28 @@ sub update_roles {
}
}
} else {
+ my ($cdom,$cnum,$csec);
+ if (grep(/^\Q$role\E$/,@cstrroles)) {
+ ($cdom,$cnum) = ($url =~ m{^/($match_domain)/($match_username)$});
+ } elsif (grep(/^\Q$role\E$/,@domroles)) {
+ ($cdom) = ($url =~ m{^/($match_domain)/$});
+ } elsif ($url =~ m-^/($match_domain)/($match_courseid)/?(\w*)$-) {
+ ($cdom,$cnum,$csec) = ($1,$2,$3);
+ }
+ if ($cdom ne '') {
+ unless ($udom eq $cdom) {
+ next if (&Apache::lonuserutils::restricted_dom($context,$id,$udom,
+ $uname,$role,$now,0,$cdom,$cnum,$csec,'',\%process_by,
+ \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+ \%pending,\%notifydc));
+ }
+ }
my $result=&Apache::lonnet::assignrole($env{'form.ccdomain'},
$env{'form.ccuname'},$url,$role,0,$now,'','',
$context);
- $output = &Apache::lonhtmlcommon::confirm_success(&mt('Re-enabling [_1] in [_2]',
- &Apache::lonnet::plaintext($role),
- &Apache::loncommon::show_role_extent($url,$context,$role)),$result ne "ok").' ';
+ $output = &Apache::lonhtmlcommon::confirm_success(&mt('Re-enabling [_1] in [_2]',
+ &Apache::lonnet::plaintext($role),
+ &Apache::loncommon::show_role_extent($url,$context,$role)),$result ne "ok").' ';
if ($result ne "ok") {
$output .= &mt('Error: [_1]',$result).' ';
}
@@ -4715,6 +4152,17 @@ sub update_roles {
# Re-enable custom role
if ($key=~m{^form\.ren\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
+ my $id = $url.'_cr'."/$rdom/$rnam/$rolename";
+ my $role = "cr/$rdom/$rnam/$rolename";
+ if ($url =~ m-^/($match_domain)/($match_courseid)/?(\w*)$-) {
+ my ($cdom,$cnum,$csec) = ($1,$2,$3);
+ unless ($udom eq $cdom) {
+ next if (&Apache::lonuserutils::restricted_dom($context,$id,$udom,
+ $uname,$role,$now,0,$cdom,$cnum,$csec,'',\%process_by,
+ \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+ \%pending,\%notifydc));
+ }
+ }
my $result = &Apache::lonnet::assigncustomrole(
$env{'form.ccdomain'}, $env{'form.ccuname'},
$url,$rdom,$rnam,$rolename,0,$now,undef,$context);
@@ -4736,6 +4184,8 @@ sub update_roles {
# Activate a custom role
my ($one,$two,$three,$four,$five)=($1,$2,$3,$4,$5);
my $url='/'.$one.'/'.$two;
+ my $id = $url.'_cr/'."$three/$four/$five";
+ my $role = "cr/$three/$four/$five";
my $full=$one.'_'.$two.'_cr_cr_'.$three.'_'.$four.'_'.$five;
my $start = ( $env{'form.start_'.$full} ?
@@ -4744,15 +4194,22 @@ sub update_roles {
my $end = ( $env{'form.end_'.$full} ?
$env{'form.end_'.$full} :
0 );
-
+
# split multiple sections
my %sections = ();
- my $num_sections = &build_roles($env{'form.sec_'.$full},\%sections,$5);
+ my $num_sections = &build_roles($env{'form.sec_'.$full},\%sections,$five);
if ($num_sections == 0) {
+ unless ($udom eq $one) {
+ next if (&Apache::lonuserutils::restricted_dom($context,$id,$udom,
+ $uname,$role,$start,$end,$one,$two,'','',\%process_by,
+ \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+ \%pending,\%notifydc));
+ }
$r->print(&Apache::loncommon::commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end,$context));
} else {
my %curr_groups =
&Apache::longroup::coursegroups($one,$two);
+ my ($restricted,$numchanges);
foreach my $sec (sort {$a cmp $b} keys(%sections)) {
if (($sec eq 'none') || ($sec eq 'all') ||
exists($curr_groups{$sec})) {
@@ -4760,8 +4217,18 @@ sub update_roles {
next;
}
my $securl = $url.'/'.$sec;
+ my $secid = $securl.'_cr'."/$three/$four/$five";
+ undef($restricted);
+ unless ($udom eq $one) {
+ next if (&Apache::lonuserutils::restricted_dom($context,$secid,$udom,
+ $uname,$role,$start,$end,$one,$two,$sec,'',\%process_by,
+ \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+ \%pending,\%notifydc));
+ }
+ $numchanges ++;
$r->print(&Apache::loncommon::commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end,$context));
}
+ next unless ($numchanges);
}
if (!grep(/^cr$/,@rolechanges)) {
push(@rolechanges,'cr');
@@ -4770,20 +4237,21 @@ sub update_roles {
# Activate roles for sections with 3 id numbers
# set start, end times, and the url for the class
my ($one,$two,$three)=($1,$2,$3);
- my $start = ( $env{'form.start_'.$one.'_'.$two.'_'.$three} ?
- $env{'form.start_'.$one.'_'.$two.'_'.$three} :
+ my $start = ( $env{'form.start_'.$one.'_'.$two.'_'.$three} ?
+ $env{'form.start_'.$one.'_'.$two.'_'.$three} :
$now );
- my $end = ( $env{'form.end_'.$one.'_'.$two.'_'.$three} ?
+ my $end = ( $env{'form.end_'.$one.'_'.$two.'_'.$three} ?
$env{'form.end_'.$one.'_'.$two.'_'.$three} :
0 );
my $url='/'.$one.'/'.$two;
+ my $id = $url.'_'.$three;
my $type = 'three';
# split multiple sections
my %sections = ();
my $num_sections = &build_roles($env{'form.sec_'.$one.'_'.$two.'_'.$three},\%sections,$three);
- my $credits;
+ my ($credits,$numchanges);
if ($three eq 'st') {
- if ($showcredits) {
+ if ($showcredits) {
my $defaultcredits =
&Apache::lonuserutils::get_defaultcredits($one,$two);
$credits = $env{'form.credits_'.$one.'_'.$two.'_'.$three};
@@ -4794,11 +4262,19 @@ sub update_roles {
}
}
if ($num_sections == 0) {
+ unless ($udom eq $one) {
+ next if (&Apache::lonuserutils::restricted_dom($context,$id,$udom,
+ $uname,$three,$start,$end,$one,$two,'',$credits,\%process_by,
+ \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+ \%pending,\%notifydc));
+ }
+ $numchanges ++;
$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,'',$context,$credits));
} else {
my %curr_groups =
&Apache::longroup::coursegroups($one,$two);
my $emptysec = 0;
+ my $restricted;
foreach my $sec (sort {$a cmp $b} keys(%sections)) {
$sec =~ s/\W//g;
if ($sec ne '') {
@@ -4808,14 +4284,34 @@ sub update_roles {
next;
}
my $securl = $url.'/'.$sec;
+ my $secid = $securl.'_'.$three;
+ unless ($udom eq $one) {
+ undef($restricted);
+ $restricted = &Apache::lonuserutils::restricted_dom($context,$secid,$udom,
+ $uname,$three,$start,$end,$one,$two,$sec,$credits,\%process_by,
+ \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+ \%pending,\%notifydc);
+ next if ($restricted);
+ }
+ $numchanges ++;
$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec,$context,$credits));
} else {
$emptysec = 1;
}
}
if ($emptysec) {
+ unless ($udom eq $one) {
+ undef($restricted);
+ $restricted = &Apache::lonuserutils::restricted_dom($context,$id,$udom,
+ $uname,$three,$start,$end,$one,$two,'',$credits,\%process_by,
+ \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+ \%pending,\%notifydc);
+ next if ($restricted);
+ }
+ $numchanges ++;
$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,'',$context,$credits));
}
+ next unless ($numchanges);
}
if (!grep(/^\Q$three\E$/,@rolechanges)) {
push(@rolechanges,$three);
@@ -4823,33 +4319,63 @@ sub update_roles {
} elsif ($key=~/^form\.act\_([^\_]+)\_([^\_]+)$/) {
# Activate roles for sections with two id numbers
# set start, end times, and the url for the class
- my $start = ( $env{'form.start_'.$1.'_'.$2} ?
- $env{'form.start_'.$1.'_'.$2} :
+ my $start = ( $env{'form.start_'.$1.'_'.$2} ?
+ $env{'form.start_'.$1.'_'.$2} :
$now );
- my $end = ( $env{'form.end_'.$1.'_'.$2} ?
+ my $end = ( $env{'form.end_'.$1.'_'.$2} ?
$env{'form.end_'.$1.'_'.$2} :
0 );
my $one = $1;
my $two = $2;
my $url='/'.$one.'/';
+ my $id = $url.'_'.$two;
# split multiple sections
my %sections = ();
+ my ($restricted,$numchanges);
my $num_sections = &build_roles($env{'form.sec_'.$one.'_'.$two},\%sections,$two);
if ($num_sections == 0) {
+ unless ($udom eq $one) {
+ $restricted = &Apache::lonuserutils::restricted_dom($context,$id,$udom,
+ $uname,$two,$start,$end,$one,$two,'','',\%process_by,
+ \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+ \%pending,\%notifydc);
+ next if ($restricted);
+ }
+ $numchanges ++;
$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$two,$start,$end,$one,undef,'',$context));
} else {
my $emptysec = 0;
foreach my $sec (sort {$a cmp $b} keys(%sections)) {
if ($sec ne '') {
my $securl = $url.'/'.$sec;
+ my $secid = $securl.'_'.$two;
+ unless ($udom eq $one) {
+ undef($restricted);
+ $restricted = &Apache::lonuserutils::restricted_dom($context,$secid,$udom,
+ $uname,$two,$start,$end,$one,$two,$sec,'',\%process_by,
+ \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+ \%pending,\%notifydc);
+ next if ($restricted);
+ }
+ $numchanges ++;
$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$two,$start,$end,$one,undef,$sec,$context));
} else {
$emptysec = 1;
}
}
if ($emptysec) {
+ unless ($udom eq $one) {
+ undef($restricted);
+ $restricted = &Apache::lonuserutils::restricted_dom($context,$id,$udom,
+ $uname,$two,$start,$end,$one,$two,'','',\%process_by,
+ \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+ \%pending,\%notifydc);
+ next if ($restricted);
+ }
+ $numchanges ++;
$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$two,$start,$end,$one,undef,'',$context));
}
+ next unless ($numchanges);
}
if (!grep(/^\Q$two\E$/,@rolechanges)) {
push(@rolechanges,$two);
@@ -4873,6 +4399,12 @@ sub update_roles {
}
}
} # End of foreach (keys(%env))
+ if (keys(%reject)) {
+ $r->print(&Apache::lonuserutils::print_roles_rejected($context,\%reject));
+ }
+ if (keys(%pending)) {
+ $r->print(&Apache::lonuserutils::print_roles_queued($context,\%pending,\%notifydc));
+ }
# Flush the course logs so reverse user roles immediately updated
$r->register_cleanup(\&Apache::lonnet::flushcourselogs);
if (@rolechanges == 0) {
@@ -4927,11 +4459,34 @@ sub enroll_single_student {
}
}
}
+ my ($startdate,$enddate) = &Apache::lonuserutils::get_dates_from_form();
+ my (%got_role_approvals,%got_instdoms,%process_by,%instdoms,%pending,%reject,%notifydc);
+ unless ($env{'form.ccdomain'} eq $env{'course.'.$env{'request.course.id'}.'.domain'}) {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $csec = $env{'form.sections'};
+ my $id = "/$cdom/$cnum";
+ if ($csec ne '') {
+ $id .= "/$csec";
+ }
+ $id .= '_st';
+ if (&Apache::lonuserutils::restricted_dom($context,$id,$env{'form.ccdomain'},$env{'form.ccuname'},
+ 'st',$startdate,$enddate,$cdom,$cnum,$csec,$credits,
+ \%process_by,\%instdoms,\%got_role_approvals,\%got_instdoms,
+ \%reject,\%pending,\%notifydc)) {
+ if (keys(%reject)) {
+ $r->print(&Apache::lonuserutils::print_roles_rejected($context,\%reject));
+ }
+ if (keys(%pending)) {
+ $r->print(&Apache::lonuserutils::print_roles_queued($context,\%pending,\%notifydc));
+ }
+ return;
+ }
+ }
# Clean out any old student roles the user has in this class.
&Apache::lonuserutils::modifystudent($env{'form.ccdomain'},
$env{'form.ccuname'},$env{'request.course.id'},undef,$uhome);
- my ($startdate,$enddate) = &Apache::lonuserutils::get_dates_from_form();
my $enroll_result =
&Apache::lonnet::modify_student_enrollment($env{'form.ccdomain'},
$env{'form.ccuname'},$env{'form.cid'},$env{'form.cfirstname'},
@@ -5041,10 +4596,6 @@ 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;
@@ -5055,10 +4606,6 @@ 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;
}
@@ -5301,162 +4848,29 @@ sub set_custom_role {
);
}
-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);
+sub show_role_requests {
+ my ($caller,$dom) = @_;
+ my $showrolereqs;
+ my %domconfig = &Apache::lonnet::get_dom('configuration',['privacy'],$dom);
+ if (ref($domconfig{'privacy'}) eq 'HASH') {
+ if (ref($domconfig{'privacy'}{'approval'}) eq 'HASH') {
+ my %approvalconf = %{$domconfig{'privacy'}{'approval'}};
+ foreach my $key ('instdom','extdom') {
+ if (ref($approvalconf{$key}) eq 'HASH') {
+ if (keys(%{$approvalconf{$key}})) {
+ foreach my $context ('domain','author','course','community') {
+ if ($approvalconf{$key}{$context} eq $caller) {
+ $showrolereqs = 1;
+ last if ($showrolereqs);
}
}
}
}
- 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]',
- ' '.join(', ',map { &Apache::loncommon::plainname(split(':',$_))." ($_)"; } @managers));
- }
+ last if ($showrolereqs);
}
}
- } else {
- $output = ''.
- &mt('You do not have permission to perform this action').
- ' ';
}
- return $output;
+ return $showrolereqs;
}
# ================================================================ Main Handler
@@ -5474,17 +4888,12 @@ 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;
@@ -5509,7 +4918,7 @@ sub handler {
if (&Apache::lonnet::auto_run($cnum,$cdom) && (($permission->{'cusr'}) || ($permission->{'view'}))) {
push(@allhelp,'Course_Automated_Enrollment');
}
- if (($permission->{'selfenrolladmin'}) || ($permission->{'selfenrollview'})) {
+ if ($permission->{'selfenrolladmin'}) {
push(@allhelp,'Course_Approve_Selfenroll');
}
}
@@ -5522,13 +4931,6 @@ 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');
@@ -5555,8 +4957,7 @@ 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',
- 'forceedit']);
+ 'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue']);
&Apache::lonhtmlcommon::clear_breadcrumbs();
my $args;
my $brcrum = [];
@@ -5571,9 +4972,6 @@ 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 ".
@@ -5622,7 +5020,7 @@ sub handler {
if (! exists($env{'form.state'})) {
&Apache::lonuserutils::print_first_users_upload_form($r,$context);
} elsif ($env{'form.state'} eq 'got_file') {
- my $result =
+ my $result =
&Apache::lonuserutils::print_upload_manager_form($r,$context,
$permission,
$crstype,$showcredits);
@@ -5936,7 +5334,7 @@ sub handler {
&Apache::lonhtmlcommon::row_closure(1));
}
}
- if ($pickstart) {
+ if ($pickstart) {
$r->print(&Apache::lonhtmlcommon::end_pick_box().'');
} else {
$r->print(''.&mt('No information to display for this account request.').'
');
@@ -6060,9 +5458,8 @@ sub handler {
''.&mt('You do not have permission to modify dates or sections for users').' ');
}
} elsif ($env{'form.action'} eq 'selfenroll') {
- my %currsettings;
- if ($permission->{selfenrolladmin} || $permission->{selfenrollview}) {
- %currsettings = (
+ if ($permission->{selfenrolladmin}) {
+ my %currsettings = (
selfenroll_types => $env{'course.'.$cid.'.internal.selfenroll_types'},
selfenroll_registered => $env{'course.'.$cid.'.internal.selfenroll_registered'},
selfenroll_section => $env{'course.'.$cid.'.internal.selfenroll_section'},
@@ -6078,8 +5475,6 @@ sub handler {
default_enrollment_end_date => $env{'course.'.$cid.'.default_enrollment_end_date'},
uniquecode => $env{'course.'.$cid.'.internal.uniquecode'},
);
- }
- if ($permission->{selfenrolladmin}) {
push(@{$brcrum},
{href => '/adm/createuser?action=selfenroll',
text => "Configure Self-enrollment",
@@ -6100,16 +5495,6 @@ sub handler {
$r->print(''.&mt('Self-enrollment with a student role').' '."\n");
&update_selfenroll_config($r,$cid,$cdom,$cnum,$context,$crstype,\%currsettings);
}
- } elsif ($permission->{selfenrollview}) {
- push(@{$brcrum},
- {href => '/adm/createuser?action=selfenroll',
- text => "View Self-enrollment configuration",
- help => 'Course_Self_Enrollment'});
- $args = { bread_crumbs => $brcrum,
- bread_crumbs_component => 'Self-enrollment Settings'};
- $r->print(&header(undef,$args));
- $r->print(''.&mt('Self-enrollment with a student role').' '."\n");
- &print_selfenroll_menu($r,'course',$cid,$cdom,$cnum,\%currsettings,'',1);
} else {
$r->print(&header(undef,{'no_nav_bar' => 1}).
''.&mt('You do not have permission to configure self-enrollment').' ');
@@ -6168,63 +5553,25 @@ sub handler {
$r->print(&header(undef,{'no_nav_bar' => 1}).
''.&mt('You do not have permission to view helpdesk access').' ');
}
- } 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 'rolerequests') {
+ if ($permission->{cusr} || $permission->{view}) {
+ &print_queued_roles($r,$context,$permission,$brcrum);
}
- } 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').
- '
');
+ } elsif ($env{'form.action'} eq 'queuedroles') {
+ if (($permission->{cusr}) && ($context eq 'domain')) {
+ if (&show_role_requests($context,$env{'request.role.domain'})) {
+ if ($env{'form.state'} eq 'done') {
+ &process_pendingroles($r,$context,$permission,$brcrum);
} else {
- &Apache::lonviewcoauthors::print_coauthors($r,$auname,$audom,$role,
- '/adm/createuser',\%viewsettings);
+ &print_pendingroles($r,$context,$permission,$brcrum);
}
+ } else {
+ $r->print(&header(undef,{'no_nav_bar' => 1}).
+ ''.&mt('Domain coordinator approval of requests from other domains for assignment of roles to users from this domain not in use.').' ');
}
} else {
- $r->internal_redirect('/adm/viewcoauthors');
- return OK;
+ $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.').' ');
}
} else {
$bread_crumbs_component = 'User Management';
@@ -6332,15 +5679,6 @@ 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') {
@@ -6426,15 +5764,6 @@ 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;
}
@@ -6495,6 +5824,7 @@ sub print_main_menu {
listusers => 'Show and manage users in this community.',
},
);
+
if ($linkcontext eq 'domain') {
unless ($permission->{'cusr'}) {
$links{'domain'}{'singleuser'} = 'View a User';
@@ -6616,6 +5946,7 @@ sub print_main_menu {
groups => 'Community Groups',
},
);
+ $linktext{'Placement'} = $linktext{'Course'};
my %linktitle = (
'Course' => {
@@ -6630,6 +5961,8 @@ sub print_main_menu {
},
);
+ $linktitle{'Placement'} = $linktitle{'Course'};
+
push(@{ $menu[0]->{items} }, #Category: Single Users
{
linktext => $linktext{$crstype}{'single'},
@@ -6693,7 +6026,7 @@ sub print_main_menu {
icon => 'selfenrl-queue.png',
#help => 'Course_Approve_Selfenroll',
url => '/adm/createuser?action=selfenrollqueue',
- permission => $permission->{'selfenrolladmin'} || $permission->{'selfenrollview'},
+ permission => $permission->{'selfenrolladmin'},
linktitle =>'Approve or reject enrollment requests.',
},
);
@@ -6720,7 +6053,7 @@ sub print_main_menu {
icon => 'self_enroll.png',
#help => 'Course_Self_Enrollment',
url => '/adm/createuser?action=selfenroll',
- permission => $permission->{'selfenrolladmin'} || $permission->{'selfenrollview'},
+ permission => $permission->{'selfenrolladmin'},
linktitle => 'Configure user self-enrollment.',
},
);
@@ -6735,21 +6068,27 @@ sub print_main_menu {
permission => $permission->{'cusr'},
linktitle => 'View change log.',
},
+ );
+ }
+ push(@{ $menu[2]->{items} },
+ {
+ linktext => 'Role Requests (other domains)',
+ icon => 'edit-find.png',
+ #help => 'Role_Requests',
+ url => '/adm/createuser?action=rolerequests',
+ permission => $permission->{'cusr'},
+ linktitle => 'Role requests for users in other domains',
+ },
+ );
+ if (&show_role_requests($context,$env{'request.role.domain'})) {
+ push(@{ $menu[2]->{items} },
{
- 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',
+ linktext => 'Queued Role Assignments (this domain)',
+ icon => 'edit-find.png',
+ #help => 'Role_Approvals',
+ url => '/adm/createuser?action=queuedroles',
+ permission => $permission->{'cusr'},
+ linktitle => "Role requests for this domain's users",
},
);
}
@@ -6985,7 +6324,8 @@ ENDSCRIPT
'// ]]>'."\n".
''."\n".
''.$lt->{'selfenroll'}.' '."\n";
- my $visactions = &cat_visibility($cdom);
+
+ my $visactions = &cat_visibility();
my ($cathash,%cattype);
my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
if (ref($domconfig{'coursecategories'}) eq 'HASH') {
@@ -7148,10 +6488,11 @@ ENDSCRIPT
} elsif ($curr_types eq '') {
$add_domtitle = &mt('Users in other domain:');
}
+ my ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$cdom);
$output .= &Apache::loncommon::start_data_table_row()
.' '.$add_domtitle.' '
.&Apache::loncommon::select_dom_form('','selfenroll_newdom',
- $includeempty,$showdomdesc,'','','',$readonly)
+ $includeempty,$showdomdesc,'',$trusted,$untrusted,$readonly)
.' '
.' '.&Apache::loncommon::end_data_table_row()
.&Apache::loncommon::end_data_table();
@@ -7530,7 +6871,6 @@ sub visible_in_stdcat {
}
sub cat_visibility {
- my ($cdom) = @_;
my %visactions = &Apache::lonlocal::texthash(
vis => 'This course/community currently appears in the Course/Community Catalog for this domain.',
gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.',
@@ -7543,24 +6883,13 @@ sub cat_visibility {
dc_chgconf => 'Ask a domain coordinator to change the Catalog type for this domain.',
dc_setcode => 'Ask a domain coordinator to assign a six character code to the course',
dc_unhide => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.',
- dc_addinst => 'Ask a domain coordinator to enable catalog display of "Official courses (with institutional codes)".',
+ dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".',
dc_instcode => 'Ask a domain coordinator to assign an institutional code (if this is an official course).',
dc_catalog => 'Ask a domain coordinator to enable or create at least one course category in the domain.',
dc_categories => 'Ask a domain coordinator to create a hierarchy of categories and sub categories for courses in the domain.',
dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain',
dc_addcat => 'Ask a domain coordinator to assign a category to the course.',
);
- if ($env{'request.role'} eq "dc./$cdom/") {
- $visactions{'dc_chgconf'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to change the Catalog type for this domain.','»');
- $visactions{'dc_setcode'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to assign a six character code to the course.','»');
- $visactions{'dc_unhide'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to change the "Exclude from course catalog" setting.','»');
- $visactions{'dc_addinst'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to enable catalog display of "Official courses (with institutional codes)".','»');
- $visactions{'dc_instcode'} = &mt('Use: "Main menu" [_1] "View or modify a course or community" [_1] "View/Modify course owner, institutional code ... " to assign an institutional code (if this is an official course).','»');
- $visactions{'dc_catalog'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to enable or create at least one course category in the domain.','»');
- $visactions{'dc_categories'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to create a hierarchy of categories and sub categories for courses in the domain.','»');
- $visactions{'dc_chgcat'} = &mt('Use: "Main menu" [_1] "View or modify a course or community" [_1] "View/Modify catalog settings for course" to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','»');
- $visactions{'dc_addcat'} = &mt('Use: "Main menu" [_1] "View or modify a course or community" [_1] "View/Modify catalog settings for course" to assign a category to the course.','»');
- }
$visactions{'unhide'} = &mt('Use [_1]Categorize course[_2] to change the "Exclude from course catalog" setting.','',' "');
$visactions{'chgcat'} = &mt('Use [_1]Categorize course[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"',' "');
$visactions{'addcat'} = &mt('Use [_1]Categorize course[_2] to assign a category to the course.','"',' "');
@@ -7686,11 +7015,9 @@ 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);
}
@@ -8367,7 +7694,7 @@ sub role_display_filter {
} elsif ($context eq 'domain') {
@posscontexts = ('any','domain','requestauthor','domconfig','server');
} else {
- @posscontexts = ('any','author','coauthor','domain');
+ @posscontexts = ('any','author','domain');
}
foreach my $chgtype (@posscontexts) {
my $selstr = '';
@@ -8438,7 +7765,6 @@ sub rolechg_contexts {
any => 'Any',
domain => 'User Management in domain',
author => 'User Management by author',
- coauthor => 'User Management by coauthor',
);
}
return %lt;
@@ -8850,6 +8176,67 @@ ENDJS
return;
}
+sub print_queued_roles {
+ my ($r,$context,$permission,$brcrum) = @_;
+ push (@{$brcrum},
+ {href => '/adm/createuser?action=rolerequests',
+ text => 'Role Requests (other domains)',
+ help => ''});
+ my $bread_crumbs_component = 'Role Requests';
+ my $args = { bread_crumbs => $brcrum,
+ bread_crumbs_component => $bread_crumbs_component};
+ # print page header
+ $r->print(&header('',$args));
+ my ($dom,$cnum);
+ $dom = $env{'request.role.domain'};
+ if ($context eq 'course') {
+ if ($env{'request.course.id'}) {
+ if (&Apache::loncommon::course_type() eq 'Community') {
+ $context = 'community';
+ }
+ $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ }
+ } elsif ($context eq 'author') {
+ $cnum = $env{'user.name'};
+ }
+ $r->print(&Apache::loncoursequeueadmin::display_queued_requests('othdomqueue',$dom,$cnum,$context));
+ return;
+}
+
+sub print_pendingroles {
+ my ($r,$context,$permission,$brcrum) = @_;
+ push (@{$brcrum},
+ {href => '/adm/createuser?action=queuedroles',
+ text => 'Queued Role Assignments (users in this domain)',
+ help => ''});
+ my $bread_crumbs_component = 'Queued Role Assignments';
+ my $args = { bread_crumbs => $brcrum,
+ bread_crumbs_component => $bread_crumbs_component};
+ # print page header
+ $r->print(&header('',$args));
+ $r->print(&Apache::loncoursequeueadmin::display_queued_requests('othdomaction',$env{'request.role.domain'},'','domain'));
+ return;
+}
+
+sub process_pendingroles {
+ my ($r,$context,$permission,$brcrum) = @_;
+ push (@{$brcrum},
+ {href => '/adm/createuser?action=queuedroles',
+ text => 'Queued Role Assignments (users in this domain)',
+ help => ''},
+ {href => '/adm/createuser?action=processrolereq',
+ text => 'Process Queue',
+ help => ''});
+ my $bread_crumbs_component = 'Queued Role Assignments';
+ my $args = { bread_crumbs => $brcrum,
+ bread_crumbs_component => $bread_crumbs_component};
+ # print page header
+ $r->print(&header('',$args));
+ $r->print(&Apache::loncoursequeueadmin::update_request_queue('othdombydc',
+ $env{'request.role.domain'}));
+ return;
+}
+
sub domain_adhoc_access {
my ($roles,$domcurrent,$accesstypes,$usertypes,$othertitle) = @_;
my %domusage;
@@ -9478,7 +8865,7 @@ sub user_search_result {
my $domd_chk = &domdirectorysrch_check($srch);
$response .= ''.$instd_chk.' ';
if ($domd_chk eq 'ok') {
- $response .= &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.');
+ $response .= &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.');
}
$response .= ' ';
}
@@ -9489,7 +8876,7 @@ sub user_search_result {
my $instd_chk = &instdirectorysrch_check($srch);
$response .= ''.$domd_chk.' ';
if ($instd_chk eq 'ok') {
- $response .= &mt('You may want to search in the institutional directory instead of the LON-CAPA domain.');
+ $response .= &mt('You may want to search in the institutional directory instead of in the LON-CAPA domain.');
}
$response .= ' ';
}
@@ -9590,7 +8977,7 @@ sub user_search_result {
$response = ''.
&mt('Institutional directory search is not available in domain: [_1]',$showdom).
' '.
- &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').
+ &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.').
' ';
}
}
@@ -9663,7 +9050,7 @@ sub user_search_result {
$response = ''.
&mt('Institutional directory search is not available in domain: [_1]',$showdom).
' '.
- &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').
+ &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.').
' ';
}
}
@@ -10183,7 +9570,7 @@ sub course_level_dc {
ENDTIMEENTRY
$otheritems .= &Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table()."\n";
- return $cb_jscript.$hiddenitems.$header.$otheritems;
+ return $cb_jscript.$header.$hiddenitems.$otheritems;
}
sub update_selfenroll_config {
@@ -10519,7 +9906,7 @@ sub update_selfenroll_config {
} else {
$r->print(&mt('No changes were made to the existing self-enrollment settings in this course.'));
}
- my $visactions = &cat_visibility($cdom);
+ my $visactions = &cat_visibility();
my ($cathash,%cattype);
my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
if (ref($domconfig{'coursecategories'}) eq 'HASH') {