loncom/interface/loncreateuser.pm - diff

Return to loncreateuser.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncreateuser.pm between versions 1.268.4.2 and 1.299

version 1.268.4.2, 2009/09/14 21:50:04	version 1.299, 2009/07/25 14:44:50
Line 124 sub portfolio_quota {	Line 124 sub portfolio_quota {
my ($ccuname,$ccdomain) = @_;	my ($ccuname,$ccdomain) = @_;
my %lt = &Apache::lonlocal::texthash(	my %lt = &Apache::lonlocal::texthash(
'usrt' => "User Tools",	'usrt' => "User Tools",
'blog' => "Personal User Blog",
'aboutme' => "Personal Information Page",
'portfolio' => "Personal User Portfolio",
'avai' => "Available",
'cusa' => "availability",
'chse' => "Change setting",
'disk' => "Disk space allocated to user's portfolio files",	'disk' => "Disk space allocated to user's portfolio files",
'cuqu' => "Current quota",	'cuqu' => "Current quota",
'cust' => "Custom quota",	'cust' => "Custom quota",
'defa' => "Default",	'defa' => "Default",
'usde' => "Use default",
'uscu' => "Use custom",
'chqu' => "Change quota",	'chqu' => "Change quota",
);	);
my ($currquota,$quotatype,$inststatus,$defquota) =	my ($currquota,$quotatype,$inststatus,$defquota) =
Line 191 END_SCRIPT	Line 183 END_SCRIPT
&Apache::loncommon::start_data_table();	&Apache::loncommon::start_data_table();

if (&Apache::lonnet::allowed('mut',$ccdomain)) {	if (&Apache::lonnet::allowed('mut',$ccdomain)) {
my %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,	$output .= &build_tools_display($ccuname,$ccdomain,'tools');
'tools.aboutme','tools.portfolio','tools.blog');
my @usertools = ('aboutme','blog','portfolio');
foreach my $item (@usertools) {
my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off);
$cust_off = 'checked="checked" ';
$tool_on = 'checked="checked" ';
$curr_access = &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item);
if ($userenv{'tools.'.$item} eq '') {
$custom_access = 'default';
if (!$curr_access) {
$tool_off = 'checked="checked" ';
$tool_on = '';
}
} else {
$custom_access = 'custom';
$cust_on = ' checked="checked" ';
$cust_off = '';
if ($userenv{'tools.'.$item} == 0) {
$tool_off = 'checked="checked" ';
$tool_on = '';
}
}
$output .= ' <tr class="LC_info_row">'."\n".
' <td>'.$lt{$item}.'</td>'."\n".
' </tr>'."\n".
&Apache::loncommon::start_data_table_row()."\n".
' <td>'.&mt('Availability determined currently from [_1] setting.',$custom_access).
'     '.$lt{'avai'}.': '.
($curr_access?&mt('Yes'):&mt('No')).'</td>'."\n".
&Apache::loncommon::end_data_table_row()."\n".
&Apache::loncommon::start_data_table_row()."\n".
' <td><span class="LC_nobreak">'.$lt{'chse'}.': <label>'.
'<input type="radio" name="custom'.$item.'" value="0" '.
$cust_off.'/>'.$lt{'usde'}.'</label>   '.
'<label><input type="radio" name="custom'.$item.'" value="1" '.
$cust_on.'/>'.$lt{'uscu'}.'</label>  --  '.
$lt{'cusa'}.': <label>'.
'<input type="radio" name="tools_'.$item.'" value="1" '.
$tool_on.'/>'.&mt('On').'</label> <label>'.
'<input type="radio" name="tools_'.$item.'" value="0" '.
$tool_off.'/>'.&mt('Off').'</label></span></td>'."\n".
&Apache::loncommon::end_data_table_row()."\n";
}
}	}
if (&Apache::lonnet::allowed('mpq',$ccdomain)) {	if (&Apache::lonnet::allowed('mpq',$ccdomain)) {
$output .= '<tr class="LC_info_row">'."\n".	$output .= '<tr class="LC_info_row">'."\n".
Line 263 END_SCRIPT	Line 212 END_SCRIPT
return $output;	return $output;
}	}

	sub build_tools_display {
	my ($ccuname,$ccdomain,$context) = @_;
	my (@usertools,%userenv,$output);
	my %lt = &Apache::lonlocal::texthash (
	'blog' => "Personal User Blog",
	'aboutme' => "Personal Information Page",
	'portfolio' => "Personal User Portfolio",
	'avai' => "Available",
	'cusa' => "availability",
	'chse' => "Change setting",
	'usde' => "Use default",
	'uscu' => "Use custom",
	'official' => 'Can request creation of official courses',
	'unofficial' => 'Can request creation of unofficial courses',
	'community' => 'Can request creation of communities',
	);
	if ($context eq 'requestcourses') {
	%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
	'requestcourses.official','requestcourses.unofficial',
	'requestcourses.community');
	@usertools = ('official','unofficial','community');
	} else {
	%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
	'tools.aboutme','tools.portfolio','tools.blog');
	@usertools = ('aboutme','blog','portfolio');
	}
	foreach my $item (@usertools) {
	my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off);
	$cust_off = 'checked="checked" ';
	$tool_on = 'checked="checked" ';
	$curr_access =
	&Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
	$context);
	if ($userenv{$context.'.'.$item} eq '') {
	$custom_access = 'default';
	if (!$curr_access) {
	$tool_off = 'checked="checked" ';
	$tool_on = '';
	}
	} else {
	$custom_access = 'custom';
	$cust_on = ' checked="checked" ';
	$cust_off = '';
	if ($userenv{$context.'.'.$item} == 0) {
	$tool_off = 'checked="checked" ';
	$tool_on = '';
	}
	}
	$output .= ' <tr class="LC_info_row">'."\n".
	' <td>'.$lt{$item}.'</td>'."\n".
	' </tr>'."\n".
	&Apache::loncommon::start_data_table_row()."\n".
	' <td>'.&mt('Availability determined currently from [_1] setting.',$custom_access).
	'     '.$lt{'avai'}.': '.
	($curr_access?&mt('Yes'):&mt('No')).'</td>'."\n".
	&Apache::loncommon::end_data_table_row()."\n".
	&Apache::loncommon::start_data_table_row()."\n".
	' <td><span class="LC_nobreak">'.$lt{'chse'}.': <label>'.
	'<input type="radio" name="custom'.$item.'" value="0" '.
	$cust_off.'/>'.$lt{'usde'}.'</label>   '.
	'<label><input type="radio" name="custom'.$item.'" value="1" '.
	$cust_on.'/>'.$lt{'uscu'}.'</label>  --  '.
	$lt{'cusa'}.': <label>'.
	'<input type="radio" name="'.$context.'_'.$item.'" value="1" '.
	$tool_on.'/>'.&mt('On').'</label> <label>'.
	'<input type="radio" name="'.$context.'_'.$item.'" value="0" '.
	$tool_off.'/>'.&mt('Off').'</label></span></td>'."\n".
	&Apache::loncommon::end_data_table_row()."\n";
	}
	return $output;
	}

# =================================================================== Phase one	# =================================================================== Phase one

