--- loncom/interface/loncreateuser.pm 2024/09/01 02:28:19 1.406.2.20.2.7
+++ loncom/interface/loncreateuser.pm 2023/11/04 00:06:00 1.472
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.406.2.20.2.7 2024/09/01 02:28:19 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.472 2023/11/04 00:06:00 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -80,6 +80,7 @@ my $authformkrb;
my $authformint;
my $authformfsys;
my $authformloc;
+my $authformlti;
sub initialize_authen_forms {
my ($dom,$formname,$curr_authtype,$mode,$readonly) = @_;
@@ -90,7 +91,7 @@ sub initialize_authen_forms {
domain => $dom,
);
my %abv_auth = &auth_abbrev();
- if ($curr_authtype =~ /^(krb4|krb5|internal|localauth|unix):(.*)$/) {
+ if ($curr_authtype =~ /^(krb4|krb5|internal|localauth|unix|lti):(.*)$/) {
my $long_auth = $1;
my $curr_autharg = $2;
my %abv_auth = &auth_abbrev();
@@ -112,6 +113,7 @@ sub initialize_authen_forms {
$authformint = &Apache::loncommon::authform_internal(%param);
$authformfsys = &Apache::loncommon::authform_filesystem(%param);
$authformloc = &Apache::loncommon::authform_local(%param);
+ $authformlti = &Apache::loncommon::authform_lti(%param);
}
sub auth_abbrev {
@@ -121,6 +123,7 @@ sub auth_abbrev {
internal => 'int',
localauth => 'loc',
unix => 'fsys',
+ lti => 'lti',
);
return %abv_auth;
}
@@ -141,7 +144,7 @@ sub user_quotas {
);
my ($currquota,$quotatype,$inststatus,$defquota) =
&Apache::loncommon::get_user_quota($ccuname,$ccdomain,$name);
- if ($longinsttype eq '') {
+ if ($longinsttype eq '') {
if ($inststatus ne '') {
if ($usertypes->{$inststatus} ne '') {
$longinsttype = $usertypes->{$inststatus};
@@ -171,7 +174,7 @@ sub user_quotas {
} else {
$defaultinfo = &mt("For this user, the default quota of [_1]".
" MB,[_2]is determined by the user's institutional".
- " affiliation ([_3]).",$defquota,'<br />',$longinsttype);
+ " affiliation ([_3]).",$defquota,'<br />'.$longinsttype);
}
}
@@ -242,15 +245,10 @@ function toggleCustom(form,item,name) {
if (radioname) {
if (radioname.length > 0) {
var setvis;
- 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) {
- if (RegExp.test(item)) {
- divid.style.display = 'inline';
- } else {
- divid.style.display = 'block';
- }
+ divid.style.display = 'block';
setvis = 1;
}
break;
@@ -275,14 +273,13 @@ sub build_tools_display {
my ($ccuname,$ccdomain,$context) = @_;
my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay,
$colspan,$isadv,%domconfig,@defaulteditors,@customeditors,@custommanagers,
- @possmanagers);
+ @possmanagers,$editorsty,$customsty);
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",
+ 'managers' => "Co-authors who can add/revoke co-authors",
'portfolio' => "Personal User Portfolio",
'portaccess' => "Portfolio Shareable",
'timezone' => "Can set Time Zone",
@@ -295,6 +292,8 @@ sub build_tools_display {
'unofficial' => 'Can request creation of unofficial courses',
'community' => 'Can request creation of communities',
'textbook' => 'Can request creation of textbook courses',
+ 'placement' => 'Can request creation of placement tests',
+ 'lti' => 'Can request creation of LTI courses',
'requestauthor' => 'Can request author space',
'edit' => 'Standard editor (Edit)',
'xml' => 'Text editor (EditXML)',
@@ -304,8 +303,9 @@ sub build_tools_display {
if ($context eq 'requestcourses') {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'requestcourses.official','requestcourses.unofficial',
- 'requestcourses.community','requestcourses.textbook');
- @usertools = ('official','unofficial','community','textbook');
+ 'requestcourses.community','requestcourses.textbook',
+ 'requestcourses.placement','requestcourses.lti');
+ @usertools = ('official','unofficial','community','textbook','placement','lti');
@options =('norequest','approval','autolimit','validate');
%validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);
%reqtitles = &courserequest_titles();
@@ -325,8 +325,8 @@ sub build_tools_display {
&Apache::lonnet::get_dom('configuration',['quotas','authordefaults'],$ccdomain);
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,'tools.webdav',
'authoreditors','authormanagers',
- 'authorarchive','domcoord.author');
- @usertools = ('webdav','editors','managers','archive');
+ 'domcoord.author');
+ @usertools = ('webdav','editors','managers');
$colspan = ' colspan="2"';
} else {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
@@ -337,33 +337,23 @@ sub build_tools_display {
}
foreach my $item (@usertools) {
my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off,
- $currdisp,$custdisp,$custradio,$onclick,$customsty,$editorsty);
+ $currdisp,$custdisp,$custradio,$onclick);
$cust_off = 'checked="checked" ';
$tool_on = 'checked="checked" ';
- unless (($context eq 'authordefaults') || ($item eq 'webdav')) {
- $curr_access =
- &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
- $context,\%userenv,'',
- {'is_adv' => $isadv});
- }
+ $curr_access =
+ &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
+ $context,\%userenv,'',
+ {'is_adv' => $isadv});
if ($context eq 'requestauthor') {
if ($userenv{$context} ne '') {
$cust_on = ' checked="checked" ';
$cust_off = '';
}
} elsif ($context eq 'authordefaults') {
- if (($item eq 'editors') || ($item eq 'archive')) {
+ if ($item eq 'editors') {
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 '') {
@@ -460,8 +450,6 @@ sub build_tools_display {
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 =
@@ -486,14 +474,16 @@ sub build_tools_display {
' </tr>'."\n".
&Apache::loncommon::start_data_table_row()."\n";
if (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
- my ($curroption,$currlimit);
+ my ($curroption,$currlimit,$customsty);
my $envkey = $context.'.'.$item;
if ($context eq 'requestauthor') {
$envkey = $context;
}
if ($userenv{$envkey} ne '') {
$curroption = $userenv{$envkey};
+ $customsty = ' style="display:block"';
} else {
+ $customsty = ' style="display:none"';
my (@inststatuses);
if ($context eq 'requestcourses') {
$curroption =
@@ -669,12 +659,14 @@ sub coursereq_externaluser {
'unofficial' => 'Can request creation of unofficial courses',
'community' => 'Can request creation of communities',
'textbook' => 'Can request creation of textbook courses',
+ 'placement' => 'Can request creation of placement tests',
);
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'reqcrsotherdom.official','reqcrsotherdom.unofficial',
- 'reqcrsotherdom.community','reqcrsotherdom.textbook');
- @usertools = ('official','unofficial','community','textbook');
+ 'reqcrsotherdom.community','reqcrsotherdom.textbook',
+ 'reqcrsotherdom.placement');
+ @usertools = ('official','unofficial','community','textbook','placement');
@options = ('approval','validate','autolimit');
%validations = &Apache::lonnet::auto_courserequest_checks($cdom);
my $optregex = join('|',@options);
@@ -767,6 +759,8 @@ sub courserequest_titles {
unofficial => 'Unofficial',
community => 'Communities',
textbook => 'Textbook',
+ placement => 'Placement Tests',
+ lti => 'LTI Provider',
norequest => 'Not allowed',
approval => 'Approval by Dom. Coord.',
validate => 'With validation',
@@ -1110,7 +1104,15 @@ ENDBLOCK
(!(($env{'form.action'} eq 'singleuser') && ($context eq 'domain') &&
(!&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))))) {
my $defdom=$env{'request.role.domain'};
- my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');
+ my ($trusted,$untrusted);
+ if ($context eq 'course') {
+ ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$defdom);
+ } elsif ($context eq 'author') {
+ ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('othcoau',$defdom);
+ } elsif ($context eq 'domain') {
+ ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('domroles',$defdom);
+ }
+ my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain',undef,undef,undef,$trusted,$untrusted);
my %lt=&Apache::lonlocal::texthash(
'enro' => 'Enroll one student',
'enrm' => 'Enroll one member',
@@ -1507,7 +1509,6 @@ sub print_user_modification_page {
'bread_crumbs_component' => 'User Management'};
if ($env{'form.popup'}) {
$args->{'no_nav_bar'} = 1;
- $args->{'add_modal'} = 1;
}
if (($context eq 'domain') && ($env{'request.role.domain'} eq $ccdomain)) {
my @toggles;
@@ -1517,13 +1518,13 @@ sub print_user_modification_page {
unless ($isauthor) {
push(@toggles,'requestauthor');
}
- push(@toggles,('webdav','editors','archive'));
+ push(@toggles,('webdav','editors'));
}
if (&Apache::lonnet::allowed('mut',$ccdomain)) {
push(@toggles,('aboutme','blog','portfolio','portaccess','timezone'));
}
if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
- push(@toggles,('official','unofficial','community','textbook'));
+ push(@toggles,('official','unofficial','community','textbook','placement','lti'));
}
if (@toggles) {
my $onload;
@@ -1742,15 +1743,21 @@ ENDAUTH
$inst_results{$ccuname.':'.$ccdomain}));
if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) ||
(&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) {
- $r->print('<br /><h3>'.&mt('Can Request Creation of Courses/Communities in this Domain?').'</h3>'."\n".
- &Apache::loncommon::start_data_table());
- if ($env{'request.role.domain'} eq $ccdomain) {
- $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
+ $r->print('<br /><h3>'.&mt('Can Request Creation of Courses/Communities in this Domain?').'</h3>'."\n");
+ if (($env{'request.role.domain'} eq $ccdomain) ||
+ (&Apache::lonnet::will_trust('reqcrs',$ccdomain,$env{'request.role.domain'}))) {
+ $r->print(&Apache::loncommon::start_data_table());
+ if ($env{'request.role.domain'} eq $ccdomain) {
+ $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
+ } else {
+ $r->print(&coursereq_externaluser($ccuname,$ccdomain,
+ $env{'request.role.domain'}));
+ }
+ $r->print(&Apache::loncommon::end_data_table());
} else {
- $r->print(&coursereq_externaluser($ccuname,$ccdomain,
- $env{'request.role.domain'}));
+ $r->print(&mt('Domain configuration for this domain prohibits course creation by users from domain: "[_1]"',
+ &Apache::lonnet::domain($ccdomain,'description')));
}
- $r->print(&Apache::loncommon::end_data_table());
}
$r->print('</div>');
my @order = ('auth','quota','tools','requestauthor','authordefaults');
@@ -1969,7 +1976,7 @@ sub validation_javascript {
if ((ref($permission) eq 'HASH') && ($permission->{'cusr'})) {
my $dcdom = $env{'request.role.domain'};
$loaditem->{'onload'} = "document.cu.coursedesc.value='';";
- $dc_setcourse_code =
+ $dc_setcourse_code =
&Apache::lonuserutils::dc_setcourse_js('cu','singleuser',$context);
}
} else {
@@ -2460,11 +2467,20 @@ sub new_domain_roles {
'<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'.
&Apache::loncommon::end_data_table_header_row();
my @allroles = &Apache::lonuserutils::roles_by_context('domain');
+ my $uprimary = &Apache::lonnet::domain($env{'request.role.domain'},'primary');
+ my $uintdom = &Apache::lonnet::internet_dom($uprimary);
foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) {
foreach my $role (@allroles) {
next if ($role eq 'ad');
next if (($role eq 'au') && ($ccdomain ne $thisdomain));
if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) {
+ if ($role eq 'dc') {
+ unless ($thisdomain eq $env{'request.role.domain'}) {
+ my $domprim = &Apache::lonnet::domain($thisdomain,'primary');
+ my $intdom = &Apache::lonnet::internet_dom($domprim);
+ next unless ($uintdom eq $intdom);
+ }
+ }
my $plrole=&Apache::lonnet::plaintext($role);
my %lt=&Apache::lonlocal::texthash(
'ssd' => "Set Start Date",
@@ -2506,7 +2522,7 @@ sub user_authentication {
'ld' => "Login Data"
);
# Check for a bad authentication type
- if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) {
+ if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth|lti):/) {
# bad authentication scheme
if (&Apache::lonnet::allowed('mau',$ccdomain)) {
&initialize_authen_forms($ccdomain,$formname);
@@ -2533,6 +2549,7 @@ $lt{'uuas'} ($currentauth). $lt{'adcs'}.
ENDBADAUTH
}
} else { # Authentication type is valid
+
&initialize_authen_forms($ccdomain,$formname,$currentauth,'modifyuser');
my ($authformcurrent,$can_modify,@authform_others) =
&modify_login_block($ccdomain,$currentauth);
@@ -2621,6 +2638,8 @@ ENDJS
$result = &mt('Currently using local (institutional) authentication.');
} elsif ($currentauth =~ /^unix:/) {
$result = &mt('Currently Filesystem Authenticated.');
+ } elsif ($currentauth =~ /^lti:/) {
+ $result = &mt('Currently LTI authenticated.');
}
$outcome = '<h3>'.$lt{'ld'}.'</h3>'.
&Apache::loncommon::start_data_table().
@@ -2659,6 +2678,9 @@ sub modify_login_block {
if ($can_assign{'loc'}) {
push(@authform_others,$authformloc);
}
+ if ($can_assign{'lti'}) {
+ push(@authform_others,$authformlti);
+ }
if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
$show_override_msg = 1;
}
@@ -2670,6 +2692,9 @@ sub modify_login_block {
if ($can_assign{'loc'}) {
push(@authform_others,$authformloc);
}
+ if ($can_assign{'lti'}) {
+ push(@authform_others,$authformlti);
+ }
if ($can_assign{'int'}) {
$show_override_msg = 1;
}
@@ -2684,6 +2709,9 @@ sub modify_login_block {
if ($can_assign{'loc'}) {
push(@authform_others,$authformloc);
}
+ if ($can_assign{'lti'}) {
+ push(@authform_others,$authformlti);
+ }
if ($can_assign{'fsys'}) {
$show_override_msg = 1;
}
@@ -2695,9 +2723,23 @@ sub modify_login_block {
if ($can_assign{'int'}) {
push(@authform_others,$authformint);
}
+ if ($can_assign{'lti'}) {
+ push(@authform_others,$authformlti);
+ }
if ($can_assign{'loc'}) {
$show_override_msg = 1;
}
+ } elsif ($currentauth=~/^lti:/) {
+ $authformcurrent=$authformlti;
+ if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
+ push(@authform_others,$authformkrb);
+ }
+ if ($can_assign{'int'}) {
+ push(@authform_others,$authformint);
+ }
+ if ($can_assign{'loc'}) {
+ push(@authform_others,$authformloc);
+ }
}
if ($show_override_msg) {
$authformcurrent = '<table><tr><td colspan="3">'.$authformcurrent.
@@ -2798,7 +2840,7 @@ sub personal_data_display {
} else {
undef($condition);
}
- }
+ }
if ($excluded) {
unless ($excluded =~ /^\@[^\@]+$/) {
undef($condition);
@@ -2838,7 +2880,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".
'<span class="LC_nobreak">'.&mt('Use e-mail address: ').
'<label><input type="radio" name="emailused" value="1" checked="checked" onclick="'.$onclick.'" />'.
@@ -3164,6 +3206,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
@@ -3183,9 +3228,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 @requestcourses = ('official','unofficial','community','textbook','placement','lti');
my @requestauthor = ('requestauthor');
- my @authordefaults = ('webdav','editors','archive');
+ my @authordefaults = ('webdav','editors');
my ($othertitle,$usertypes,$types) =
&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
my %canmodify_status =
@@ -3315,13 +3360,7 @@ sub update_user_data {
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');
-
+ \%changeHash,'authordefaults');
}
}
if ($canmodify_status{'inststatus'}) {
@@ -3340,7 +3379,7 @@ sub update_user_data {
my $chgresult =
&Apache::lonnet::put('environment',\%changeHash,
$env{'form.ccdomain'},$env{'form.ccuname'});
- }
+ }
}
$r->print('<br />'.&mt('Home Server').': '.$uhome.' '.
&Apache::lonnet::hostname($uhome));
@@ -3361,7 +3400,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:/) &&
@@ -3390,12 +3429,13 @@ sub update_user_data {
'id','permanentemail','portfolioquota','authorquota','inststatus',
'tools.aboutme','tools.blog','tools.webdav',
'tools.portfolio','tools.timezone','tools.portaccess',
- 'authormanagers','authoreditors','authorarchive','requestauthor',
+ 'authormanagers','authoreditors','requestauthor',
'requestcourses.official','requestcourses.unofficial',
'requestcourses.community','requestcourses.textbook',
+ 'requestcourses.placement','requestcourses.lti',
'reqcrsotherdom.official','reqcrsotherdom.unofficial',
'reqcrsotherdom.community','reqcrsotherdom.textbook',
- 'domcoord.author'],
+ 'reqcrsotherdom.placement','domcoord.author'],
$env{'form.ccdomain'},$env{'form.ccuname'});
my ($tmp) = keys(%userenv);
if ($tmp =~ /^(con_lost|error)/i) {
@@ -3430,7 +3470,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);
}
}
@@ -3741,83 +3781,39 @@ sub update_user_data {
}
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);
+ $key,'reload','requestauthor');
}
} 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'};
+ if ($key eq 'editors') {
+ if ($env{'form.customeditors'}) {
+ $newenvhash{'environment.editors'} = $changeHash{'author'.$key};
} 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.editors'} =
+ &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
+ $key,'reload','authordefaults');
}
- $newenvhash{'environment.canarchive'} =
- $domdefaults{'archive'};
}
} elsif ($key ne 'quota') {
$newenvhash{'environment.tools.'.$key} =
@@ -3826,20 +3822,9 @@ 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');
}
}
}
@@ -3888,7 +3873,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 =
@@ -4033,13 +4018,14 @@ sub display_userinfo {
'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",
+ 'managers' => "Co-authors who can add/revoke co-authors",
'edit' => 'Standard editor (Edit)',
'xml' => 'Text editor (EditXML)',
'daxe' => 'Daxe editor (Daxe)',
@@ -4073,7 +4059,7 @@ sub display_userinfo {
if ($entry eq 'requestauthor') {
@items = ($entry);
} elsif ($entry eq 'authordefaults') {
- @items = ('webdav','managers','editors','archive');
+ @items = ('webdav','managers','editors');
} else {
@items = @{$requestcourses};
}
@@ -4324,9 +4310,6 @@ sub tool_changes {
} 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};
@@ -4358,7 +4341,7 @@ sub tool_changes {
} elsif ($tool eq 'editors') {
$oldaccesstext->{$tool} = &mt('can use: [_1]',
join(', ', map { $tooldesc{$_} } split(/,/,$userenv->{$envkey})));
- } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
+ } elsif ($tool eq 'webdav') {
if ($userenv->{$envkey}) {
$oldaccesstext->{$tool} = &mt("availability set to 'on'");
} else {
@@ -4404,7 +4387,7 @@ sub tool_changes {
$managers =~ s/,/, /g;
$newaccesstext->{$tool} = $managers;
}
- } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
+ } elsif ($tool eq 'webdav') {
if ($newval) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
} else {
@@ -4444,13 +4427,13 @@ sub tool_changes {
$managers =~ s/,/, /g;
$newaccesstext->{$tool} = $managers;
}
- } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
+ } elsif ($tool eq 'webdav') {
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'");
@@ -4493,8 +4476,8 @@ sub tool_changes {
$managers =~ s/,/, /g;
$newaccesstext->{$tool} = $managers;
}
- } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
- if ($newval) {
+ } elsif ($tool eq 'webdav') {
+ if ($userenv->{$envkey}) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
@@ -4541,7 +4524,7 @@ sub tool_changes {
} elsif ($tool eq 'editors') {
$newaccesstext->{$tool} = &mt('can use: [_1]',
join(', ', map { $tooldesc{$_} } split(/,/,$newval)));
- } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
+ } elsif ($tool eq 'webdav') {
if ($newval) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
} else {
@@ -4570,7 +4553,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,%status,%unauthorized,%currqueued);
+ $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('<h3>'.&mt('Modifying Roles').'</h3>');
foreach my $key (keys(%env)) {
next if (! $env{$key});
@@ -4672,6 +4661,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') {
@@ -4679,10 +4669,17 @@ 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,
+ \%status,\%unauthorized,\%currqueued));
+ }
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) {
@@ -4698,12 +4695,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,\%status,\%unauthorized,\%currqueued));
+ }
+ }
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").'<br />';
+ $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").'<br />';
if ($result ne "ok") {
$output .= &mt('Error: [_1]',$result).'<br />';
}
@@ -4716,6 +4729,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,\%status,\%unauthorized,\%currqueued));
+ }
+ }
my $result = &Apache::lonnet::assigncustomrole(
$env{'form.ccdomain'}, $env{'form.ccuname'},
$url,$rdom,$rnam,$rolename,0,$now,undef,$context);
@@ -4737,6 +4761,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} ?
@@ -4745,15 +4771,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,\%status,\%unauthorized,\%currqueued));
+ }
$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})) {
@@ -4761,8 +4794,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,\%status,\%unauthorized,\%currqueued));
+ }
+ $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');
@@ -4771,20 +4814,20 @@ 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 $type = 'three';
+ my $id = $url.'_'.$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};
@@ -4795,11 +4838,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,\%status,\%unauthorized,\%currqueued));
+ }
+ $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 '') {
@@ -4809,14 +4860,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,\%status,\%unauthorized,\%currqueued);
+ 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,\%status,\%unauthorized,\%currqueued);
+ 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);
@@ -4824,33 +4895,64 @@ 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;
+ my ($cdom,$cnum) = split(/\//,$one);
# 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,$cdom,$cnum,'','',\%process_by,
+ \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+ \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued);
+ 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,$cdom,$cnum,$sec,'',\%process_by,
+ \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+ \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued);
+ 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,$cdom,$cnum,'','',\%process_by,
+ \%instdoms,\%got_role_approvals,\%got_instdoms,\%reject,
+ \%pending,\%notifydc,\%status,\%unauthorized,\%currqueued);
+ 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);
@@ -4874,6 +4976,12 @@ sub update_roles {
}
}
} # End of foreach (keys(%env))
+ if ((keys(%reject)) || (keys(%unauthorized))) {
+ $r->print(&Apache::lonuserutils::print_roles_rejected($context,\%reject,\%unauthorized));
+ }
+ if ((keys(%pending)) || (keys(%currqueued))) {
+ $r->print(&Apache::lonuserutils::print_roles_queued($context,\%pending,\%notifydc,\%currqueued));
+ }
# Flush the course logs so reverse user roles immediately updated
$r->register_cleanup(\&Apache::lonnet::flushcourselogs);
if (@rolechanges == 0) {
@@ -4928,11 +5036,35 @@ 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,
+ %status,%unauthorized,%currqueued);
+ 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,\%status,\%unauthorized,\%currqueued)) {
+ if ((keys(%reject)) || (keys(%unauthorized))) {
+ $r->print(&Apache::lonuserutils::print_roles_rejected($context,\%reject,\%unauthorized));
+ }
+ if ((keys(%pending)) || (keys(%currqueued))) {
+ $r->print(&Apache::lonuserutils::print_roles_queued($context,\%pending,\%notifydc,\%currqueued));
+ }
+ 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'},
@@ -5056,7 +5188,7 @@ sub tool_admin {
$toolchanged = 1;
if ($tool eq 'requestauthor') {
$changeHash->{$context} = $settool;
- } elsif (($tool eq 'managers') || ($tool eq 'editors') || ($tool eq 'archive')) {
+ } elsif (($tool eq 'managers') || ($tool eq 'editors')) {
$changeHash->{'author'.$tool} = $settool;
} elsif ($tool eq 'webdav') {
$changeHash->{'tools.'.$tool} = $settool;
@@ -5302,6 +5434,31 @@ sub set_custom_role {
);
}
+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);
+ }
+ }
+ }
+ }
+ last if ($showrolereqs);
+ }
+ }
+ }
+ return $showrolereqs;
+}
+
sub display_coauthor_managers {
my ($permission) = @_;
my $output;
@@ -5623,7 +5780,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);
@@ -5937,7 +6094,7 @@ sub handler {
&Apache::lonhtmlcommon::row_closure(1));
}
}
- if ($pickstart) {
+ if ($pickstart) {
$r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>');
} else {
$r->print('<div>'.&mt('No information to display for this account request.').'</div>');
@@ -6169,11 +6326,31 @@ 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 'rolerequests') {
+ if ($permission->{cusr} || $permission->{view}) {
+ &print_queued_roles($r,$context,$permission,$brcrum);
+ }
+ } 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 {
+ &print_pendingroles($r,$context,$permission,$brcrum);
+ }
+ } else {
+ $r->print(&header(undef,{'no_nav_bar' => 1}).
+ '<span class="LC_info">'.&mt('Domain coordinator approval of requests from other domains for assignment of roles to users from this domain not in use.').'</span>');
+ }
+ } else {
+ $r->print(&header(undef,{'no_nav_bar' => 1}).
+ '<span class="LC_error">'.&mt('You do not have permission to view queued requests from other domains for assignment of roles to users from this domain.').'</span>');
+ }
} elsif ($env{'form.action'} eq 'camanagers') {
if (($permission->{cusr}) && ($context eq 'author')) {
push(@{$brcrum},
{href => '/adm/createuser?action=camanagers',
- text => 'Co-author Managers',
+ text => 'Co-authors who manage',
help => 'Author_Manage_Coauthors'});
if ($env{'form.state'} eq 'process') {
push(@{$brcrum},
@@ -6227,27 +6404,6 @@ sub handler {
$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('<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 {
$bread_crumbs_component = 'User Management';
$args = { bread_crumbs => $brcrum,
@@ -6517,6 +6673,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';
@@ -6638,6 +6795,7 @@ sub print_main_menu {
groups => 'Community Groups',
},
);
+ $linktext{'Placement'} = $linktext{'Course'};
my %linktitle = (
'Course' => {
@@ -6652,6 +6810,8 @@ sub print_main_menu {
},
);
+ $linktitle{'Placement'} = $linktitle{'Course'};
+
push(@{ $menu[0]->{items} }, #Category: Single Users
{
linktext => $linktext{$crstype}{'single'},
@@ -6748,27 +6908,6 @@ 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',
@@ -6780,15 +6919,15 @@ sub print_main_menu {
},
{
linktext => 'Co-author Managers',
- icon => 'camanager.png',
+ icon => 'helpdesk-access.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',
+ linktext => 'Configure Coauthor Listing',
+ icon => 'helpdesk-access.png',
#help => 'Coauthor_Settings',
url => '/adm/createuser?action=calist&forceedit=1',
permission => ($permission->{'cusr'}),
@@ -6796,6 +6935,28 @@ sub print_main_menu {
},
);
}
+ 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 => '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",
+ },
+ );
+ }
return Apache::lonhtmlcommon::generate_menu(@menu);
# { text => 'View Log-in History',
# help => 'Course_User_Logins',
@@ -7191,10 +7352,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()
.'<td colspan="2"><span class="LC_nobreak">'.$add_domtitle.'</span><br />'
.&Apache::loncommon::select_dom_form('','selfenroll_newdom',
- $includeempty,$showdomdesc,'','','',$readonly)
+ $includeempty,$showdomdesc,'',$trusted,$untrusted,$readonly)
.'<input type="hidden" name="selfenroll_types_total" value="'.$num.'" />'
.'</td>'.&Apache::loncommon::end_data_table_row()
.&Apache::loncommon::end_data_table();
@@ -7465,7 +7627,7 @@ sub get_noedit_fields {
}
}
return %noedit;
-}
+}
sub visible_in_stdcat {
my ($cdom,$cnum,$domconf) = @_;
@@ -7784,12 +7946,13 @@ ENDSCRIPT
chgcontext => 'any',
rolelog_start_date => $defstart,
rolelog_end_date => $now,
+ approvals => 'any',
);
my $more_records = 0;
# set current
my %curr;
- foreach my $item ('show','page','role','chgcontext') {
+ foreach my $item ('show','page','role','chgcontext','approvals') {
$curr{$item} = $env{'form.'.$item};
}
my ($startdate,$enddate) =
@@ -7863,6 +8026,11 @@ ENDSCRIPT
if (($context eq 'course') && ($viewablesec ne '')) {
next if ($roleslog{$id}{'logentry'}{'section'} ne $viewablesec);
}
+ if ($curr{'approvals'} eq 'none') {
+ next if ($roleslog{$id}{'logentry'}{'approval'});
+ } elsif ($curr{'approvals'} ne 'any') {
+ next if ($roleslog{$id}{'logentry'}{'approval'} ne $curr{'approvals'});
+ }
$count ++;
next if ($count < $minshown);
unless ($showntableheader) {
@@ -7909,11 +8077,30 @@ ENDSCRIPT
if ($chgcontext ne '' && $lt{$chgcontext} ne '') {
$chgcontext = $lt{$chgcontext};
}
+ my ($showreqby,%reqby);
+ if (($roleslog{$id}{'logentry'}{'approval'}) &&
+ ($roleslog{$id}{'logentry'}{'requester'})) {
+ if ($reqby{$roleslog{$id}{'logentry'}{'requester'}} eq '') {
+ my ($requname,$requdom) = split(/:/,$roleslog{$id}{'logentry'}{'requester'});
+ $reqby{$roleslog{$id}{'logentry'}{'requester'}} =
+ &Apache::loncommon::plainname($requname,$requdom);
+ }
+ $showreqby = &mt('Requester').': <span class="LC_nobreak">'.$reqby{$roleslog{$id}{'logentry'}{'requester'}}.'</span><br />';
+ if ($roleslog{$id}{'logentry'}{'approval'} eq 'domain') {
+ $showreqby .= &mt('Adjudicator').': <span class="LC_nobreak">'.
+ $whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.
+ '</span>';
+ } else {
+ $showreqby .= '<span class="LC_nobreak">'.&mt('User approved').'</span>';
+ }
+ } else {
+ $showreqby = $whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}};
+ }
$r->print(
&Apache::loncommon::start_data_table_row()
.'<td>'.$count.'</td>'
.'<td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td>'
- .'<td>'.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.'</td>'
+ .'<td>'.$showreqby.'</td>'
.'<td>'.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.'</td>'
.'<td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'},$crstype).'</td>');
if ($context eq 'course') {
@@ -8267,7 +8454,7 @@ sub activity_display_filter {
my $nolink = 1;
my $output = '<table><tr><td valign="top">'.
'<span class="LC_nobreak"><b>'.&mt('Actions/page:').'</b></span><br />'.
- &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
+ &Apache::lonmeta::selectbox('show',$curr->{'show'},'',undef,
(&mt('all'),5,10,20,50,100,1000,10000)).
'</td><td> </td>';
my $startform =
@@ -8354,14 +8541,10 @@ sub userlogdisplay_navlinks {
sub role_display_filter {
my ($context,$formname,$cdom,$cnum,$curr,$version,$crstype) = @_;
- my $lctype;
- if ($context eq 'course') {
- $lctype = lc($crstype);
- }
my $nolink = 1;
my $output = '<table><tr><td valign="top">'.
'<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b></span><br />'.
- &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
+ &Apache::lonmeta::selectbox('show',$curr->{'show'},'',undef,
(&mt('all'),5,10,20,50,100,1000,10000)).
'</td><td> </td>';
my $startform =
@@ -8385,7 +8568,7 @@ sub role_display_filter {
if ($curr->{'role'} eq 'any') {
$output .= ' selected="selected"';
}
- $output .= '>'.&mt('Any').'</option>'."\n";
+ $output .= '>'.&mt('Any').'</option>'."\n";
my @roles = &Apache::lonuserutils::roles_by_context($context,1,$crstype);
foreach my $role (@roles) {
my $plrole;
@@ -8406,7 +8589,7 @@ sub role_display_filter {
&mt('Context:').'</b><br /><select name="chgcontext">';
my @posscontexts;
if ($context eq 'course') {
- @posscontexts = ('any','automated','updatenow','createcourse','course','domain','selfenroll','requestcourses','chgtype');
+ @posscontexts = ('any','automated','updatenow','createcourse','course','domain','selfenroll','requestcourses','chgtype','ltienroll');
} elsif ($context eq 'domain') {
@posscontexts = ('any','domain','requestauthor','domconfig','server');
} else {
@@ -8424,8 +8607,20 @@ sub role_display_filter {
}
$output .= '<option value="'.$chgtype.'"'.$selstr.'>'.$lt{$chgtype}.'</option>'."\n";
}
- $output .= '</select></td>'
- .'</tr></table>';
+ my @possapprovals = ('any','none','domain','user');
+ my %apptxt = &approval_types();
+ $output .= '</select></td>'.
+ '<td> </td>'.
+ '<td valign="top"><b>'.
+ &mt('Approvals:').'</b><br /><select name="approvals">';
+ foreach my $approval (@possapprovals) {
+ my $selstr = '';
+ if ($curr->{'approvals'} eq $approval) {
+ $selstr = ' selected="selected"';
+ }
+ $output .= '<option value="'.$approval.'"'.$selstr.'>'.$apptxt{$approval}.'</option>';
+ }
+ $output .= '</select></td></tr></table>';
# Update Display button
$output .= '<p>'
@@ -8462,6 +8657,7 @@ sub rolechg_contexts {
domain => 'User Management in domain',
selfenroll => 'Self-enrolled',
requestcourses => 'Course Request',
+ ltienroll => 'Enrollment via LTI',
);
if ($crstype eq 'Community') {
$lt{'createcourse'} = &mt('Community Creation');
@@ -8487,6 +8683,15 @@ sub rolechg_contexts {
return %lt;
}
+sub approval_types {
+ return &Apache::lonlocal::texthash (
+ any => 'Any',
+ none => 'No approval needed',
+ user => 'Role recipient approval',
+ domain => 'Domain coordinator approval',
+ );
+}
+
sub print_helpdeskaccess_display {
my ($r,$permission,$brcrum) = @_;
my $formname = 'helpdeskaccess';
@@ -8893,6 +9098,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;
@@ -9521,7 +9787,7 @@ sub user_search_result {
my $domd_chk = &domdirectorysrch_check($srch);
$response .= '<span class="LC_warning">'.$instd_chk.'</span><br />';
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 .= '<br />';
}
@@ -9532,7 +9798,7 @@ sub user_search_result {
my $instd_chk = &instdirectorysrch_check($srch);
$response .= '<span class="LC_warning">'.$domd_chk.'</span><br />';
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 .= '<br />';
}
@@ -9633,7 +9899,7 @@ sub user_search_result {
$response = '<span class="LC_warning">'.
&mt('Institutional directory search is not available in domain: [_1]',$showdom).
'</span><br />'.
- &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.').
'<br />';
}
}
@@ -9706,7 +9972,7 @@ sub user_search_result {
$response = '<span class="LC_warning">'.
&mt('Institutional directory search is not available in domain: [_1]',$showdom).
'</span><br />'.
- &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.').
'<br />';
}
}