version 1.45, 2008/01/06 04:27:25
|
version 1.73, 2008/10/15 14:12:41
|
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 168 sub propagate_id_change {
|
Line 169 sub propagate_id_change {
|
} |
} |
|
|
sub update_classlist { |
sub update_classlist { |
my ($cdom,$cnum,$udom,$uname,$user) = @_; |
my ($cdom,$cnum,$udom,$uname,$user,$newend) = @_; |
my ($uid,$classlistentry); |
my ($uid,$classlistentry); |
my $fullname = |
my $fullname = |
&Apache::lonnet::format_name($user->{'firstname'},$user->{'middlename'}, |
&Apache::lonnet::format_name($user->{'firstname'},$user->{'middlename'}, |
Line 179 sub update_classlist {
|
Line 180 sub update_classlist {
|
my @classinfo = split(/:/,$classhash{$uname.':'.$udom}); |
my @classinfo = split(/:/,$classhash{$uname.':'.$udom}); |
my $ididx=&Apache::loncoursedata::CL_ID() - 2; |
my $ididx=&Apache::loncoursedata::CL_ID() - 2; |
my $nameidx=&Apache::loncoursedata::CL_FULLNAME() - 2; |
my $nameidx=&Apache::loncoursedata::CL_FULLNAME() - 2; |
|
my $endidx = &Apache::loncoursedata::CL_END() - 2; |
|
my $startidx = &Apache::loncoursedata::CL_START() - 2; |
for (my $i=0; $i<@classinfo; $i++) { |
for (my $i=0; $i<@classinfo; $i++) { |
if ($i == $ididx) { |
if ($i == $endidx) { |
|
if ($newend ne '') { |
|
$classlistentry .= $newend.':'; |
|
} else { |
|
$classlistentry .= $classinfo[$i].':'; |
|
} |
|
} elsif ($i == $startidx) { |
|
if ($newend ne '') { |
|
if ($classinfo[$i] > $newend) { |
|
$classlistentry .= $newend.':'; |
|
} else { |
|
$classlistentry .= $classinfo[$i].':'; |
|
} |
|
} else { |
|
$classlistentry .= $classinfo[$i].':'; |
|
} |
|
} elsif ($i == $ididx) { |
if (defined($user->{'id'})) { |
if (defined($user->{'id'})) { |
$classlistentry .= $user->{'id'}.':'; |
$classlistentry .= $user->{'id'}.':'; |
} else { |
} else { |
$classlistentry .= $classinfo[$i].':'; |
$classlistentry .= $classinfo[$i].':'; |
} |
} |
} elsif ($i == $nameidx) { |
} elsif ($i == $nameidx) { |
$classlistentry .= $fullname.':'; |
if (defined($user->{'lastname'})) { |
|
$classlistentry .= $fullname.':'; |
|
} else { |
|
$classlistentry .= $classinfo[$i].':'; |
|
} |
} else { |
} else { |
$classlistentry .= $classinfo[$i].':'; |
$classlistentry .= $classinfo[$i].':'; |
} |
} |
Line 306 sub print_upload_manager_header {
|
Line 329 sub print_upload_manager_header {
|
$env{'request.role.domain'},$context, |
$env{'request.role.domain'},$context, |
$groupslist); |
$groupslist); |
my $checked=(($env{'form.noFirstLine'})?' checked="checked" ':''); |
my $checked=(($env{'form.noFirstLine'})?' checked="checked" ':''); |
$r->print(&mt('Total number of records found in file: <b>[_1]</b>.',$distotal). |
$r->print(&mt('Total number of records found in file: [_1]','<b>'.$distotal.'</b>'). |
"<br />\n"); |
"<br />\n"); |
$r->print('<div class="LC_left_float"><h3>'. |
$r->print('<div class="LC_left_float"><h3>'. |
&mt('Identify fields in uploaded list')."</h3>\n"); |
&mt('Identify fields in uploaded list')."</h3>\n"); |
Line 318 sub print_upload_manager_header {
|
Line 341 sub print_upload_manager_header {
|
&hidden_input('fileupload',$env{'form.fileupload'}). |
&hidden_input('fileupload',$env{'form.fileupload'}). |
&hidden_input('upfiletype',$env{'form.upfiletype'}). |
&hidden_input('upfiletype',$env{'form.upfiletype'}). |
&hidden_input('upfile_associate',$env{'form.upfile_associate'})); |
&hidden_input('upfile_associate',$env{'form.upfile_associate'})); |
$r->print('<br /><input type="button" value="Reverse Association" '. |
$r->print('<br /><label><input type="checkbox" name="noFirstLine"'.$checked.'/>'. |
'name="'.&mt('Reverse Association').'" '. |
&mt('Ignore First Line').'</label><br />'); |
|
$r->print('<br /><input type="button" value="'.&mt('Reverse Association').'" '. |
|
'name="Reverse Association" '. |
'onClick="javascript:this.form.associate.value=\'Reverse Association\';submit(this.form);" />'); |
'onClick="javascript:this.form.associate.value=\'Reverse Association\';submit(this.form);" />'); |
$r->print('<label><input type="checkbox" name="noFirstLine"'.$checked.'/>'. |
|
&mt('Ignore First Line').'</label>'); |
|
$r->print("<br /><br />\n". |
$r->print("<br /><br />\n". |
'<script type="text/javascript" language="Javascript">'."\n". |
'<script type="text/javascript" language="Javascript">'."\n". |
$javascript."\n".$javascript_validations.'</script>'); |
$javascript."\n".$javascript_validations.'</script>'); |
Line 382 sub javascript_validations {
|
Line 405 sub javascript_validations {
|
section => 'The optional section field was not specified.', |
section => 'The optional section field was not specified.', |
email => 'The optional email address field was not specified.', |
email => 'The optional email address field was not specified.', |
role => 'The optional role field was not specified.', |
role => 'The optional role field was not specified.', |
|
domain => 'The optional domain field was not specified.', |
continue => 'Continue adding users?', |
continue => 'Continue adding users?', |
); |
); |
my $function_name = <<"END"; |
my $function_name = <<"END"; |
$setsections_js |
$setsections_js |
|
|
function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) { |
function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain) { |
END |
END |
my ($authnum,%can_assign) = &Apache::loncommon::get_assignable_auth($domain); |
my ($authnum,%can_assign) = &Apache::loncommon::get_assignable_auth($domain); |
my $auth_checks; |
my $auth_checks; |
Line 502 END
|
Line 526 END
|
} |
} |
message+='$alert{'email'}'; |
message+='$alert{'email'}'; |
} |
} |
|
if (foundrole==0) { |
|
if (message!='') { |
|
message+='\\n'; |
|
} |
|
message+='$alert{'role'}'; |
|
} |
|
if (founddomain==0) { |
|
if (message!='') { |
|
message+='\\n'; |
|
} |
|
message+='$alert{'domain'}'; |
|
} |
if (message!='') { |
if (message!='') { |
message+= '\\n$alert{'continue'}'; |
message+= '\\n$alert{'continue'}'; |
if (confirm(message)) { |
if (confirm(message)) { |
Line 531 function verify(vf,sec_caller) {
|
Line 567 function verify(vf,sec_caller) {
|
var foundsec=0; |
var foundsec=0; |
var foundemail=0; |
var foundemail=0; |
var foundrole=0; |
var foundrole=0; |
|
var founddomain=0; |
var tw; |
var tw; |
for (i=0;i<=vf.nfields.value;i++) { |
for (i=0;i<=vf.nfields.value;i++) { |
tw=eval('vf.f'+i+'.selectedIndex'); |
tw=eval('vf.f'+i+'.selectedIndex'); |
Line 541 function verify(vf,sec_caller) {
|
Line 578 function verify(vf,sec_caller) {
|
if (tw==9) { foundpwd=1; } |
if (tw==9) { foundpwd=1; } |
if (tw==10) { foundemail=1; } |
if (tw==10) { foundemail=1; } |
if (tw==11) { foundrole=1; } |
if (tw==11) { foundrole=1; } |
|
if (tw==12) { founddomain=1; } |
} |
} |
verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole); |
verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain); |
} |
} |
|
|
// |
// |
Line 563 function verify(vf,sec_caller) {
|
Line 601 function verify(vf,sec_caller) {
|
// 9 = ipwd (password) |
// 9 = ipwd (password) |
// 10 = email address |
// 10 = email address |
// 11 = role |
// 11 = role |
|
// 12 = domain |
|
|
function flip(vf,tf) { |
function flip(vf,tf) { |
var nw=eval('vf.f'+tf+'.selectedIndex'); |
var nw=eval('vf.f'+tf+'.selectedIndex'); |
Line 626 function verify(vf,sec_caller) {
|
Line 665 function verify(vf,sec_caller) {
|
var foundid=0; |
var foundid=0; |
var foundsec=0; |
var foundsec=0; |
var foundrole=0; |
var foundrole=0; |
|
var founddomain=0; |
var tw; |
var tw; |
for (i=0;i<=vf.nfields.value;i++) { |
for (i=0;i<=vf.nfields.value;i++) { |
tw=eval('vf.f'+i+'.selectedIndex'); |
tw=eval('vf.f'+i+'.selectedIndex'); |
Line 635 function verify(vf,sec_caller) {
|
Line 675 function verify(vf,sec_caller) {
|
if (i==7 && tw!=0) { foundsec=1; } |
if (i==7 && tw!=0) { foundsec=1; } |
if (i==8 && tw!=0) { foundpwd=1; } |
if (i==8 && tw!=0) { foundpwd=1; } |
if (i==9 && tw!=0) { foundrole=1; } |
if (i==9 && tw!=0) { foundrole=1; } |
|
if (i==10 && tw!=0) { founddomain=1; } |
} |
} |
verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundrole); |
verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundrole,founddomain); |
} |
} |
|
|
function flip(vf,tf) { |
function flip(vf,tf) { |
Line 699 sub print_upload_manager_footer {
|
Line 740 sub print_upload_manager_footer {
|
$Str .= &hidden_input('keyfields',$keyfields); |
$Str .= &hidden_input('keyfields',$keyfields); |
$Str .= "<h3>".&mt('Login Type')."</h3>\n"; |
$Str .= "<h3>".&mt('Login Type')."</h3>\n"; |
if ($context eq 'domain') { |
if ($context eq 'domain') { |
$Str .= '<p>'.&mt('Change authentication for existing users to these settings?').' <span class="LC_nobreak"><label><input type="radio" name="changeauth" value="No" checked="checked" />'.&mt('No').'</label> <label><input type="radio" name="changeauth" value="Yes" />'.&mt('Yes').'</label></span></p>'; |
$Str .= '<p>'.&mt('Change authentication for existing users in domain "[_1]" to these settings?',$defdom).' <span class="LC_nobreak"><label><input type="radio" name="changeauth" value="No" checked="checked" />'.&mt('No').'</label> <label><input type="radio" name="changeauth" value="Yes" />'.&mt('Yes').'</label></span></p>'; |
} else { |
} else { |
$Str .= "<p>\n". |
$Str .= "<p>\n". |
&mt('Note: this will not take effect if the user already exists'). |
&mt('Note: This will not take effect if the user already exists.'). |
&Apache::loncommon::help_open_topic('Auth_Options'). |
&Apache::loncommon::help_open_topic('Auth_Options'). |
"</p>\n"; |
"</p>\n"; |
} |
} |
Line 717 sub print_upload_manager_footer {
|
Line 758 sub print_upload_manager_footer {
|
} else { |
} else { |
$Str .= $home_server_pick; |
$Str .= $home_server_pick; |
} |
} |
|
$Str .= '<h3>'.&mt('Default domain').'</h3>'."\n". |
|
&Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1); |
$Str .= '<h3>'.&mt('Starting and Ending Dates'). |
$Str .= '<h3>'.&mt('Starting and Ending Dates'). |
"</h3>\n"; |
"</h3>\n"; |
$Str .= "<p>\n".$date_table."</p>\n"; |
$Str .= "<p>\n".$date_table."</p>\n"; |
Line 754 sub print_upload_manager_footer {
|
Line 797 sub print_upload_manager_footer {
|
if ($context eq 'course' || $context eq 'domain') { |
if ($context eq 'course' || $context eq 'domain') { |
$Str .= &forceid_change($context); |
$Str .= &forceid_change($context); |
} |
} |
$Str .= '</div><div class="LC_clear_float_footer"><br /><input type="button"'. |
|
'onClick="javascript:verify(this.form,this.form.csec)" '. |
|
'value="Update Users" />'."<br />\n"; |
|
if ($context eq 'course') { |
|
$Str .= &mt('Note: for large courses, this operation may be time '. |
|
'consuming'); |
|
} |
|
$Str .= '</div>'; |
$Str .= '</div>'; |
|
$Str .= '<div class="LC_clear_float_footer">'; |
|
if ($context eq 'course') { |
|
$Str .= '<div class="LC_info">' |
|
.&mt('Note: For large courses, this operation may be time consuming.') |
|
.'</div>'; |
|
} |
|
$Str .= '<input type="button"' |
|
.'onClick="javascript:verify(this.form,this.form.csec)" ' |
|
.'value="'.&mt('Update Users').'" />'."\n" |
|
.'</div>'; |
$r->print($Str); |
$r->print($Str); |
return; |
return; |
} |
} |
Line 769 sub print_upload_manager_footer {
|
Line 815 sub print_upload_manager_footer {
|
sub forceid_change { |
sub forceid_change { |
my ($context) = @_; |
my ($context) = @_; |
my $output = |
my $output = |
"<h3>".&mt('ID/Student Number')."</h3>\n". |
"<h3>".&mt('Student/Employee ID')."</h3>\n". |
"<p>\n".'<label><input type="checkbox" name="forceid" value="yes">'. |
"<p>\n".'<label><input type="checkbox" name="forceid" value="yes">'. |
&mt('Disable ID/Student Number Safeguard and Force Change '. |
&mt('Disable Student/Employee ID Safeguard and force change of conflicting IDs'). |
'of Conflicting IDs').'</label><br />'."\n". |
'</label><br />'."\n". |
&mt('(only do if you know what you are doing.)')."\n"; |
&mt('(only do if you know what you are doing.)')."\n"; |
if ($context eq 'domain') { |
if ($context eq 'domain') { |
$output .= '<br /><label><input type="checkbox" name="recurseid"'. |
$output .= '<br /><label><input type="checkbox" name="recurseid"'. |
' value="yes">'. |
' value="yes">'. |
&mt('Update ID/Student Number in courses in which user is Active/Future student,<br />(if forcing change).'). |
&mt('Update Student/Employee ID in courses in which user is active/future student,[_1](if forcing change).','<br />'). |
'</label>'."\n"; |
'</label>'."\n"; |
} |
} |
$output .= '</p>'; |
$output .= '</p>'; |
Line 817 sub print_upload_manager_form {
|
Line 863 sub print_upload_manager_form {
|
'ipwd_choice' => 'scalar', |
'ipwd_choice' => 'scalar', |
'email_choice' => 'scalar', |
'email_choice' => 'scalar', |
'role_choice' => 'scalar', |
'role_choice' => 'scalar', |
|
'domain_choice' => 'scalar', |
}; |
}; |
my $defdom = $env{'request.role.domain'}; |
my $defdom = $env{'request.role.domain'}; |
if ($context eq 'course') { |
if ($context eq 'course') { |
Line 843 sub print_upload_manager_form {
|
Line 890 sub print_upload_manager_form {
|
['mname',&mt('Middle Names/Initials'),$env{'form.mname_choice'}], |
['mname',&mt('Middle Names/Initials'),$env{'form.mname_choice'}], |
['lname',&mt('Last Name'), $env{'form.lname_choice'}], |
['lname',&mt('Last Name'), $env{'form.lname_choice'}], |
['gen', &mt('Generation'), $env{'form.gen_choice'}], |
['gen', &mt('Generation'), $env{'form.gen_choice'}], |
['id', &mt('ID/Student Number'),$env{'form.id_choice'}], |
['id', &mt('Student/Employee ID'),$env{'form.id_choice'}], |
['sec', &mt('Section'), $env{'form.sec_choice'}], |
['sec', &mt('Section'), $env{'form.sec_choice'}], |
['ipwd', &mt('Initial Password'),$env{'form.ipwd_choice'}], |
['ipwd', &mt('Initial Password'),$env{'form.ipwd_choice'}], |
['email',&mt('E-mail Address'), $env{'form.email_choice'}], |
['email',&mt('E-mail Address'), $env{'form.email_choice'}], |
['role',&mt('Role'), $env{'form.role_choice'}]); |
['role',&mt('Role'), $env{'form.role_choice'}], |
|
['domain',&mt('Domain'), $env{'form.domain_choice'}]); |
if ($env{'form.upfile_associate'} eq 'reverse') { |
if ($env{'form.upfile_associate'} eq 'reverse') { |
&Apache::loncommon::csv_print_samples($r,\@records); |
&Apache::loncommon::csv_print_samples($r,\@records); |
$i=&Apache::loncommon::csv_print_select_table($r,\@records, |
$i=&Apache::loncommon::csv_print_select_table($r,\@records, |
Line 924 sub setup_date_selectors {
|
Line 972 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 958 sub date_setting_table {
|
Line 1013 sub date_setting_table {
|
} |
} |
my $perpetual = '<span class="LC_nobreak"><label><input type="checkbox" name="no_end_date"'; |
my $perpetual = '<span class="LC_nobreak"><label><input type="checkbox" name="no_end_date"'; |
if (defined($endtime) && $endtime == 0) { |
if (defined($endtime) && $endtime == 0) { |
$perpetual .= ' checked'; |
$perpetual .= ' checked="checked"'; |
} |
} |
$perpetual.= ' /> '.&mt('no ending date').'</label></span>'; |
$perpetual.= ' /> '.&mt('no ending date').'</label></span>'; |
if ($mode eq 'create_enrolldates') { |
if ($mode eq 'create_enrolldates') { |
Line 1244 sub print_userlist {
|
Line 1299 sub print_userlist {
|
$output_selector .= "\n".$option; |
$output_selector .= "\n".$option; |
} |
} |
$output_selector .= '</select>'; |
$output_selector .= '</select>'; |
$r->print('<label>'.&mt('Output Format: [_1]',$output_selector).'</label>'.(' 'x3)); |
$r->print('<label><span class="LC_nobreak">' |
} |
.&mt('Output Format: [_1]',$output_selector) |
$r->print('<label>'.&mt('User Status: [_1]',$status_select).'</label>'.(' 'x3)."\n"); |
.'</span></label>'.(' 'x3)); |
|
} |
|
$r->print('<label><span class="LC_nobreak">' |
|
.&mt('User Status: [_1]',$status_select) |
|
.'</span></label>'.(' 'x3)."\n"); |
my $roleselected = ''; |
my $roleselected = ''; |
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 1307 sub print_userlist {
|
Line 1343 sub print_userlist {
|
} |
} |
$r->rflush(); |
$r->rflush(); |
if ($context eq 'course') { |
if ($context eq 'course') { |
if ($env{'form.showrole'} eq 'st' || ($env{'form.showrole'} eq 'Any') { |
if (($env{'form.showrole'} eq 'st') || ($env{'form.showrole'} eq 'Any')) { |
my $classlist = &Apache::loncoursedata::get_classlist(); |
my $classlist = &Apache::loncoursedata::get_classlist(); |
%userlist = %{$classlist}; |
if (ref($classlist) eq 'HASH') { |
|
%userlist = %{$classlist}; |
|
} |
} |
} |
if ($env{'form.showrole'} ne 'st') { |
if ($env{'form.showrole'} ne 'st') { |
my $showroles; |
my $showroles; |
Line 1443 sub print_userlist {
|
Line 1481 sub print_userlist {
|
$permission,$env{'form.Status'},\%userlist,$keylist); |
$permission,$env{'form.Status'},\%userlist,$keylist); |
} |
} |
if (!$usercount) { |
if (!$usercount) { |
$r->print('<br />'.&mt('There are no users matching the search criteria.')); |
$r->print('<br /><span class="LC_warning">' |
|
.&mt('There are no users matching the search criteria.') |
|
.'</span>' |
|
); |
} |
} |
} |
} |
$r->print('<input type="hidden" name="phase" value="'. |
$r->print('<input type="hidden" name="phase" value="'. |
$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><span class="LC_nobreak">' |
|
.&mt('Role Type: [_1]',$role_select) |
|
.'</span></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><span class="LC_nobreak">' |
|
.&mt('Role: [_1]',$role_select) |
|
.'</span></label>'; |
|
} |
|
return $output; |
|
} |
|
|
sub section_group_filter { |
sub section_group_filter { |
my ($cnum,$cdom) = @_; |
my ($cnum,$cdom) = @_; |
my @filters; |
my @filters; |
Line 1467 sub section_group_filter {
|
Line 1547 sub section_group_filter {
|
all => 'all', |
all => 'all', |
none => 'none', |
none => 'none', |
); |
); |
my ($output,@options); |
my $output; |
foreach my $item (@filters) { |
foreach my $item (@filters) { |
my $markup; |
my ($markup,@options); |
if ($env{'form.'.$name{$item}} eq '') { |
if ($env{'form.'.$name{$item}} eq '') { |
$env{'form.'.$name{$item}} = 'all'; |
$env{'form.'.$name{$item}} = 'all'; |
} |
} |
Line 1513 sub list_submit_button {
|
Line 1593 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 1606 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 1791 sub make_keylist_array {
|
Line 1874 sub make_keylist_array {
|
$index->{'role'} = &Apache::loncoursedata::CL_ROLE(); |
$index->{'role'} = &Apache::loncoursedata::CL_ROLE(); |
$index->{'extent'} = &Apache::loncoursedata::CL_EXTENT(); |
$index->{'extent'} = &Apache::loncoursedata::CL_EXTENT(); |
$index->{'photo'} = &Apache::loncoursedata::CL_PHOTO(); |
$index->{'photo'} = &Apache::loncoursedata::CL_PHOTO(); |
|
$index->{'thumbnail'} = &Apache::loncoursedata::CL_THUMBNAIL(); |
foreach my $key (keys(%{$index})) { |
foreach my $key (keys(%{$index})) { |
$keylist->[$index->{$key}] = $key; |
$keylist->[$index->{$key}] = $key; |
} |
} |
Line 1824 sub aggregate_user_info {
|
Line 1908 sub aggregate_user_info {
|
sub process_date_info { |
sub process_date_info { |
my ($userdata) = @_; |
my ($userdata) = @_; |
my $now = time; |
my $now = time; |
$userdata->{'status'} = 'Active'; |
$userdata->{'status'} = &mt('Active'); |
if ($userdata->{'start'} > 0) { |
if ($userdata->{'start'} > 0) { |
if ($now < $userdata->{'start'}) { |
if ($now < $userdata->{'start'}) { |
$userdata->{'status'} = 'Future'; |
$userdata->{'status'} = &mt('Future'); |
} |
} |
} |
} |
if ($userdata->{'end'} > 0) { |
if ($userdata->{'end'} > 0) { |
if ($now > $userdata->{'end'}) { |
if ($now > $userdata->{'end'}) { |
$userdata->{'status'} = 'Expired'; |
$userdata->{'status'} = &mt('Expired'); |
} |
} |
} |
} |
return; |
return; |
} |
} |
|
|
sub show_users_list { |
sub show_users_list { |
my ($r,$context,$mode,$permission,$statusmode,$userlist,$keylist)=@_; |
my ($r,$context,$mode,$permission,$statusmode,$userlist,$keylist,$formname)=@_; |
|
if ($formname eq '') { |
|
$formname = 'studentform'; |
|
} |
# |
# |
# Variables for excel output |
# Variables for excel output |
my ($excel_workbook, $excel_sheet, $excel_filename,$row,$format); |
my ($excel_workbook, $excel_sheet, $excel_filename,$row,$format); |
Line 1854 sub show_users_list {
|
Line 1941 sub show_users_list {
|
} else { |
} else { |
push(@sortable,'extent'); |
push(@sortable,'extent'); |
} |
} |
|
if ($mode eq 'pickauthor') { |
|
@sortable = ('username','fullname','email','status'); |
|
} |
if (!grep(/^\Q$sortby\E$/,@sortable)) { |
if (!grep(/^\Q$sortby\E$/,@sortable)) { |
$sortby = 'username'; |
$sortby = 'username'; |
} |
} |
Line 1894 function photowindow(photolink) {
|
Line 1984 function photowindow(photolink) {
|
END |
END |
} |
} |
} |
} |
if ($mode ne 'autoenroll') { |
if ($mode ne 'autoenroll' && $mode ne 'pickauthor') { |
my $check_uncheck_js = &Apache::loncommon::check_uncheck_jscript(); |
my $check_uncheck_js = &Apache::loncommon::check_uncheck_jscript(); |
my $alert = &mt("You must select at least one user by checking a user's 'Select' checkbox"); |
|
my $singconfirm = &mt(' for a single user?'); |
|
my $multconfirm = &mt(' for multiple users?'); |
|
my $date_sec_selector = &date_section_javascript($context,$setting,$statusmode); |
my $date_sec_selector = &date_section_javascript($context,$setting,$statusmode); |
my %lt = &Apache::lonlocal::texthash( |
my $verify_action_js = &bulkaction_javascript($formname); |
acwi => 'Access will be set to start immediately', |
|
asyo => 'as you did not select an end date in the pop-up window', |
|
accw => 'Access will be set to continue indefinitely', |
|
asyd => 'as you did not select an end date in the pop-up window', |
|
sewi => "Sections will be switched to 'No section'", |
|
ayes => "as you either selected the 'No section' option", |
|
oryo => 'or you did not select a section in the pop-up window', |
|
arol => 'A role with no section will be added', |
|
swbs => 'Sections will be switched to:', |
|
rwba => 'Roles will be added for section(s):', |
|
); |
|
$r->print(<<END); |
$r->print(<<END); |
|
|
<script type="text/javascript" language="Javascript"> |
<script type="text/javascript" language="Javascript"> |
$check_uncheck_js |
$check_uncheck_js |
|
|
function verify_action (field) { |
$verify_action_js |
var numchecked = 0; |
|
var singconf = '$singconfirm'; |
|
var multconf = '$multconfirm'; |
|
if (field.length > 0) { |
|
for (i = 0; i < field.length; i++) { |
|
if (field[i].checked == true) { |
|
numchecked ++; |
|
} |
|
} |
|
} else { |
|
if (field.checked == true) { |
|
numchecked ++; |
|
} |
|
} |
|
if (numchecked == 0) { |
|
alert("$alert"); |
|
} |
|
else { |
|
var message = document.studentform.bulkaction[document.studentform.bulkaction.selectedIndex].text; |
|
var choice = document.studentform.bulkaction[document.studentform.bulkaction.selectedIndex].value; |
|
if (numchecked == 1) { |
|
message += singconf; |
|
} |
|
else { |
|
message += multconf; |
|
} |
|
if (choice == 'chgdates' || choice == 'reenable' || choice == 'activate') { |
|
var datemsg = ''; |
|
if ((document.studentform.startdate_month.value == '') && |
|
(document.studentform.startdate_day.value == '') && |
|
(document.studentform.startdate_year.value == '')) { |
|
datemsg = "\\n$lt{'acwi'},\\n$lt{'asyo'}.\\n"; |
|
} |
|
if ((document.studentform.enddate_month.value == '') && |
|
(document.studentform.enddate_day.value == '') && |
|
(document.studentform.enddate_year.value == '')) { |
|
datemsg += "\\n$lt{'accw'},\\n$lt{'asyd'}.\\n"; |
|
} |
|
if (datemsg != '') { |
|
message += "\\n"+datemsg; |
|
} |
|
} |
|
if (choice == 'chgsec') { |
|
var rolefilter = document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value; |
|
var retained = document.studentform.retainsec.value; |
|
var secshow = document.studentform.newsecs.value; |
|
if (secshow == '') { |
|
if (rolefilter == 'st' || retained == 0 || retained == "") { |
|
message += "\\n\\n$lt{'sewi'},\\n$lt{'ayes'},\\n$lt{'oryo'}.\\n"; |
|
} else { |
|
message += "\\n\\n$lt{'arol'}\\n$lt{'ayes'},\\n$lt{'oryo'}.\\n"; |
|
} |
|
} else { |
|
if (rolefilter == 'st' || retained == 0 || retained == "") { |
|
message += "\\n\\n$lt{'swbs'} "+secshow+".\\n"; |
|
} else { |
|
message += "\\n\\n$lt{'rwba'} "+secshow+".\\n"; |
|
} |
|
} |
|
} |
|
if (confirm(message)) { |
|
document.studentform.phase.value = 'bulkchange'; |
|
document.studentform.submit(); |
|
} |
|
} |
|
} |
|
|
|
function username_display_launch(username,domain) { |
function username_display_launch(username,domain) { |
var target; |
var target; |
for (var i=0; i<document.studentform.usernamelink.length; i++) { |
for (var i=0; i<document.$formname.usernamelink.length; i++) { |
if (document.studentform.usernamelink[i].checked) { |
if (document.$formname.usernamelink[i].checked) { |
target = document.studentform.usernamelink[i].value; |
target = document.$formname.usernamelink[i].value; |
} |
} |
} |
} |
if (target == 'modify') { |
if (target == 'modify') { |
document.studentform.srchterm.value=username; |
if (document.$formname.userwin.checked == true) { |
document.studentform.srchdomain.value=domain; |
var url = '/adm/createuser?srchterm='+username+'&srchdomain='+domain+'&phase=get_user_info&action=singleuser&srchin=dom&srchby=uname&srchtype=exact&popup=1'; |
document.studentform.phase.value='get_user_info'; |
var options = 'height=600,width=800,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no'; |
document.studentform.action.value = 'singleuser'; |
modifywin = window.open(url,'',options,1); |
document.studentform.submit(); |
modifywin.focus(); |
|
return; |
|
} else { |
|
document.$formname.srchterm.value=username; |
|
document.$formname.srchdomain.value=domain; |
|
document.$formname.phase.value='get_user_info'; |
|
document.$formname.action.value = 'singleuser'; |
|
document.$formname.submit(); |
|
} |
} |
} |
else { |
if (target == 'aboutme') { |
document.location.href = '/adm/'+domain+'/'+username+'/aboutme'; |
if (document.$formname.userwin.checked == true) { |
|
var url = '/adm/'+domain+'/'+username+'/aboutme?popup=1'; |
|
var options = 'height=600,width=800,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no'; |
|
aboutmewin = window.open(url,'',options,1); |
|
aboutmewin.focus(); |
|
return; |
|
} else { |
|
document.location.href = '/adm/'+domain+'/'+username+'/aboutme'; |
|
} |
} |
} |
} |
} |
</script> |
</script> |
Line 2025 END
|
Line 2051 END
|
'role' => "role", |
'role' => "role", |
'type' => "enroll type/action", |
'type' => "enroll type/action", |
'email' => "email address", |
'email' => "email address", |
'clicker' => "clicker id", |
|
'photo' => "photo", |
'photo' => "photo", |
'extent' => "extent", |
'extent' => "extent", |
'go' => "go", |
|
'pr' => "Proceed", |
'pr' => "Proceed", |
'ca' => "check all", |
'ca' => "check all", |
'ua' => "uncheck all", |
'ua' => "uncheck all", |
'ac' => "Action to take for selected users", |
'ac' => "Action to take for selected users", |
'link' => "Behavior of username links", |
'link' => "Behavior of clickable username link for each user", |
'aboutme' => "Display a user's personal page", |
'aboutme' => "Display a user's personal page", |
|
'owin' => "Open in a new window", |
'modify' => "Modify a user's information", |
'modify' => "Modify a user's information", |
|
'clicker' => "Clicker-ID", |
); |
); |
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'); |
} elsif ($context eq 'author') { |
} elsif ($context eq 'author') { |
$lt{'extent'} = &mt('Author'); |
$lt{'extent'} = &mt('Author'); |
} |
} |
my @cols = ('username','domain','id','fullname'); |
my @cols; |
if ($context eq 'course') { |
if ($mode eq 'pickauthor') { |
push(@cols,'section'); |
@cols = ('username','fullname','status','email'); |
} |
} else { |
if (!($context eq 'domain' && $env{'form.roletype'} eq 'course')) { |
@cols = ('username','domain','id','fullname'); |
push(@cols,('start','end')); |
if ($context eq 'course') { |
} |
push(@cols,'section'); |
if ($env{'form.showrole'} eq 'Any' || $env{'form.showrole'} eq 'cr') { |
} |
push(@cols,'role'); |
if (!($context eq 'domain' && $env{'form.roletype'} eq 'course')) { |
} |
push(@cols,('start','end')); |
if ($context eq 'domain' && ($env{'form.roletype'} eq 'author' || |
} |
$env{'form.roletype'} eq 'course')) { |
if ($env{'form.showrole'} eq 'Any' || $env{'form.showrole'} eq 'cr') { |
push (@cols,'extent'); |
push(@cols,'role'); |
} |
} |
if (($statusmode eq 'Any') && |
if ($context eq 'domain' && ($env{'form.roletype'} eq 'author' || |
(!($context eq 'domain' && $env{'form.roletype'} eq 'course'))) { |
$env{'form.roletype'} eq 'course')) { |
push(@cols,'status'); |
push (@cols,'extent'); |
} |
} |
if ($context eq 'course') { |
if (($statusmode eq 'Any') && |
push(@cols,'groups'); |
(!($context eq 'domain' && $env{'form.roletype'} eq 'course'))) { |
|
push(@cols,'status'); |
|
} |
|
if ($context eq 'course') { |
|
push(@cols,'groups'); |
|
} |
|
push(@cols,'email'); |
} |
} |
push(@cols,'email'); |
|
|
|
my $rolefilter = $env{'form.showrole'}; |
my $rolefilter = $env{'form.showrole'}; |
if ($env{'form.showrole'} eq 'cr') { |
if ($env{'form.showrole'} eq 'cr') { |
Line 2075 END
|
Line 2106 END
|
if ($mode ne 'autoenroll') { |
if ($mode ne 'autoenroll') { |
$results_description = &results_header_row($rolefilter,$statusmode, |
$results_description = &results_header_row($rolefilter,$statusmode, |
$context,$permission,$mode); |
$context,$permission,$mode); |
$r->print('<b>'.$results_description.'</b><br />'); |
$r->print('<b>'.$results_description.'</b><br /><br />'); |
} |
} |
my ($output,$actionselect,%canchange,%canchangesec); |
my ($output,$actionselect,%canchange,%canchangesec); |
if ($mode eq 'html' || $mode eq 'view' || $mode eq 'autoenroll') { |
if ($mode eq 'html' || $mode eq 'view' || $mode eq 'autoenroll' || $mode eq 'pickauthor') { |
if ($mode ne 'autoenroll') { |
if ($mode ne 'autoenroll' && $mode ne 'pickauthor') { |
if ($permission->{'cusr'}) { |
if ($permission->{'cusr'}) { |
$actionselect = &select_actions($context,$setting,$statusmode); |
$actionselect = &select_actions($context,$setting,$statusmode,$formname); |
} |
} |
$r->print(<<END); |
$r->print(<<END); |
<input type="hidden" name="srchby" value="uname" /> |
<input type="hidden" name="srchby" value="uname" /> |
Line 2090 END
|
Line 2121 END
|
<input type="hidden" name="srchterm" value="" /> |
<input type="hidden" name="srchterm" value="" /> |
<input type="hidden" name="srchdomain" value="" /> |
<input type="hidden" name="srchdomain" value="" /> |
END |
END |
$output = '<p>'; |
|
my @linkdests = ('aboutme'); |
|
if ($permission->{'cusr'}) { |
|
push (@linkdests,'modify'); |
|
$output .= '<span class="LC_nobreak">'.$lt{'link'}.': '; |
|
my $usernamelink = $env{'form.usernamelink'}; |
|
if ($usernamelink eq '') { |
|
$usernamelink = 'aboutme'; |
|
} |
|
foreach my $item (@linkdests) { |
|
my $checkedstr = ''; |
|
if ($item eq $usernamelink) { |
|
$checkedstr = ' checked="checked" '; |
|
} |
|
$output .= '<label><input type="radio" name="usernamelink" value="'.$item.'"'.$checkedstr.'> '.$lt{$item}.'</label> '; |
|
} |
|
$output .= '</span><br />'; |
|
} else { |
|
$output .= &mt("Click on a username to view the user's personal page.").'<br />'; |
|
} |
|
if ($actionselect) { |
if ($actionselect) { |
$output .= <<"END"; |
$output .= <<"END"; |
$lt{'ac'}: $actionselect <input type="button" value="$lt{'go'}" onclick="javascript:opendatebrowser(this.form,'studentform','go')" /></p> |
<div class="LC_left_float"><fieldset><legend><b>$lt{'ac'}</b></legend> |
<p><input type="button" value="$lt{'ca'}" onclick="javascript:checkAll(document.studentform.actionlist)" /> |
$actionselect |
<input type="button" value="$lt{'ua'}" onclick="javascript:uncheckAll(document.studentform.actionlist)" /><br /><br /><input type="button" value="$lt{'pr'}" onclick="javascript:verify_action(document.studentform.actionlist)" /> |
<br/><br /><input type="button" value="$lt{'ca'}" onclick="javascript:checkAll(document.$formname.actionlist)" /> |
|
<input type="button" value="$lt{'ua'}" onclick="javascript:uncheckAll(document.$formname.actionlist)" /><br /><input type="button" value="$lt{'pr'}" onclick="javascript:verify_action('actionlist')" /></fieldset></div> |
END |
END |
my @allroles; |
my @allroles; |
if ($env{'form.showrole'} eq 'Any') { |
if ($env{'form.showrole'} eq 'Any') { |
Line 2156 END
|
Line 2168 END
|
} |
} |
} |
} |
} |
} |
|
$output .= '<div class="LC_left_float"><fieldset><legend><b>'.$lt{'link'}.'</b></legend>'. |
|
'<table><tr>'; |
|
my @linkdests = ('aboutme'); |
|
if ($permission->{'cusr'}) { |
|
unshift (@linkdests,'modify'); |
|
} |
|
$output .= '<td>'; |
|
my $usernamelink = $env{'form.usernamelink'}; |
|
if ($usernamelink eq '') { |
|
$usernamelink = 'aboutme'; |
|
} |
|
foreach my $item (@linkdests) { |
|
my $checkedstr = ''; |
|
if ($item eq $usernamelink) { |
|
$checkedstr = ' checked="checked" '; |
|
} |
|
$output .= '<span class="LC_nobreak"><label><input type="radio" name="usernamelink" value="'.$item.'"'.$checkedstr.'> '.$lt{$item}.'</label></span><br />'; |
|
} |
|
my $checkwin; |
|
if ($env{'form.userwin'}) { |
|
$checkwin = 'checked = "checked"'; |
|
} |
|
$output .= '</td><td valign="top"><span class="LC_nobreak"><input type="checkbox" name="userwin" value="1" '.$checkwin.'/>'.$lt{'owin'}.'</span></td></tr></table></fieldset></div>'; |
} |
} |
$output .= "\n<p>\n". |
$output .= "\n".'<div class="LC_clear_float_footer"> </div>'."\n". |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(); |
&Apache::loncommon::start_data_table_header_row(); |
if ($mode eq 'autoenroll') { |
if ($mode eq 'autoenroll') { |
$output .= " |
$output .= " |
<th><a href=\"javascript:document.studentform.sortby.value='type';document.studentform.submit();\">$lt{'type'}</a></th> |
<th><a href=\"javascript:document.$formname.sortby.value='type';document.$formname.submit();\">$lt{'type'}</a></th> |
"; |
"; |
} else { |
} else { |
$output .= "\n".'<th>'.&mt('Count').'</th>'."\n"; |
if ($mode eq 'pickauthor') { |
|
$output .= "\n".'<th> </th>'."\n"; |
|
} else { |
|
$output .= "\n".'<th>'.&mt('Count').'</th>'."\n"; |
|
} |
if ($actionselect) { |
if ($actionselect) { |
$output .= '<th>'.&mt('Select').'</th>'."\n"; |
$output .= '<th>'.&mt('Select').'</th>'."\n"; |
} |
} |
} |
} |
foreach my $item (@cols) { |
foreach my $item (@cols) { |
$output .= "<th><a href=\"javascript:document.studentform.sortby.value='$item';document.studentform.submit();\">$lt{$item}</a></th>\n"; |
$output .= "<th><a href=\"javascript:document.$formname.sortby.value='$item';document.$formname.submit();\">$lt{$item}</a></th>\n"; |
} |
} |
my %role_types = &role_type_names(); |
my %role_types = &role_type_names(); |
if ($context eq 'course' && $mode ne 'autoenroll') { |
if ($context eq 'course' && $mode ne 'autoenroll') { |
if ($env{'form.showrole'} eq 'st' || $env{'form.showrole'} eq 'Any') { |
if ($env{'form.showrole'} eq 'st' || $env{'form.showrole'} eq 'Any') { |
# Clicker display on or off? |
# Clicker display on or off? |
my %clicker_options = &Apache::lonlocal::texthash( |
my %clicker_options = ( |
'on' => 'Show', |
'on' => 'Show', |
'off' => 'Hide', |
'off' => 'Hide', |
); |
); |
my $clickerchg = 'on'; |
my $clickerchg = 'on'; |
if ($displayclickers eq 'on') { |
if ($displayclickers eq 'on') { |
$clickerchg = 'off'; |
$clickerchg = 'off'; |
} |
} |
$output .= ' <th>'."\n".' '. |
$output .= ' <th>'."\n".' ' |
'<a href="javascript:document.studentform.displayclickers.value='. |
.&mt('[_1]'.$clicker_options{$clickerchg}.'[_2] clicker id' |
"'".$clickerchg."'".';document.studentform.submit();">'. |
,'<a href="javascript:document.'.$formname.'.displayclickers.value=' |
$clicker_options{$clickerchg}.'</a> '.$lt{'clicker'}."\n". |
."'".$clickerchg."'".';document.'.$formname.'.submit();">' |
' </th>'."\n"; |
,'</a>') |
|
."\n".' </th>'."\n"; |
|
|
# Photo display on or off? |
# Photo display on or off? |
if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) { |
if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) { |
Line 2202 END
|
Line 2242 END
|
$photochg = 'off'; |
$photochg = 'off'; |
} |
} |
$output .= ' <th>'."\n".' '. |
$output .= ' <th>'."\n".' '. |
'<a href="javascript:document.studentform.displayphotos.value='. |
'<a href="javascript:document.'.$formname.'.displayphotos.value='. |
"'".$photochg."'".';document.studentform.submit();">'. |
"'".$photochg."'".';document.'.$formname.'.submit();">'. |
$photo_options{$photochg}.'</a> '.$lt{'photo'}."\n". |
$photo_options{$photochg}.'</a> '.$lt{'photo'}."\n". |
' </th>'."\n"; |
' </th>'."\n"; |
} |
} |
Line 2219 END
|
Line 2259 END
|
time.'_'.rand(1000000000).'.csv'; |
time.'_'.rand(1000000000).'.csv'; |
unless ($CSVfile = Apache::File->new('>/home/httpd'.$CSVfilename)) { |
unless ($CSVfile = Apache::File->new('>/home/httpd'.$CSVfilename)) { |
$r->log_error("Couldn't open $CSVfilename for output $!"); |
$r->log_error("Couldn't open $CSVfilename for output $!"); |
$r->print("Problems occured in writing the csv file. ". |
$r->print(&mt('Problems occurred in writing the CSV file. ' |
"This error has been logged. ". |
.'This error has been logged. ' |
"Please alert your LON-CAPA administrator."); |
.'Please alert your LON-CAPA administrator.')); |
$CSVfile = undef; |
$CSVfile = undef; |
} |
} |
# |
# |
|
push @cols,'clicker'; |
# Write headers and data to file |
# Write headers and data to file |
print $CSVfile '"'.$results_description.'"'."\n"; |
print $CSVfile '"'.$results_description.'"'."\n"; |
print $CSVfile '"'.join('","',map { |
print $CSVfile '"'.join('","',map { |
&Apache::loncommon::csv_translate($lt{$_}) |
&Apache::loncommon::csv_translate($lt{$_}) |
} (@cols)).'"'."\n"; |
} (@cols))."\"\n"; |
} elsif ($mode eq 'excel') { |
} elsif ($mode eq 'excel') { |
|
push @cols,'clicker'; |
# Create the excel spreadsheet |
# Create the excel spreadsheet |
($excel_workbook,$excel_filename,$format) = |
($excel_workbook,$excel_filename,$format) = |
&Apache::loncommon::create_workbook($r); |
&Apache::loncommon::create_workbook($r); |
Line 2239 END
|
Line 2281 END
|
$excel_sheet->write($row++,0,$results_description,$format->{'h2'}); |
$excel_sheet->write($row++,0,$results_description,$format->{'h2'}); |
# |
# |
my @colnames = map {$lt{$_}} (@cols); |
my @colnames = map {$lt{$_}} (@cols); |
|
|
$excel_sheet->write($row++,0,\@colnames,$format->{'bold'}); |
$excel_sheet->write($row++,0,\@colnames,$format->{'bold'}); |
} |
} |
|
|
# Done with header lines in all formats |
# Done with header lines in all formats |
|
|
my %index; |
my %index; |
my $i; |
my $i; |
foreach my $idx (@$keylist) { |
foreach my $idx (@$keylist) { |
Line 2345 END
|
Line 2387 END
|
if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) { |
if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) { |
if (($displayphotos eq 'on') && ($role eq 'st')) { |
if (($displayphotos eq 'on') && ($role eq 'st')) { |
$userlist->{$user}->[$index{'photo'}] = |
$userlist->{$user}->[$index{'photo'}] = |
|
&Apache::lonnet::retrievestudentphoto($udom,$uname,'jpg'); |
|
$userlist->{$user}->[$index{'thumbnail'}] = |
&Apache::lonnet::retrievestudentphoto($udom,$uname, |
&Apache::lonnet::retrievestudentphoto($udom,$uname, |
'gif','thumbnail'); |
'gif','thumbnail'); |
} |
} |
Line 2389 END
|
Line 2433 END
|
foreach my $item (@{$keylist}) { |
foreach my $item (@{$keylist}) { |
$in{$item} = $sdata->[$index{$item}]; |
$in{$item} = $sdata->[$index{$item}]; |
} |
} |
my $role = $in{'role'}; |
my $clickers = (&Apache::lonnet::userenvironment($in{'domain'},$in{'username'},'clickers'))[1]; |
|
if ($clickers!~/\w/) { $clickers='-'; } |
|
$in{'clicker'} = $clickers; |
|
my $role = $in{'role'}; |
$in{'role'}=&Apache::lonnet::plaintext($sdata->[$index{'role'}]); |
$in{'role'}=&Apache::lonnet::plaintext($sdata->[$index{'role'}]); |
if (! defined($in{'start'}) || $in{'start'} == 0) { |
if (! defined($in{'start'}) || $in{'start'} == 0) { |
$in{'start'} = &mt('none'); |
$in{'start'} = &mt('none'); |
Line 2401 END
|
Line 2448 END
|
} else { |
} else { |
$in{'end'} = &Apache::lonlocal::locallocaltime($in{'end'}); |
$in{'end'} = &Apache::lonlocal::locallocaltime($in{'end'}); |
} |
} |
if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') { |
if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll' || $mode eq 'pickauthor') { |
$r->print(&Apache::loncommon::start_data_table_row()); |
$r->print(&Apache::loncommon::start_data_table_row()); |
my $checkval; |
my $checkval; |
if ($mode eq 'autoenroll') { |
if ($mode eq 'autoenroll') { |
Line 2423 END
|
Line 2470 END
|
} |
} |
$r->print("<td>$cellentry</td>\n"); |
$r->print("<td>$cellentry</td>\n"); |
} else { |
} else { |
$r->print("<td>$rowcount</td>\n"); |
if ($mode ne 'pickauthor') { |
|
$r->print("<td>$rowcount</td>\n"); |
|
} |
if ($actionselect) { |
if ($actionselect) { |
my $showcheckbox; |
my $showcheckbox; |
if ($role =~ /^cr\//) { |
if ($role =~ /^cr\//) { |
Line 2457 END
|
Line 2506 END
|
} else { |
} else { |
$r->print('<td> </td>'); |
$r->print('<td> </td>'); |
} |
} |
|
} elsif ($mode eq 'pickauthor') { |
|
$r->print('<td><input type="button" name="chooseauthor" onclick="javascript:gochoose('."'$in{'username'}'".');" value="'.&mt('Select').'" /></td>'); |
} |
} |
} |
} |
foreach my $item (@cols) { |
foreach my $item (@cols) { |
if ($item eq 'username') { |
if ($item eq 'username') { |
$r->print('<td>'.&print_username_link($mode,$permission, |
$r->print('<td>'.&print_username_link($mode,\%in).'</td>'); |
\%in).'</td>'); |
|
} elsif (($item eq 'start' || $item eq 'end') && ($actionselect)) { |
} elsif (($item eq 'start' || $item eq 'end') && ($actionselect)) { |
$r->print('<td>'.$in{$item}.'<input type="hidden" name="'.$checkval.'_'.$item.'" value="'.$sdata->[$index{$item}].'" /></td>'."\n"); |
$r->print('<td>'.$in{$item}.'<input type="hidden" name="'.$checkval.'_'.$item.'" value="'.$sdata->[$index{$item}].'" /></td>'."\n"); |
} else { |
} else { |
Line 2481 END
|
Line 2531 END
|
} |
} |
if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) { |
if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) { |
if ($displayphotos eq 'on' && $role eq 'st' && $in{'photo'} ne '') { |
if ($displayphotos eq 'on' && $role eq 'st' && $in{'photo'} ne '') { |
$r->print(' <td align="right"><a href="javascript:photowindow('."'".&Apache::lonnet::studentphoto($in{'domain'},$in{'username'},'jpg')."'".')"><img src="'.$in{'photo'}.'" border="1"></a></td>'); |
$r->print(' <td align="right"><a href="javascript:photowindow('."'".$in{'photo'}."'".')"><img src="'.$in{'thumbnail'}.'" border="1"></a></td>'); |
} else { |
} else { |
$r->print(' <td> </td> '); |
$r->print(' <td> </td> '); |
} |
} |
Line 2506 END
|
Line 2556 END
|
foreach my $item (@cols) { |
foreach my $item (@cols) { |
push @line,&Apache::loncommon::csv_translate($in{$item}); |
push @line,&Apache::loncommon::csv_translate($in{$item}); |
} |
} |
print $CSVfile '"'.join('","',@line).'"'."\n"; |
print $CSVfile '"'.join('","',@line)."\"\n"; |
} elsif ($mode eq 'excel') { |
} elsif ($mode eq 'excel') { |
my $col = 0; |
my $col = 0; |
foreach my $item (@cols) { |
foreach my $item (@cols) { |
Line 2525 END
|
Line 2575 END
|
$row++; |
$row++; |
} |
} |
} |
} |
if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') { |
if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll' || $mode eq 'pickauthor') { |
$r->print(&Apache::loncommon::end_data_table().'<br />'); |
$r->print(&Apache::loncommon::end_data_table().'<br />'); |
} elsif ($mode eq 'excel') { |
} elsif ($mode eq 'excel') { |
$excel_workbook->close(); |
$excel_workbook->close(); |
$r->print('<p><a href="'.$excel_filename.'">'. |
$r->print(&mt('[_1]Your Excel spreadsheet[_2] is ready for download.', '<p><a href="'.$excel_filename.'">','</a>')."</p>\n"); |
&mt('Your Excel spreadsheet').'</a> '.&mt('is ready for download').'.</p>'."\n"); |
|
} elsif ($mode eq 'csv') { |
} elsif ($mode eq 'csv') { |
close($CSVfile); |
close($CSVfile); |
$r->print('<a href="'.$CSVfilename.'">'. |
$r->print(&mt('[_1]Your CSV file[_2] is ready for download.', '<p><a href="'.$CSVfilename.'">','</a>')."</p>\n"); |
&mt('Your CSV file').'</a> is ready for download.'. |
|
"\n"); |
|
$r->rflush(); |
$r->rflush(); |
} |
} |
if ($mode eq 'autoenroll') { |
if ($mode eq 'autoenroll') { |
Line 2545 END
|
Line 2592 END
|
} |
} |
} |
} |
|
|
|
sub bulkaction_javascript { |
|
my ($formname,$caller) = @_; |
|
my $docstart = 'document'; |
|
if ($caller eq 'popup') { |
|
$docstart = 'opener.document'; |
|
} |
|
my %lt = &Apache::lonlocal::texthash( |
|
acwi => 'Access will be set to start immediately', |
|
asyo => 'as you did not select an end date in the pop-up window', |
|
accw => 'Access will be set to continue indefinitely', |
|
asyd => 'as you did not select an end date in the pop-up window', |
|
sewi => "Sections will be switched to 'No section'", |
|
ayes => "as you either selected the 'No section' option", |
|
oryo => 'or you did not select a section in the pop-up window', |
|
arol => 'A role with no section will be added', |
|
swbs => 'Sections will be switched to:', |
|
rwba => 'Roles will be added for section(s):', |
|
); |
|
my $alert = &mt("You must select at least one user by checking a user's 'Select' checkbox"); |
|
my $noaction = &mt("You need to select an action to take for the user(s) you have selected"); |
|
my $singconfirm = &mt(' for a single user?'); |
|
my $multconfirm = &mt(' for multiple users?'); |
|
my $output = <<"ENDJS"; |
|
function verify_action (field) { |
|
var numchecked = 0; |
|
var singconf = '$singconfirm'; |
|
var multconf = '$multconfirm'; |
|
if ($docstart.$formname.elements[field].length > 0) { |
|
for (i=0; i<$docstart.$formname.elements[field].length; i++) { |
|
if ($docstart.$formname.elements[field][i].checked == true) { |
|
numchecked ++; |
|
} |
|
} |
|
} else { |
|
if ($docstart.$formname.elements[field].checked == true) { |
|
numchecked ++; |
|
} |
|
} |
|
if (numchecked == 0) { |
|
alert("$alert"); |
|
return; |
|
} else { |
|
var message = $docstart.$formname.bulkaction[$docstart.$formname.bulkaction.selectedIndex].text; |
|
var choice = $docstart.$formname.bulkaction[$docstart.$formname.bulkaction.selectedIndex].value; |
|
if (choice == '') { |
|
alert("$noaction"); |
|
return; |
|
} else { |
|
if (numchecked == 1) { |
|
message += singconf; |
|
} else { |
|
message += multconf; |
|
} |
|
ENDJS |
|
if ($caller ne 'popup') { |
|
$output .= <<"NEWWIN"; |
|
if (choice == 'chgdates' || choice == 'reenable' || choice == 'activate' || choice == 'chgsec') { |
|
opendatebrowser(document.$formname,'$formname','go'); |
|
return; |
|
|
|
} else { |
|
if (confirm(message)) { |
|
document.$formname.phase.value = 'bulkchange'; |
|
document.$formname.submit(); |
|
return; |
|
} |
|
} |
|
NEWWIN |
|
} else { |
|
$output .= <<"POPUP"; |
|
if (choice == 'chgdates' || choice == 'reenable' || choice == 'activate') { |
|
var datemsg = ''; |
|
if (($docstart.$formname.startdate_month.value == '') && |
|
($docstart.$formname.startdate_day.value == '') && |
|
($docstart.$formname.startdate_year.value == '')) { |
|
datemsg = "\\n$lt{'acwi'},\\n$lt{'asyo'}.\\n"; |
|
} |
|
if (($docstart.$formname.enddate_month.value == '') && |
|
($docstart.$formname.enddate_day.value == '') && |
|
($docstart.$formname.enddate_year.value == '')) { |
|
datemsg += "\\n$lt{'accw'},\\n$lt{'asyd'}.\\n"; |
|
} |
|
if (datemsg != '') { |
|
message += "\\n"+datemsg; |
|
} |
|
} |
|
if (choice == 'chgsec') { |
|
var rolefilter = $docstart.$formname.showrole.options[$docstart.$formname.showrole.selectedIndex].value; |
|
var retained = $docstart.$formname.retainsec.value; |
|
var secshow = $docstart.$formname.newsecs.value; |
|
if (secshow == '') { |
|
if (rolefilter == 'st' || retained == 0 || retained == "") { |
|
message += "\\n\\n$lt{'sewi'},\\n$lt{'ayes'},\\n$lt{'oryo'}.\\n"; |
|
} else { |
|
message += "\\n\\n$lt{'arol'}\\n$lt{'ayes'},\\n$lt{'oryo'}.\\n"; |
|
} |
|
} else { |
|
if (rolefilter == 'st' || retained == 0 || retained == "") { |
|
message += "\\n\\n$lt{'swbs'} "+secshow+".\\n"; |
|
} else { |
|
message += "\\n\\n$lt{'rwba'} "+secshow+".\\n"; |
|
} |
|
} |
|
} |
|
if (confirm(message)) { |
|
$docstart.$formname.phase.value = 'bulkchange'; |
|
$docstart.$formname.submit(); |
|
window.close(); |
|
} |
|
POPUP |
|
} |
|
$output .= ' |
|
} |
|
} |
|
} |
|
'; |
|
return $output; |
|
} |
|
|
sub print_username_link { |
sub print_username_link { |
my ($mode,$permission,$in) = @_; |
my ($mode,$in) = @_; |
my $output; |
my $output; |
if ($mode eq 'autoenroll') { |
if ($mode eq 'autoenroll') { |
$output = $in->{'username'}; |
$output = $in->{'username'}; |
} elsif (!$permission->{'cusr'}) { |
|
$output = &Apache::loncommon::aboutmewrapper($in->{'username'}, |
|
$in->{'username'}, |
|
$in->{'domain'}); |
|
} else { |
} else { |
$output = '<a href="javascript:username_display_launch('. |
$output = '<a href="javascript:username_display_launch('. |
"'$in->{'username'}','$in->{'domain'}'".')" />'. |
"'$in->{'username'}','$in->{'domain'}'".')" />'. |
Line 2572 sub role_type_names {
|
Line 2734 sub role_type_names {
|
} |
} |
|
|
sub select_actions { |
sub select_actions { |
my ($context,$setting,$statusmode) = @_; |
my ($context,$setting,$statusmode,$formname) = @_; |
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
revoke => "Revoke user roles", |
revoke => "Revoke user roles", |
delete => "Delete user roles", |
delete => "Delete user roles", |
Line 2633 sub select_actions {
|
Line 2795 sub select_actions {
|
} |
} |
} |
} |
if ($options) { |
if ($options) { |
$output = '<select name="bulkaction" onchange="javascript:opendatebrowser(this.form,'."'studentform','change'".')" />'."\n". |
$output = '<select name="bulkaction">'."\n". |
'<option value="" selected="selected">'. |
'<option value="" selected="selected">'. |
&mt('Please select').'</option>'."\n".$options."\n".'</select>'; |
&mt('Please select').'</option>'."\n".$options."\n".'</select>'; |
if ($choices{'dates'}) { |
if ($choices{'dates'}) { |
Line 2649 sub select_actions {
|
Line 2811 sub select_actions {
|
'<input type="hidden" name="enddate_year" value="" />'."\n". |
'<input type="hidden" name="enddate_year" value="" />'."\n". |
'<input type="hidden" name="enddate_hour" value="" />'."\n". |
'<input type="hidden" name="enddate_hour" value="" />'."\n". |
'<input type="hidden" name="enddate_minute" value="" />'."\n". |
'<input type="hidden" name="enddate_minute" value="" />'."\n". |
'<input type="hidden" name="enddate_second" value="" />'."\n"; |
'<input type="hidden" name="enddate_second" value="" />'."\n". |
|
'<input type="hidden" name="no_end_date" value="" />'."\n"; |
if ($context eq 'course') { |
if ($context eq 'course') { |
$output .= '<input type="hidden" name="makedatesdefault" value="" />'."\n"; |
$output .= '<input type="hidden" name="makedatesdefault" value="" />'."\n"; |
} |
} |
Line 2664 sub select_actions {
|
Line 2827 sub select_actions {
|
|
|
sub date_section_javascript { |
sub date_section_javascript { |
my ($context,$setting) = @_; |
my ($context,$setting) = @_; |
my $title; |
my $title = 'Date_And_Section_Selector'; |
if (($context eq 'course') || ($context eq 'domain' && $setting eq 'course')) { |
|
$title = &mt('Date and Section selector'); |
|
} else { |
|
$title = &mt('Date selector'); |
|
} |
|
my %nopopup = &Apache::lonlocal::texthash ( |
my %nopopup = &Apache::lonlocal::texthash ( |
revoke => "Check the boxes for any users for whom roles are to be revoked, and click 'Proceed'", |
revoke => "Check the boxes for any users for whom roles are to be revoked, and click 'Proceed'", |
delete => "Check the boxes for any users for whom roles are to be deleted, and click 'Proceed'", |
delete => "Check the boxes for any users for whom roles are to be deleted, and click 'Proceed'", |
none => "Choose an action to take for selected users", |
none => "Choose an action to take for selected users", |
); |
); |
my $output = ' |
my $output = ' |
<script type="text/javascript"> |
<script type="text/javascript">'."\n"; |
var stdeditbrowser;'."\n"; |
|
$output .= <<"ENDONE"; |
$output .= <<"ENDONE"; |
function opendatebrowser(callingform,formname,calledby) { |
function opendatebrowser(callingform,formname,calledby) { |
var bulkaction = callingform.bulkaction.options[callingform.bulkaction.selectedIndex].value; |
var bulkaction = callingform.bulkaction.options[callingform.bulkaction.selectedIndex].value; |
if (bulkaction == 'revoke' || bulkaction == 'delete' || bulkaction == '') { |
|
if (calledby == 'go') { |
|
if (bulkaction == 'revoke') { |
|
alert("$nopopup{'revoke'}"); |
|
} |
|
if (bulkaction == 'delete') { |
|
alert("$nopopup{'delete'}"); |
|
} |
|
if (bulkaction == '') { |
|
alert("$nopopup{'none'}"); |
|
} |
|
} |
|
return; |
|
} |
|
var url = '/adm/createuser?'; |
var url = '/adm/createuser?'; |
var type = ''; |
var type = ''; |
var showrole = callingform.showrole.options[callingform.showrole.selectedIndex].value; |
var showrole = callingform.showrole.options[callingform.showrole.selectedIndex].value; |
Line 2748 END
|
Line 2891 END
|
setSections(formname); |
setSections(formname); |
if (seccheck == 'ok') { |
if (seccheck == 'ok') { |
opener.document.$callingform.newsecs.value = formname.sections.value; |
opener.document.$callingform.newsecs.value = formname.sections.value; |
window.close(); |
|
} |
} |
return; |
|
END |
END |
} else { |
} else { |
if ($context eq 'course') { |
if ($context eq 'course') { |
Line 2784 END
|
Line 2925 END
|
opener.document.$callingform.enddate_hour.value = formname.enddate_hour.options[formname.enddate_hour.selectedIndex].value; |
opener.document.$callingform.enddate_hour.value = formname.enddate_hour.options[formname.enddate_hour.selectedIndex].value; |
opener.document.$callingform.enddate_minute.value = formname.enddate_minute.value; |
opener.document.$callingform.enddate_minute.value = formname.enddate_minute.value; |
opener.document.$callingform.enddate_second.value = formname.enddate_second.value; |
opener.document.$callingform.enddate_second.value = formname.enddate_second.value; |
window.close(); |
if (formname.no_end_date.checked) { |
|
opener.document.$callingform.no_end_date.value = '1'; |
|
} else { |
|
opener.document.$callingform.no_end_date.value = '0'; |
|
} |
END |
END |
} |
} |
$output .= ' |
my $verify_action_js = &bulkaction_javascript($callingform,'popup'); |
|
$output .= <<"ENDJS"; |
|
verify_action('actionlist'); |
} |
} |
|
|
|
$verify_action_js |
|
|
</script> |
</script> |
'; |
ENDJS |
my %lt = &Apache::lonlocal::texthash ( |
my %lt = &Apache::lonlocal::texthash ( |
chac => 'Access dates to apply for selected users', |
chac => 'Access dates to apply for selected users', |
chse => 'Changes in section affiliation to apply to selected users', |
chse => 'Changes in section affiliation to apply to selected users', |
Line 2847 END
|
Line 2997 END
|
$output .= $info.$secbox; |
$output .= $info.$secbox; |
} |
} |
$output .= '<p>'. |
$output .= '<p>'. |
&mt('Use "Save" to update the main window with your selections.').'<br /><br />'. |
'<input type="button" name="dateselection" value="'.&mt('Make changes').'" onclick="javascript:saveselections(this.form)" /></p>'."\n". |
'<input type="button" name="dateselection" value="'.&mt('Save').'" onclick="javascript:saveselections(this.form)" /></p>'."\n". |
|
'</form>'; |
'</form>'; |
return $output; |
return $output; |
} |
} |
Line 2861 sub section_picker {
|
Line 3010 sub section_picker {
|
if ($mode eq 'upload') { |
if ($mode eq 'upload') { |
my ($options,$cb_script,$coursepick) = |
my ($options,$cb_script,$coursepick) = |
&default_role_selector($context,1); |
&default_role_selector($context,1); |
$secbox .= &Apache::lonhtmlcommon::row_title('role','LC_oddrow_value'). |
$secbox .= &Apache::lonhtmlcommon::row_title(&mt('role'),'LC_oddrow_value'). |
$options. &Apache::lonhtmlcommon::row_closure(1)."\n"; |
$options. &Apache::lonhtmlcommon::row_closure(1)."\n"; |
} |
} |
$secbox .= &Apache::lonhtmlcommon::row_title($rowtitle,'LC_oddrow_value')."\n"; |
$secbox .= &Apache::lonhtmlcommon::row_title($rowtitle,'LC_oddrow_value')."\n"; |
Line 2891 sub results_header_row {
|
Line 3040 sub results_header_row {
|
} |
} |
if ($context eq 'course') { |
if ($context eq 'course') { |
if ($mode eq 'csv' || $mode eq 'excel') { |
if ($mode eq 'csv' || $mode eq 'excel') { |
$description = &mt('Course - ').$env{'course.'.$env{'request.course.id'}.'.description'}.': '; |
$description = &mt('Course - [_1]:',$env{'course.'.$env{'request.course.id'}.'.description'}).' '; |
} |
} |
if ($statusmode eq 'Expired') { |
if ($statusmode eq 'Expired') { |
$description .= &mt('Users in course with expired [_1] roles',$showfilter); |
$description .= &mt('Users in course with expired [_1] roles',$showfilter); |
Line 2950 sub results_header_row {
|
Line 3099 sub results_header_row {
|
} |
} |
} elsif ($context eq 'author') { |
} elsif ($context eq 'author') { |
$description = |
$description = |
&mt('Author space for <span class="LC_cusr_emph">[_1]</span>', |
&mt('Author space for [_1]' |
&Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'})).': '; |
,'<span class="LC_cusr_emph">' |
|
.&Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}) |
|
.'</span>') |
|
.': '; |
if ($statusmode eq 'Expired') { |
if ($statusmode eq 'Expired') { |
$description .= &mt('Co-authors with expired [_1] roles',$showfilter); |
$description .= &mt('Co-authors with expired [_1] roles',$showfilter); |
} elsif ($statusmode eq 'Future') { |
} elsif ($statusmode eq 'Future') { |
Line 2967 sub results_header_row {
|
Line 3119 sub results_header_row {
|
} |
} |
} elsif ($context eq 'domain') { |
} elsif ($context eq 'domain') { |
my $domdesc = &Apache::lonnet::domain($env{'request.role.domain'},'description'); |
my $domdesc = &Apache::lonnet::domain($env{'request.role.domain'},'description'); |
$description = &mt('Domain - ').$domdesc.': '; |
$description = &mt('Domain - [_1]:',$domdesc).' '; |
if ($env{'form.roletype'} eq 'domain') { |
if ($env{'form.roletype'} eq 'domain') { |
if ($statusmode eq 'Expired') { |
if ($statusmode eq 'Expired') { |
$description .= &mt('Users in domain with expired [_1] roles',$showfilter); |
$description .= &mt('Users in domain with expired [_1] roles',$showfilter); |
Line 3222 sub print_first_users_upload_form {
|
Line 3374 sub print_first_users_upload_form {
|
$str .= '<input type="hidden" name="state" value="got_file" />'; |
$str .= '<input type="hidden" name="state" value="got_file" />'; |
$str .= "<h3>".&mt('Upload a file containing information about users')."</h3>\n"; |
$str .= "<h3>".&mt('Upload a file containing information about users')."</h3>\n"; |
$str .= &Apache::loncommon::upfile_select_html(); |
$str .= &Apache::loncommon::upfile_select_html(); |
$str .= "<p>\n"; |
$str .= '<p>'; |
$str .= '<input type="submit" name="fileupload" value="'. |
|
&mt('Upload file of users').'">'."\n"; |
|
$str .= '<label><input type="checkbox" name="noFirstLine" /> '. |
|
&mt('Ignore First Line')."</label></p>\n"; |
|
$str .= &Apache::loncommon::help_open_topic("Course_Create_Class_List", |
$str .= &Apache::loncommon::help_open_topic("Course_Create_Class_List", |
&mt("How do I create a users list from a spreadsheet")). |
&mt("How do I create a users list from a spreadsheet")). |
"<br />\n"; |
"<br />\n"; |
$str .= &Apache::loncommon::help_open_topic("Course_Convert_To_CSV", |
$str .= &Apache::loncommon::help_open_topic("Course_Convert_To_CSV", |
&mt("How do I create a CSV file from a spreadsheet")). |
&mt("How do I create a CSV file from a spreadsheet")); |
"<br />\n"; |
$str .= "</p>\n"; |
|
$str .= "<p>\n"; |
|
$str .= '<label><input type="checkbox" name="noFirstLine" /> '. |
|
&mt('Ignore First Line')."</label></p>\n"; |
|
$str .= '<input type="submit" name="fileupload" value="'. |
|
&mt('Go to next step').'">'."<br />\n"; |
$str .= &Apache::loncommon::end_page(); |
$str .= &Apache::loncommon::end_page(); |
$r->print($str); |
$r->print($str); |
return; |
return; |
Line 3262 sub upfile_drop_add {
|
Line 3415 sub upfile_drop_add {
|
# |
# |
# Store the field choices away |
# Store the field choices away |
foreach my $field (qw/username names |
foreach my $field (qw/username names |
fname mname lname gen id sec ipwd email role/) { |
fname mname lname gen id sec ipwd email role domain/) { |
$env{'form.'.$field.'_choice'}=$fields{$field}; |
$env{'form.'.$field.'_choice'}=$fields{$field}; |
} |
} |
&Apache::loncommon::store_course_settings('enrollment_upload', |
&Apache::loncommon::store_course_settings('enrollment_upload', |
Line 3276 sub upfile_drop_add {
|
Line 3429 sub upfile_drop_add {
|
'sec_choice' => 'scalar', |
'sec_choice' => 'scalar', |
'ipwd_choice' => 'scalar', |
'ipwd_choice' => 'scalar', |
'email_choice' => 'scalar', |
'email_choice' => 'scalar', |
'role_choice' => 'scalar' }); |
'role_choice' => 'scalar', |
|
'domain_choice' => 'scalar'}); |
# |
# |
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,$context)); |
$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 $defdom=$env{'request.role.domain'}; |
|
my $domain; |
|
if ($env{'form.defaultdomain'} ne '') { |
|
$domain = $env{'form.defaultdomain'}; |
|
} else { |
|
$domain = $defdom; |
|
} |
my $desiredhost = $env{'form.lcserver'}; |
my $desiredhost = $env{'form.lcserver'}; |
if (lc($desiredhost) eq 'default') { |
if (lc($desiredhost) eq 'default') { |
$desiredhost = undef; |
$desiredhost = undef; |
} else { |
} else { |
my %home_servers = &Apache::lonnet::get_servers($domain,'library'); |
my %home_servers = &Apache::lonnet::get_servers($defdom,'library'); |
if (! exists($home_servers{$desiredhost})) { |
if (! exists($home_servers{$desiredhost})) { |
$r->print('<span class="LC_error">'.&mt('Error'). |
$r->print('<span class="LC_error">'.&mt('Error'). |
&mt('Invalid home server specified').'</span>'); |
&mt('Invalid home server specified').'</span>'); |
Line 3373 sub upfile_drop_add {
|
Line 3533 sub upfile_drop_add {
|
if ($context eq 'course') { |
if ($context eq 'course') { |
my ($cnum,$cdom) = &get_course_identity(); |
my ($cnum,$cdom) = &get_course_identity(); |
my $roster = &Apache::loncoursedata::get_classlist(); |
my $roster = &Apache::loncoursedata::get_classlist(); |
%userlist = %{$roster}; |
if (ref($roster) eq 'HASH') { |
|
%userlist = %{$roster}; |
|
} |
my %advrolehash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef, |
my %advrolehash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef, |
\@statuses,\@poss_roles); |
\@statuses,\@poss_roles); |
&gather_userinfo($context,'view',\%userlist,$indexhash,\%info, |
&gather_userinfo($context,'view',\%userlist,$indexhash,\%info, |
Line 3479 sub upfile_drop_add {
|
Line 3641 sub upfile_drop_add {
|
'</b>'); |
'</b>'); |
next; |
next; |
} else { |
} else { |
|
if ($entries{$fields{'domain'}} |
|
ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) { |
|
$r->print('<br />'. '<b>'.$entries{$fields{'domain'}}. |
|
'</b>: '.&mt('Unacceptable domain for user [_2] [_3] [_4] [_5]',$fname,$mname,$lname,$gen).'</b>'); |
|
next; |
|
} |
my $username = $entries{$fields{'username'}}; |
my $username = $entries{$fields{'username'}}; |
|
my $userdomain = $entries{$fields{'domain'}}; |
|
if ($userdomain eq '') { |
|
$userdomain = $domain; |
|
} |
if (defined($fields{'sec'})) { |
if (defined($fields{'sec'})) { |
if (defined($entries{$fields{'sec'}})) { |
if (defined($entries{$fields{'sec'}})) { |
$entries{$fields{'sec'}} =~ s/\W//g; |
$entries{$fields{'sec'}} =~ s/\W//g; |
Line 3497 sub upfile_drop_add {
|
Line 3669 sub upfile_drop_add {
|
} |
} |
if ($env{'request.course.sec'} ne '') { |
if ($env{'request.course.sec'} ne '') { |
@secs = ($env{'request.course.sec'}); |
@secs = ($env{'request.course.sec'}); |
if (ref($userlist{$username.':'.$domain}) eq 'ARRAY') { |
if (ref($userlist{$username.':'.$userdomain}) eq 'ARRAY') { |
my $currsec = $userlist{$username.':'.$domain}[$secidx]; |
my $currsec = $userlist{$username.':'.$userdomain}[$secidx]; |
if ($currsec ne $env{'request.course.sec'}) { |
if ($currsec ne $env{'request.course.sec'}) { |
$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 />'); |
$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 />'); |
if ($currsec eq '') { |
if ($currsec eq '') { |
Line 3560 sub upfile_drop_add {
|
Line 3732 sub upfile_drop_add {
|
$role = $defaultrole; |
$role = $defaultrole; |
} |
} |
# Clean up whitespace |
# Clean up whitespace |
foreach (\$domain,\$username,\$id,\$fname,\$mname, |
foreach (\$id,\$fname,\$mname,\$lname,\$gen) { |
\$lname,\$gen) { |
|
$$_ =~ s/(\s+$|^\s+)//g; |
$$_ =~ s/(\s+$|^\s+)//g; |
} |
} |
# check against rules |
# check against rules |
my $checkid = 0; |
my $checkid = 0; |
my $newuser = 0; |
my $newuser = 0; |
my (%rulematch,%inst_results,%idinst_results); |
my (%rulematch,%inst_results,%idinst_results); |
my $uhome=&Apache::lonnet::homeserver($username,$domain); |
my $uhome=&Apache::lonnet::homeserver($username,$userdomain); |
if ($uhome eq 'no_host') { |
if ($uhome eq 'no_host') { |
|
next if ($userdomain ne $domain); |
$checkid = 1; |
$checkid = 1; |
$newuser = 1; |
$newuser = 1; |
my $checkhash; |
my $checkhash; |
Line 3585 sub upfile_drop_add {
|
Line 3757 sub upfile_drop_add {
|
} |
} |
} else { |
} else { |
if ($context eq 'course' || $context eq 'author') { |
if ($context eq 'course' || $context eq 'author') { |
if ($role eq '') { |
if ($userdomain eq $domain ) { |
my @checkroles; |
if ($role eq '') { |
foreach my $role (@poss_roles) { |
my @checkroles; |
my $endkey; |
foreach my $role (@poss_roles) { |
if ($role ne 'st') { |
my $endkey; |
$endkey = ':'.$role; |
if ($role ne 'st') { |
} |
$endkey = ':'.$role; |
if (exists($userlist{$username.':'.$domain.$endkey})) { |
} |
if (!grep(/^\Q$role\E$/,@checkroles)) { |
if (exists($userlist{$username.':'.$userdomain.$endkey})) { |
push(@checkroles,$role); |
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}}; |
} |
} |
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); |
my @newinfo = (\$fname,\$mname,\$lname,\$gen,\$email,\$id); |
for (my $i=0; $i<@userinfo; $i++) { |
for (my $i=0; $i<@userinfo; $i++) { |
if (${$newinfo[$i]} ne '') { |
if (${$newinfo[$i]} ne '') { |
if (!$canmodify{$userinfo[$i]}) { |
if (!$canmodify{$userinfo[$i]}) { |
${$newinfo[$i]} = ''; |
${$newinfo[$i]} = ''; |
} |
} |
} |
} |
} |
} |
} |
} |
} |
if ($id ne '') { |
if ($id ne '') { |
if (!$newuser) { |
if (!$newuser) { |
my %idhash = &Apache::lonnet::idrget($domain,($username)); |
my %idhash = &Apache::lonnet::idrget($userdomain,($username)); |
if ($idhash{$username} ne $id) { |
if ($idhash{$username} ne $id) { |
$checkid = 1; |
$checkid = 1; |
} |
} |
Line 3624 sub upfile_drop_add {
|
Line 3798 sub upfile_drop_add {
|
if ($checkid) { |
if ($checkid) { |
my $checkhash; |
my $checkhash; |
my $checks = { 'id' => 1 }; |
my $checks = { 'id' => 1 }; |
$checkhash->{$username.':'.$domain} = { 'newuser' => $newuser, |
$checkhash->{$username.':'.$userdomain} = { 'newuser' => $newuser, |
'id' => $id }; |
'id' => $id }; |
&Apache::loncommon::user_rule_check($checkhash,$checks, |
&Apache::loncommon::user_rule_check($checkhash,$checks, |
\%alerts,\%rulematch,\%idinst_results,\%curr_rules, |
\%alerts,\%rulematch,\%idinst_results,\%curr_rules, |
\%got_rules); |
\%got_rules); |
if (ref($alerts{'id'}) eq 'HASH') { |
if (ref($alerts{'id'}) eq 'HASH') { |
if (ref($alerts{'id'}{$domain}) eq 'HASH') { |
if (ref($alerts{'id'}{$userdomain}) eq 'HASH') { |
next if ($alerts{'id'}{$domain}{$id}); |
next if ($alerts{'id'}{$userdomain}{$id}); |
} |
} |
} |
} |
} |
} |
Line 3646 sub upfile_drop_add {
|
Line 3820 sub upfile_drop_add {
|
if (@secs > 0) { |
if (@secs > 0) { |
$sec = $secs[0]; |
$sec = $secs[0]; |
} |
} |
&modifystudent($domain,$username,$cid,$sec, |
&modifystudent($userdomain,$username,$cid,$sec, |
$desiredhost); |
$desiredhost,$context); |
$roleresult = |
$roleresult = |
&Apache::lonnet::modifystudent |
&Apache::lonnet::modifystudent |
($domain,$username,$id,$amode,$password, |
($userdomain,$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 3668 sub upfile_drop_add {
|
Line 3843 sub upfile_drop_add {
|
foreach my $sec (@secs) { |
foreach my $sec (@secs) { |
($userres{$sec},$authres{$sec},$roleres{$sec},$idres{$sec}) = |
($userres{$sec},$authres{$sec},$roleres{$sec},$idres{$sec}) = |
&modifyuserrole($context,$setting, |
&modifyuserrole($context,$setting, |
$changeauth,$cid,$domain,$username, |
$changeauth,$cid,$userdomain,$username, |
$id,$amode,$password,$fname, |
$id,$amode,$password,$fname, |
$mname,$lname,$gen,$sec, |
$mname,$lname,$gen,$sec, |
$env{'form.forceid'},$desiredhost, |
$env{'form.forceid'},$desiredhost, |
Line 3684 sub upfile_drop_add {
|
Line 3859 sub upfile_drop_add {
|
if (!$multiple) { |
if (!$multiple) { |
($userresult,$authresult,$roleresult,$idresult) = |
($userresult,$authresult,$roleresult,$idresult) = |
&modifyuserrole($context,$setting, |
&modifyuserrole($context,$setting, |
$changeauth,$cid,$domain,$username, |
$changeauth,$cid,$userdomain,$username, |
$id,$amode,$password,$fname, |
$id,$amode,$password,$fname, |
$mname,$lname,$gen,$singlesec, |
$mname,$lname,$gen,$singlesec, |
$env{'form.forceid'},$desiredhost, |
$env{'form.forceid'},$desiredhost, |
Line 3696 sub upfile_drop_add {
|
Line 3871 sub upfile_drop_add {
|
$flushc = |
$flushc = |
&user_change_result($r,$userres{$sec},$authres{$sec}, |
&user_change_result($r,$userres{$sec},$authres{$sec}, |
$roleres{$sec},$idres{$sec},\%counts,$flushc, |
$roleres{$sec},$idres{$sec},\%counts,$flushc, |
$username,\%userchg); |
$username,$userdomain,\%userchg); |
|
|
} |
} |
} else { |
} else { |
$flushc = |
$flushc = |
&user_change_result($r,$userresult,$authresult, |
&user_change_result($r,$userresult,$authresult, |
$roleresult,$idresult,\%counts,$flushc, |
$roleresult,$idresult,\%counts,$flushc, |
$username,\%userchg); |
$username,$userdomain,\%userchg); |
} |
} |
} else { |
} else { |
if ($context eq 'course') { |
if ($context eq 'course') { |
Line 3751 sub upfile_drop_add {
|
Line 3926 sub upfile_drop_add {
|
'<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'. |
'<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'. |
&mt('There are no students with current/future access to the course.'). |
&mt('There are no students with current/future access to the course.'). |
'</form>'."\n"); |
'</form>'."\n"); |
} else { |
} elsif (ref($classlist) eq 'HASH') { |
# Remove the students we just added from the list of students. |
# Remove the students we just added from the list of students. |
foreach my $line (@userdata) { |
foreach my $line (@userdata) { |
my %entries=&Apache::loncommon::record_sep($line); |
my %entries=&Apache::loncommon::record_sep($line); |
Line 3813 sub print_namespacing_alerts {
|
Line 3988 sub print_namespacing_alerts {
|
|
|
sub user_change_result { |
sub user_change_result { |
my ($r,$userresult,$authresult,$roleresult,$idresult,$counts,$flushc, |
my ($r,$userresult,$authresult,$roleresult,$idresult,$counts,$flushc, |
$username,$userchg) = @_; |
$username,$userdomain,$userchg) = @_; |
my $okresult = 0; |
my $okresult = 0; |
if ($userresult ne 'ok') { |
if ($userresult ne 'ok') { |
if ($userresult =~ /^error:(.+)$/) { |
if ($userresult =~ /^error:(.+)$/) { |
my $error = $1; |
my $error = $1; |
$r->print('<br />'. |
$r->print('<br />'. |
&mt('<b>[_1]</b>: Unable to add/modify: [_2]',$username,$error)); |
&mt('<b>[_1]</b>: Unable to add/modify: [_2]',$username.':'.$userdomain,$error)); |
} |
} |
} else { |
} else { |
$counts->{'user'} ++; |
$counts->{'user'} ++; |
Line 3829 sub user_change_result {
|
Line 4004 sub user_change_result {
|
if ($authresult =~ /^error:(.+)$/) { |
if ($authresult =~ /^error:(.+)$/) { |
my $error = $1; |
my $error = $1; |
$r->print('<br />'. |
$r->print('<br />'. |
&mt('<b>[_1]</b>: Unable to modify authentication: [_2]',$username,$error)); |
&mt('<b>[_1]</b>: Unable to modify authentication: [_2]',$username.':'.$userdomain,$error)); |
} |
} |
} else { |
} else { |
$counts->{'auth'} ++; |
$counts->{'auth'} ++; |
Line 3839 sub user_change_result {
|
Line 4014 sub user_change_result {
|
if ($roleresult =~ /^error:(.+)$/) { |
if ($roleresult =~ /^error:(.+)$/) { |
my $error = $1; |
my $error = $1; |
$r->print('<br />'. |
$r->print('<br />'. |
&mt('<b>[_1]</b>: Unable to add role: [_2]',$username,$error)); |
&mt('<b>[_1]</b>: Unable to add role: [_2]',$username.':'.$userdomain,$error)); |
} |
} |
} else { |
} else { |
$counts->{'role'} ++; |
$counts->{'role'} ++; |
Line 3847 sub user_change_result {
|
Line 4022 sub user_change_result {
|
} |
} |
if ($okresult) { |
if ($okresult) { |
$flushc++; |
$flushc++; |
$userchg->{$username}=1; |
$userchg->{$username.':'.$userdomain}=1; |
$r->print('. '); |
$r->print('. '); |
if ($flushc>15) { |
if ($flushc>15) { |
$r->rflush; |
$r->rflush; |
Line 3959 sub update_user_list {
|
Line 4134 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 3985 sub update_user_list {
|
Line 4161 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 4019 sub update_user_list {
|
Line 4195 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 4028 sub update_user_list {
|
Line 4205 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 4048 sub update_user_list {
|
Line 4227 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 4126 sub classlist_drop {
|
Line 4305 sub classlist_drop {
|
my ($scope,$uname,$udom,$now) = @_; |
my ($scope,$uname,$udom,$now) = @_; |
my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)}); |
my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)}); |
if (&Apache::lonnet::is_course($cdom,$cnum)) { |
if (&Apache::lonnet::is_course($cdom,$cnum)) { |
my $user = $uname.':'.$udom; |
|
if (!&active_student_roles($cnum,$cdom,$uname,$udom)) { |
if (!&active_student_roles($cnum,$cdom,$uname,$udom)) { |
my $result = |
my %user; |
&Apache::lonnet::cput('classlist', |
my $result = &update_classlist($cdom,$cnum,$udom,$uname,\%user,$now); |
{ $user => $now },$cdom,$cnum); |
|
return &mt('Drop from classlist: [_1]', |
return &mt('Drop from classlist: [_1]', |
'<b>'.$result.'</b>').'<br />'; |
'<b>'.$result.'</b>').'<br />'; |
} |
} |
Line 4197 sub set_login {
|
Line 4374 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 4215 sub course_sections {
|
Line 4404 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>'; |
Line 4412 sub can_modify_userinfo {
|
Line 4611 sub can_modify_userinfo {
|
if (ref($userroles) eq 'ARRAY') { |
if (ref($userroles) eq 'ARRAY') { |
foreach my $role (@{$userroles}) { |
foreach my $role (@{$userroles}) { |
my $testrole; |
my $testrole; |
if ($role =~ /^cr\//) { |
if ($context eq 'selfcreate') { |
$testrole = 'cr'; |
|
} else { |
|
$testrole = $role; |
$testrole = $role; |
|
} else { |
|
if ($role =~ /^cr\//) { |
|
$testrole = 'cr'; |
|
} else { |
|
$testrole = $role; |
|
} |
} |
} |
if (ref($domconfig{'usermodification'}{$context}{$testrole}) eq 'HASH') { |
if (ref($domconfig{'usermodification'}{$context}{$testrole}) eq 'HASH') { |
if ($domconfig{'usermodification'}{$context}{$testrole}{$field}) { |
if ($domconfig{'usermodification'}{$context}{$testrole}{$field}) { |