version 1.26, 2007/12/22 04:58:45
|
version 1.27, 2007/12/22 17:33:26
|
Line 3063 sub upfile_drop_add {
|
Line 3063 sub upfile_drop_add {
|
# |
# |
my ($startdate,$enddate) = &get_dates_from_form(); |
my ($startdate,$enddate) = &get_dates_from_form(); |
if ($env{'form.makedatesdefault'}) { |
if ($env{'form.makedatesdefault'}) { |
$r->print(&make_dates_default($startdate,$enddate)); |
$r->print(&make_dates_default($startdate,$enddate,$context)); |
} |
} |
# Determine domain and desired host (home server) |
# Determine domain and desired host (home server) |
my $domain=$env{'request.role.domain'}; |
my $domain=$env{'request.role.domain'}; |
Line 3116 sub upfile_drop_add {
|
Line 3116 sub upfile_drop_add {
|
$defaultrole = $env{'form.defaultrole'}; |
$defaultrole = $env{'form.defaultrole'}; |
} elsif ($setting eq 'course') { |
} elsif ($setting eq 'course') { |
$defaultrole = $env{'form.courserole'}; |
$defaultrole = $env{'form.courserole'}; |
|
$defaultsec = $env{'form.sections'}; |
} |
} |
} elsif ($context eq 'author') { |
} elsif ($context eq 'author') { |
$defaultrole = $env{'form.defaultrole'}; |
$defaultrole = $env{'form.defaultrole'}; |
} |
} elsif ($context eq 'course') { |
if ($context eq 'domain' && $setting eq 'course') { |
$defaultrole = $env{'form.defaultrole'}; |
if ($env{'form.newsec'} ne '') { |
$defaultsec = $env{'form.sections'}; |
$defaultsec = $env{'form.newsec'}; |
|
} elsif ($env{'form.defaultsec'} ne '') { |
|
$defaultsec = $env{'form.defaultsec'} |
|
} |
|
} |
} |
if ($env{'request.course.id'} ne '') { |
if ($env{'request.course.id'} ne '') { |
$cid = $env{'request.course.id'}; |
$cid = $env{'request.course.id'}; |
} elsif ($env{'form.defaultdomain'} ne '' && $env{'form.defaultcourse'} ne '') { |
} elsif ($setting eq 'course') { |
$cid = $env{'form.defaultdomain'}.'_'. |
if (&Apache::lonnet::is_course($env{'form.dcdomain'},$env{'form.dccourse'})) { |
$env{'form.defaultcourse'}; |
$cid = $env{'form.dcdomain'}.'_'.$env{'form.dccourse'}; |
|
} |
|
} |
|
# Check to see if user information can be changed |
|
my @userinfo = ('firstname','middlename','lastname','generation', |
|
'permanentemail','id'); |
|
my %canmodify; |
|
if (&Apache::lonnet::allowed('mau',$domain)) { |
|
foreach my $field (@userinfo) { |
|
$canmodify{$field} = 1; |
|
} |
|
} |
|
my (%userlist,%modifiable_fields,@poss_roles); |
|
my $secidx = &Apache::loncoursedata::CL_SECTION(); |
|
my @courseroles = &roles_by_context('course',1); |
|
if (!&Apache::lonnet::allowed('mau',$domain)) { |
|
if ($context eq 'course' || $context eq 'author') { |
|
@poss_roles = &curr_role_permissions($context); |
|
my @statuses = ('active','future'); |
|
my ($indexhash,$keylist) = &make_keylist_array(); |
|
my %info; |
|
foreach my $role (@poss_roles) { |
|
%{$modifiable_fields{$role}} = &can_modify_userinfo($context,$domain, |
|
\@userinfo,[$role]); |
|
} |
|
if ($context eq 'course') { |
|
my ($cnum,$cdom) = &get_course_identity(); |
|
my $roster = &Apache::loncoursedata::get_classlist(); |
|
%userlist = %{$roster}; |
|
my %advrolehash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef, |
|
\@statuses,\@poss_roles); |
|
&gather_userinfo($context,'view',\%userlist,$indexhash,\%info, |
|
\%advrolehash,$permission); |
|
} elsif ($context eq 'author') { |
|
my %cstr_roles = &Apache::lonnet::get_my_roles(undef,undef,undef, |
|
\@statuses,\@poss_roles); |
|
&gather_userinfo($context,'view',\%userlist,$indexhash,\%info, |
|
\%cstr_roles,$permission); |
|
|
|
} |
|
} |
} |
} |
if ( $domain eq &LONCAPA::clean_domain($domain) |
if ( $domain eq &LONCAPA::clean_domain($domain) |
&& ($amode ne '')) { |
&& ($amode ne '')) { |
Line 3152 sub upfile_drop_add {
|
Line 3189 sub upfile_drop_add {
|
); |
); |
my $flushc=0; |
my $flushc=0; |
my %student=(); |
my %student=(); |
my %curr_groups; |
my (%curr_groups,@sections,@cleansec,@secs,$defaultwarn,$groupwarn); |
my %userchg; |
my %userchg; |
if ($context eq 'course') { |
if ($context eq 'course' || $setting eq 'course') { |
# Get information about course groups |
if ($context eq 'course') { |
%curr_groups = &Apache::longroup::coursegroups(); |
# Get information about course groups |
|
%curr_groups = &Apache::longroup::coursegroups(); |
|
} elsif ($setting eq 'course') { |
|
if ($cid) { |
|
%curr_groups = |
|
&Apache::longroup::coursegroups($env{'form.dcdomain'}, |
|
$env{'form.dccourse'}); |
|
} |
|
} |
|
# determine section number |
|
if ($defaultsec =~ /,/) { |
|
push(@sections,split(/,/,$defaultsec)); |
|
} else { |
|
push(@sections,$defaultsec); |
|
} |
|
# remove non alphanumeric values from section |
|
foreach my $item (@sections) { |
|
$item =~ s/\W//g; |
|
if ($item eq "none" || $item eq 'all') { |
|
$defaultwarn = &mt('Default section name [_1] could not be used as it is a reserved word.',$item); |
|
} elsif ($item ne '' && exists($curr_groups{$item})) { |
|
$groupwarn = &mt('Default section name "[_1]" is the name of a course group. Section names and group names must be distinct.',$item); |
|
} elsif ($item ne '') { |
|
push(@cleansec,$item); |
|
} |
|
} |
|
if ($defaultwarn) { |
|
$r->print($defaultwarn.'<br />'); |
|
} |
|
if ($groupwarn) { |
|
$r->print($groupwarn.'<br />'); |
|
} |
} |
} |
my (%curr_rules,%got_rules,%alerts); |
my (%curr_rules,%got_rules,%alerts); |
|
my %customroles = &my_custom_roles(); |
|
my ($custom_ok,@permitted_roles) = |
|
&roles_on_upload($context,%customroles); |
# Get new users list |
# Get new users list |
foreach (@userdata) { |
foreach my $line (@userdata) { |
my %entries=&Apache::loncommon::record_sep($_); |
my %entries=&Apache::loncommon::record_sep($line); |
# Determine user name |
# Determine user name |
unless (($entries{$fields{'username'}} eq '') || |
unless (($entries{$fields{'username'}} eq '') || |
(!defined($entries{$fields{'username'}}))) { |
(!defined($entries{$fields{'username'}}))) { |
Line 3189 sub upfile_drop_add {
|
Line 3260 sub upfile_drop_add {
|
&mt('<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]', |
&mt('<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]', |
$entries{$fields{'username'}},$fname,$mname,$lname,$gen). |
$entries{$fields{'username'}},$fname,$mname,$lname,$gen). |
'</b>'); |
'</b>'); |
|
next; |
} else { |
} else { |
my $username = $entries{$fields{'username'}}; |
my $username = $entries{$fields{'username'}}; |
my $sec; |
if (defined($fields{'sec'})) { |
if ($context eq 'course' || $setting eq 'course') { |
if (defined($entries{$fields{'sec'}})) { |
# determine section number |
my $item = $entries{$fields{'sec'}}; |
if (defined($fields{'sec'})) { |
$item =~ s/(\s+$|^\s+)//g; |
if (defined($entries{$fields{'sec'}})) { |
if ($item eq "none" || $item eq 'all') { |
$sec=$entries{$fields{'sec'}}; |
$r->print('<br />'.&mt('<b>[_1]</b>: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a reserved word.',$username,$fname,$mname,$lname,$gen,$item)); |
|
next; |
|
} elsif (exists($curr_groups{$item})) { |
|
$r->print('<br />'.&mt('<b>[_1]</b>: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a course group.',$username,$fname,$mname,$lname,$gen,$item).' '.&mt('Section names and group names must be distinct.')); |
|
next; |
|
} else { |
|
push(@secs,$item); |
} |
} |
} else { |
|
$sec = $defaultsec; |
|
} |
} |
# remove non alphanumeric values from section |
} |
$sec =~ s/\W//g; |
if ($env{'request.course.sec'} ne '') { |
if ($sec eq "none" || $sec eq 'all') { |
@secs = ($env{'request.course.sec'}); |
$r->print('<br />'. |
if (ref($userlist{$username.':'.$domain}) eq 'ARRAY') { |
&mt('<b>[_1]</b>: Unable to enroll: section name "[_2]" for user [_3] [_4] [_5] [_6] is a reserved word.', |
my $currsec = $userlist{$username.':'.$domain}[$secidx]; |
$username,$sec,$fname,$mname,$lname,$gen)); |
if ($currsec ne $env{'request.course.sec'}) { |
next; |
$r->print('<br />'.&mt('<b>[_1]</b>: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]".',$username,$fname,$mname,$lname,$gen,$secs[0]).'<br />'); |
} elsif (($sec ne '') && (exists($curr_groups{$sec}))) { |
if ($currsec eq '') { |
$r->print('<br />'. |
$r->print(&mt('This user already has an active/future student role in the course, unaffiliated to any section.')); |
&mt('<b>[_1]</b>: Unable to enroll: section name "[_2]" for user [_3] [_4] [_5] [_6] is a course group. Section names and group names must be distinct.', |
|
$username,$sec,$fname,$mname,$lname,$gen)); |
} else { |
next; |
$r->print(&mt('This user already has an active/future role in section "[_1]" of the course.',$currsec)); |
|
} |
|
$r->print('<br />'.&mt('Although your current role has privileges to add students to section "[_1]", you do not have privileges to modify existing enrollments in other sections.',$secs[0]).'<br />'); |
|
next; |
|
} |
|
} |
|
} elsif ($context eq 'course' || $setting eq 'course') { |
|
if (@secs == 0) { |
|
@secs = @cleansec; |
} |
} |
} |
} |
# determine id number |
# determine id number |
Line 3241 sub upfile_drop_add {
|
Line 3325 sub upfile_drop_add {
|
my $role = ''; |
my $role = ''; |
if (defined($fields{'role'})) { |
if (defined($fields{'role'})) { |
if ($entries{$fields{'role'}}) { |
if ($entries{$fields{'role'}}) { |
my @poss_roles = |
if (grep(/^\Q$entries{$fields{'role'}}\E$/,@permitted_roles)) { |
&curr_role_permissions($context,$setting); |
|
if (grep(/^\Q$entries{$fields{'role'}}\E/,@poss_roles)) { |
|
$role=$entries{$fields{'role'}}; |
$role=$entries{$fields{'role'}}; |
} else { |
$role =~ s/(\s+$|^\s+)//g; |
my $rolestr = join(', ',@poss_roles); |
} |
|
if ($custom_ok) { |
|
if ($customroles{$role}) { |
|
$role = 'cr_'.$env{'user.domain'}.'_'.$env{'user.name'}.'_'.$entries{$fields{'role'}}; |
|
} |
|
} |
|
if ($role eq '') { |
|
my $rolestr = join(', ',@permitted_roles); |
$r->print('<br />'. |
$r->print('<br />'. |
&mt('<b>[_1]</b>: You do not have permission to add the requested role [_2] for the user.',$entries{$fields{'username'}},$entries{$fields{'role'}}).'<br />'.&mt('Allowable role(s) is/are: [_1].',$rolestr)."\n"); |
&mt('<b>[_1]</b>: You do not have permission to add the requested role [_2] for the user.',$entries{$fields{'username'}},$entries{$fields{'role'}}).'<br />'.&mt('Allowable role(s) is/are: [_1].',$rolestr)."\n"); |
next; |
next; |
Line 3258 sub upfile_drop_add {
|
Line 3347 sub upfile_drop_add {
|
} |
} |
# Clean up whitespace |
# Clean up whitespace |
foreach (\$domain,\$username,\$id,\$fname,\$mname, |
foreach (\$domain,\$username,\$id,\$fname,\$mname, |
\$lname,\$gen,\$sec,\$role) { |
\$lname,\$gen) { |
$$_ =~ s/(\s+$|^\s+)//g; |
$$_ =~ s/(\s+$|^\s+)//g; |
} |
} |
# check against rules |
# check against rules |
Line 3281 sub upfile_drop_add {
|
Line 3370 sub upfile_drop_add {
|
} |
} |
} |
} |
} else { |
} else { |
# FIXME check if user info can be updated. |
if ($context eq 'course' || $context eq 'author') { |
|
if ($role eq '') { |
|
my @checkroles; |
|
foreach my $role (@poss_roles) { |
|
my $endkey; |
|
if ($role ne 'st') { |
|
$endkey = ':'.$role; |
|
} |
|
if (exists($userlist{$username.':'.$domain.$endkey})) { |
|
if (!grep(/^\Q$role\E$/,@checkroles)) { |
|
push(@checkroles,$role); |
|
} |
|
} |
|
} |
|
if (@checkroles > 0) { |
|
%canmodify = &can_modify_userinfo($context,$domain,\@userinfo,\@checkroles); |
|
} |
|
} elsif (ref($modifiable_fields{$role}) eq 'HASH') { |
|
%canmodify = %{$modifiable_fields{$role}}; |
|
} |
|
} |
|
my @newinfo = (\$fname,\$mname,\$lname,\$gen,\$email,\$id); |
|
for (my $i=0; $i<@userinfo; $i++) { |
|
if (${$newinfo[$i]} ne '') { |
|
if (!$canmodify{$userinfo[$i]}) { |
|
${$newinfo[$i]} = ''; |
|
} |
|
} |
|
} |
} |
} |
if ($id ne '') { |
if ($id ne '') { |
if (!$newuser) { |
if (!$newuser) { |
Line 3306 sub upfile_drop_add {
|
Line 3423 sub upfile_drop_add {
|
} |
} |
} |
} |
if ($password || $env{'form.login'} eq 'loc') { |
if ($password || $env{'form.login'} eq 'loc') { |
my ($userresult,$authresult,$roleresult); |
my $multiple = 0; |
|
my ($userresult,$authresult,$roleresult,$idresult); |
|
my (%userres,%authres,%roleres,%idres); |
if ($role eq 'st') { |
if ($role eq 'st') { |
&modifystudent($domain,$username,$cid,$sec, |
my $sec; |
$desiredhost); |
if ($cid) { |
$roleresult = |
if (@secs > 0) { |
&Apache::lonnet::modifystudent |
$sec = $secs[0]; |
($domain,$username,$id,$amode,$password, |
} |
$fname,$mname,$lname,$gen,$sec,$enddate, |
&modifystudent($domain,$username,$cid,$sec, |
$startdate,$env{'form.forceid'}, |
$desiredhost); |
$desiredhost,$email); |
$roleresult = |
|
&Apache::lonnet::modifystudent |
|
($domain,$username,$id,$amode,$password, |
|
$fname,$mname,$lname,$gen,$sec,$enddate, |
|
$startdate,$env{'form.forceid'}, |
|
$desiredhost,$email,'manual','',$cid); |
|
$userresult = $roleresult; |
|
} |
} else { |
} else { |
($userresult,$authresult,$roleresult) = |
if (($context eq 'course') || |
&modifyuserrole($context,$setting, |
(grep(/^\Q$role\E$/,@courseroles))) { |
$changeauth,$cid,$domain,$username, |
if (!$cid) { |
$id,$amode,$password,$fname, |
next; |
$mname,$lname,$gen,$sec, |
} |
$env{'form.forceid'},$desiredhost, |
} |
$email,$role,$enddate,$startdate,$checkid); |
my $singlesec; |
} |
if ((grep(/^\Q$role\E$/,@courseroles)) && ($role ne 'cc')) { |
$flushc = |
if (@secs > 1) { |
&user_change_result($r,$userresult,$authresult, |
$multiple = 1; |
$roleresult,\%counts,$flushc, |
foreach my $sec (@secs) { |
$username,%userchg); |
($userres{$sec},$authres{$sec},$roleres{$sec},$idres{$sec}) = |
|
&modifyuserrole($context,$setting, |
|
$changeauth,$cid,$domain,$username, |
|
$id,$amode,$password,$fname, |
|
$mname,$lname,$gen,$sec, |
|
$env{'form.forceid'},$desiredhost, |
|
$email,$role,$enddate,$startdate,$checkid); |
|
} |
|
} elsif (@secs > 0) { |
|
$singlesec = $secs[0]; |
|
} |
|
} |
|
if (!$multiple) { |
|
($userresult,$authresult,$roleresult) = |
|
&modifyuserrole($context,$setting, |
|
$changeauth,$cid,$domain,$username, |
|
$id,$amode,$password,$fname, |
|
$mname,$lname,$gen,$singlesec, |
|
$env{'form.forceid'},$desiredhost, |
|
$email,$role,$enddate,$startdate,$checkid); |
|
} |
|
} |
|
if ($multiple) { |
|
foreach my $sec (sort(keys(%userres))) { |
|
$flushc = |
|
&user_change_result($r,$userres{$sec},$authres{$sec}, |
|
$roleres{$sec},$idres{$sec},\%counts,$flushc, |
|
$username,\%userchg); |
|
|
|
} |
|
} else { |
|
$flushc = |
|
&user_change_result($r,$userresult,$authresult, |
|
$roleresult,\%counts,$flushc, |
|
$username,%userchg); |
|
} |
} else { |
} else { |
if ($context eq 'course') { |
if ($context eq 'course') { |
$r->print('<br />'. |
$r->print('<br />'. |
Line 4118 sub authorpriv {
|
Line 4279 sub authorpriv {
|
|| (&Apache::lonnet::allowed('caa',$audom.'/'.$auname))) { return ''; } return 1; |
|| (&Apache::lonnet::allowed('caa',$audom.'/'.$auname))) { return ''; } return 1; |
} |
} |
|
|
|
sub roles_on_upload { |
|
my ($context,%customroles) = @_; |
|
my (@possible_roles,@permitted_roles); |
|
if ($context eq 'domain') { |
|
@possible_roles = &curr_role_permissions($context,undef,1); |
|
push(@possible_roles,&curr_role_permissions($context,'course',1)); |
|
} else { |
|
@possible_roles = &curr_role_permissions($context,undef,1); |
|
} |
|
my $custom_ok = 0; |
|
foreach my $role (@possible_roles) { |
|
if ($role eq 'cr') { |
|
$custom_ok = 1; |
|
push(@permitted_roles,keys(%customroles)); |
|
} else { |
|
push(@permitted_roles,$role); |
|
} |
|
} |
|
return ($custom_ok,@permitted_roles); |
|
} |
|
|
sub get_course_identity { |
sub get_course_identity { |
my ($cid) = @_; |
my ($cid) = @_; |
my ($cnum,$cdom,$cdesc); |
my ($cnum,$cdom,$cdesc); |