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.55 and 1.77

version 1.55, 2008/05/19 17:10:19	version 1.77, 2008/12/12 16:50:53
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 307 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 319 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 381 sub javascript_validations {	Line 403 sub javascript_validations {
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 ID number 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.',
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 503 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 532 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 542 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 564 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 627 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 636 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 700 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 718 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 755 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 770 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 818 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 844 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 966 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 1252 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" ';
Line 1294 sub print_userlist {	Line 1345 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 1428 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="'.
Line 1445 sub role_filter {	Line 1501 sub role_filter {
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 1465 sub role_filter {	Line 1523 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 1848 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;
Line 1926 END	Line 1986 END
}	}
if ($mode ne 'autoenroll' && $mode ne 'pickauthor') {	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.$formname.bulkaction[document.$formname.bulkaction.selectedIndex].text;
var choice = document.$formname.bulkaction[document.$formname.bulkaction.selectedIndex].value;
if (numchecked == 1) {
message += singconf;
}
else {
message += multconf;
}
if (choice == 'chgdates' \|\| choice == 'reenable' \|\| choice == 'activate') {
var datemsg = '';
if ((document.$formname.startdate_month.value == '') &&
(document.$formname.startdate_day.value == '') &&
(document.$formname.startdate_year.value == '')) {
datemsg = "\\n$lt{'acwi'},\\n$lt{'asyo'}.\\n";
}
if ((document.$formname.enddate_month.value == '') &&
(document.$formname.enddate_day.value == '') &&
(document.$formname.enddate_year.value == '')) {
datemsg += "\\n$lt{'accw'},\\n$lt{'asyd'}.\\n";
}
if (datemsg != '') {
message += "\\n"+datemsg;
}
}
if (choice == 'chgsec') {
var rolefilter = document.$formname.showrole.options[document.$formname.showrole.selectedIndex].value;
var retained = document.$formname.retainsec.value;
var secshow = document.$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)) {
document.$formname.phase.value = 'bulkchange';
document.$formname.submit();
}
}
}

function username_display_launch(username,domain) {	function username_display_launch(username,domain) {
var target;	var target;
Line 2071 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",	'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 2127 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' \|\| $mode eq 'pickauthor') {	if ($mode eq 'html' \|\| $mode eq 'view' \|\| $mode eq 'autoenroll' \|\| $mode eq 'pickauthor') {
Line 2142 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'}) {
unshift (@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>  ';
}
my $checkwin;
if ($env{'form.userwin'}) {
$checkwin = 'checked = "checked"';
}
$output .= '    <input type="checkbox" name="userwin" value="1" $checkwin />'.$lt{'owin'}.'</span><br />';
if ($actionselect) {	if ($actionselect) {
$output .= <<"END";	$output .= <<"END";
$lt{'ac'}: $actionselect <input type="button" value="$lt{'go'}" onclick="javascript:opendatebrowser(this.form,'$formname','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.$formname.actionlist)" />	$actionselect
<input type="button" value="$lt{'ua'}" onclick="javascript:uncheckAll(document.$formname.actionlist)" /><br /><br /><input type="button" value="$lt{'pr'}" onclick="javascript:verify_action(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>
END	END
my @allroles;	my @allroles;
if ($env{'form.showrole'} eq 'Any') {	if ($env{'form.showrole'} eq 'Any') {
Line 2210 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') {
Line 2235 END	Line 2216 END
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.'.$formname.'.displayclickers.value='.	.&mt('[_1]'.$clicker_options{$clickerchg}.'[_2] clicker id'
"'".$clickerchg."'".';document.'.$formname.'.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 2277 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 2297 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'});
}	}

Line 2448 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 2469 END	Line 2457 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 2478 END	Line 2466 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 2568 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 2591 END	Line 2579 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 2607 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,$in) = @_;	my ($mode,$in) = @_;
my $output;	my $output;
Line 2691 sub select_actions {	Line 2795 sub select_actions {
}	}
}	}
if ($options) {	if ($options) {
$output = '<select name="bulkaction" onchange="javascript:opendatebrowser(this.form,'."'$formname','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 2707 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 2733 sub date_section_javascript {	Line 2838 sub date_section_javascript {
$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 2800 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 2836 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 2899 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 2913 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 2943 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 3002 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 3019 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 3274 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 3314 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 3328 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 3425 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 3526 sub upfile_drop_add {	Line 3636 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 {
	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));
	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;
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 3549 sub upfile_drop_add {	Line 3668 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('[_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 3602 sub upfile_drop_add {	Line 3721 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 3612 sub upfile_drop_add {	Line 3736 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 3637 sub upfile_drop_add {	Line 3761 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 3676 sub upfile_drop_add {	Line 3802 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 3698 sub upfile_drop_add {	Line 3824 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,$context);	$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,
Line 3721 sub upfile_drop_add {	Line 3847 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 3737 sub upfile_drop_add {	Line 3863 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 3749 sub upfile_drop_add {	Line 3875 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') {
$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 3804 sub upfile_drop_add {	Line 3930 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 3866 sub print_namespacing_alerts {	Line 3992 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('[_1]: Unable to add/modify: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
}	}
} else {	} else {
$counts->{'user'} ++;	$counts->{'user'} ++;
Line 3882 sub user_change_result {	Line 4008 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('[_1]: Unable to modify authentication: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
}	}
} else {	} else {
$counts->{'auth'} ++;	$counts->{'auth'} ++;
Line 3892 sub user_change_result {	Line 4018 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('[_1]: Unable to add role: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
}	}
} else {	} else {
$counts->{'role'} ++;	$counts->{'role'} ++;
Line 3900 sub user_change_result {	Line 4026 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 4162 sub update_user_list {	Line 4288 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 4183 sub classlist_drop {	Line 4309 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 4491 sub can_modify_userinfo {	Line 4615 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}) {

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

Removed from v.1.55
changed lines
	Added in v.1.77