version 1.50, 2008/01/20 22:25:05
|
version 1.54, 2008/05/12 17:52:08
|
Line 42 use LONCAPA qw(:DEFAULT :match);
|
Line 42 use LONCAPA qw(:DEFAULT :match);
|
############################################################### |
############################################################### |
# Drop student from all sections of a course, except optional $csec |
# Drop student from all sections of a course, except optional $csec |
sub modifystudent { |
sub modifystudent { |
my ($udom,$unam,$courseid,$csec,$desiredhost)=@_; |
my ($udom,$unam,$courseid,$csec,$desiredhost,$context)=@_; |
# if $csec is undefined, drop the student from all the courses matching |
# if $csec is undefined, drop the student from all the courses matching |
# this one. If $csec is defined, drop them from all other sections of |
# this one. If $csec is defined, drop them from all other sections of |
# this course and add them to section $csec |
# this course and add them to section $csec |
Line 69 sub modifystudent {
|
Line 69 sub modifystudent {
|
# dom name id mode pass f m l g |
# dom name id mode pass f m l g |
($udom,$unam,'', '', '',undef,undef,undef,undef, |
($udom,$unam,'', '', '',undef,undef,undef,undef, |
$section,time,undef,undef,$desiredhost,'','manual', |
$section,time,undef,undef,$desiredhost,'','manual', |
'',$courseid); |
'',$courseid,'',$context); |
$result .= $reply.':'; |
$result .= $reply.':'; |
} |
} |
} |
} |
Line 129 sub modifyuserrole {
|
Line 129 sub modifyuserrole {
|
if ($role ne '') { |
if ($role ne '') { |
$role =~ s/_/\//g; |
$role =~ s/_/\//g; |
$roleresult = &Apache::lonnet::assignrole($udom,$uname,$scope, |
$roleresult = &Apache::lonnet::assignrole($udom,$uname,$scope, |
$role,$end,$start); |
$role,$end,$start,'', |
|
'',$context); |
} |
} |
} |
} |
return ($userresult,$authresult,$roleresult,$idresult); |
return ($userresult,$authresult,$roleresult,$idresult); |
Line 924 sub setup_date_selectors {
|
Line 925 sub setup_date_selectors {
|
|
|
|
|
sub get_dates_from_form { |
sub get_dates_from_form { |
my $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate'); |
my ($startname,$endname) = @_; |
my $enddate = &Apache::lonhtmlcommon::get_date_from_form('enddate'); |
if ($startname eq '') { |
|
$startname = 'startdate'; |
|
} |
|
if ($endname eq '') { |
|
$endname = 'enddate'; |
|
} |
|
my $startdate = &Apache::lonhtmlcommon::get_date_from_form($startname); |
|
my $enddate = &Apache::lonhtmlcommon::get_date_from_form($endname); |
if ($env{'form.no_end_date'}) { |
if ($env{'form.no_end_date'}) { |
$enddate = 0; |
$enddate = 0; |
} |
} |
Line 1251 sub print_userlist {
|
Line 1259 sub print_userlist {
|
if ($env{'form.showrole'} eq 'Any') { |
if ($env{'form.showrole'} eq 'Any') { |
$roleselected = ' selected="selected" '; |
$roleselected = ' selected="selected" '; |
} |
} |
my ($role_select,$cnum,$cdom); |
my ($cnum,$cdom); |
if ($context eq 'domain') { |
$r->print(&role_filter($context)); |
$role_select = &domain_roles_select(); |
if ($context eq 'course') { |
$r->print('<label>'.&mt('Role Type: [_1]',$role_select).'</label>'); |
($cnum,$cdom) = &get_course_identity(); |
} else { |
$r->print(§ion_group_filter($cnum,$cdom)); |
$role_select = '<select name="showrole">'."\n". |
|
'<option value="Any" '.$roleselected.'>'. |
|
&mt('Any role').'</option>'; |
|
my @poss_roles = &curr_role_permissions($context); |
|
foreach my $role (@poss_roles) { |
|
$roleselected = ''; |
|
if ($role eq $env{'form.showrole'}) { |
|
$roleselected = ' selected="selected" '; |
|
} |
|
my $plrole; |
|
if ($role eq 'cr') { |
|
$plrole = &mt('Custom role'); |
|
} else { |
|
$plrole=&Apache::lonnet::plaintext($role); |
|
} |
|
$role_select .= '<option value="'.$role.'"'.$roleselected.'>'.$plrole.'</option>'; |
|
} |
|
$role_select .= '</select>'; |
|
$r->print('<label>'.&mt('Role: [_1]',$role_select).'</label>'); |
|
if ($context eq 'course') { |
|
($cnum,$cdom) = &get_course_identity(); |
|
$r->print(§ion_group_filter($cnum,$cdom)); |
|
} |
|
} |
} |
if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) { |
if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) { |
$r->print(' '.&list_submit_button(&mt('Update Display')). |
$r->print(' '.&list_submit_button(&mt('Update Display')). |
Line 1450 sub print_userlist {
|
Line 1435 sub print_userlist {
|
$env{'form.phase'}.'" /></form>'); |
$env{'form.phase'}.'" /></form>'); |
} |
} |
|
|
|
sub role_filter { |
|
my ($context) = @_; |
|
my $output; |
|
my $roleselected = ''; |
|
if ($env{'form.showrole'} eq 'Any') { |
|
$roleselected = ' selected="selected" '; |
|
} |
|
my ($role_select); |
|
if ($context eq 'domain') { |
|
$role_select = &domain_roles_select(); |
|
$output = '<label>'.&mt('Role Type: [_1]',$role_select).'</label>'; |
|
} else { |
|
$role_select = '<select name="showrole">'."\n". |
|
'<option value="Any" '.$roleselected.'>'. |
|
&mt('Any role').'</option>'; |
|
my @poss_roles = &curr_role_permissions($context); |
|
foreach my $role (@poss_roles) { |
|
$roleselected = ''; |
|
if ($role eq $env{'form.showrole'}) { |
|
$roleselected = ' selected="selected" '; |
|
} |
|
my $plrole; |
|
if ($role eq 'cr') { |
|
$plrole = &mt('Custom role'); |
|
} else { |
|
$plrole=&Apache::lonnet::plaintext($role); |
|
} |
|
$role_select .= '<option value="'.$role.'"'.$roleselected.'>'.$plrole.'</option>'; |
|
} |
|
$role_select .= '</select>'; |
|
$output = '<label>'.&mt('Role: [_1]',$role_select).'</label>'; |
|
} |
|
return $output; |
|
} |
|
|
sub section_group_filter { |
sub section_group_filter { |
my ($cnum,$cdom) = @_; |
my ($cnum,$cdom) = @_; |
my @filters; |
my @filters; |
Line 1513 sub list_submit_button {
|
Line 1533 sub list_submit_button {
|
|
|
sub gather_userinfo { |
sub gather_userinfo { |
my ($context,$format,$userlist,$indexhash,$userinfo,$rolehash,$permission) = @_; |
my ($context,$format,$userlist,$indexhash,$userinfo,$rolehash,$permission) = @_; |
|
my $viewablesec; |
|
if ($context eq 'course') { |
|
$viewablesec = &viewable_section($permission); |
|
} |
foreach my $item (keys(%{$rolehash})) { |
foreach my $item (keys(%{$rolehash})) { |
my %userdata; |
my %userdata; |
if ($context eq 'author') { |
if ($context eq 'author') { |
Line 1522 sub gather_userinfo {
|
Line 1546 sub gather_userinfo {
|
&build_user_record($context,\%userdata,$userinfo,$indexhash, |
&build_user_record($context,\%userdata,$userinfo,$indexhash, |
$item,$userlist); |
$item,$userlist); |
} elsif ($context eq 'course') { |
} elsif ($context eq 'course') { |
my $viewablesec = &viewable_section($permission); |
|
($userdata{'username'},$userdata{'domain'},$userdata{'role'}, |
($userdata{'username'},$userdata{'domain'},$userdata{'role'}, |
$userdata{'section'}) = split(/:/,$item,-1); |
$userdata{'section'}) = split(/:/,$item,-1); |
($userdata{'start'},$userdata{'end'})=split(/:/,$rolehash->{$item}); |
($userdata{'start'},$userdata{'end'})=split(/:/,$rolehash->{$item}); |
Line 3657 sub upfile_drop_add {
|
Line 3680 sub upfile_drop_add {
|
$sec = $secs[0]; |
$sec = $secs[0]; |
} |
} |
&modifystudent($domain,$username,$cid,$sec, |
&modifystudent($domain,$username,$cid,$sec, |
$desiredhost); |
$desiredhost,$context); |
$roleresult = |
$roleresult = |
&Apache::lonnet::modifystudent |
&Apache::lonnet::modifystudent |
($domain,$username,$id,$amode,$password, |
($domain,$username,$id,$amode,$password, |
$fname,$mname,$lname,$gen,$sec,$enddate, |
$fname,$mname,$lname,$gen,$sec,$enddate, |
$startdate,$env{'form.forceid'}, |
$startdate,$env{'form.forceid'}, |
$desiredhost,$email,'manual','',$cid); |
$desiredhost,$email,'manual','',$cid, |
|
'',$context); |
$userresult = $roleresult; |
$userresult = $roleresult; |
} else { |
} else { |
if ($role ne '') { |
if ($role ne '') { |
Line 3969 sub update_user_list {
|
Line 3993 sub update_user_list {
|
$end = $now; |
$end = $now; |
$type = 'manual'; |
$type = 'manual'; |
$result = |
$result = |
&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid); |
&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context); |
} elsif ($choice eq 'revoke') { |
} elsif ($choice eq 'revoke') { |
# revoke or delete user role |
# revoke or delete user role |
$end = $now; |
$end = $now; |
if ($role eq 'st') { |
if ($role eq 'st') { |
$result = |
$result = |
&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid); |
&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context); |
} else { |
} else { |
$result = |
$result = |
&Apache::lonnet::revokerole($udom,$uname,$scope,$role); |
&Apache::lonnet::revokerole($udom,$uname,$scope,$role, |
|
'','',$context); |
} |
} |
} elsif ($choice eq 'delete') { |
} elsif ($choice eq 'delete') { |
if ($role eq 'st') { |
if ($role eq 'st') { |
&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$now,$start,$type,$locktype,$cid); |
&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$now,$start,$type,$locktype,$cid,'',$context); |
} |
} |
$result = |
$result = |
&Apache::lonnet::assignrole($udom,$uname,$scope,$role,$now, |
&Apache::lonnet::assignrole($udom,$uname,$scope,$role,$now, |
$start,1); |
$start,1,'',$context); |
} else { |
} else { |
#reenable, activate, change access dates or change section |
#reenable, activate, change access dates or change section |
if ($choice ne 'chgsec') { |
if ($choice ne 'chgsec') { |
Line 3995 sub update_user_list {
|
Line 4020 sub update_user_list {
|
} |
} |
if ($choice eq 'reenable') { |
if ($choice eq 'reenable') { |
if ($role eq 'st') { |
if ($role eq 'st') { |
$result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid); |
$result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context); |
} else { |
} else { |
$result = |
$result = |
&Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end, |
&Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end, |
$now); |
$now,'','',$context); |
} |
} |
} elsif ($choice eq 'activate') { |
} elsif ($choice eq 'activate') { |
if ($role eq 'st') { |
if ($role eq 'st') { |
$result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid); |
$result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context); |
} else { |
} else { |
$result = &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end, |
$result = &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end, |
$now); |
$now,'','',$context); |
} |
} |
} elsif ($choice eq 'chgdates') { |
} elsif ($choice eq 'chgdates') { |
if ($role eq 'st') { |
if ($role eq 'st') { |
$result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid); |
$result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context); |
} else { |
} else { |
$result = &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end, |
$result = &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end, |
$start); |
$start,'','',$context); |
} |
} |
} elsif ($choice eq 'chgsec') { |
} elsif ($choice eq 'chgsec') { |
my (@newsecs,$revresult,$nochg,@retained); |
my (@newsecs,$revresult,$nochg,@retained); |
Line 4029 sub update_user_list {
|
Line 4054 sub update_user_list {
|
} else { |
} else { |
$revresult = |
$revresult = |
&Apache::lonnet::revokerole($udom,$uname, |
&Apache::lonnet::revokerole($udom,$uname, |
$scope,$role); |
$scope,$role, |
|
'','',$context); |
} |
} |
} else { |
} else { |
if (@newsecs > 0) { |
if (@newsecs > 0) { |
Line 4038 sub update_user_list {
|
Line 4064 sub update_user_list {
|
} else { |
} else { |
$revresult = |
$revresult = |
&Apache::lonnet::revokerole($udom,$uname, |
&Apache::lonnet::revokerole($udom,$uname, |
$scope,$role); |
$scope,$role, |
|
'','',$context); |
} |
} |
} else { |
} else { |
$revresult = |
$revresult = |
&Apache::lonnet::revokerole($udom,$uname, |
&Apache::lonnet::revokerole($udom,$uname, |
$scope,$role); |
$scope,$role, |
|
'','',$context); |
} |
} |
} |
} |
} else { |
} else { |
Line 4058 sub update_user_list {
|
Line 4086 sub update_user_list {
|
if (!$nochg) { |
if (!$nochg) { |
if ($role eq 'st') { |
if ($role eq 'st') { |
$result = |
$result = |
&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$end,$start,$type,$locktype,$cid); |
&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$end,$start,$type,$locktype,$cid,'',$context); |
} else { |
} else { |
my $newscope = $scopestem; |
my $newscope = $scopestem; |
$result = &Apache::lonnet::assignrole($udom,$uname,$newscope,$role,$end,$start); |
$result = &Apache::lonnet::assignrole($udom,$uname,$newscope,$role,$end,$start,'','',$context); |
} |
} |
} |
} |
} else { |
} else { |
foreach my $newsec (@newsecs) { |
foreach my $newsec (@newsecs) { |
if (!grep(/^\Q$newsec\E$/,@retained)) { |
if (!grep(/^\Q$newsec\E$/,@retained)) { |
if ($role eq 'st') { |
if ($role eq 'st') { |
$result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$newsec,$end,$start,$type,$locktype,$cid); |
$result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$newsec,$end,$start,$type,$locktype,$cid,'',$context); |
} else { |
} else { |
my $newscope = $scopestem; |
my $newscope = $scopestem; |
if ($newsec ne '') { |
if ($newsec ne '') { |
Line 4207 sub set_login {
|
Line 4235 sub set_login {
|
} |
} |
|
|
sub course_sections { |
sub course_sections { |
my ($sections_count,$role) = @_; |
my ($sections_count,$role,$current_sec) = @_; |
my $output = ''; |
my $output = ''; |
my @sections = (sort {$a <=> $b} keys %{$sections_count}); |
my @sections = (sort {$a <=> $b} keys %{$sections_count}); |
my $numsec = scalar(@sections); |
my $numsec = scalar(@sections); |
|
my $is_selected = ' selected="selected" '; |
if ($numsec <= 1) { |
if ($numsec <= 1) { |
$output = '<select name="currsec_'.$role.'" >'."\n". |
$output = '<select name="currsec_'.$role.'" >'."\n". |
' <option value="">'.&mt('Select').'</option>'."\n". |
' <option value="">'.&mt('Select').'</option>'."\n"; |
|
if ($current_sec eq 'none') { |
|
$output .= |
|
' <option value=""'.$is_selected.'>'.&mt('No section').'</option>'."\n"; |
|
} else { |
|
$output .= |
' <option value="">'.&mt('No section').'</option>'."\n"; |
' <option value="">'.&mt('No section').'</option>'."\n"; |
|
} |
if ($numsec == 1) { |
if ($numsec == 1) { |
$output .= |
if ($current_sec eq $sections[0]) { |
|
$output .= |
|
' <option value="'.$sections[0].'"'.$is_selected.'>'.$sections[0].'</option>'."\n"; |
|
} else { |
|
$output .= |
' <option value="'.$sections[0].'" >'.$sections[0].'</option>'."\n"; |
' <option value="'.$sections[0].'" >'.$sections[0].'</option>'."\n"; |
|
} |
} |
} |
} else { |
} else { |
$output = '<select name="currsec_'.$role.'" '; |
$output = '<select name="currsec_'.$role.'" '; |
Line 4225 sub course_sections {
|
Line 4265 sub course_sections {
|
if (scalar(@sections) < 4) { $multiple = scalar(@sections); } |
if (scalar(@sections) < 4) { $multiple = scalar(@sections); } |
if ($role eq 'st') { |
if ($role eq 'st') { |
$output .= '>'."\n". |
$output .= '>'."\n". |
' <option value="">'.&mt('Select').'</option>'."\n". |
' <option value="">'.&mt('Select').'</option>'."\n"; |
|
if ($current_sec eq 'none') { |
|
$output .= |
|
' <option value=""'.$is_selected.'>'.&mt('No section')."</option>\n"; |
|
} else { |
|
$output .= |
' <option value="">'.&mt('No section')."</option>\n"; |
' <option value="">'.&mt('No section')."</option>\n"; |
|
} |
} else { |
} else { |
$output .= 'multiple="multiple" size="'.$multiple.'">'."\n"; |
$output .= 'multiple="multiple" size="'.$multiple.'">'."\n"; |
} |
} |
foreach my $sec (@sections) { |
foreach my $sec (@sections) { |
$output .= '<option value="'.$sec.'">'.$sec."</option>\n"; |
if ($current_sec eq $sec) { |
|
$output .= '<option value="'.$sec.'"'.$is_selected.'>'.$sec."</option>\n"; |
|
} else { |
|
$output .= '<option value="'.$sec.'">'.$sec."</option>\n"; |
|
} |
} |
} |
} |
} |
$output .= '</select>'; |
$output .= '</select>'; |