loncom/interface/lonuserutils.pm - diff

Return to lonuserutils.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonuserutils.pm between versions 1.60 and 1.96

version 1.60, 2008/07/12 23:56:13	version 1.96, 2009/08/03 16:26:09
Line 86 sub modifystudent {	Line 86 sub modifystudent {
sub modifyuserrole {	sub modifyuserrole {
my ($context,$setting,$changeauth,$cid,$udom,$uname,$uid,$umode,$upass,	my ($context,$setting,$changeauth,$cid,$udom,$uname,$uid,$umode,$upass,
$first,$middle,$last,$gene,$sec,$forceid,$desiredhome,$email,$role,	$first,$middle,$last,$gene,$sec,$forceid,$desiredhome,$email,$role,
$end,$start,$checkid) = @_;	$end,$start,$checkid,$inststatus) = @_;
my ($scope,$userresult,$authresult,$roleresult,$idresult);	my ($scope,$userresult,$authresult,$roleresult,$idresult);
if ($setting eq 'course' \|\| $context eq 'course') {	if ($setting eq 'course' \|\| $context eq 'course') {
$scope = '/'.$cid;	$scope = '/'.$cid;
Line 124 sub modifyuserrole {	Line 124 sub modifyuserrole {
$userresult =	$userresult =
&Apache::lonnet::modifyuser($udom,$uname,$uid,$umode,$upass,$first,	&Apache::lonnet::modifyuser($udom,$uname,$uid,$umode,$upass,$first,
$middle,$last,$gene,$forceid,$desiredhome,	$middle,$last,$gene,$forceid,$desiredhome,
$email,$role,$start,$end);	$email,$inststatus);
if ($userresult eq 'ok') {	if ($userresult eq 'ok') {
if ($role ne '') {	if ($role ne '') {
$role =~ s/_/\//g;	$role =~ s/_/\//g;
Line 169 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 180 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 328 sub print_upload_manager_header {
&javascript_validations('upload',$krbdefdom,$password_choice,undef,	&javascript_validations('upload',$krbdefdom,$password_choice,undef,
$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('<p>'
"<br />\n");	.&mt('Total number of records found in file: [_1]'
	,'<b>'.$distotal.'</b>')
	."</p>\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");
$r->print(&mt('Enter as many fields as you can.<br /> The system will inform you and bring you back to this page, <br /> if the data selected are insufficient to add users.')."<br />\n");	$r->print(&mt('Enter as many fields as you can.<br /> The system will inform you and bring you back to this page, <br /> if the data selected are insufficient to add users.')."<br />\n");
Line 319 sub print_upload_manager_header {	Line 343 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 /><label><input type="checkbox" name="noFirstLine"'.$checked.' />'.
	&mt('Ignore First Line').'</label><br />');
$r->print('<br /><input type="button" value="'.&mt('Reverse Association').'" '.	$r->print('<br /><input type="button" value="'.&mt('Reverse Association').'" '.
'name="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>');	'// <![CDATA['."\n".
	$javascript."\n".$javascript_validations."\n".
	'// ]]>'."\n".
	'</script>');
}	}

###############################################################	###############################################################
Line 379 sub javascript_validations {	Line 406 sub javascript_validations {
krb => 'You need to specify the Kerberos domain.',	krb => 'You need to specify the Kerberos domain.',
ipass => 'You need to specify the initial password.',	ipass => 'You need to specify the initial password.',
name => 'The optional name field was not specified.',	name => 'The optional name field was not specified.',
snum => 'The optional ID number field was not specified.',	snum => 'The optional student/employee ID field was not specified.',
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 e-mail 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.',	domain => 'The optional domain field was not specified.',
continue => 'Continue adding users?',	continue => 'Continue adding users?',
);	);
	if (($mode eq 'upload') && ($context eq 'domain')) {
	$alert{'inststatus'} = &mt('The optional affiliation field was not specified');
	}
my $function_name = <<"END";	my $function_name = <<"END";
$setsections_js	$setsections_js

function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain) {	function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain,foundinststatus) {
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 516 END	Line 546 END
}	}
message+='$alert{'domain'}';	message+='$alert{'domain'}';
}	}
	END
	if (($mode eq 'upload') && ($context eq 'domain')) {
	$optional_checks .= (<<END);

	if (foundinststatus==0) {
	if (message!='') {
	message+='\\n';
	}
	message+='$alert{'inststatus'}';
	}
	END
	}
	$optional_checks .= (<<END);

if (message!='') {	if (message!='') {
message+= '\\n$alert{'continue'}';	message+= '\\n$alert{'continue'}';
if (confirm(message)) {	if (confirm(message)) {
Line 546 function verify(vf,sec_caller) {	Line 590 function verify(vf,sec_caller) {
var foundemail=0;	var foundemail=0;
var foundrole=0;	var foundrole=0;
var founddomain=0;	var founddomain=0;
	var foundinststatus=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 557 function verify(vf,sec_caller) {	Line 602 function verify(vf,sec_caller) {
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; }	if (tw==12) { founddomain=1; }
	if (tw==13) { foundinststatus=1; }
}	}
verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddom);	verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain,foundinststatus);
}	}

//	//
Line 580 function verify(vf,sec_caller) {	Line 626 function verify(vf,sec_caller) {
// 10 = email address	// 10 = email address
// 11 = role	// 11 = role
// 12 = domain	// 12 = domain
	// 13 = inststatus

function flip(vf,tf) {	function flip(vf,tf) {
var nw=eval('vf.f'+tf+'.selectedIndex');	var nw=eval('vf.f'+tf+'.selectedIndex');
Line 644 function verify(vf,sec_caller) {	Line 691 function verify(vf,sec_caller) {
var foundsec=0;	var foundsec=0;
var foundrole=0;	var foundrole=0;
var founddomain=0;	var founddomain=0;
	var foundinststatus=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 654 function verify(vf,sec_caller) {	Line 702 function verify(vf,sec_caller) {
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; }	if (i==10 && tw!=0) { founddomain=1; }
	if (i==13 && tw!=0) { foundinstatus=1; }
}	}
verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundrole,founddomain);	verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundrole,founddomain,foundinststatus);
}	}

function flip(vf,tf) {	function flip(vf,tf) {
Line 713 sub print_upload_manager_footer {	Line 762 sub print_upload_manager_footer {
my $locform = &Apache::loncommon::authform_local(%param);	my $locform = &Apache::loncommon::authform_local(%param);
my $date_table = &date_setting_table(undef,undef,$context,undef,	my $date_table = &date_setting_table(undef,undef,$context,undef,
$formname,$permission);	$formname,$permission);

my $Str = "\n".'<div class="LC_left_float">';	my $Str = "\n".'<div class="LC_left_float">';
$Str .= &hidden_input('nfields',$i);	$Str .= &hidden_input('nfields',$i);
$Str .= &hidden_input('keyfields',$keyfields);	$Str .= &hidden_input('keyfields',$keyfields);
$Str .= "<h3>".&mt('Login Type')."</h3>\n";
	$Str .= '<h3>'.&mt('Options').'</h3>'
	.&Apache::lonhtmlcommon::start_pick_box();

	$Str .= &Apache::lonhtmlcommon::row_title(&mt('Login Type'));
if ($context eq 'domain') {	if ($context eq 'domain') {
$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>';	$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 class="LC_info">'."\n".
&mt('Note: this will not take effect if the user already exists').	&mt('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";
}	}
$Str .= &set_login($defdom,$krbform,$intform,$locform);	$Str .= &set_login($defdom,$krbform,$intform,$locform)
	.&Apache::lonhtmlcommon::row_closure();

my ($home_server_pick,$numlib) =	my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($defdom,'lcserver',	&Apache::loncommon::home_server_form_item($defdom,'lcserver',
'default','hide');	'default','hide');
	#FIXME: Broken?!? $home_server_pick returns empty value on prod (2.8.1) and on dev server. SB 2009-08-03
if ($numlib > 1) {	if ($numlib > 1) {
$Str .= '<h3>'.&mt('LON-CAPA Home Server for New Users')."</h3>\n".	$Str .= &Apache::lonhtmlcommon::row_title(
&mt('LON-CAPA domain: [_1] with home server: [_2]',$defdom,	&mt('LON-CAPA Home Server for New Users'))
$home_server_pick).'<br />';	.&mt('LON-CAPA domain: [_1] with home server:','"'.$defdom.'"')
} else {	.$home_server_pick
$Str .= $home_server_pick;	.&Apache::lonhtmlcommon::row_closure();
}	} else {
$Str .= '<h3>'.&mt('Default domain').'</h3>'."\n".	$Str .= &Apache::lonhtmlcommon::row_title(&mt('Home Server'))
&Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1);	.$home_server_pick
$Str .= '<h3>'.&mt('Starting and Ending Dates').	.&Apache::lonhtmlcommon::row_closure();
"</h3>\n";	}
$Str .= "<p>\n".$date_table."</p>\n";
	$Str .= &Apache::lonhtmlcommon::row_title(&mt('Default domain'))
	.&Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1)
	.&Apache::lonhtmlcommon::row_closure();

	$Str .= &Apache::lonhtmlcommon::row_title(&mt('Starting and Ending Dates'))
	."<p>\n".$date_table."</p>\n"
	.&Apache::lonhtmlcommon::row_closure();

if ($context eq 'domain') {	if ($context eq 'domain') {
$Str .= '<h3>'.&mt('Settings for assigning roles:').'</h3>'."\n".	$Str .= &Apache::lonhtmlcommon::row_title(
&mt('Pick the action to take on roles for these users:').'<br /><span class="LC_nobreak"><label><input type="radio" name="roleaction" value="norole" checked="checked" /> '.&mt('No role changes').'</label>   <label><input type="radio" name="roleaction" value="domain" /> '.&mt('Add a domain role').'</label>   <label><input type="radio" name="roleaction" value="course" /> '.&mt('Add a course role').'</label></span>';	&mt('Settings for assigning roles'))
}	.&mt('Pick the action to take on roles for these users:').'<br />'
if ($context eq 'author') {	.'<span class="LC_nobreak"><label>'
$Str .= '<h3>'.&mt('Default role')."</h3>\n".	.'<input type="radio" name="roleaction" value="norole" checked="checked" />'
&mt('Choose the role to assign to users without a value specified in the uploaded file');	.' '.&mt('No role changes').'</label>'
	.'   <label>'
	.'<input type="radio" name="roleaction" value="domain" />'
	.' '.&mt('Add a domain role').'</label>'
	.'   <label>'
	.'<input type="radio" name="roleaction" value="course" />'
	.' '.&mt('Add a course role').'</label>'
	.'</span>';
	} elsif ($context eq 'author') {
	$Str .= &Apache::lonhtmlcommon::row_title(
	&mt('Default role'))
	.&mt('Choose the role to assign to users without a value specified in the uploaded file.')
} elsif ($context eq 'course') {	} elsif ($context eq 'course') {
$Str .= '<h3>'.&mt('Default role and section')."</h3>\n".	$Str .= &Apache::lonhtmlcommon::row_title(
&mt('Choose the role and/or section(s) to assign to users without values specified in the uploaded file');	&mt('Default role and section'))
} else {	.&mt('Choose the role and/or section(s) to assign to users without values specified in the uploaded file.');
$Str .= '<br /><br /><b>'.&mt('Default role and/or section(s)')."</b><br />\n".	} else {
&mt('Role and/or section(s) for users without values specified in the uploaded file.');	$Str .= &Apache::lonhtmlcommon::row_title(
	&mt('Default role and/or section(s)'))
	.&mt('Role and/or section(s) for users without values specified in the uploaded file.');
}	}
$Str .= '<br />';
if (($context eq 'domain') \|\| ($context eq 'author')) {	if (($context eq 'domain') \|\| ($context eq 'author')) {
	$Str .= '<br />';
my ($options,$cb_script,$coursepick) = &default_role_selector($context,1);	my ($options,$cb_script,$coursepick) = &default_role_selector($context,1);
if ($context eq 'domain') {	if ($context eq 'domain') {
$Str .= '<span class="LC_role_level">'.&mt('Domain Level').'</span><br />'.$options.'<br /><br /><span class="LC_role_level">'.&mt('Course Level').'</span><br />'.$cb_script.$coursepick;	$Str .= '<p>'
	.'<b>'.&mt('Domain Level').'</b><br />'
	.$options
	.'</p><p>'
	.'<b>'.&mt('Course Level').'</b>'
	.'</p>'
	.$cb_script.$coursepick
	.&Apache::lonhtmlcommon::row_closure();
} elsif ($context eq 'author') {	} elsif ($context eq 'author') {
$Str .= $options;	$Str .= $options
	.&Apache::lonhtmlcommon::row_closure(1); # last row in pick_box
}	}
} else {	} else {
my ($cnum,$cdom) = &get_course_identity();	my ($cnum,$cdom) = &get_course_identity();
my $rowtitle = &mt('section');	my $rowtitle = &mt('section');
my $secbox = &section_picker($cdom,$cnum,'Any',$rowtitle,	my $secbox = &section_picker($cdom,$cnum,'Any',$rowtitle,
$permission,$context,'upload');	$permission,$context,'upload');
$Str .= $secbox."<h3>".&mt('Full Update')."</h3>\n".	$Str .= $secbox
'<p><label><input type="checkbox" name="fullup" value="yes">'.	.&Apache::lonhtmlcommon::row_closure();
' '.&mt('Display students with current/future access who are not in the uploaded file.').'</label><br />'.&mt('Students selected from this list can be dropped.').'</p>'."\n";
	$Str .= &Apache::lonhtmlcommon::row_title(&mt('Full Update'))
	.'<label><input type="checkbox" name="fullup" value="yes" />'.
	' '.&mt('Display students with current/future access who are not in the uploaded file.')
	.'</label><br />'
	.&mt('Students selected from this list can be dropped.')
	.&Apache::lonhtmlcommon::row_closure();
}	}
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)" '.	$Str .= &Apache::lonhtmlcommon::end_pick_box();
'value="'.&mt('Update Users').'" />'."<br />\n";
if ($context eq 'course') {
$Str .= &mt('Note: for large courses, this operation may be time '.
'consuming');
}
$Str .= '</div>';	$Str .= '</div>';

	# Footer
	$Str .= '<div class="LC_clear_float_footer">'
	.'<hr />';
	if ($context eq 'course') {
	$Str .= '<p class="LC_info">'
	.&mt('Note: For large courses, this operation may be time consuming.')
	.'</p>';
	}
	$Str .= '<p><input type="button"'
	.' onclick="javascript:verify(this.form,this.form.csec)"'
	.' value="'.&mt('Update Users').'" />'
	.'</p>'."\n"
	.'</div>';
$r->print($Str);	$r->print($Str);
return;	return;
}	}
Line 790 sub print_upload_manager_footer {	Line 900 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".	&Apache::lonhtmlcommon::row_title(&mt('Student/Employee ID'))
"<p>\n".'<label><input type="checkbox" name="forceid" value="yes">'.	.'<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 .= &Apache::lonhtmlcommon::row_closure(1); # last row in pick_box
return $output;	return $output;
}	}

Line 839 sub print_upload_manager_form {	Line 949 sub print_upload_manager_form {
'email_choice' => 'scalar',	'email_choice' => 'scalar',
'role_choice' => 'scalar',	'role_choice' => 'scalar',
'domain_choice' => 'scalar',	'domain_choice' => 'scalar',
	'inststatus_choice' => 'scalar',
};	};
my $defdom = $env{'request.role.domain'};	my $defdom = $env{'request.role.domain'};
if ($context eq 'course') {	if ($context eq 'course') {
Line 865 sub print_upload_manager_form {	Line 976 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'}]);	['domain',&mt('Domain'), $env{'form.domain_choice'}],
	['inststatus',&mt('Affiliation'), $env{'form.inststatus_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 988 sub date_setting_table {	Line 1100 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 1073 sub default_role_selector {	Line 1185 sub default_role_selector {
'<th>'.$lt{'grs'}.'</th>'.	'<th>'.$lt{'grs'}.'</th>'.
&Apache::loncommon::end_data_table_header_row().	&Apache::loncommon::end_data_table_header_row().
&Apache::loncommon::start_data_table_row()."\n".	&Apache::loncommon::start_data_table_row()."\n".
'<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'studentform','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".	'<td><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'studentform','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
'<td><select name="courserole">'."\n".	'<td><select name="courserole">'."\n".
&default_course_roles($context,$checkpriv,%customroles)."\n".	&default_course_roles($context,$checkpriv,%customroles)."\n".
'</select></td><td>'.	'</select></td><td>'.
Line 1266 sub print_userlist {	Line 1378 sub print_userlist {
'html' => 'HTML');	'html' => 'HTML');
my $output_selector = '<select size="1" name="output" >';	my $output_selector = '<select size="1" name="output" >';
foreach my $outputformat ('html','csv','excel') {	foreach my $outputformat ('html','csv','excel') {
my $option = '<option value="'.$outputformat.'" ';	my $option = '<option value="'.$outputformat.'"';
if ($outputformat eq $env{'form.output'}) {	if ($outputformat eq $env{'form.output'}) {
$option .= 'selected ';	$option .= ' selected="selected"';
}	}
$option .='>'.$lt{$outputformat}.'</option>';	$option .='>'.$lt{$outputformat}.'</option>';
$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 ($cnum,$cdom);	my ($cnum,$cdom);
$r->print(&role_filter($context));	$r->print(&role_filter($context));
Line 1287 sub print_userlist {	Line 1403 sub print_userlist {
($cnum,$cdom) = &get_course_identity();	($cnum,$cdom) = &get_course_identity();
$r->print(&section_group_filter($cnum,$cdom));	$r->print(&section_group_filter($cnum,$cdom));
}	}
	if ($env{'form.phase'} eq '') {
	$r->print('<br /><br />'.&list_submit_button(&mt('Display List of Users')).
	"\n</p>\n".
	'<input type="hidden" name="phase" value="" /></form>');
	return;
	}
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')).
"\n</p>\n");	"\n</p>\n");
Line 1316 sub print_userlist {	Line 1438 sub print_userlist {
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 1450 sub print_userlist {	Line 1574 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="'.
Line 1462 sub role_filter {	Line 1589 sub role_filter {
my $output;	my $output;
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);	my ($role_select);
if ($context eq 'domain') {	if ($context eq 'domain') {
$role_select = &domain_roles_select();	$role_select = &domain_roles_select();
$output = '<label>'.&mt('Role Type: [_1]',$role_select).'</label>';	$output = '<label><span class="LC_nobreak">'
	.&mt('Role Type: [_1]',$role_select)
	.'</span></label>';
} else {	} else {
$role_select = '<select name="showrole">'."\n".	$role_select = '<select name="showrole">'."\n".
'<option value="Any" '.$roleselected.'>'.	'<option value="Any" '.$roleselected.'>'.
Line 1476 sub role_filter {	Line 1605 sub role_filter {
foreach my $role (@poss_roles) {	foreach my $role (@poss_roles) {
$roleselected = '';	$roleselected = '';
if ($role eq $env{'form.showrole'}) {	if ($role eq $env{'form.showrole'}) {
$roleselected = ' selected="selected" ';	$roleselected = ' selected="selected"';
}	}
my $plrole;	my $plrole;
if ($role eq 'cr') {	if ($role eq 'cr') {
Line 1487 sub role_filter {	Line 1616 sub role_filter {
$role_select .= '<option value="'.$role.'"'.$roleselected.'>'.$plrole.'</option>';	$role_select .= '<option value="'.$role.'"'.$roleselected.'>'.$plrole.'</option>';
}	}
$role_select .= '</select>';	$role_select .= '</select>';
$output = '<label>'.&mt('Role: [_1]',$role_select).'</label>';	$output = '<label><span class="LC_nobreak">'
	.&mt('Role: [_1]',$role_select)
	.'</span></label>';
}	}
return $output;	return $output;
}	}
Line 1531 sub section_group_filter {	Line 1662 sub section_group_filter {
foreach my $option ('all','none',@options) {	foreach my $option ('all','none',@options) {
$currsel = '';	$currsel = '';
if ($env{'form.'.$name{$item}} eq $option) {	if ($env{'form.'.$name{$item}} eq $option) {
$currsel = ' selected="selected" ';	$currsel = ' selected="selected"';
}	}
$markup .= ' <option value="'.$option.'"'.$currsel.'>';	$markup .= ' <option value="'.$option.'"'.$currsel.'>';
if (($option eq 'all') \|\| ($option eq 'none')) {	if (($option eq 'all') \|\| ($option eq 'none')) {
Line 1930 sub show_users_list {	Line 2061 sub show_users_list {
if ($env{'course.'.$cid.'.internal.showphoto'}) {	if ($env{'course.'.$cid.'.internal.showphoto'}) {
$r->print('	$r->print('
<script type="text/javascript">	<script type="text/javascript">
	// <![CDATA[
function photowindow(photolink) {	function photowindow(photolink) {
var title = "Photo_Viewer";	var title = "Photo_Viewer";
var options = "scrollbars=1,resizable=1,menubar=0";	var options = "scrollbars=1,resizable=1,menubar=0";
Line 1937 function photowindow(photolink) {	Line 2069 function photowindow(photolink) {
stdeditbrowser = open(photolink,title,options,"1");	stdeditbrowser = open(photolink,title,options,"1");
stdeditbrowser.focus();	stdeditbrowser.focus();
}	}
	// ]]>
</script>	</script>
');	');
}	}
Line 1953 END	Line 2086 END
$r->print(<<END);	$r->print(<<END);

<script type="text/javascript" language="Javascript">	<script type="text/javascript" language="Javascript">
	// <![CDATA[
$check_uncheck_js	$check_uncheck_js

$verify_action_js	$verify_action_js
Line 1991 function username_display_launch(usernam	Line 2125 function username_display_launch(usernam
}	}
}	}
}	}
	// ]]>
</script>	</script>
$date_sec_selector	$date_sec_selector
<input type="hidden" name="state" value="$env{'form.state'}" />	<input type="hidden" name="state" value="$env{'form.state'}" />
Line 2012 END	Line 2147 END
'status' => "status",	'status' => "status",
'role' => "role",	'role' => "role",
'type' => "enroll type/action",	'type' => "enroll type/action",
'email' => "email address",	'email' => "e-mail address",
'photo' => "photo",	'photo' => "photo",
'extent' => "extent",	'extent' => "extent",
'pr' => "Proceed",	'pr' => "Proceed",
Line 2020 END	Line 2155 END
'ua' => "uncheck all",	'ua' => "uncheck all",
'ac' => "Action to take for selected users",	'ac' => "Action to take for selected users",
'link' => "Behavior of clickable username link for each user",	'link' => "Behavior of clickable username link for each user",
'aboutme' => "Display a user's personal page",	'aboutme' => "Display a user's personal information page",
'owin' => "Open in a new window",	'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');
Line 2084 END	Line 2220 END
END	END
if ($actionselect) {	if ($actionselect) {
$output .= <<"END";	$output .= <<"END";
<div class="LC_left_float"><fieldset><legend><b>$lt{'ac'}</b></legend>	<div class="LC_left_float"><fieldset><legend>$lt{'ac'}</legend>
$actionselect	$actionselect
<br/><br /><input type="button" value="$lt{'ca'}" onclick="javascript:checkAll(document.$formname.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>	<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>
Line 2129 END	Line 2265 END
}	}
}	}
}	}
$output .= '<div class="LC_left_float"><fieldset><legend><b>'.$lt{'link'}.'</b></legend>'.	$output .= '<div class="LC_left_float"><fieldset><legend>'.$lt{'link'}.'</legend>'.
'<table><tr>';	'<table><tr>';
my @linkdests = ('aboutme');	my @linkdests = ('aboutme');
if ($permission->{'cusr'}) {	if ($permission->{'cusr'}) {
Line 2143 END	Line 2279 END
foreach my $item (@linkdests) {	foreach my $item (@linkdests) {
my $checkedstr = '';	my $checkedstr = '';
if ($item eq $usernamelink) {	if ($item eq $usernamelink) {
$checkedstr = ' checked="checked" ';	$checkedstr = ' checked="checked"';
}	}
$output .= '<span class="LC_nobreak"><label><input type="radio" name="usernamelink" value="'.$item.'"'.$checkedstr.'> '.$lt{$item}.'</label></span><br />';	$output .= '<span class="LC_nobreak"><label><input type="radio" name="usernamelink" value="'.$item.'"'.$checkedstr.' /> '.$lt{$item}.'</label></span><br />';
}	}
my $checkwin;	my $checkwin;
if ($env{'form.userwin'}) {	if ($env{'form.userwin'}) {
$checkwin = 'checked = "checked"';	$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 .= '</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".'<div class="LC_clear_float_footer"> </div>'."\n".	$output .= "\n".'<div class="LC_clear_float_footer"> </div>'."\n".
&Apache::loncommon::start_data_table().	&Apache::loncommon::start_data_table().
Line 2220 END	Line 2356 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 2240 END	Line 2378 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'});
}	}

Line 2261 END	Line 2400 END
$grpfilter = 'all';	$grpfilter = 'all';
}	}
}	}
	my %ltstatus = &Apache::lonlocal::texthash(
	Active => 'Active',
	Future => 'Future',
	Expired => 'Expired',
	);
# Get groups, role, permanent e-mail so we can sort on them if	# Get groups, role, permanent e-mail so we can sort on them if
# necessary.	# necessary.
foreach my $user (keys(%{$userlist})) {	foreach my $user (keys(%{$userlist})) {
Line 2391 END	Line 2535 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 2412 END	Line 2559 END
$cellentry = '<b>'.&mt('auto').'</b> <label><input type="checkbox" name="chgauto" value="'.$in{'username'}.':'.$in{'domain'}.'" /> Change</label>';	$cellentry = '<b>'.&mt('auto').'</b> <label><input type="checkbox" name="chgauto" value="'.$in{'username'}.':'.$in{'domain'}.'" /> Change</label>';
$autocount ++;	$autocount ++;
} else {	} else {
$cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><nobr><label><input type="checkbox" name="chgmanual" value="'.$in{'username'}.':'.$in{'domain'}.'" /> Change</label></nobr></td></tr><tr><td><nobr>';	$cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><span class="LC_nobreak"><label><input type="checkbox" name="chgmanual" value="'.$in{'username'}.':'.$in{'domain'}.'" /> Change</label></span></td></tr><tr><td><span class="LC_nobreak">';
$manualcount ++;	$manualcount ++;
if ($in{'lockedtype'}) {	if ($in{'lockedtype'}) {
$cellentry .= '<label><input type="checkbox" name="unlockchg" value="'.$in{'username'}.':'.$in{'domain'}.'" /> '.&mt('Unlock').'</label>';	$cellentry .= '<label><input type="checkbox" name="unlockchg" value="'.$in{'username'}.':'.$in{'domain'}.'" /> '.&mt('Unlock').'</label>';
Line 2421 END	Line 2568 END
$cellentry .= '<label><input type="checkbox" name="lockchg" value="'.$in{'username'}.':'.$in{'domain'}.'" /> '.&mt('Lock').'</label>';	$cellentry .= '<label><input type="checkbox" name="lockchg" value="'.$in{'username'}.':'.$in{'domain'}.'" /> '.&mt('Lock').'</label>';
$lockcount ++;	$lockcount ++;
}	}
$cellentry .= '</nobr></td></tr></table>';	$cellentry .= '</span></td></tr></table>';
}	}
$r->print("<td>$cellentry</td>\n");	$r->print("<td>$cellentry</td>\n");
} else {	} else {
Line 2457 END	Line 2604 END
}	}
}	}
$r->print('<td><input type="checkbox" name="'.	$r->print('<td><input type="checkbox" name="'.
'actionlist" value="'.$checkval.'"></td>');	'actionlist" value="'.$checkval.'" /></td>');
} else {	} else {
$r->print('<td> </td>');	$r->print('<td> </td>');
}	}
Line 2470 END	Line 2617 END
$r->print('<td>'.&print_username_link($mode,\%in).'</td>');	$r->print('<td>'.&print_username_link($mode,\%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");
	} elsif ($item eq 'status') {
	my $showitem = $in{$item};
	if (defined($ltstatus{$in{$item}})) {
	$showitem = $ltstatus{$in{$item}};
	}
	$r->print('<td>'.$showitem.'</td>'."\n");
} else {	} else {
$r->print('<td>'.$in{$item}.'</td>'."\n");	$r->print('<td>'.$in{$item}.'</td>'."\n");
}	}
Line 2486 END	Line 2639 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('."'".$in{'photo'}."'".')"><img src="'.$in{'thumbnail'}.'" border="1"></a></td>');	$r->print(' <td align="right"><a href="javascript:photowindow('."'".$in{'photo'}."'".')"><img src="'.$in{'thumbnail'}.'" border="1" alt="" /></a></td>');
} else {	} else {
$r->print(' <td> </td> ');	$r->print(' <td> </td> ');
}	}
Line 2511 END	Line 2664 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 2534 END	Line 2687 END
$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 2776 sub select_actions {	Line 2926 sub select_actions {
}	}
}	}
if ($choices{'sections'}) {	if ($choices{'sections'}) {
$output .= '<input type="hidden" name="retainsec" value= "" />'."\n".	$output .= '<input type="hidden" name="retainsec" value="" />'."\n".
'<input type="hidden" name="newsecs" value= "" />'."\n";	'<input type="hidden" name="newsecs" value="" />'."\n";
}	}
}	}
return $output;	return $output;
Line 2791 sub date_section_javascript {	Line 2941 sub date_section_javascript {
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 = <<"ENDONE";
<script type="text/javascript">'."\n";	<script type="text/javascript">
$output .= <<"ENDONE";	// <![CDATA[
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;
var url = '/adm/createuser?';	var url = '/adm/createuser?';
Line 2816 ENDONE	Line 2966 ENDONE
stdeditbrowser = open(url,title,options,'1');	stdeditbrowser = open(url,title,options,'1');
stdeditbrowser.focus();	stdeditbrowser.focus();
}	}
	// ]]>
</script>	</script>
ENDTWO	ENDTWO
return $output;	return $output;
Line 2829 sub date_section_selector {	Line 2980 sub date_section_selector {
my $sec_js = &setsections_javascript($formname,$groupslist);	my $sec_js = &setsections_javascript($formname,$groupslist);
my $output = <<"END";	my $output = <<"END";
<script type="text/javascript">	<script type="text/javascript">
	// <![CDATA[

$sec_js	$sec_js

Line 2897 END	Line 3049 END

$verify_action_js	$verify_action_js

	// ]]>
</script>	</script>
ENDJS	ENDJS
my %lt = &Apache::lonlocal::texthash (	my %lt = &Apache::lonlocal::texthash (
Line 2955 ENDJS	Line 3108 ENDJS
$output .= $info.$secbox;	$output .= $info.$secbox;
}	}
$output .= '<p>'.	$output .= '<p>'.
'<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 2998 sub results_header_row {	Line 3151 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 3057 sub results_header_row {	Line 3210 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 3074 sub results_header_row {	Line 3230 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 3170 sub show_drop_list {	Line 3326 sub show_drop_list {
<input type="hidden" name="action" value="$action" />	<input type="hidden" name="action" value="$action" />
<input type="hidden" name="state" value="done" />	<input type="hidden" name="state" value="done" />
<script type="text/javascript" language="Javascript">	<script type="text/javascript" language="Javascript">
	// <![CDATA[
$check_uncheck_js	$check_uncheck_js
	// ]]>
</script>	</script>
<p>	<p>
<input type="hidden" name="phase" value="four">	<input type="hidden" name="phase" value="four" />
END	END
my ($indexhash,$keylist) = &make_keylist_array();	my ($indexhash,$keylist) = &make_keylist_array();
my $studentcount = 0;	my $studentcount = 0;
Line 3291 END	Line 3449 END
#	#
$r->print(&Apache::loncommon::start_data_table_row());	$r->print(&Apache::loncommon::start_data_table_row());
$r->print(<<"END");	$r->print(<<"END");
<td><input type="checkbox" name="droplist" value="$studentkey"></td>	<td><input type="checkbox" name="droplist" value="$studentkey" /></td>
<td>$username</td>	<td>$username</td>
<td>$domain</td>	<td>$domain</td>
<td>$id</td>	<td>$id</td>
Line 3310 END	Line 3468 END
'ua' => "uncheck all",	'ua' => "uncheck all",
);	);
$r->print(<<"END");	$r->print(<<"END");
</p><p>	</p>
<input type="button" value="$lt{'ca'}" onclick="javascript:checkAll(document.studentform.droplist)">	<p>
<input type="button" value="$lt{'ua'}" onclick="javascript:uncheckAll(document.studentform.droplist)">	<input type="button" value="$lt{'ca'}" onclick="javascript:checkAll(document.studentform.droplist)" />
<p><input type=submit value="$lt{'dp'}"></p>	<input type="button" value="$lt{'ua'}" onclick="javascript:uncheckAll(document.studentform.droplist)" />
	</p>
	<p>
	<input type="submit" value="$lt{'dp'}" />
	</p>
END	END
return;	return;
}	}
Line 3324 END	Line 3486 END
sub print_first_users_upload_form {	sub print_first_users_upload_form {
my ($r,$context) = @_;	my ($r,$context) = @_;
my $str;	my $str;
$str = '<input type="hidden" name="phase" value="two">';	$str = '<input type="hidden" name="phase" value="two" />';
$str .= '<input type="hidden" name="action" value="upload" />';	$str .= '<input type="hidden" name="action" value="upload" />';
$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 .= &Apache::loncommon::upfile_select_html();	$str .= '<h2>'.&mt('Upload a file containing information about users').'</h2>'."\n";
$str .= "<p>\n";
$str .= '<input type="submit" name="fileupload" value="'.	# Excel and CSV Help
&mt('Upload file of users').'">'."\n";	$str .= '<p>'
$str .= '<label><input type="checkbox" name="noFirstLine" /> '.	.&Apache::loncommon::help_open_topic("Course_Create_Class_List",
&mt('Ignore First Line')."</label></p>\n";	&mt("How do I create a users list from a spreadsheet"))
$str .= &Apache::loncommon::help_open_topic("Course_Create_Class_List",	."<br />\n"
&mt("How do I create a users list from a spreadsheet")).	.&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
"<br />\n";	&mt("How do I create a CSV file from a spreadsheet"))
$str .= &Apache::loncommon::help_open_topic("Course_Convert_To_CSV",	."</p>\n";
&mt("How do I create a CSV file from a spreadsheet")).
"<br />\n";	$str .= &Apache::lonhtmlcommon::start_pick_box()
	.&Apache::lonhtmlcommon::row_title(&mt('File'))
	.'<p class="LC_info">'."\n"
	.&mt('Please upload an UTF8 encoded file to ensure a correct character encoding in your classlist.')."\n"
	.'</p>'."\n"
	.&Apache::loncommon::upfile_select_html()
	.&Apache::lonhtmlcommon::row_closure()
	.&Apache::lonhtmlcommon::row_title(
	'<label for="noFirstLine">'
	.&mt('Ignore First Line')
	.'</label>')
	.'<input type="checkbox" name="noFirstLine" id="noFirstLine" />'
	.&Apache::lonhtmlcommon::row_closure(1)
	.&Apache::lonhtmlcommon::end_pick_box();

	$str .= '<p>'
	.'<input type="submit" name="fileupload" value="'.&mt('Next').'" />'
	.'</p>';

$str .= &Apache::loncommon::end_page();	$str .= &Apache::loncommon::end_page();

$r->print($str);	$r->print($str);
return;	return;
}	}
Line 3384 sub upfile_drop_add {	Line 3565 sub upfile_drop_add {
'ipwd_choice' => 'scalar',	'ipwd_choice' => 'scalar',
'email_choice' => 'scalar',	'email_choice' => 'scalar',
'role_choice' => 'scalar',	'role_choice' => 'scalar',
'domain_choice' => 'scalar'});	'domain_choice' => 'scalar',
	'inststatus_choice' => 'scalar'});
#	#
my ($startdate,$enddate) = &get_dates_from_form();	my ($startdate,$enddate) = &get_dates_from_form();
if ($env{'form.makedatesdefault'}) {	if ($env{'form.makedatesdefault'}) {
Line 3467 sub upfile_drop_add {	Line 3649 sub upfile_drop_add {
'permanentemail','id');	'permanentemail','id');
my %canmodify;	my %canmodify;
if (&Apache::lonnet::allowed('mau',$domain)) {	if (&Apache::lonnet::allowed('mau',$domain)) {
	push(@userinfo,'inststatus');
foreach my $field (@userinfo) {	foreach my $field (@userinfo) {
$canmodify{$field} = 1;	$canmodify{$field} = 1;
}	}
Line 3487 sub upfile_drop_add {	Line 3670 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 3513 sub upfile_drop_add {	Line 3698 sub upfile_drop_add {
} else {	} else {
$r->print('<h3>'.&mt('Adding/Modifying Users')."</h3>\n<p>\n");	$r->print('<h3>'.&mt('Adding/Modifying Users')."</h3>\n<p>\n");
}	}
	$r->rflush;

my %counts = (	my %counts = (
user => 0,	user => 0,
auth => 0,	auth => 0,
Line 3588 sub upfile_drop_add {	Line 3775 sub upfile_drop_add {
if ($entries{$fields{'username'}}	if ($entries{$fields{'username'}}
ne &LONCAPA::clean_username($entries{$fields{'username'}})) {	ne &LONCAPA::clean_username($entries{$fields{'username'}})) {
$r->print('<br />'.	$r->print('<br />'.
&mt('<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]',	&mt('[_1]: Unacceptable username for user [_2] [_3] [_4] [_5]',
$entries{$fields{'username'}},$fname,$mname,$lname,$gen).	'<b>'.$entries{$fields{'username'}}.'</b>',$fname,$mname,$lname,$gen));
'</b>');
next;	next;
} else {	} else {
my $baddom = 0;	if ($entries{$fields{'domain'}}
if ($entries{$fields{'dom'}}
ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) {	ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) {
$baddom = 1;
} else {
if (&Apache::lonnet::domain($entries{$fields{'domain'}}) eq '') {
$baddom = 1;
}
}
if ($baddom) {
$r->print('<br />'. '<b>'.$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>');	'</b>: '.&mt('Unacceptable domain for user [_2] [_3] [_4] [_5]',$fname,$mname,$lname,$gen));
next;	next;
}	}
my $username = $entries{$fields{'username'}};	my $username = $entries{$fields{'username'}};
Line 3617 sub upfile_drop_add {	Line 3795 sub upfile_drop_add {
$entries{$fields{'sec'}} =~ s/\W//g;	$entries{$fields{'sec'}} =~ s/\W//g;
my $item = $entries{$fields{'sec'}};	my $item = $entries{$fields{'sec'}};
if ($item eq "none" \|\| $item eq 'all') {	if ($item eq "none" \|\| $item eq 'all') {
$r->print('<br />'.&mt('<b>[_1]</b>: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a reserved word.',$username,$fname,$mname,$lname,$gen,$item));	$r->print('<br />'.&mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a reserved word.','<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$item));
next;	next;
} elsif (exists($curr_groups{$item})) {	} elsif (exists($curr_groups{$item})) {
$r->print('<br />'.&mt('<b>[_1]</b>: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a course group.',$username,$fname,$mname,$lname,$gen,$item).' '.&mt('Section names and group names must be distinct.'));	$r->print('<br />'.&mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a course group.','<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$item).' '.&mt('Section names and group names must be distinct.'));
next;	next;
} else {	} else {
push(@secs,$item);	push(@secs,$item);
Line 3632 sub upfile_drop_add {	Line 3810 sub upfile_drop_add {
if (ref($userlist{$username.':'.$userdomain}) eq 'ARRAY') {	if (ref($userlist{$username.':'.$userdomain}) eq 'ARRAY') {
my $currsec = $userlist{$username.':'.$userdomain}[$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('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]".','<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$secs[0]).'<br />');
if ($currsec eq '') {	if ($currsec eq '') {
$r->print(&mt('This user already has an active/future student role in the course, unaffiliated to any section.'));	$r->print(&mt('This user already has an active/future student role in the course, unaffiliated to any section.'));

Line 3661 sub upfile_drop_add {	Line 3839 sub upfile_drop_add {
if (defined($fields{'email'})) {	if (defined($fields{'email'})) {
if (defined($entries{$fields{'email'}})) {	if (defined($entries{$fields{'email'}})) {
$email=$entries{$fields{'email'}};	$email=$entries{$fields{'email'}};
unless ($email=~/^[^\@]+\@[^\@]+$/) { $email=''; } }	unless ($email=~/^[^\@]+\@[^\@]+$/) { $email=''; }
	}
	}
	# determine affiliation
	my $inststatus='';
	if (defined($fields{'inststatus'})) {
	if (defined($entries{$fields{'inststatus'}})) {
	$inststatus=$entries{$fields{'inststatus'}};
	}
}	}
# determine user password	# determine user password
my $password = $genpwd;	my $password = $genpwd;
Line 3682 sub upfile_drop_add {	Line 3868 sub upfile_drop_add {
}	}
if ($role eq '') {	if ($role eq '') {
my $rolestr = join(', ',@permitted_roles);	my $rolestr = join(', ',@permitted_roles);
$r->print('<br />'.	$r->print('<br />'
&mt('<b>[_1]</b>: You do not have permission to add the requested role [_2] for the user.',$entries{$fields{'username'}},$entries{$fields{'role'}}).'<br />'.&mt('Allowable role(s) is/are: [_1].',$rolestr)."\n");	.&mt('[_1]: You do not have permission to add the requested role [_2] for the user.'
	,'<b>'.$entries{$fields{'username'}}.'</b>'
	,$entries{$fields{'role'}})
	.'<br />'
	.&mt('Allowable role(s) is/are: [_1].',$rolestr)."\n"
	);
next;	next;
}	}
}	}
Line 3739 sub upfile_drop_add {	Line 3930 sub upfile_drop_add {
}	}
}	}
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<@newinfo; $i++) {
if (${$newinfo[$i]} ne '') {	if (${$newinfo[$i]} ne '') {
if (!$canmodify{$userinfo[$i]}) {	if (!$canmodify{$userinfo[$i]}) {
${$newinfo[$i]} = '';	${$newinfo[$i]} = '';
Line 3788 sub upfile_drop_add {	Line 3979 sub upfile_drop_add {
$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);	'',$context,$inststatus);
$userresult = $roleresult;	$userresult = $roleresult;
} else {	} else {
if ($role ne '') {	if ($role ne '') {
Line 3808 sub upfile_drop_add {	Line 3999 sub upfile_drop_add {
$mname,$lname,$gen,$sec,	$mname,$lname,$gen,$sec,
$env{'form.forceid'},$desiredhost,	$env{'form.forceid'},$desiredhost,
$email,$role,$enddate,	$email,$role,$enddate,
$startdate,$checkid);	$startdate,$checkid,$inststatus);
}	}
} elsif (@secs > 0) {	} elsif (@secs > 0) {
$singlesec = $secs[0];	$singlesec = $secs[0];
Line 3823 sub upfile_drop_add {	Line 4014 sub upfile_drop_add {
$id,$amode,$password,$fname,	$id,$amode,$password,$fname,
$mname,$lname,$gen,$singlesec,	$mname,$lname,$gen,$singlesec,
$env{'form.forceid'},$desiredhost,	$env{'form.forceid'},$desiredhost,
$email,$role,$enddate,$startdate,$checkid);	$email,$role,$enddate,$startdate,
	$checkid,$inststatus);
}	}
}	}
if ($multiple) {	if ($multiple) {
Line 3843 sub upfile_drop_add {	Line 4035 sub upfile_drop_add {
} else {	} else {
if ($context eq 'course') {	if ($context eq 'course') {
$r->print('<br />'.	$r->print('<br />'.
&mt('<b>[_1]</b>: Unable to enroll. No password specified.',$username)	&mt('[_1]: Unable to enroll. No password specified.','<b>'.$username.'</b>')
);	);
} elsif ($context eq 'author') {	} elsif ($context eq 'author') {
$r->print('<br />'.	$r->print('<br />'.
&mt('<b>[_1]</b>: Unable to add co-author. No password specified.',$username)	&mt('[_1]: Unable to add co-author. No password specified.','<b>'.$username.'</b>')
);	);
} else {	} else {
$r->print('<br />'.	$r->print('<br />'.
&mt('<b>[_1]</b>: Unable to add user. No password specified.',$username)	&mt('[_1]: Unable to add user. No password specified.','<b>'.$username.'</b>')
);	);
}	}
}	}
Line 3886 sub upfile_drop_add {	Line 4078 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 3954 sub user_change_result {	Line 4146 sub user_change_result {
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.':'.$userdomain,$error));	&mt('[_1]: Unable to add/modify: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
}	}
} else {	} else {
$counts->{'user'} ++;	$counts->{'user'} ++;
Line 3964 sub user_change_result {	Line 4156 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.':'.$userdomain,$error));	&mt('[_1]: Unable to modify authentication: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
}	}
} else {	} else {
$counts->{'auth'} ++;	$counts->{'auth'} ++;
Line 3974 sub user_change_result {	Line 4166 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.':'.$userdomain,$error));	&mt('[_1]: Unable to add role: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
}	}
} else {	} else {
$counts->{'role'} ++;	$counts->{'role'} ++;
Line 4244 sub update_user_list {	Line 4436 sub update_user_list {
$r->print('<p><b>'.&mt("$result_text{'ok'}{$choice} role(s) for [quant,_1,user,users,no users].",$count).'</b></p>');	$r->print('<p><b>'.&mt("$result_text{'ok'}{$choice} role(s) for [quant,_1,user,users,no users].",$count).'</b></p>');
if ($count > 0) {	if ($count > 0) {
if ($choice eq 'revoke' \|\| $choice eq 'drop') {	if ($choice eq 'revoke' \|\| $choice eq 'drop') {
$r->print('<p>'.&mt('Re-enabling will re-activate data for the role.</p>'));	$r->print('<p>'.&mt('Re-enabling will re-activate data for the role.').'</p>');
}	}
# Flush the course logs so reverse user roles immediately updated	# Flush the course logs so reverse user roles immediately updated
&Apache::lonnet::flushcourselogs();	&Apache::lonnet::flushcourselogs();
Line 4265 sub classlist_drop {	Line 4457 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 4340 sub course_sections {	Line 4530 sub course_sections {
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" ';	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";

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.60
changed lines
	Added in v.1.96