version 1.214, 2023/06/20 14:03:52
|
version 1.219, 2023/11/04 00:06:00
|
Line 115 sub modifyuserrole {
|
Line 115 sub modifyuserrole {
|
} elsif ($context eq 'domain') { |
} elsif ($context eq 'domain') { |
$scope = '/'.$env{'request.role.domain'}.'/'; |
$scope = '/'.$env{'request.role.domain'}.'/'; |
} elsif ($context eq 'author') { |
} elsif ($context eq 'author') { |
$scope = '/'.$env{'user.domain'}.'/'.$env{'user.name'}; |
if ($env{'request.role'} =~ m{^ca\.(/$match_domain/$match_username)$}) { |
|
$scope = $1; |
|
} else { |
|
$scope = '/'.$env{'user.domain'}.'/'.$env{'user.name'}; |
|
} |
} |
} |
if ($context eq 'domain') { |
if ($context eq 'domain') { |
my $uhome = &Apache::lonnet::homeserver($uname,$udom); |
my $uhome = &Apache::lonnet::homeserver($uname,$udom); |
Line 1065 END
|
Line 1069 END
|
"; |
"; |
} elsif ($mode eq 'modifycourse') { |
} elsif ($mode eq 'modifycourse') { |
$auth_checks .= " |
$auth_checks .= " |
if (vf.elements[current.argfield].value == null || vf.elements[current.argfield].value == '') { |
if ((current.argfield !== null) && (current.argfield !== undefined) && (current.argfield !== '') && (vf.elements[current.argfield].value == null || vf.elements[current.argfield].value == '')) { |
"; |
"; |
} |
} |
if ( ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) { |
if ( ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) { |
Line 2048 sub construction_space_roles {
|
Line 2052 sub construction_space_roles {
|
foreach my $role (@allroles) { |
foreach my $role (@allroles) { |
if (&Apache::lonnet::allowed('c'.$role,$env{'user.domain'}.'/'.$env{'user.name'})) { |
if (&Apache::lonnet::allowed('c'.$role,$env{'user.domain'}.'/'.$env{'user.name'})) { |
push(@roles,$role); |
push(@roles,$role); |
|
} elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) { |
|
my ($audom,$auname) = ($1,$2); |
|
if (($role eq 'ca') || ($role eq 'aa')) { |
|
if ((&Apache::lonnet::allowed('v'.$role,,$audom.'/'.$auname)) && |
|
($env{"environment.internal.manager./$audom/$auname"})) { |
|
push(@roles,$role); |
|
} |
|
} |
} |
} |
} |
} |
return @roles; |
return @roles; |
Line 2305 sub print_userlist {
|
Line 2317 sub print_userlist {
|
} else { |
} else { |
my (%cstr_roles,%dom_roles); |
my (%cstr_roles,%dom_roles); |
if ($context eq 'author') { |
if ($context eq 'author') { |
# List co-authors and assistant co-authors |
|
my @possroles = &roles_by_context($context); |
my @possroles = &roles_by_context($context); |
%cstr_roles = &Apache::lonnet::get_my_roles(undef,undef,undef, |
my @allowedroles; |
\@statuses,\@possroles); |
# List co-authors and assistant co-authors |
&gather_userinfo($context,$format,\%userlist,$indexhash,\%userinfo, |
my ($auname,$audom); |
\%cstr_roles,$permission); |
if ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) { |
|
($audom,$auname) = ($1,$2); |
|
foreach my $role (@possroles) { |
|
if ((&Apache::lonnet::allowed('v'.$role,"$audom/$auname")) || |
|
(&Apache::lonnet::allowed('c'.$role,"$audom/$auname"))) { |
|
push(@allowedroles,$role); |
|
} |
|
} |
|
} elsif ($env{'request.role'} =~ m{^au\./($match_domain)/}) { |
|
if ($1 eq $env{'user.domain'}) { |
|
$auname = $env{'user.name'}; |
|
$audom = $env{'user.domain'}; |
|
} |
|
@allowedroles = @possroles; |
|
} |
|
if (($auname ne '') && ($audom ne '')) { |
|
%cstr_roles = &Apache::lonnet::get_my_roles($auname,$audom,undef, |
|
\@statuses,\@allowedroles); |
|
&gather_userinfo($context,$format,\%userlist,$indexhash,\%userinfo, |
|
\%cstr_roles,$permission); |
|
} |
} elsif ($context eq 'domain') { |
} elsif ($context eq 'domain') { |
if ($env{'form.roletype'} eq 'domain') { |
if ($env{'form.roletype'} eq 'domain') { |
if (grep(/^authorusage$/,@cols)) { |
if (grep(/^authorusage$/,@cols)) { |
Line 2601 sub get_cols_array {
|
Line 2632 sub get_cols_array {
|
push(@cols,'photo'); |
push(@cols,'photo'); |
} |
} |
if ($context eq 'domain') { |
if ($context eq 'domain') { |
push (@cols,('authorusage','authorquota','extent')); |
push(@cols,('authorusage','authorquota','extent')); |
|
} |
|
if ($context eq 'author') { |
|
push(@cols,'manager'); |
} |
} |
} |
} |
return @cols; |
return @cols; |
Line 2642 sub column_checkboxes {
|
Line 2676 sub column_checkboxes {
|
} elsif ($env{'form.roletype'} eq 'domain') { |
} elsif ($env{'form.roletype'} eq 'domain') { |
$disabledchk{'extent'} = 1; |
$disabledchk{'extent'} = 1; |
} |
} |
|
} elsif ($context eq 'author') { |
|
if (($env{'form.Status'} eq 'Expired') || |
|
($env{'form.showrole'} eq 'aa')) { |
|
$disabledchk{'manager'} = 1; |
|
} |
} |
} |
} |
} |
my $numposs = scalar(@cols); |
my $numposs = scalar(@cols); |
Line 2733 sub get_column_names {
|
Line 2772 sub get_column_names {
|
'ca' => "check all", |
'ca' => "check all", |
'ua' => "uncheck all", |
'ua' => "uncheck all", |
'clicker' => "clicker-ID", |
'clicker' => "clicker-ID", |
|
'manager' => "co-author manager", |
); |
); |
if ($context eq 'domain' && $env{'form.roletype'} eq 'course') { |
if ($context eq 'domain' && $env{'form.roletype'} eq 'course') { |
$lt{'extent'} = &mt('course(s): description, section(s), status'); |
$lt{'extent'} = &mt('course(s): description, section(s), status'); |
Line 3017 sub make_keylist_array {
|
Line 3057 sub make_keylist_array {
|
$index->{'instsec'} = &Apache::loncoursedata::CL_INSTSEC(); |
$index->{'instsec'} = &Apache::loncoursedata::CL_INSTSEC(); |
$index->{'authorquota'} = &Apache::loncoursedata::CL_AUTHORQUOTA(); |
$index->{'authorquota'} = &Apache::loncoursedata::CL_AUTHORQUOTA(); |
$index->{'authorusage'} = &Apache::loncoursedata::CL_AUTHORUSAGE(); |
$index->{'authorusage'} = &Apache::loncoursedata::CL_AUTHORUSAGE(); |
|
$index->{'manager'} = &Apache::loncoursedata::CL_CAMANAGER(); |
foreach my $key (keys(%{$index})) { |
foreach my $key (keys(%{$index})) { |
$keylist->[$index->{$key}] = $key; |
$keylist->[$index->{$key}] = $key; |
} |
} |
Line 3091 sub show_users_list {
|
Line 3132 sub show_users_list {
|
(($env{'form.showrole'} eq 'Any') || ($env{'form.showrole'} eq 'au'))) { |
(($env{'form.showrole'} eq 'Any') || ($env{'form.showrole'} eq 'au'))) { |
push(@sortable,('authorusage','authorquota')); |
push(@sortable,('authorusage','authorquota')); |
} |
} |
|
if ($context eq 'author') { |
|
push(@sortable,'manager'); |
|
} |
} |
} |
if ($mode eq 'pickauthor') { |
if ($mode eq 'pickauthor') { |
@sortable = ('username','fullname','email','status'); |
@sortable = ('username','fullname','email','status'); |
Line 3408 END
|
Line 3452 END
|
foreach my $idx (@$keylist) { |
foreach my $idx (@$keylist) { |
$index{$idx} = $i++; |
$index{$idx} = $i++; |
} |
} |
|
my $now = time; |
my $usercount = 0; |
my $usercount = 0; |
my ($secfilter,$grpfilter); |
my ($secfilter,$grpfilter); |
if ($context eq 'course') { |
if ($context eq 'course') { |
Line 3425 END
|
Line 3470 END
|
Future => 'Future', |
Future => 'Future', |
Expired => 'Expired', |
Expired => 'Expired', |
); |
); |
# If this is for a single course get last course "log-in". |
my (%crslogins,%camanagers); |
my %crslogins; |
|
if ($context eq 'course') { |
if ($context eq 'course') { |
|
# If this is for a single course get last course "log-in". |
%crslogins=&Apache::lonnet::dump('nohist_crslastlogin',$cdom,$cnum); |
%crslogins=&Apache::lonnet::dump('nohist_crslastlogin',$cdom,$cnum); |
|
} elsif ($context eq 'author') { |
|
map { $camanagers{$_.':ca'} = 1; } split(/,/,$env{'environment.authormanagers'}); |
} |
} |
# Get groups, role, permanent e-mail so we can sort on them if |
# Get groups, role, permanent e-mail so we can sort on them if |
# necessary. |
# necessary. |
Line 3528 END
|
Line 3575 END
|
} |
} |
} |
} |
} |
} |
|
if ($context eq 'author') { |
|
if (($camanagers{$user}) && |
|
((!defined($userlist->{$user}->[$index{'end'}])) || |
|
($userlist->{$user}->[$index{'end'}] == 0) || |
|
($userlist->{$user}->[$index{'end'}] > $now))) { |
|
$userlist->{$user}->[$index{'manager'}] = &mt('Yes'); |
|
} else { |
|
$userlist->{$user}->[$index{'manager'}] = &mt('No'); |
|
} |
|
} |
my %emails = &Apache::loncommon::getemails($uname,$udom); |
my %emails = &Apache::loncommon::getemails($uname,$udom); |
if ($emails{'permanentemail'} =~ /\S/) { |
if ($emails{'permanentemail'} =~ /\S/) { |
$userlist->{$user}->[$index{'email'}] = $emails{'permanentemail'}; |
$userlist->{$user}->[$index{'email'}] = $emails{'permanentemail'}; |
Line 4723 sub upfile_drop_add {
|
Line 4780 sub upfile_drop_add {
|
$fieldstype{$field.'_choice'} = 'scalar'; |
$fieldstype{$field.'_choice'} = 'scalar'; |
} |
} |
&Apache::loncommon::store_course_settings('enrollment_upload',\%fieldstype); |
&Apache::loncommon::store_course_settings('enrollment_upload',\%fieldstype); |
my ($cid,$crstype,$setting,$crsdom,$crsnum); |
my ($cid,$crstype,$setting,$crsdom,$crsnum,$oldcrsuserdoms); |
if ($context eq 'domain') { |
if ($context eq 'domain') { |
$setting = $env{'form.roleaction'}; |
$setting = $env{'form.roleaction'}; |
} |
} |
Line 4738 sub upfile_drop_add {
|
Line 4795 sub upfile_drop_add {
|
$crstype = &Apache::loncommon::course_type($cid); |
$crstype = &Apache::loncommon::course_type($cid); |
$crsdom = $env{'form.dcdomain'}; |
$crsdom = $env{'form.dcdomain'}; |
$crsnum = $env{'form.dccourse'}; |
$crsnum = $env{'form.dccourse'}; |
|
if (exists($env{'course.'.$cid.'.internal.userdomains'})) { |
|
$oldcrsuserdoms = 1; |
|
} |
|
my %coursedesc = &Apache::lonnet::coursedescription($cid,{ one_time => 1 }); |
|
$env{'course.'.$cid.'.internal.userdomains'} = $coursedesc{'internal.userdomains'}; |
} |
} |
} |
} |
my ($startdate,$enddate) = &get_dates_from_form(); |
my ($startdate,$enddate) = &get_dates_from_form(); |
Line 5564 sub upfile_drop_add {
|
Line 5626 sub upfile_drop_add {
|
} # end of loop |
} # end of loop |
$r->print('</ul>'); |
$r->print('</ul>'); |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
|
if (($context eq 'domain') && ($setting eq 'course')) { |
|
unless ($oldcrsuserdoms) { |
|
if (exists($env{'course.'.$cid.'.internal.userdomains'})) { |
|
delete($env{'course.'.$cid.'.internal.userdomains'}); |
|
} |
|
} |
|
} |
} |
} |
# Flush the course logs so reverse user roles immediately updated |
# Flush the course logs so reverse user roles immediately updated |
$r->register_cleanup(\&Apache::lonnet::flushcourselogs); |
$r->register_cleanup(\&Apache::lonnet::flushcourselogs); |
Line 6780 sub get_permission {
|
Line 6849 sub get_permission {
|
$permission{'selfenrolladmin'} = 1; |
$permission{'selfenrolladmin'} = 1; |
} |
} |
} |
} |
|
unless ($permission{'selfenrolladmin'}) { |
|
$permission{'selfenrollview'} = 1; |
|
} |
} |
} |
if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
my $user; |
my $user; |
Line 6799 sub get_permission {
|
Line 6871 sub get_permission {
|
} |
} |
} |
} |
} elsif ($context eq 'author') { |
} elsif ($context eq 'author') { |
$permission{'cusr'} = &authorpriv($env{'user.name'},$env{'request.role.domain'}); |
my $audom = $env{'request.role.domain'}; |
$permission{'view'} = $permission{'cusr'}; |
my $auname = $env{'user.name'}; |
|
if ((&Apache::lonnet::allowed('cca',"$audom/$auname")) || |
|
(&Apache::lonnet::allowed('caa',"$audom/$auname"))) { |
|
$permission{'author'} = 1; |
|
$permission{'cusr'} = 1; |
|
$permission{'view'} = 1; |
|
} |
|
} elsif ($context eq 'coauthor') { |
|
my ($audom,$auname) = ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}); |
|
if ((&Apache::lonnet::allowed('vca',"$audom/$auname")) || |
|
(&Apache::lonnet::allowed('vaa',"$audom/$auname"))) { |
|
if ($env{"environment.internal.manager./$audom/$auname"}) { |
|
$permission{'cusr'} = 1; |
|
$permission{'view'} = 1; |
|
} |
|
} |
} else { |
} else { |
my @allroles = &roles_by_context($context); |
my @allroles = &roles_by_context($context); |
foreach my $role (@allroles) { |
foreach my $role (@allroles) { |
Line 6829 sub get_permission {
|
Line 6916 sub get_permission {
|
} |
} |
my $allowed = 0; |
my $allowed = 0; |
foreach my $key (keys(%permission)) { |
foreach my $key (keys(%permission)) { |
next if (($key eq 'owner') || ($key eq 'co-owner')); |
next if (($key eq 'owner') || ($key eq 'co-owner') || ($key eq 'author')); |
if ($permission{$key}) { $allowed=1; last; } |
if ($permission{$key}) { $allowed=1; last; } |
} |
} |
return (\%permission,$allowed); |
return (\%permission,$allowed); |
Line 6843 sub authorpriv {
|
Line 6930 sub authorpriv {
|
|| (&Apache::lonnet::allowed('caa',$audom.'/'.$auname))) { return ''; } return 1; |
|| (&Apache::lonnet::allowed('caa',$audom.'/'.$auname))) { return ''; } return 1; |
} |
} |
|
|
|
sub coauthorpriv { |
|
my ($auname,$audom)=@_; |
|
my $uname = $env{'user.name'}; |
|
my $udom = $env{'user.domain'}; |
|
if (((&Apache::lonnet::allowed('vca',"$udom/$uname")) || |
|
(&Apache::lonnet::allowed('vaa',"$udom/$uname"))) && |
|
($env{"environment.internal.manager./$audom/$auname"})) { |
|
return 1; |
|
} |
|
return ''; |
|
} |
|
|
sub roles_on_upload { |
sub roles_on_upload { |
my ($context,$setting,$crstype,%customroles) = @_; |
my ($context,$setting,$crstype,%customroles) = @_; |
my (@possible_roles,@permitted_roles); |
my (@possible_roles,@permitted_roles); |
Line 7243 sub selfenrollment_administration {
|
Line 7342 sub selfenrollment_administration {
|
} |
} |
} |
} |
if ($settings{'internal.selfenrollmgrdc'} ne '') { |
if ($settings{'internal.selfenrollmgrdc'} ne '') { |
my @in_domain = split(/,/,$settings{'internal.selfenrollmgrdc'}); |
@in_domain = split(/,/,$settings{'internal.selfenrollmgrdc'}); |
my @diffs = &Apache::loncommon::compare_arrays(\@in_domain,$possconfigs); |
my @diffs = &Apache::loncommon::compare_arrays(\@in_domain,$possconfigs); |
unless (@diffs) { |
unless (@diffs) { |
return (\@in_course,\@in_domain); |
return (\@in_course,\@in_domain); |