sub print_username_entry_form {	sub print_username_entry_form {
Line 318 sub print_username_entry_form {	Line 339 sub print_username_entry_form {
'dom' => "Domain",	'dom' => "Domain",
'ecrp' => "Edit Custom Role Privileges",	'ecrp' => "Edit Custom Role Privileges",
'nr' => "Name of Role",	'nr' => "Name of Role",
'cre' => "Custom Role Editor",	'cre' => "Next",
);	);
$r->print($start_page."\n".$crumbs);	$r->print($start_page."\n".$crumbs);
if ($env{'form.action'} eq 'custom') {	if ($env{'form.action'} eq 'custom') {
Line 328 sub print_username_entry_form {	Line 349 sub print_username_entry_form {
<input type="hidden" name="action" value="$env{'form.action'}" />	<input type="hidden" name="action" value="$env{'form.action'}" />
<input type="hidden" name="phase" value="selected_custom_edit" />	<input type="hidden" name="phase" value="selected_custom_edit" />
<h3>$lt{'ecrp'}</h3>	<h3>$lt{'ecrp'}</h3>
$lt{'nr'}: $choice <input type="text" size="15" name="newrolename" /><br />	$choice $lt{'nr'}: <input type="text" size="15" name="newrolename" /><br />
<input name="customeditor" type="submit" value="$lt{'cre'}" />	<input name="customeditor" type="submit" value="$lt{'cre'}" />
</form>	</form>
ENDCUSTOM	ENDCUSTOM
Line 612 sub print_user_modification_page {	Line 633 sub print_user_modification_page {
&Apache::lonuserutils::can_create_user($ccdomain,$context,	&Apache::lonuserutils::can_create_user($ccdomain,$context,
$usertype);	$usertype);
if (!$cancreate) {	if (!$cancreate) {
my $helplink = ' href="javascript:helpMenu('."'display'".')"';	my $helplink = 'javascript:helpMenu('."'display'".')';
my %usertypetext = (	my %usertypetext = (
official => 'institutional',	official => 'institutional',
unofficial => 'non-institutional',	unofficial => 'non-institutional',
Line 622 sub print_user_modification_page {	Line 643 sub print_user_modification_page {
$response = '<span class="LC_warning">'.&mt('No match was found for the username ([_1]) in LON-CAPA domain: [_2]',$ccuname,$ccdomain).	$response = '<span class="LC_warning">'.&mt('No match was found for the username ([_1]) in LON-CAPA domain: [_2]',$ccuname,$ccdomain).
'</span><br />';	'</span><br />';
}	}
$response .= '<span class="LC_warning">'.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the <a[_1]>helpdesk</a> for assistance.',$helplink).'</span><br /><br />';	$response .= '<p class="LC_warning">'
	.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.")
	.' '
	.&mt('Please contact the [_1]helpdesk[_2] for assistance.'
	,'<a href="'.$helplink.'">','</a>')
	.'</p><br />';
$env{'form.phase'} = '';	$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response);	&print_username_entry_form($r,$context,$response);
return;	return;
Line 770 $lt{'hs'}: $home_server_pick	Line 796 $lt{'hs'}: $home_server_pick
my $authtype = $rules->{$matchedrule}{'authtype'};	my $authtype = $rules->{$matchedrule}{'authtype'};
if ($authtype !~ /^(krb4\|krb5\|int\|fsys\|loc)$/) {	if ($authtype !~ /^(krb4\|krb5\|int\|fsys\|loc)$/) {
$r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc));	$r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc));
} else {	} else {
my $authparm = $rules->{$matchedrule}{'authparm'};	my $authparm = $rules->{$matchedrule}{'authparm'};
$authmsg = $rules->{$matchedrule}{'authmsg'};	$authmsg = $rules->{$matchedrule}{'authmsg'};
if ($authtype =~ /^krb(4\|5)$/) {	if ($authtype =~ /^krb(4\|5)$/) {
Line 848 ENDCHANGEUSER	Line 874 ENDCHANGEUSER
if ($showforceid) {	if ($showforceid) {
$r->print(&Apache::lonuserutils::forceid_change($context));	$r->print(&Apache::lonuserutils::forceid_change($context));
}	}
	if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
	$r->print('<h3>'.&mt('User Can Request Creation of Courses?').'</h3>'.
	&Apache::loncommon::start_data_table().
	&build_tools_display($ccuname,$ccdomain,'requestcourses').
	&Apache::loncommon::end_data_table());
	}
$r->print('</div>');	$r->print('</div>');
my $user_auth_text = &user_authentication($ccuname,$ccdomain,$formname);	my $user_auth_text = &user_authentication($ccuname,$ccdomain,$formname);
my ($user_quota_text,$user_tools_text);	my ($user_quota_text,$user_tools_text,$user_reqcrs_text);
if ((&Apache::lonnet::allowed('mpq',$ccdomain)) \|\|	if ((&Apache::lonnet::allowed('mpq',$ccdomain)) \|\|
(&Apache::lonnet::allowed('mut',$ccdomain))) {	(&Apache::lonnet::allowed('mut',$ccdomain))) {
# Current user has quota modification privileges	# Current user has quota modification privileges
Line 876 ENDNOPORTPRIV	Line 908 ENDNOPORTPRIV
if (&Apache::lonnet::allowed('mut',$env{'request.role.domain'})) {	if (&Apache::lonnet::allowed('mut',$env{'request.role.domain'})) {
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'utav' => "User Tools Availability",	'utav' => "User Tools Availability",
'yodo' => "You do not have privileges to modify Portfolio, Blog or Home Page settings for this user.",	'yodo' => "You do not have privileges to modify Portfolio, Blog or Personal Information Page settings for this user.",
'ifch' => "If a change is required, contact a domain coordinator for the domain",	'ifch' => "If a change is required, contact a domain coordinator for the domain",
);	);
$user_tools_text = <<ENDNOTOOLSPRIV;	$user_tools_text = <<ENDNOTOOLSPRIV;
Line 1205 sub display_existing_roles {	Line 1237 sub display_existing_roles {
}	}
}	}
if ($rolesdisplay == 1) {	if ($rolesdisplay == 1) {
	my $contextrole='';
	if ($env{'request.course.id'}) {
	$contextrole = 'Existing Roles in this Course';
	} elsif ($env{'request.role'} =~ /^au\./) {
	$contextrole = 'Existing Co-Author Roles in your Construction Space';
	} else {
	$contextrole = 'Existing Roles in this Domain';
	}
$r->print('	$r->print('
<h3>'.$lt{'rer'}.'</h3>'.	<h3>'.$lt{'rer'}.'</h3>'.
	'<div>'.&mt($contextrole).'</div>'.
&Apache::loncommon::start_data_table("LC_createuser").	&Apache::loncommon::start_data_table("LC_createuser").
&Apache::loncommon::start_data_table_header_row().	&Apache::loncommon::start_data_table_header_row().
'<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}.	'<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}.
Line 1258 sub new_coauthor_roles {	Line 1299 sub new_coauthor_roles {
&Apache::loncommon::end_data_table_header_row()."\n".	&Apache::loncommon::end_data_table_header_row()."\n".
&Apache::loncommon::start_data_table_row().'	&Apache::loncommon::start_data_table_row().'
<td>	<td>
<input type=checkbox name="act_'.$cudom.'_'.$cuname.'_ca" />	<input type="checkbox" name="act_'.$cudom.'_'.$cuname.'_ca" />
</td>	</td>
<td>'.$lt{'cau'}.'</td>	<td>'.$lt{'cau'}.'</td>
<td>'.$cudom.'_'.$cuname.'</td>	<td>'.$cudom.'_'.$cuname.'</td>
Line 1270 sub new_coauthor_roles {	Line 1311 sub new_coauthor_roles {
"javascript:pjump('."'date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".	"javascript:pjump('."'date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".
&Apache::loncommon::end_data_table_row()."\n".	&Apache::loncommon::end_data_table_row()."\n".
&Apache::loncommon::start_data_table_row()."\n".	&Apache::loncommon::start_data_table_row()."\n".
'<td><input type=checkbox name="act_'.$cudom.'_'.$cuname.'_aa" /></td>	'<td><input type="checkbox" name="act_'.$cudom.'_'.$cuname.'_aa" /></td>
<td>'.$lt{'caa'}.'</td>	<td>'.$lt{'caa'}.'</td>
<td>'.$cudom.'_'.$cuname.'</td>	<td>'.$cudom.'_'.$cuname.'</td>
<td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_aa" value="" />	<td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_aa" value="" />
Line 1321 sub new_domain_roles {	Line 1362 sub new_domain_roles {
$num_domain_level ++;	$num_domain_level ++;
$domaintext .=	$domaintext .=
&Apache::loncommon::start_data_table_row().	&Apache::loncommon::start_data_table_row().
'<td><input type=checkbox name="act_'.$thisdomain.'_'.$role.'" /></td>	'<td><input type="checkbox" name="act_'.$thisdomain.'_'.$role.'" /></td>
<td>'.$plrole.'</td>	<td>'.$plrole.'</td>
<td>'.$thisdomain.'</td>	<td>'.$thisdomain.'</td>
<td><input type="hidden" name="start_'.$thisdomain.'_'.$role.'" value="" />	<td><input type="hidden" name="start_'.$thisdomain.'_'.$role.'" value="" />
Line 1499 sub modify_login_block {	Line 1540 sub modify_login_block {

sub personal_data_display {	sub personal_data_display {
my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray) = @_;	my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray) = @_;
my ($output,$showforceid,%userenv,%canmodify);	my ($output,$showforceid,%userenv,%canmodify,%canmodify_status);
my @userinfo = ('firstname','middlename','lastname','generation',	my @userinfo = ('firstname','middlename','lastname','generation',
'permanentemail','id');	'permanentemail','id');
my $rowcount = 0;	my $rowcount = 0;
my $editable = 0;	my $editable = 0;
	%canmodify_status =
	&Apache::lonuserutils::can_modify_userinfo($context,$ccdomain,
	['inststatus'],$rolesarray);
if (!$newuser) {	if (!$newuser) {
# Get the users information	# Get the users information
%userenv = &Apache::lonnet::get('environment',	%userenv = &Apache::lonnet::get('environment',
['firstname','middlename','lastname','generation',	['firstname','middlename','lastname','generation',
'permanentemail','id'],$ccdomain,$ccuname);	'permanentemail','id','inststatus'],$ccdomain,$ccuname);
%canmodify =	%canmodify =
&Apache::lonuserutils::can_modify_userinfo($context,$ccdomain,	&Apache::lonuserutils::can_modify_userinfo($context,$ccdomain,
\@userinfo,$rolesarray);	\@userinfo,$rolesarray);
Line 1524 sub personal_data_display {	Line 1568 sub personal_data_display {
'generation' => "Generation",	'generation' => "Generation",
'permanentemail' => "Permanent e-mail address",	'permanentemail' => "Permanent e-mail address",
'id' => "Student/Employee ID",	'id' => "Student/Employee ID",
'lg' => "Login Data"	'lg' => "Login Data",
	'inststatus' => "Affiliation",
);	);
my %textboxsize = (	my %textboxsize = (
firstname => '15',	firstname => '15',
Line 1592 sub personal_data_display {	Line 1637 sub personal_data_display {
$rowcount ++;	$rowcount ++;
}	}
}	}
	if (($canmodify_status{'inststatus'}) \|\| ($context ne 'selfcreate')) {
	my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($ccdomain);
	if (ref($types) eq 'ARRAY') {
	if (@{$types} > 0) {
	my ($hiderow,$shown);
	if ($canmodify_status{'inststatus'}) {
	$shown = &pick_inst_statuses($userenv{'inststatus'},$usertypes,$types);
	} else {
	$shown .= $userenv{'inststatus'};
	if ($userenv{'inststatus'} eq '') {
	$hiderow = 1;
	}
	}
	if (!$hiderow) {
	my $row = &Apache::lonhtmlcommon::row_title(&mt('Affliations'),undef,'LC_oddrow_value')."\n".
	$shown.&Apache::lonhtmlcommon::row_closure(1);
	if ($context eq 'selfcreate') {
	$rowcount ++;
	}
	$output .= $row;
	}
	}
	}
	}
$output .= &Apache::lonhtmlcommon::end_pick_box();	$output .= &Apache::lonhtmlcommon::end_pick_box();
if (wantarray) {	if (wantarray) {
if ($context eq 'selfcreate') {	if ($context eq 'selfcreate') {
Line 1604 sub personal_data_display {	Line 1673 sub personal_data_display {
}	}
}	}

	sub pick_inst_statuses {
	my ($curr,$usertypes,$types) = @_;
	my ($output,$rem,@currtypes);
	if ($curr ne '') {
	@currtypes = map { &unescape($_); } split(/:/,$curr);
	}
	my $numinrow = 2;
	if (ref($types) eq 'ARRAY') {
	$output = '<table>';
	my $lastcolspan;
	for (my $i=0; $i<@{$types}; $i++) {
	if (defined($usertypes->{$types->[$i]})) {
	my $rem = $i%($numinrow);
	if ($rem == 0) {
	if ($i<@{$types}-1) {
	if ($i > 0) {
	$output .= '</tr>';
	}
	$output .= '<tr>';
	}
	} elsif ($i==@{$types}-1) {
	my $colsleft = $numinrow - $rem;
	if ($colsleft > 1) {
	$lastcolspan = ' colspan="'.$colsleft.'"';
	}
	}
	my $check = ' ';
	if (grep(/^\Q$types->[$i]\E$/,@currtypes)) {
	$check = ' checked="checked" ';
	}
	$output .= '<td class="LC_left_item"'.$lastcolspan.'>'.
	'<span class="LC_nobreak"><label>'.
	'<input type="checkbox" name="inststatus" '.
	'value="'.$types->[$i].'"'.$check.'/>'.
	$usertypes->{$types->[$i]}.'</label></span></td>';
	}
	}
	$output .= '</tr></table>';
	}
	return $output;
	}

sub selfcreate_canmodify {	sub selfcreate_canmodify {
my ($context,$dom,$userinfo,$inst_results,$rolesarray) = @_;	my ($context,$dom,$userinfo,$inst_results,$rolesarray) = @_;
if (ref($inst_results) eq 'HASH') {	if (ref($inst_results) eq 'HASH') {
Line 1703 sub update_user_data {	Line 1814 sub update_user_data {
}	}
if ( $env{'form.ccdomain'} ne	if ( $env{'form.ccdomain'} ne
&LONCAPA::clean_domain($env{'form.ccdomain'}) ) {	&LONCAPA::clean_domain($env{'form.ccdomain'}) ) {
$r->print($error.&mt ('Invalid domain name.').' '.	$r->print($error.&mt('Invalid domain name.').' '.
&mt('Only letters, numbers, periods, dashes, and underscores are valid.').	&mt('Only letters, numbers, periods, dashes, and underscores are valid.').
$end.$rtnlink);	$end.$rtnlink);
return;	return;
Line 1752 sub update_user_data {	Line 1863 sub update_user_data {
$env{'form.ccuname'}, $env{'form.ccdomain'}).'</h3>');	$env{'form.ccuname'}, $env{'form.ccdomain'}).'</h3>');
my (%alerts,%rulematch,%inst_results,%curr_rules);	my (%alerts,%rulematch,%inst_results,%curr_rules);
my @usertools = ('aboutme','blog','portfolio');	my @usertools = ('aboutme','blog','portfolio');
	my @requestcourses = ('official','unofficial','community');
	my ($othertitle,$usertypes,$types) =
	&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
if ($env{'form.makeuser'}) {	if ($env{'form.makeuser'}) {
$r->print('<h3>'.&mt('Creating new account.').'</h3>');	$r->print('<h3>'.&mt('Creating new account.').'</h3>');
# Check for the authentication mode and password	# Check for the authentication mode and password
Line 1825 sub update_user_data {	Line 1939 sub update_user_data {
foreach my $item (@usertools) {	foreach my $item (@usertools) {
if ($env{'form.custom'.$item} == 1) {	if ($env{'form.custom'.$item} == 1) {
$newcustom{$item} = $env{'form.tools_'.$item};	$newcustom{$item} = $env{'form.tools_'.$item};
$changed{$item} = &tool_admin($item,$newcustom{$item},\%changeHash);	$changed{$item} = &tool_admin($item,$newcustom{$item},
	\%changeHash,'tools');
	}
	}
	foreach my $item (@requestcourses) {
	$newcustom{$item} = $env{'form.requestcourses_'.$item};
	$changed{$item} = &tool_admin($item,$newcustom{$item},
	\%changeHash,'requestcourses');
	}
	if (exists($env{'form.inststatus'})) {
	my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus');
	if (@inststatuses > 0) {
	$changeHash{'inststatus'} = join(',',@inststatuses);
	$changed{'inststatus'} = $changeHash{'inststatus'};
}	}
}	}
if (keys(%changed)) {	if (keys(%changed)) {
Line 1872 sub update_user_data {	Line 1999 sub update_user_data {
my %userenv = &Apache::lonnet::get	my %userenv = &Apache::lonnet::get
('environment',['firstname','middlename','lastname','generation',	('environment',['firstname','middlename','lastname','generation',
'id','permanentemail','portfolioquota','inststatus','tools.aboutme',	'id','permanentemail','portfolioquota','inststatus','tools.aboutme',
'tools.blog','tools.portfolio'],	'tools.blog','tools.portfolio','requestcourses.official',
	'requestcourses.unofficial','requestcourses.community'],
$env{'form.ccdomain'},$env{'form.ccuname'});	$env{'form.ccdomain'},$env{'form.ccuname'});
my ($tmp) = keys(%userenv);	my ($tmp) = keys(%userenv);
if ($tmp =~ /^(con_lost\|error)/i) {	if ($tmp =~ /^(con_lost\|error)/i) {
Line 1974 sub update_user_data {	Line 2102 sub update_user_data {
(!$forceid)) {	(!$forceid)) {
if ($env{'form.cid'} ne $uidhash{$env{'form.ccuname'}}) {	if ($env{'form.cid'} ne $uidhash{$env{'form.ccuname'}}) {
$env{'form.cid'} = $userenv{'id'};	$env{'form.cid'} = $userenv{'id'};
$no_forceid_alert = &mt('New Student/Employee ID does not match existing ID for this user.')	$no_forceid_alert = &mt('New student/employee ID does not match existing ID for this user.')
.'<br />'	.'<br />'
.&mt("Change is not permitted without checking the 'Force ID change' checkbox on the previous page.")	.&mt("Change is not permitted without checking the 'Force ID change' checkbox on the previous page.")
.'<br />'."\n";	.'<br />'."\n";
Line 1995 sub update_user_data {	Line 2123 sub update_user_data {
}	}
}	}
}	}
my ($quotachanged,$oldportfolioquota,$newportfolioquota,	my ($quotachanged,$oldportfolioquota,$newportfolioquota,$oldinststatus,
$inststatus,$oldisdefault,$newisdefault,$olddefquotatext,	$inststatus,$newinststatus,$oldisdefault,$newisdefault,$olddefquotatext,
$newdefquotatext,%oldaccess,%oldaccesstext,%newaccess,%newaccesstext);	$newdefquotatext,%oldaccess,%oldaccesstext,%newaccess,%newaccesstext,
	$oldinststatuses,$newinststatuses);
my ($defquota,$settingstatus) =	my ($defquota,$settingstatus) =
&Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus);	&Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus);
my ($showquota,$showtools);	my ($showquota,$showtools,$showrequestcourses,$showinststatus);
if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {	if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
$showquota = 1;	$showquota = 1;
}	}
if (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) {	if (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) {
$showtools = 1;	$showtools = 1;
}	}
	if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) {
	$showrequestcourses = 1;
	}
	if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) {
	$showinststatus = 1;
	}
my (%changeHash,%changed);	my (%changeHash,%changed);
	$oldinststatus = $userenv{'inststatus'};
	if ($oldinststatus eq '') {
	$oldinststatuses = $othertitle;
	} else {
	if (ref($usertypes) eq 'HASH') {
	$oldinststatuses = join(', ',map{ $usertypes->{ &unescape($_) }; } (split(/:/,$userenv{'inststatus'})));
	} else {
	$oldinststatuses = join(', ',map{ &unescape($_); } (split(/:/,$userenv{'inststatus'})));
	}
	}
	$changeHash{'inststatus'} = $userenv{'inststatus'};
	my %canmodify_inststatus = &Apache::lonuserutils::can_modify_userinfo($context,$env{'form.ccdomain'},['inststatus'],\@userroles);
	if ($canmodify_inststatus{'inststatus'}) {
	if (exists($env{'form.inststatus'})) {
	my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus');
	if (@inststatuses > 0) {
	$newinststatus = join(':',map { &escape($_); } @inststatuses);
	$changeHash{'inststatus'} = $newinststatus;
	if ($newinststatus ne $oldinststatus) {
	$changed{'inststatus'} = $newinststatus;
	}
	if (ref($usertypes) eq 'HASH') {
	$newinststatuses = join(', ',map{ $usertypes->{$_}; } (@inststatuses));
	} else {
	$newinststatuses = join(', ',map{ $usertypes->{$_}; } (@inststatuses));
	}
	} else {
	$newinststatus = '';
	$changeHash{'inststatus'} = $newinststatus;
	$newinststatuses = $othertitle;
	if ($newinststatus ne $oldinststatus) {
	$changed{'inststatus'} = $changeHash{'inststatus'};
	}
	}
	}
	}
$changeHash{'portfolioquota'} = $userenv{'portfolioquota'};	$changeHash{'portfolioquota'} = $userenv{'portfolioquota'};
if ($userenv{'portfolioquota'} ne '') {	if ($userenv{'portfolioquota'} ne '') {
$oldportfolioquota = $userenv{'portfolioquota'};	$oldportfolioquota = $userenv{'portfolioquota'};
Line 2024 sub update_user_data {	Line 2195 sub update_user_data {
} else {	} else {
$changed{'quota'} = &quota_admin('',\%changeHash);	$changed{'quota'} = &quota_admin('',\%changeHash);
$newportfolioquota = $defquota;	$newportfolioquota = $defquota;
$newisdefault = 1;	$newisdefault = 1;
}	}
} else {	} else {
$oldisdefault = 1;	$oldisdefault = 1;
Line 2048 sub update_user_data {	Line 2219 sub update_user_data {
if ($newisdefault) {	if ($newisdefault) {
$newdefquotatext = &get_defaultquota_text($settingstatus);	$newdefquotatext = &get_defaultquota_text($settingstatus);
}	}
	&tool_changes('tools',\@usertools,\%oldaccess,\%oldaccesstext,\%userenv,
foreach my $tool (@usertools) {	\%changeHash,\%changed,\%newaccess,\%newaccesstext);
if ($userenv{'tools.'.$tool} ne '') {	&tool_changes('requestcourses',\@requestcourses,\%oldaccess,\%oldaccesstext,
$oldaccess{$tool} = &mt('custom');	\%userenv, \%changeHash,\%changed,\%newaccess,\%newaccesstext);
if ($userenv{'tools_'.$tool}) {
$oldaccesstext{$tool} = &mt("availability set to 'on'");
} else {
$oldaccesstext{$tool} = &mt("availability set to 'off'");
}
$changeHash{'tools.'.$tool} = $userenv{'tools.'.$tool};
if ($env{'form.custom'.$tool} == 1) {
if ($env{'form.tools_'.$tool} ne $userenv{'tools.'.$tool}) {
$changed{$tool} = &tool_admin($tool,$env{'form.tools_'.$tool},
\%changeHash);
if ($changed{$tool}) {
$newaccess{$tool} = &mt('custom');
if ($env{'form.tools_'.$tool}) {
$newaccesstext{$tool} = &mt("availability set to 'on'");
} else {
$newaccesstext{$tool} = &mt("availability set to 'off'");
}
} else {
$newaccess{$tool} = $oldaccess{$tool};
if ($userenv{'tools.'.$tool}) {
$newaccesstext{$tool} = &mt("availability set to 'on'");
} else {
$newaccesstext{$tool} = &mt("availability set to 'off'");
}
}
} else {
$newaccess{$tool} = $oldaccess{$tool};
$newaccesstext{$tool} = $oldaccesstext{$tool};
}
} else {
$changed{$tool} = &tool_admin($tool,'',\%changeHash);
if ($changed{$tool}) {
$newaccess{$tool} = &mt('default');
} else {
$newaccess{$tool} = $oldaccess{$tool};
if ($userenv{'tools.'.$tool}) {
$newaccesstext{$tool} = &mt("availability set to 'on'");
} else {
$newaccesstext{$tool} = &mt("availability set to 'off'");
}
}
}
} else {
$oldaccess{$tool} = &mt('default');
if ($env{'form.custom'.$tool} == 1) {
$changed{$tool} = &tool_admin($tool,$env{'form.tools_'.$tool},
\%changeHash);
if ($changed{$tool}) {
$newaccess{$tool} = &mt('custom');
if ($env{'form.tools_'.$tool}) {
$newaccesstext{$tool} = &mt("availability set to 'on'");
} else {
$newaccesstext{$tool} = &mt("availability set to 'off'");
}
} else {
$newaccess{$tool} = $oldaccess{$tool};
}
} else {
$newaccess{$tool} = $oldaccess{$tool};
}
}
}

if ($env{'form.cfirstname'} ne $userenv{'firstname'} \|\|	if ($env{'form.cfirstname'} ne $userenv{'firstname'} \|\|
$env{'form.cmiddlename'} ne $userenv{'middlename'} \|\|	$env{'form.cmiddlename'} ne $userenv{'middlename'} \|\|
$env{'form.clastname'} ne $userenv{'lastname'} \|\|	$env{'form.clastname'} ne $userenv{'lastname'} \|\|
Line 2140 sub update_user_data {	Line 2248 sub update_user_data {
($env{'user.domain'} eq $env{'form.ccdomain'})) {	($env{'user.domain'} eq $env{'form.ccdomain'})) {
my %newenvhash;	my %newenvhash;
foreach my $key (keys(%changed)) {	foreach my $key (keys(%changed)) {
if ($key ne 'quota') {	if (($key eq 'official') \|\| ($key eq 'unofficial')
	\|\| ($key eq 'community')) {
	$newenvhash{'environment.requestcourses.'.$key} =
	$changeHash{'requestcourses.'.$key};
	if ($changeHash{'requestcourses.'.$key} ne '') {
	$newenvhash{'environment.canrequest.'.$key} =
	$changeHash{'requestcourses.'.$key};
	} else {
	$newenvhash{'environment.canrequest.'.$key} =
	&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
	$key,'reload','requestcourses');
	}
	} elsif ($key ne 'quota') {
$newenvhash{'environment.tools.'.$key} =	$newenvhash{'environment.tools.'.$key} =
$changeHash{'tools.'.$key};	$changeHash{'tools.'.$key};
$newenvhash{'environment.availabletools.'.$key} =	if ($changeHash{'tools.'.$key} ne '') {
$changeHash{'tools.'.$key};	$newenvhash{'environment.availabletools.'.$key} =
	$changeHash{'tools.'.$key};
	} else {
	$newenvhash{'environment.availabletools.'.$key} =
	&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'}, $key,'reload','tools');
	}
}	}
}	}
if (keys(%newenvhash)) {	if (keys(%newenvhash)) {
Line 2173 sub update_user_data {	Line 2298 sub update_user_data {
((keys(%changed) > 0) && $chgresult eq 'ok')) {	((keys(%changed) > 0) && $chgresult eq 'ok')) {
# Tell the user we changed the name	# Tell the user we changed the name
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'uic' => "User Information Changed",	'uic' => 'User Information Changed',
'frst' => "First",	'frst' => 'First Name',
'mddl' => "Middle",	'mddl' => 'Middle Name',
'lst' => "Last",	'lst' => 'Last Name',
'gen' => "Generation",	'gen' => 'Generation',
'id' => "Student/Employee ID",	'id' => 'Student/Employee ID',
'mail' => "Permanent E-mail",	'mail' => 'Permanent e-mail address',
'disk' => "Disk space allocated to portfolio files",	'disk' => 'Disk space allocated to portfolio files',
'blog' => "Blog Availability",	'blog' => 'Blog Availability',
'aboutme' => "Home Page Availability",	'aboutme' => 'Personal Information Page Availability',
'portfolio' => "Portfolio Availability",	'portfolio' => 'Portfolio Availability',
'prvs' => "Previous",	'official' => 'Can Request Official Courses',
'chto' => "Changed To"	'unofficial' => 'Can Request Unofficial Courses',
	'community' => 'Can Request Communities',
	'inststatus' => "Affiliation",
	'prvs' => 'Previous Value:',
	'chto' => 'Changed To:'
);	);
$r->print('<h4>'.$lt{'uic'}.'</h4>'.	$r->print('<h4>'.$lt{'uic'}.'</h4>'.
&Apache::loncommon::start_data_table().	&Apache::loncommon::start_data_table().
Line 2199 sub update_user_data {	Line 2328 sub update_user_data {
<th>$lt{'id'}</th>	<th>$lt{'id'}</th>
<th>$lt{'mail'}</th>	<th>$lt{'mail'}</th>
END	END
	if ($showinststatus) {
	$r->print("
	<th>$lt{'inststatus'}</th>\n");
	}
	if ($showrequestcourses) {
	foreach my $item (@requestcourses) {
	$r->print("
	<th>$lt{$item}</th>\n");
	}
	}
if ($showquota) {	if ($showquota) {
$r->print("	$r->print("
<th>$lt{'disk'}</th>\n");	<th>$lt{'disk'}</th>\n");
Line 2220 END	Line 2359 END
<td>$userenv{'id'}</td>	<td>$userenv{'id'}</td>
<td>$userenv{'permanentemail'} </td>	<td>$userenv{'permanentemail'} </td>
END	END
	if ($showinststatus) {
	$r->print("
	<td>$oldinststatuses</td>\n");
	}
	if ($showrequestcourses) {
	foreach my $item (@requestcourses) {
	$r->print("
	<td>$oldaccess{$item} $oldaccesstext{$item}</td>\n");
	}
	}
if ($showquota) {	if ($showquota) {
$r->print("	$r->print("
<td>$oldportfolioquota Mb $olddefquotatext </td>\n");	<td>$oldportfolioquota Mb $olddefquotatext </td>\n");
Line 2241 END	Line 2390 END
<td>$env{'form.cid'} </td>	<td>$env{'form.cid'} </td>
<td>$env{'form.cpermanentemail'} </td>	<td>$env{'form.cpermanentemail'} </td>
END	END
	if ($showinststatus) {
	$r->print("
	<td>$newinststatuses</td>\n");
	}
	if ($showrequestcourses) {
	foreach my $item (@requestcourses) {
	$r->print("
	<td>$newaccess{$item} $newaccesstext{$item} </td>\n");
	}
	}
if ($showquota) {	if ($showquota) {
$r->print("	$r->print("
<td>$newportfolioquota Mb $newdefquotatext </td>\n");	<td>$newportfolioquota Mb $newdefquotatext </td>\n");
Line 2279 END	Line 2438 END
$env{'form.ccdomain'}.'</span><br />');	$env{'form.ccdomain'}.'</span><br />');
}	}
} else { # End of if ($env ... ) logic	} else { # End of if ($env ... ) logic
# They did not want to change the users name, quota or tool availability,	# They did not want to change the users name, quota, tool availability,
	# or ability to request creation of courses,
# but we can still tell them what the name and quota and availabilities are	# but we can still tell them what the name and quota and availabilities are
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'id' => "Student/Employee ID",	'id' => "Student/Employee ID",
'mail' => "Permanent e-mail",	'mail' => "Permanent e-mail address",
'disk' => "Disk space allocated to user's portfolio files",	'disk' => "Disk space allocated to user's portfolio files",
'blog' => "Blog Availability",	'blog' => "Blog Availability",
'aboutme' => "Home Page Availability",	'aboutme' => "Personal Information Page Availability",
'portfolio' => "Portfolio Availability",	'portfolio' => "Portfolio Availability",
	'official' => "Can Request Official Courses",
	'unofficial' => "Can Request Unofficial Courses",
	'community' => "Can Request Communities",
	'inststatus' => "Affiliation",
);	);
$r->print(<<"END");	$r->print(<<"END");
<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'}	<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'}
Line 2296 END	Line 2460 END
$r->print('<br />['.$lt{'mail'}.': '.	$r->print('<br />['.$lt{'mail'}.': '.
$userenv{'permanentemail'}.']');	$userenv{'permanentemail'}.']');
}	}
	if ($showinststatus) {
	$r->print('<br />['.$lt{'inststatus'}.': '.$oldinststatuses.']');
	}
	if ($showrequestcourses) {
	foreach my $item (@requestcourses) {
	$r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '.
	$newaccesstext{$item}.']'."\n");
	}
	}
if ($showtools) {	if ($showtools) {
foreach my $item (@usertools) {	foreach my $item (@usertools) {
$r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '.	$r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '.
Line 2331 END	Line 2504 END
} else {	} else {
$r->print(&mt("You do not have the authority to change these fields given the user's current set of active/future [_1] roles:",$contextname));	$r->print(&mt("You do not have the authority to change these fields given the user's current set of active/future [_1] roles:",$contextname));
}	}
$r->print('<span class="LC_cusr_emph">'.$rolestr.'</span><br />'.	my $helplink = 'javascript:helpMenu('."'display'".')';
&mt('Contact your <a href="[_1]">helpdesk</a> for more information.',"javascript:helpMenu('display')").'<br />');	$r->print('<span class="LC_cusr_emph">'.$rolestr.'</span><br />'
	.&mt('Please contact your [_1]helpdesk[_2] for more information.'
	,'<a href="'.$helplink.'">','</a>')
	.'<br />');
}	}
$r->print('<span class="LC_warning">'	$r->print('<span class="LC_warning">'
.$no_forceid_alert	.$no_forceid_alert
Line 2374 END	Line 2550 END
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
}	}

	sub tool_changes {
	my ($context,$usertools,$oldaccess,$oldaccesstext,$userenv,$changeHash,
	$changed,$newaccess,$newaccesstext) = @_;
	if (!((ref($usertools) eq 'ARRAY') && (ref($oldaccess) eq 'HASH') &&
	(ref($oldaccesstext) eq 'HASH') && (ref($userenv) eq 'HASH') &&
	(ref($changeHash) eq 'HASH') && (ref($changed) eq 'HASH') &&
	(ref($newaccess) eq 'HASH') && (ref($newaccesstext) eq 'HASH'))) {
	return;
	}
	foreach my $tool (@{$usertools}) {
	if ($userenv->{$context.'.'.$tool} ne '') {
	$oldaccess->{$tool} = &mt('custom');
	if ($userenv->{$context.'.'.$tool}) {
	$oldaccesstext->{$tool} = &mt("availability set to 'on'");
	} else {
	$oldaccesstext->{$tool} = &mt("availability set to 'off'");
	}
	$changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool};
	if ($env{'form.custom'.$tool} == 1) {
	if ($env{'form.'.$context.'_'.$tool} ne $userenv->{$context.'.'.$tool}) {
	$changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool},
	$changeHash,$context);
	if ($changed->{$tool}) {
	$newaccess->{$tool} = &mt('custom');
	if ($env{'form.'.$context.'_'.$tool}) {
	$newaccesstext->{$tool} = &mt("availability set to 'on'");
	} else {
	$newaccesstext->{$tool} = &mt("availability set to 'off'");
	}
	} else {
	$newaccess->{$tool} = $oldaccess->{$tool};
	if ($userenv->{$context.'.'.$tool}) {
	$newaccesstext->{$tool} = &mt("availability set to 'on'");
	} else {
	$newaccesstext->{$tool} = &mt("availability set to 'off'");
	}
	}
	} else {
	$newaccess->{$tool} = $oldaccess->{$tool};
	$newaccesstext->{$tool} = $oldaccesstext->{$tool};
	}
	} else {
	$changed->{$tool} = &tool_admin($tool,'',$changeHash,$context);
	if ($changed->{$tool}) {
	$newaccess->{$tool} = &mt('default');
	} else {
	$newaccess->{$tool} = $oldaccess->{$tool};
	if ($userenv->{$context.'.'.$tool}) {
	$newaccesstext->{$tool} = &mt("availability set to 'on'");
	} else {
	$newaccesstext->{$tool} = &mt("availability set to 'off'");
	}
	}
	}
	} else {
	$oldaccess->{$tool} = &mt('default');
	if ($env{'form.custom'.$tool} == 1) {
	$changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool},
	$changeHash,$context);
	if ($changed->{$tool}) {
	$newaccess->{$tool} = &mt('custom');
	if ($env{'form.'.$context.'_'.$tool}) {
	$newaccesstext->{$tool} = &mt("availability set to 'on'");
	} else {
	$newaccesstext->{$tool} = &mt("availability set to 'off'");
	}
	} else {
	$newaccess->{$tool} = $oldaccess->{$tool};
	}
	} else {
	$newaccess->{$tool} = $oldaccess->{$tool};
	}
	}
	}
	return;
	}

sub update_roles {	sub update_roles {
my ($r,$context) = @_;	my ($r,$context) = @_;
my $now=time;	my $now=time;
Line 2441 sub update_roles {	Line 2694 sub update_roles {
if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {	if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);	my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
# Delete custom role	# Delete custom role
$r->print(&mt('Deleting custom role [_1] by [_2]:[_3] in [_4]',	$r->print(&mt('Deleting custom role [_1] by [_2] in [_3]',
$rolename,$rnam,$rdom,$url).': <b>'.	$rolename,$rnam.':'.$rdom,$url).': <b>'.
&Apache::lonnet::assigncustomrole($env{'form.ccdomain'},	&Apache::lonnet::assigncustomrole($env{'form.ccdomain'},
$env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,	$env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
0,1,$context).'</b><br />');	0,1,$context).'</b><br />');
Line 2493 sub update_roles {	Line 2746 sub update_roles {
my $result = &Apache::lonnet::assigncustomrole(	my $result = &Apache::lonnet::assigncustomrole(
$env{'form.ccdomain'}, $env{'form.ccuname'},	$env{'form.ccdomain'}, $env{'form.ccuname'},
$url,$rdom,$rnam,$rolename,0,$now,undef,$context);	$url,$rdom,$rnam,$rolename,0,$now,undef,$context);
$r->print(&mt('Re-enabling custom role [_1] by [_2]:[_3] in [_4] : [_5]',	$r->print(&mt('Re-enabling custom role [_1] by [_2] in [_3]: [_4]',
$rolename,$rnam,$rdom,$url,'<b>'.$result.'</b>').'<br />');	$rolename,$rnam.':'.$rdom,$url,'<b>'.$result.'</b>').'<br />');
if (!grep(/^cr$/,@rolechanges)) {	if (!grep(/^cr$/,@rolechanges)) {
push(@rolechanges,'cr');	push(@rolechanges,'cr');
}	}
Line 2616 sub update_roles {	Line 2869 sub update_roles {
$r->print('<p><span class="LC_error">'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$key.'</tt></span></p><br />');	$r->print('<p><span class="LC_error">'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$key.'</tt></span></p><br />');
}	}
foreach my $key (sort(keys(%disallowed))) {	foreach my $key (sort(keys(%disallowed))) {
	$r->print('<p class="LC_warning">');
if (($key eq 'none') \|\| ($key eq 'all')) {	if (($key eq 'none') \|\| ($key eq 'all')) {
$r->print('<p>'.&mt('[_1] may not be used as the name for a section, as it is a reserved word.',$key));	$r->print(&mt('[_1] may not be used as the name for a section, as it is a reserved word.','<tt>'.$key.'</tt>'));
} else {	} else {
$r->print('<p>'.&mt('[_1] may not be used as the name for a section, as it is the name of a course group.',$key));	$r->print(&mt('[_1] may not be used as the name for a section, as it is the name of a course group.','<tt>'.$key.'</tt>'));
}	}
$r->print(' '.&mt('Please <a href="javascript:history.go(-1)">go back</a> and choose a different section name.').'</p><br />');	$r->print('</p><p>'
	.&mt('Please [_1]go back[_2] and choose a different section name.'
	,'<a href="javascript:history.go(-1)'
	,'</a>')
	.'</p><br />'
	);
}	}
}	}
} # End of foreach (keys(%env))	} # End of foreach (keys(%env))
Line 2732 sub quota_admin {	Line 2991 sub quota_admin {
}	}

sub tool_admin {	sub tool_admin {
my ($tool,$settool,$changeHash) = @_;	my ($tool,$settool,$changeHash,$context) = @_;
my $toolchanged;	my $canchange = 0;
if (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) {	if ($context eq 'requestcourses') {
	if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) {
	$canchange = 1;
	}
	} elsif (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) {
# Current user has quota modification privileges	# Current user has quota modification privileges
	$canchange = 1;
	}
	my $toolchanged;
	if ($canchange) {
if (ref($changeHash) eq 'HASH') {	if (ref($changeHash) eq 'HASH') {
$toolchanged = 1;	$toolchanged = 1;
$changeHash->{'tools.'.$tool} = $settool;	$changeHash->{$context.'.'.$tool} = $settool;
}	}
}	}
return $toolchanged;	return $toolchanged;
Line 2896 ENDCCF	Line 3163 ENDCCF
my $privtext = &Apache::lonnet::plaintext($priv);	my $privtext = &Apache::lonnet::plaintext($priv);
$r->print(&Apache::loncommon::start_data_table_row().	$r->print(&Apache::loncommon::start_data_table_row().
'<td>'.$privtext.'</td><td>'.	'<td>'.$privtext.'</td><td>'.
($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c" '.	($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c"'.
($courselevelcurrent{$priv}?'checked="1"':'').' />':' ').	($courselevelcurrent{$priv}?' checked="checked"':'').' />':' ').
'</td><td>'.	'</td><td>'.
($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d" '.	($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d"'.
($domainlevelcurrent{$priv}?'checked="1"':'').' />':' ').	($domainlevelcurrent{$priv}?' checked="checked"':'').' />':' ').
'</td><td>'.	'</td><td>'.
($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s" '.	($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s"'.
($systemlevelcurrent{$priv}?'checked="1"':'').' />':' ').	($systemlevelcurrent{$priv}?' checked="checked"':'').' />':' ').
'</td>'.	'</td>'.
&Apache::loncommon::end_data_table_row());	&Apache::loncommon::end_data_table_row());
}	}
Line 2912 ENDCCF	Line 3179 ENDCCF
'<input type="hidden" name="startrolename" value="'.$env{'form.rolename'}.	'<input type="hidden" name="startrolename" value="'.$env{'form.rolename'}.
'" />'."\n".'<input type="hidden" name="currstate" value="" />'."\n".	'" />'."\n".'<input type="hidden" name="currstate" value="" />'."\n".
'<input type="reset" value="'.&mt("Reset").'" />'."\n".	'<input type="reset" value="'.&mt("Reset").'" />'."\n".
'<input type="submit" value="'.&mt('Define Role').'" /></form>'.	'<input type="submit" value="'.&mt('Save').'" /></form>'.
&Apache::loncommon::end_page());	&Apache::loncommon::end_page());
}	}
# --------------------------------------------------------	# --------------------------------------------------------
Line 3095 sub handler {	Line 3362 sub handler {
if ($env{'form.action'} ne 'dateselect') {	if ($env{'form.action'} ne 'dateselect') {
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/createuser",	({href=>"/adm/createuser",
text=>"User Management"});	text=>"User Management",
	help=>'Course_Create_Class_List,Course_Change_Privileges,Course_View_Class_List,Course_Editing_Custom_Roles,Course_Add_Student,Course_Drop_Student,Course_Automated_Enrollment,Course_Self_Enrollment,Course_Manage_Group'});
}	}
	#SD Following files not added to help, because the corresponding .tex-files seem to
	#be missing: Course_Approve_Selfenroll,Course_User_Logs,
my ($permission,$allowed) =	my ($permission,$allowed) =
&Apache::lonuserutils::get_permission($context);	&Apache::lonuserutils::get_permission($context);
if (!$allowed) {	if (!$allowed) {
Line 3390 END	Line 3660 END
sub print_main_menu {	sub print_main_menu {
my ($permission,$context) = @_;	my ($permission,$context) = @_;
my %links = (	my %links = (
domain => {	domain => {
upload => 'Upload a File of Users',	upload => 'Upload a File of Users',
singleuser => 'Add/Modify a Single User',	singleuser => 'Add/Modify a User',
listusers => 'Manage Multiple Users',	listusers => 'Manage Users',
},	},
author => {	author => {
upload => 'Upload a File of Co-authors',	upload => 'Upload a File of Co-authors',
singleuser => 'Add/Modify a Single Co-author',	singleuser => 'Add/Modify a Co-author',
listusers => 'Display Co-authors and Manage Multiple Users',	listusers => 'Manage Co-authors',
},	},
course => {	course => {
upload => 'Upload a File of Course Users',	upload => 'Upload a File of Course Users',
singleuser => 'Add/Modify a Single Course User',	singleuser => 'Add/Modify a Course User',
listusers => 'Display Class Lists and Manage Multiple Users',	listusers => 'Manage Course Users',
},	},
);	);
my @menu =	my @menu = ( {categorytitle => 'Single Users',
(	items =>
{ text => $links{$context}{'upload'},	[
help => 'Course_Create_Class_List',	{
action => 'upload',	linktext => $links{$context}{'singleuser'},
permission => $permission->{'cusr'},	icon => 'edit-redo.png',
	#help => 'Course_Change_Privileges',
	url => '/adm/createuser?action=singleuser',
	permission => $permission->{'cusr'},
	linktitle => 'Add a user with a certain role to this course.',
},	},
{ text => $links{$context}{'singleuser'},	]},
help => 'Course_Change_Privileges',
action => 'singleuser',	{categorytitle => 'Multiple Users',
permission => $permission->{'cusr'},	items =>
	[
	{
	linktext => $links{$context}{'upload'},
	icon => 'sctr.png',
	#help => 'Course_Create_Class_List',
	url => '/adm/createuser?action=upload',
	permission => $permission->{'cusr'},
	linktitle => 'Upload a CSV or a text file containing users.',
	},
	{
	linktext => $links{$context}{'listusers'},
	icon => 'edit-find.png',
	#help => 'Course_View_Class_List',
	url => '/adm/createuser?action=listusers',
	permission => ($permission->{'view'} \|\| $permission->{'cusr'}),
	linktitle => 'Show and manage users of this course.',
	},

	]},

	{categorytitle => 'Administration',
	items => [ ]},
	);

	if ($context eq 'domain'){

	push(@{ $menu[2]->{items} }, #Category: Administration
	{
	linktext => 'Custom Roles',
	icon => 'emblem-photos.png',
	#help => 'Course_Editing_Custom_Roles',
	url => '/adm/createuser?action=custom',
	permission => $permission->{'custom'},
	linktitle => 'Configure a custom role.',
},	},
{ text => $links{$context}{'listusers'},
help => 'Course_View_Class_List',
action => 'listusers',
permission => ($permission->{'view'} \|\| $permission->{'cusr'}),
},
);	);
if ($context eq 'domain' \|\| $context eq 'course') {
my $customlink = { text => 'Edit Custom Roles',	}elsif ($context eq 'course'){
help => 'Course_Editing_Custom_Roles',
action => 'custom',
permission => $permission->{'custom'},
};
push(@menu,$customlink);
}
if ($context eq 'course') {
my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();	my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
my @courselinks =
(	push(@{ $menu[0]->{items} }, #Category: Single Users
{ text => 'Enroll a Single Student',	{
help => 'Course_Add_Student',	linktext => 'Add/Modify a Student',
action => 'singlestudent',	#help => 'Course_Add_Student',
permission => $permission->{'cusr'},	icon => 'list-add.png',
},	url => '/adm/createuser?action=singlestudent',
{ text => 'Drop Students',	permission => $permission->{'cusr'},
help => 'Course_Drop_Student',	linktitle => 'Add a user with the role student to this course.',
action => 'drop',	},
permission => $permission->{'cusr'},	);
});
if (!exists($permission->{'cusr_section'})) {	push(@{ $menu[1]->{items} }, #Category: Multiple Users
push(@courselinks,	{
{ text => 'Automated Enrollment Manager',	linktext => 'Drop Students',
help => 'Course_Automated_Enrollment',	icon => 'edit-undo.png',
	#help => 'Course_Drop_Student',
	url => '/adm/createuser?action=drop',
	permission => $permission->{'cusr'},
	linktitle =>'Remove a student from this course.',
	},
	);
	push(@{ $menu[2]->{items} }, #Category: Administration
	{
	linktext => 'Custom Roles',
	icon => 'emblem-photos.png',
	#help => 'Course_Editing_Custom_Roles',
	url => '/adm/createuser?action=custom',
	permission => $permission->{'custom'},
	linktitle => 'Configure a custom role.',
	},
	{
	linktext => 'Course Groups',
	icon => 'conf.png',
	#help => 'Course_Manage_Group',
	url => '/adm/coursegroups?refpage=cusr',
	permission => $permission->{'grp_manage'},
	linktitle => 'Manage course groups.',
	},
	{
	linktext => 'Change Logs',
	icon => 'document-properties.png',
	#help => 'Course_User_Logs',
	url => '/adm/createuser?action=changelogs',
	permission => $permission->{'cusr'},
	linktitle => 'View change log.',
	},
	);
	if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {
	push(@{ $menu[2]->{items} },
	{
	linktext => 'Enrollment Requests',
	icon => 'selfenrl-queue.png',
	#help => 'Course_Approve_Selfenroll',
	url => '/adm/createuser?action=selfenrollqueue',
	permission => $permission->{'cusr'},
	linktitle =>'Approve or reject enrollment requests.',
	},
	);
	}

	if (!exists($permission->{'cusr_section'})){

	push(@{ $menu[2]->{items} },
	{
	linktext => 'Automated Enrollment',
	icon => 'roles.png',
	#help => 'Course_Automated_Enrollment',
permission => (&Apache::lonnet::auto_run($cnum,$cdom)	permission => (&Apache::lonnet::auto_run($cnum,$cdom)
&& $permission->{'cusr'}),	&& $permission->{'cusr'}),
url => '/adm/populate',	url => '/adm/populate',
},	linktitle => 'Automated enrollment manager.',
{ text => 'Configure User Self-enrollment',	},
help => 'Course_Self_Enrollment',	{
action => 'selfenroll',	linktext => 'User Self-Enrollment',
	icon => 'cstr.png',
	#help => 'Course_Self_Enrollment',
	url => '/adm/createuser?action=selfenroll',
permission => $permission->{'cusr'},	permission => $permission->{'cusr'},
});	linktitle => 'Configure user self enrollment.',
if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {	},
push(@courselinks,	);
{text => 'Enrollment Requests',
action => 'selfenrollqueue',
permission => $permission->{'cusr'},
});
}
}	}
push(@courselinks,	};
{ text => 'Manage Course Groups',	return Apache::lonhtmlcommon::generate_menu(@menu);
help => 'Course_Manage_Group',
permission => $permission->{'grp_manage'},
url => '/adm/coursegroups?refpage=cusr',
},
{ text => 'View Change Logs',
help => 'Course_User_Logs',
action => 'changelogs',
permission => $permission->{'cusr'},
},);
# { text => 'View Log-in History',	# { text => 'View Log-in History',
# help => 'Course_User_Logins',	# help => 'Course_User_Logins',
# action => 'logins',	# action => 'logins',
# permission => $permission->{'cusr'},	# permission => $permission->{'cusr'},
# });	# });
push(@menu,@courselinks);
}
my $menu_html = '';
foreach my $menu_item (@menu) {
next if (! $menu_item->{'permission'});
$menu_html.='<p>';
if (exists($menu_item->{'help'})) {
$menu_html.=
&Apache::loncommon::help_open_topic($menu_item->{'help'});
}
$menu_html.='<font size="+1">';
if (exists($menu_item->{'url'})) {
$menu_html.=qq{<a href="$menu_item->{'url'}">};
} else {
$menu_html.=
qq{<a href="/adm/createuser?action=$menu_item->{'action'}">}; }
$menu_html.= &mt($menu_item->{'text'}).'</a></font>';
$menu_html.='</p>';
}
return $menu_html;
}	}

sub restore_prev_selections {	sub restore_prev_selections {
Line 3708 ENDSCRIPT	Line 4026 ENDSCRIPT
$output .= '<p class="LC_info">'.$visactions->{'vis'}.'</p>';	$output .= '<p class="LC_info">'.$visactions->{'vis'}.'</p>';
} else {	} else {
$output .= '<p class="LC_warning">'.$visactions->{'miss'}.'</p>'	$output .= '<p class="LC_warning">'.$visactions->{'miss'}.'</p>'
.$visactions->{'yous'}.	.$visactions->{'yous'}.
'<p>'.$visactions->{'gen'}.'<br />'.$visactions->{'coca'};	'<p>'.$visactions->{'gen'}.'<br />'.$visactions->{'coca'};
if (ref($vismsgs) eq 'ARRAY') {	if (ref($vismsgs) eq 'ARRAY') {
$output .= '<br />'.$visactions->{'make'}.'<ul>';	$output .= '<br />'.$visactions->{'make'}.'<ul>';
Line 3728 ENDSCRIPT	Line 4046 ENDSCRIPT
if (ref($lt) eq 'HASH') {	if (ref($lt) eq 'HASH') {
$title = $lt->{$item};	$title = $lt->{$item};
}	}
$output .=	$output .= &Apache::lonhtmlcommon::row_title($title);
&Apache::lonhtmlcommon::row_title($title,
'LC_selfenroll_pick_box_title','LC_oddrow_value')."\n";
if ($item eq 'types') {	if ($item eq 'types') {
my $curr_types = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_types'};	my $curr_types = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_types'};
my $showdomdesc = 1;	my $showdomdesc = 1;
Line 3892 ENDSCRIPT	Line 4208 ENDSCRIPT
}	}
if (@ccs) {	if (@ccs) {
$output .= '<br />'.&mt('Personnel to be notified when an enrollment request needs approval, or has been approved:').' '.&Apache::loncommon::start_data_table().	$output .= '<br />'.&mt('Personnel to be notified when an enrollment request needs approval, or has been approved:').' '.&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_row();	&Apache::loncommon::start_data_table_row();
my $count = 0;	my $count = 0;
my $numcols = 4;	my $numcols = 4;
foreach my $cc (sort(@ccs)) {	foreach my $cc (sort(@ccs)) {
Line 3914 ENDSCRIPT	Line 4230 ENDSCRIPT
my $rem = $count%$numcols;	my $rem = $count%$numcols;
if ($rem) {	if ($rem) {
my $emptycols = $numcols - $rem;	my $emptycols = $numcols - $rem;
for (my $i=0; $i<$emptycols; $i++) {	for (my $i=0; $i<$emptycols; $i++) {
$output .= '<td> </td>';	$output .= '<td> </td>';
}	}
}	}
Line 3934 ENDSCRIPT	Line 4250 ENDSCRIPT
} elsif ($currlim eq 'selfenrolled') {	} elsif ($currlim eq 'selfenrolled') {
$crslimit = ' ';	$crslimit = ' ';
$selflimit = ' checked="checked" ';	$selflimit = ' checked="checked" ';
$nolimit = ' ';	$nolimit = ' ';
} else {	} else {
$crslimit = ' ';	$crslimit = ' ';
$selflimit = ' ';	$selflimit = ' ';
Line 3956 ENDSCRIPT	Line 4272 ENDSCRIPT
}	}
$output .= &Apache::lonhtmlcommon::end_pick_box().	$output .= &Apache::lonhtmlcommon::end_pick_box().
'<br /><input type="button" name="selfenrollconf" value="'	'<br /><input type="button" name="selfenrollconf" value="'
.&mt('Save changes').'" onclick="validate_types(this.form);" />'	.&mt('Save').'" onclick="validate_types(this.form);" />'
.'<input type="hidden" name="action" value="selfenroll" /></form>';	.'<input type="hidden" name="action" value="selfenroll" /></form>';
$r->print($output);	$r->print($output);
return;	return;
Line 4017 sub display_selfenroll_queue {	Line 4333 sub display_selfenroll_queue {
$r->print(&Apache::loncommon::end_data_table().	$r->print(&Apache::loncommon::end_data_table().
'<input type="submit" name="processqueue" value="'.&mt('Save').'" /></form>');	'<input type="submit" name="processqueue" value="'.&mt('Save').'" /></form>');
} else {	} else {
$r->print(&mt('There are currently no enrollment requests.'));	$r->print(&mt('There are currently no enrollment requests.'));
}	}
return;	return;
}	}
Line 4028 sub update_selfenroll_queue {	Line 4344 sub update_selfenroll_queue {
my @rejections = &Apache::loncommon::get_env_multiple('form.rejectreq');	my @rejections = &Apache::loncommon::get_env_multiple('form.rejectreq');
my $access_start = $env{'course.'.$cid.'.internal.selfenroll_start_access'};	my $access_start = $env{'course.'.$cid.'.internal.selfenroll_start_access'};
my $access_end = $env{'course.'.$cid.'.internal.selfenroll_end_access'};	my $access_end = $env{'course.'.$cid.'.internal.selfenroll_end_access'};
my $limit = $env{'course.'.$cid.'.internal.selfenroll_limit'};	my $limit = $env{'course.'.$cid.'.internal.selfenroll_limit'};
my $cap = $env{'course.'.$cid.'.internal.selfenroll_cap'};	my $cap = $env{'course.'.$cid.'.internal.selfenroll_cap'};
my $notifylist = $env{'course.'.$cid.'.internal.selfenroll_notifylist'};	my $notifylist = $env{'course.'.$cid.'.internal.selfenroll_notifylist'};
my $namespace = 'selfenrollrequests';	my $namespace = 'selfenrollrequests';
Line 4050 sub update_selfenroll_queue {	Line 4366 sub update_selfenroll_queue {
mt => 'Visit [_1], to log-in and access the course',	mt => 'Visit [_1], to log-in and access the course',
args => [$protocol.'://'.$hostname],	args => [$protocol.'://'.$hostname],
}];	}];

my $rejectedmsg = [{	my $rejectedmsg = [{
mt => 'Your request for enrollment has not been approved.',	mt => 'Your request for enrollment has not been approved.',
}];	}];
Line 4059 sub update_selfenroll_queue {	Line 4375 sub update_selfenroll_queue {
my $uhome = &Apache::lonnet::homeserver($uname,$udom);	my $uhome = &Apache::lonnet::homeserver($uname,$udom);
if ($uhome ne 'no_host') {	if ($uhome ne 'no_host') {
if (exists($requesthash{$uname.':'.$udom})) {	if (exists($requesthash{$uname.':'.$udom})) {

if (exists($classlist->{$uname.':'.$udom})) {	if (exists($classlist->{$uname.':'.$udom})) {
if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') {	if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') {
if (($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Active') \|\|	if (($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Active') \|\|
Line 4085 sub update_selfenroll_queue {	Line 4401 sub update_selfenroll_queue {
last;	last;
}	}
}	}
my $result =	my $result =
&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$usec,$access_end,$access_start,'selfenroll',undef,$cdom.'_'.$cnum,1);	&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$usec,$access_end,$access_start,'selfenroll',undef,$cdom.'_'.$cnum,1);
if ($result eq 'ok') {	if ($result eq 'ok') {
push(@enrolled,$uname.':'.$udom);	push(@enrolled,$uname.':'.$udom);
Line 4101 sub update_selfenroll_queue {	Line 4417 sub update_selfenroll_queue {
status => 'approved',	status => 'approved',
}	}
);	);
my $userresult =	my $userresult =
&Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);	&Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);
if ($userresult ne 'ok') {	if ($userresult ne 'ok') {
push(@warn_approves,$uname.':'.$udom);	push(@warn_approves,$uname.':'.$udom);
Line 4123 sub update_selfenroll_queue {	Line 4439 sub update_selfenroll_queue {
my %userrequest = (	my %userrequest = (
$cdom.'_'.$cnum => {	$cdom.'_'.$cnum => {
timestamp => $now,	timestamp => $now,
adjudicator => $env{'user.name'}.':'.$env{'user.domain'},	adjudicator => $env{'user.name'}.':'.$env{'user.domain'},
status => 'rejected',	status => 'rejected',
}	}
);	);
my $userresult =	my $userresult =
&Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);	&Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);
if ($userresult ne 'ok') {	if ($userresult ne 'ok') {
push(@warn_rejects,$user);	push(@warn_rejects,$user);
Line 4137 sub update_selfenroll_queue {	Line 4453 sub update_selfenroll_queue {
if (@changes) {	if (@changes) {
my $delresult = &Apache::lonnet::del($namespace,\@changes,$cdom,$cnum);	my $delresult = &Apache::lonnet::del($namespace,\@changes,$cdom,$cnum);
if ($delresult eq 'ok') {	if ($delresult eq 'ok') {
my $namelink =	my $namelink =
&Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}).' ('.$env{'user.name'}.':'.$env{'user.domain'}.')';	&Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}).' ('.$env{'user.name'}.':'.$env{'user.domain'}.')';
my $chgmsg = "'Action was taken on the following enrollment requests by [_1].',$namelink";	my $chgmsg = "'Action was taken on the following enrollment requests by [_1].',$namelink";
my ($approvedlist,$rejectedlist);	my ($approvedlist,$rejectedlist);
Line 4145 sub update_selfenroll_queue {	Line 4461 sub update_selfenroll_queue {
$approvedlist = join("\n",@enrolled);	$approvedlist = join("\n",@enrolled);
$r->print('<p>'.&mt('The following were enrolled in the course:').'<ul>');	$r->print('<p>'.&mt('The following were enrolled in the course:').'<ul>');
foreach my $user (@enrolled) {	foreach my $user (@enrolled) {
my ($uname,$udom) = split(/:/,$user);	my ($uname,$udom) = split(/:/,$user);
my $userlink =	my $userlink =
&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom);	&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom);
$r->print('<li>'.$userlink.'</li>');	$r->print('<li>'.$userlink.'</li>');
}	}
Line 4245 sub visible_in_cat {	Line 4561 sub visible_in_cat {
miss => 'Your course does not currently appear in the Course Catalog for this domain.',	miss => 'Your course does not currently appear in the Course Catalog for this domain.',
yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.',	yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.',
coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.',	coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.',
make => 'Make any changes to self-enrollment settings below, click "Save changes", then take action to include the course in the Catalog:',	make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:',
take => 'Take the following action to ensure the course appears in the Catalog:',	take => 'Take the following action to ensure the course appears in the Catalog:',
dc_unhide => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.',	dc_unhide => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.',
dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".',	dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".',
Line 4671 sub role_display_filter {	Line 4987 sub role_display_filter {
&mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.6.99.0 or later are displayed.');	&mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.6.99.0 or later are displayed.');
if ($version) {	if ($version) {
$output .= ' '.&mt('This server is version [_3].','<b>','</b>',$version); }	$output .= ' '.&mt('This server is version [_3].','<b>','</b>',$version); }
$output .= '</span><hr noshade><br />';	$output .= '</span><hr /><br />';
return $output;	return $output;
}	}

Line 5084 sub build_search_response {	Line 5400 sub build_search_response {
.&mt("You are not authorized to create new users in your current role's domain - [_1]."	.&mt("You are not authorized to create new users in your current role's domain - [_1]."
,'<span class="LC_cusr_emph">'.$env{'request.role.domain'}.'</span>')	,'<span class="LC_cusr_emph">'.$env{'request.role.domain'}.'</span>')
.'<br />'	.'<br />'
.&mt('Contact the [_1]helpdesk[_2] if you need to create a new user.'	.&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.'
,' <a'.$helplink.'>'	,' <a'.$helplink.'>'
,'</a>')	,'</a>')
.'<br /><br />';	.'<br /><br />';
Line 5445 sub update_selfenroll_config {	Line 5761 sub update_selfenroll_config {
}	}
$changes{'internal.selfenroll_limit'} = $newlimit;	$changes{'internal.selfenroll_limit'} = $newlimit;
} else {	} else {
$warning{$item} = &mt('Maximum enrollment setting unchanged.').'<br />'.&mt('The value provided was invalid - it must be a positive integer if enrollment is being limited.');	$warning{$item} = &mt('Maximum enrollment setting unchanged.').'<br />'.&mt('The value provided was invalid - it must be a positive integer if enrollment is being limited.');
}	}
} elsif ($currcap ne '') {	} elsif ($currcap ne '') {
$changes{'internal.selfenroll_cap'} = '';	$changes{'internal.selfenroll_cap'} = '';
$changes{'internal.selfenroll_limit'} = $newlimit;	$changes{'internal.selfenroll_limit'} = $newlimit;
}	}
} elsif ($currlimit ne 'none') {	} elsif ($currlimit ne 'none') {
if ($newcap =~ /^\d+$/) {	if ($newcap =~ /^\d+$/) {
Line 5478 sub update_selfenroll_config {	Line 5794 sub update_selfenroll_config {
$changes{'internal.selfenroll_notifylist'} = '';	$changes{'internal.selfenroll_notifylist'} = '';
}	}
} else {	} else {
my @differences =	my @differences =
&compare_arrays(\@currnotified,\@newnotified);	&Apache::loncommon::compare_arrays(\@currnotified,\@newnotified);
if (@differences > 0) {	if (@differences > 0) {
if (@newnotified > 0) {	if (@newnotified > 0) {
$changes{'internal.selfenroll_notifylist'} = join(',',@newnotified);	$changes{'internal.selfenroll_notifylist'} = join(',',@newnotified);
Line 5489 sub update_selfenroll_config {	Line 5805 sub update_selfenroll_config {
}	}
}	}
} else {	} else {
my @differences = &compare_arrays(\@currnotified,\@newnotified);	my @differences = &Apache::loncommon::compare_arrays(\@currnotified,\@newnotified);
if (@differences > 0) {	if (@differences > 0) {
if (@newnotified > 0) {	if (@newnotified > 0) {
$changes{'internal.selfenroll_notifylist'} = join(',',@newnotified);	$changes{'internal.selfenroll_notifylist'} = join(',',@newnotified);
Line 5509 sub update_selfenroll_config {	Line 5825 sub update_selfenroll_config {
$warning{$item} = &mt('Section for self-enrolled users unchanged as the proposed section is a group').'<br />'.&mt('Group names and section names must be distinct');	$warning{$item} = &mt('Section for self-enrolled users unchanged as the proposed section is a group').'<br />'.&mt('Group names and section names must be distinct');
} elsif ($newval eq 'all') {	} elsif ($newval eq 'all') {
$newval = $curr_val;	$newval = $curr_val;
$warning{$item} = &mt("Section for self-enrolled users unchanged, as 'all' is a reserved section name.");	$warning{$item} = &mt('Section for self-enrolled users unchanged, as "all" is a reserved section name.');
}	}
if ($newval eq '') {	if ($newval eq '') {
$newval = 'none';	$newval = 'none';
Line 5581 sub update_selfenroll_config {	Line 5897 sub update_selfenroll_config {
}	}
if ($changes{'internal.selfenroll_limit'} eq 'none') {	if ($changes{'internal.selfenroll_limit'} eq 'none') {
$newval = &mt('No limit');	$newval = &mt('No limit');
} elsif ($changes{'internal.selfenroll_limit'} eq	} elsif ($changes{'internal.selfenroll_limit'} eq
'allstudents') {	'allstudents') {
$newval = &mt('New self-enrollment no longer allowed when total (all students) reaches [_1].',$newcap);	$newval = &mt('New self-enrollment no longer allowed when total (all students) reaches [_1].',$newcap);
} elsif ($changes{'internal.selfenroll_limit'} eq 'selfenrolled') {	} elsif ($changes{'internal.selfenroll_limit'} eq 'selfenrolled') {
Line 5602 sub update_selfenroll_config {	Line 5918 sub update_selfenroll_config {
my ($newval,$newnotify);	my ($newval,$newnotify);
if (exists($changes{'internal.selfenroll_notifylist'})) {	if (exists($changes{'internal.selfenroll_notifylist'})) {
$newnotify = $changes{'internal.selfenroll_notifylist'};	$newnotify = $changes{'internal.selfenroll_notifylist'};
} else {	} else {
$newnotify = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_notifylist'};	$newnotify = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_notifylist'};
}	}
if ($changes{'internal.selfenroll_approval'}) {	if ($changes{'internal.selfenroll_approval'}) {
Line 5610 sub update_selfenroll_config {	Line 5926 sub update_selfenroll_config {
} elsif ($changes{'internal.selfenroll_approval'} eq '0') {	} elsif ($changes{'internal.selfenroll_approval'} eq '0') {
$newval = &mt('No');	$newval = &mt('No');
} else {	} else {
my $currapproval =	my $currapproval =
$env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'};	$env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'};
if ($currapproval) {	if ($currapproval) {
$newval = &mt('Yes');	$newval = &mt('Yes');
Line 5679 sub update_selfenroll_config {	Line 5995 sub update_selfenroll_config {
return;	return;
}	}

sub compare_arrays {
my ($arrayref1,$arrayref2) = @_;
my (@difference,%count);
@difference = ();
%count = ();
if ((ref($arrayref1) eq 'ARRAY') && (ref($arrayref2) eq 'ARRAY')) {
foreach my $element (@{$arrayref1}, @{$arrayref2}) { $count{$element}++; }
foreach my $element (keys(%count)) {
if ($count{$element} == 1) {
push(@difference,$element);
}
}
}
return @difference;
}

sub get_selfenroll_titles {	sub get_selfenroll_titles {
my @row = ('types','registered','enroll_dates','access_dates','section',	my @row = ('types','registered','enroll_dates','access_dates','section',
'approval','limit');	'approval','limit');

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

Removed from v.1.268.4.2
changed lines
	Added in v.1.299