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.374 and 1.396

version 1.374, 2013/02/19 17:30:35	version 1.396, 2014/03/03 17:11:41
Line 122 sub auth_abbrev {	Line 122 sub auth_abbrev {

# ====================================================	# ====================================================

sub portfolio_quota {	sub user_quotas {
my ($ccuname,$ccdomain) = @_;	my ($ccuname,$ccdomain) = @_;
my %lt = &Apache::lonlocal::texthash(	my %lt = &Apache::lonlocal::texthash(
'usrt' => "User Tools",	'usrt' => "User Tools",
'disk' => "Disk space allocated to user's portfolio files",
'cuqu' => "Current quota",
'cust' => "Custom quota",	'cust' => "Custom quota",
'defa' => "Default",
'chqu' => "Change quota",	'chqu' => "Change quota",
);	);
my ($currquota,$quotatype,$inststatus,$defquota) =
&Apache::loncommon::get_user_quota($ccuname,$ccdomain);
my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($ccdomain);
my ($longinsttype,$showquota,$custom_on,$custom_off,$defaultinfo);
if ($inststatus ne '') {
if ($usertypes->{$inststatus} ne '') {
$longinsttype = $usertypes->{$inststatus};
}
}
$custom_on = ' ';
$custom_off = ' checked="checked" ';
my $quota_javascript = <<"END_SCRIPT";	my $quota_javascript = <<"END_SCRIPT";
<script type="text/javascript">	<script type="text/javascript">
// <![CDATA[	// <![CDATA[
function quota_changes(caller) {	function quota_changes(caller,context) {
	var customoff = document.getElementById('custom_'+context+'quota_off');
	var customon = document.getElementById('custom_'+context+'quota_on');
	var number = document.getElementById(context+'quota');
if (caller == "custom") {	if (caller == "custom") {
if (document.cu.customquota[0].checked) {	if (customoff) {
document.cu.portfolioquota.value = "";	if (customoff.checked) {
	number.value = "";
	}
}	}
}	}
if (caller == "quota") {	if (caller == "quota") {
document.cu.customquota[1].checked = true;	if (customon) {
	customon.checked = true;
	}
}	}
	return;
}	}
// ]]>	// ]]>
</script>	</script>
END_SCRIPT	END_SCRIPT
if ($quotatype eq 'custom') {	my $longinsttype;
$custom_on = $custom_off;	my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($ccdomain);
$custom_off = ' ';
$showquota = $currquota;
if ($longinsttype eq '') {
$defaultinfo = &mt('For this user, the default quota would be [_1]'
.' Mb.',$defquota);
} else {
$defaultinfo = &mt("For this user, the default quota would be [_1]".
" Mb, as determined by the user's institutional".
" affiliation ([_2]).",$defquota,$longinsttype);
}
} else {
if ($longinsttype eq '') {
$defaultinfo = &mt('For this user, the default quota is [_1]'
.' Mb.',$defquota);
} else {
$defaultinfo = &mt("For this user, the default quota of [_1]".
" Mb, is determined by the user's institutional".
" affiliation ([_2]).",$defquota,$longinsttype);
}
}

my $output = $quota_javascript."\n".	my $output = $quota_javascript."\n".
'<h3>'.$lt{'usrt'}.'</h3>'."\n".	'<h3>'.$lt{'usrt'}.'</h3>'."\n".
&Apache::loncommon::start_data_table();	&Apache::loncommon::start_data_table();
Line 189 END_SCRIPT	Line 163 END_SCRIPT
if (&Apache::lonnet::allowed('mut',$ccdomain)) {	if (&Apache::lonnet::allowed('mut',$ccdomain)) {
$output .= &build_tools_display($ccuname,$ccdomain,'tools');	$output .= &build_tools_display($ccuname,$ccdomain,'tools');
}	}
if (&Apache::lonnet::allowed('mpq',$ccdomain)) {
$output .= '<tr class="LC_info_row">'."\n".	my %titles = &Apache::lonlocal::texthash (
' <td>'.$lt{'disk'}.'</td>'."\n".	portfolio => "Disk space allocated to user's portfolio files",
' </tr>'."\n".	author => "Disk space allocated to user's Authoring Space (if role assigned)",
&Apache::loncommon::start_data_table_row()."\n".	);
' <td>'.$lt{'cuqu'}.': '.	foreach my $name ('portfolio','author') {
$currquota.' Mb.  '.	my ($currquota,$quotatype,$inststatus,$defquota) =
$defaultinfo.'</td>'."\n".	&Apache::loncommon::get_user_quota($ccuname,$ccdomain,$name);
&Apache::loncommon::end_data_table_row()."\n".	if ($longinsttype eq '') {
&Apache::loncommon::start_data_table_row()."\n".	if ($inststatus ne '') {
' <td><span class="LC_nobreak">'.$lt{'chqu'}.	if ($usertypes->{$inststatus} ne '') {
': <label>'.	$longinsttype = $usertypes->{$inststatus};
'<input type="radio" name="customquota" value="0" '.	}
$custom_off.' onchange="javascript:quota_changes('."'custom'".')"'.	}
' />'.$lt{'defa'}.' ('.$defquota.' Mb).</label> '.	}
' <label><input type="radio" name="customquota" value="1" '.	my ($showquota,$custom_on,$custom_off,$defaultinfo);
$custom_on.' onchange="javascript:quota_changes('."'custom'".')" />'.	$custom_on = ' ';
$lt{'cust'}.':</label> '.	$custom_off = ' checked="checked" ';
'<input type="text" name="portfolioquota" size ="5" value="'.	if ($quotatype eq 'custom') {
$showquota.'" onfocus="javascript:quota_changes('."'quota'".')" '.	$custom_on = $custom_off;
'/> Mb</span></td>'."\n".	$custom_off = ' ';
&Apache::loncommon::end_data_table_row()."\n";	$showquota = $currquota;
}	if ($longinsttype eq '') {
	$defaultinfo = &mt('For this user, the default quota would be [_1]'
	.' MB.',$defquota);
	} else {
	$defaultinfo = &mt("For this user, the default quota would be [_1]".
	" MB, as determined by the user's institutional".
	" affiliation ([_2]).",$defquota,$longinsttype);
	}
	} else {
	if ($longinsttype eq '') {
	$defaultinfo = &mt('For this user, the default quota is [_1]'
	.' MB.',$defquota);
	} else {
	$defaultinfo = &mt("For this user, the default quota of [_1]".
	" MB, is determined by the user's institutional".
	" affiliation ([_2]).",$defquota,$longinsttype);
	}
	}

	if (&Apache::lonnet::allowed('mpq',$ccdomain)) {
	$output .= '<tr class="LC_info_row">'."\n".
	' <td>'.$titles{$name}.'</td>'."\n".
	' </tr>'."\n".
	&Apache::loncommon::start_data_table_row()."\n".
	' <td><span class="LC_nobreak">'.
	&mt('Current quota: [_1] MB',$currquota).'</span>  '.
	$defaultinfo.'</td>'."\n".
	&Apache::loncommon::end_data_table_row()."\n".
	&Apache::loncommon::start_data_table_row()."\n".
	' <td><span class="LC_nobreak">'.$lt{'chqu'}.
	': <label>'.
	'<input type="radio" name="custom_'.$name.'quota" id="custom_'.$name.'quota_off" '.
	'value="0" '.$custom_off.' onchange="javascript:quota_changes('."'custom','$name'".');"'.
	' /><span class="LC_nobreak">'.
	&mt('Default ([_1] MB)',$defquota).'</span></label> '.
	' <label><input type="radio" name="custom_'.$name.'quota" id="custom_'.$name.'quota_on" '.
	'value="1" '.$custom_on.' onchange="javascript:quota_changes('."'custom','$name'".');"'.
	' />'.$lt{'cust'}.':</label> '.
	'<input type="text" name="'.$name.'quota" id="'.$name.'quota" size ="5" '.
	'value="'.$showquota.'" onfocus="javascript:quota_changes('."'quota','$name'".');"'.
	' /> '.&mt('MB').'</span></td>'."\n".
	&Apache::loncommon::end_data_table_row()."\n";
	}
	}
$output .= &Apache::loncommon::end_data_table();	$output .= &Apache::loncommon::end_data_table();
return $output;	return $output;
}	}
Line 223 sub build_tools_display {	Line 240 sub build_tools_display {
my %lt = &Apache::lonlocal::texthash (	my %lt = &Apache::lonlocal::texthash (
'blog' => "Personal User Blog",	'blog' => "Personal User Blog",
'aboutme' => "Personal Information Page",	'aboutme' => "Personal Information Page",
'webdav' => "WebDAV access to authoring spaces (if SSL and author/co-author)",	'webdav' => "WebDAV access to Authoring Spaces (if SSL and author/co-author)",
'portfolio' => "Personal User Portfolio",	'portfolio' => "Personal User Portfolio",
'avai' => "Available",	'avai' => "Available",
'cusa' => "availability",	'cusa' => "availability",
Line 233 sub build_tools_display {	Line 250 sub build_tools_display {
'official' => 'Can request creation of official courses',	'official' => 'Can request creation of official courses',
'unofficial' => 'Can request creation of unofficial courses',	'unofficial' => 'Can request creation of unofficial courses',
'community' => 'Can request creation of communities',	'community' => 'Can request creation of communities',
	'textbook' => 'Can request creation of textbook courses',
'requestauthor' => 'Can request author space',	'requestauthor' => 'Can request author space',
);	);
if ($context eq 'requestcourses') {	if ($context eq 'requestcourses') {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,	%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'requestcourses.official','requestcourses.unofficial',	'requestcourses.official','requestcourses.unofficial',
'requestcourses.community');	'requestcourses.community','requestcourses.textbook');
@usertools = ('official','unofficial','community');	@usertools = ('official','unofficial','community','textbook');
@options =('norequest','approval','autolimit','validate');	@options =('norequest','approval','autolimit','validate');
%validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);	%validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);
%reqtitles = &courserequest_titles();	%reqtitles = &courserequest_titles();
Line 428 sub coursereq_externaluser {	Line 446 sub coursereq_externaluser {
'official' => 'Can request creation of official courses',	'official' => 'Can request creation of official courses',
'unofficial' => 'Can request creation of unofficial courses',	'unofficial' => 'Can request creation of unofficial courses',
'community' => 'Can request creation of communities',	'community' => 'Can request creation of communities',
	'textbook' => 'Can request creation of textbook courses',
);	);

%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,	%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'reqcrsotherdom.official','reqcrsotherdom.unofficial',	'reqcrsotherdom.official','reqcrsotherdom.unofficial',
'reqcrsotherdom.community');	'reqcrsotherdom.community','reqcrsotherdom.textbook');
@usertools = ('official','unofficial','community');	@usertools = ('official','unofficial','community','textbook');
@options = ('approval','validate','autolimit');	@options = ('approval','validate','autolimit');
%validations = &Apache::lonnet::auto_courserequest_checks($cdom);	%validations = &Apache::lonnet::auto_courserequest_checks($cdom);
my $optregex = join('\|',@options);	my $optregex = join('\|',@options);
Line 513 sub courserequest_titles {	Line 532 sub courserequest_titles {
official => 'Official',	official => 'Official',
unofficial => 'Unofficial',	unofficial => 'Unofficial',
community => 'Communities',	community => 'Communities',
	textbook => 'Textbook',
norequest => 'Not allowed',	norequest => 'Not allowed',
approval => 'Approval by Dom. Coord.',	approval => 'Approval by Dom. Coord.',
validate => 'With validation',	validate => 'With validation',
Line 550 sub requestauthor_display {	Line 570 sub requestauthor_display {
return %titles;	return %titles;
}	}

	sub requestchange_display {
	my %titles = &Apache::lonlocal::texthash (
	approval => "availability set to 'on' (approval required)",
	automatic => "availability set to 'on' (automatic approval)",
	norequest => "availability set to 'off'",
	);
	return %titles;
	}

sub curr_requestauthor {	sub curr_requestauthor {
my ($uname,$udom,$isadv,$inststatuses,$domconfig) = @_;	my ($uname,$udom,$isadv,$inststatuses,$domconfig) = @_;
return unless ((ref($inststatuses) eq 'ARRAY') && (ref($domconfig) eq 'HASH'));	return unless ((ref($inststatuses) eq 'ARRAY') && (ref($domconfig) eq 'HASH'));
Line 970 ENDSCRIPT	Line 999 ENDSCRIPT
$r->print('</h3>');	$r->print('</h3>');
}	}
}	}
$r->print('<form name="usersrchform" method="post">'.	$r->print('<form name="usersrchform" method="post" action="">'.
&Apache::loncommon::start_data_table()."\n".	&Apache::loncommon::start_data_table()."\n".
&Apache::loncommon::start_data_table_header_row()."\n".	&Apache::loncommon::start_data_table_header_row()."\n".
' <th> </th>'."\n");	' <th> </th>'."\n");
Line 1042 sub print_user_query_page {	Line 1071 sub print_user_query_page {
}	}

sub print_user_modification_page {	sub print_user_modification_page {
my ($r,$ccuname,$ccdomain,$srch,$response,$context,$permission,$crstype,$brcrum) = @_;	my ($r,$ccuname,$ccdomain,$srch,$response,$context,$permission,$crstype,
	$brcrum,$showcredits) = @_;
if (($ccuname eq '') \|\| ($ccdomain eq '')) {	if (($ccuname eq '') \|\| ($ccdomain eq '')) {
my $usermsg = &mt('No username and/or domain provided.');	my $usermsg = &mt('No username and/or domain provided.');
$env{'form.phase'} = '';	$env{'form.phase'} = '';
Line 1133 sub print_user_modification_page {	Line 1163 sub print_user_modification_page {

my $groupslist = &Apache::lonuserutils::get_groupslist();	my $groupslist = &Apache::lonuserutils::get_groupslist();

my $js = &validation_javascript($context,$ccdomain,$pjump_def,	my $js = &validation_javascript($context,$ccdomain,$pjump_def,$crstype,
$groupslist,$newuser,$formname,\%loaditem);	$groupslist,$newuser,$formname,\%loaditem);
my %breadcrumb_text = &singleuser_breadcrumb($crstype);	my %breadcrumb_text = &singleuser_breadcrumb($crstype);
my $helpitem = 'Course_Change_Privileges';	my $helpitem = 'Course_Change_Privileges';
Line 1176 sub print_user_modification_page {	Line 1206 sub print_user_modification_page {
<input type="hidden" name="pres_type" value="" />	<input type="hidden" name="pres_type" value="" />
<input type="hidden" name="pres_marker" value="" />	<input type="hidden" name="pres_marker" value="" />
ENDFORMINFO	ENDFORMINFO
my (%inccourses,$roledom);	my (%inccourses,$roledom,$defaultcredits);
if ($context eq 'course') {	if ($context eq 'course') {
$inccourses{$env{'request.course.id'}}=1;	$inccourses{$env{'request.course.id'}}=1;
$roledom = $env{'course.'.$env{'request.course.id'}.'.domain'};	$roledom = $env{'course.'.$env{'request.course.id'}.'.domain'};
	if ($showcredits) {
	$defaultcredits = &Apache::lonuserutils::get_defaultcredits();
	}
} elsif ($context eq 'author') {	} elsif ($context eq 'author') {
$roledom = $env{'request.role.domain'};	$roledom = $env{'request.role.domain'};
} elsif ($context eq 'domain') {	} elsif ($context eq 'domain') {
Line 1196 ENDFORMINFO	Line 1229 ENDFORMINFO
}	}
}	}
}	}
	my $title = '';
if ($newuser) {	if ($newuser) {
my ($portfolioform,$domroleform);	my ($portfolioform,$domroleform);
if ((&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) \|\|	if ((&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) \|\|
(&Apache::lonnet::allowed('mut',$env{'request.role.domain'}))) {	(&Apache::lonnet::allowed('mut',$env{'request.role.domain'}))) {
# Current user has quota or user tools modification privileges	# Current user has quota or user tools modification privileges
$portfolioform = '<br />'.&portfolio_quota($ccuname,$ccdomain);	$portfolioform = '<br />'.&user_quotas($ccuname,$ccdomain);
}	}
if (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) {	if ((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) &&
	($ccdomain eq $env{'request.role.domain'})) {
$domroleform = '<br />'.&domainrole_req($ccuname,$ccdomain);	$domroleform = '<br />'.&domainrole_req($ccuname,$ccdomain);
}	}
&initialize_authen_forms($ccdomain,$formname);	&initialize_authen_forms($ccdomain,$formname);
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'cnu' => 'Create New User',
'ast' => 'as a student',
'ame' => 'as a member',
'ind' => 'in domain',
'lg' => 'Login Data',	'lg' => 'Login Data',
'hs' => "Home Server",	'hs' => "Home Server",
);	);
Line 1225 $loginscript	Line 1256 $loginscript
// ]]>	// ]]>
</script>	</script>
<input type='hidden' name='makeuser' value='1' />	<input type='hidden' name='makeuser' value='1' />
<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain
ENDTITLE	ENDTITLE
if ($env{'form.action'} eq 'singlestudent') {	if ($env{'form.action'} eq 'singlestudent') {
if ($crstype eq 'Community') {	if ($crstype eq 'Community') {
$r->print(' ('.$lt{'ame'}.')');	$title = &mt('Create New User [_1] in domain [_2] as a member',
	'"'.$ccuname.'"','"'.$ccdomain.'"');
} else {	} else {
$r->print(' ('.$lt{'ast'}.')');	$title = &mt('Create New User [_1] in domain [_2] as a student',
	'"'.$ccuname.'"','"'.$ccdomain.'"');
}	}
	} else {
	$title = &mt('Create New User [_1] in domain [_2]',
	'"'.$ccuname.'"','"'.$ccdomain.'"');
}	}
$r->print('</h2>'."\n".'<div class="LC_left_float">');	$r->print('<h2>'.$title.'</h2>'."\n");
my $personal_table =	$r->print('<div class="LC_left_float">');
&personal_data_display($ccuname,$ccdomain,$newuser,$context,	$r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context,
$inst_results{$ccuname.':'.$ccdomain});	$inst_results{$ccuname.':'.$ccdomain}));
$r->print($personal_table);	# Option to disable student/employee ID conflict checking not offerred for new users.
my ($home_server_pick,$numlib) =	my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($ccdomain,'hserver',	&Apache::loncommon::home_server_form_item($ccdomain,'hserver',
'default','hide');	'default','hide');
Line 1319 ENDAUTH	Line 1354 ENDAUTH
$r->print($portfolioform.$domroleform);	$r->print($portfolioform.$domroleform);
if ($env{'form.action'} eq 'singlestudent') {	if ($env{'form.action'} eq 'singlestudent') {
$r->print(&date_sections_select($context,$newuser,$formname,	$r->print(&date_sections_select($context,$newuser,$formname,
$permission,$crstype));	$permission,$crstype,$ccuname,
	$ccdomain,$showcredits));
}	}
$r->print('</div><div class="LC_clear_float_footer"></div>');	$r->print('</div><div class="LC_clear_float_footer"></div>');
} else { # user already exists	} else { # user already exists
my %lt=&Apache::lonlocal::texthash(	$r->print($start_page.$forminfo);
'cup' => "Modify existing user: ",
'ens' => "Enroll one student: ",
'enm' => "Enroll one member: ",
'id' => "in domain",
);
$r->print(<<ENDCHANGEUSER);
$start_page
$forminfo
<h2>
ENDCHANGEUSER
if ($env{'form.action'} eq 'singlestudent') {	if ($env{'form.action'} eq 'singlestudent') {
if ($crstype eq 'Community') {	if ($crstype eq 'Community') {
$r->print($lt{'enm'});	$title = &mt('Enroll one member: [_1] in domain [_2]',
	'"'.$ccuname.'"','"'.$ccdomain.'"');
} else {	} else {
$r->print($lt{'ens'});	$title = &mt('Enroll one student: [_1] in domain [_2]',
	'"'.$ccuname.'"','"'.$ccdomain.'"');
}	}
} else {	} else {
$r->print($lt{'cup'});	$title = &mt('Modify existing user: [_1] in domain [_2]',
}	'"'.$ccuname.'"','"'.$ccdomain.'"');
$r->print(' "'.$ccuname.'" '.$lt{'id'}.' "'.$ccdomain.'"</h2>'.
"\n".'<div class="LC_left_float">');
my ($personal_table,$showforceid) =
&personal_data_display($ccuname,$ccdomain,$newuser,$context,
$inst_results{$ccuname.':'.$ccdomain});
$r->print($personal_table);
if ($showforceid) {
$r->print('<table>'.&Apache::lonuserutils::forceid_change($context).'</table>');
}	}
	$r->print('<h2>'.$title.'</h2>'."\n");
	$r->print('<div class="LC_left_float">');
	$r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context,
	$inst_results{$ccuname.':'.$ccdomain}));
if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {	if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
$r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.	$r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
&Apache::loncommon::start_data_table());	&Apache::loncommon::start_data_table());
Line 1369 ENDCHANGEUSER	Line 1393 ENDCHANGEUSER
my ($isadv,$isauthor) =	my ($isadv,$isauthor) =
&Apache::lonnet::is_advanced_user($ccuname,$ccdomain);	&Apache::lonnet::is_advanced_user($ccuname,$ccdomain);
if ((!$isauthor) &&	if ((!$isauthor) &&
(&Apache::lonnet::allowed('cau',$env{'request.role.domain'}))) {	(&Apache::lonnet::allowed('cau',$env{'request.role.domain'}))
	&& ($env{'request.role.domain'} eq $ccdomain)) {
$user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain);	$user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain);
}	}
$user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname);	$user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname);
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
$user_text{'quota'} = &portfolio_quota($ccuname,$ccdomain);	$user_text{'quota'} = &user_quotas($ccuname,$ccdomain);
}	}
if (!&Apache::lonnet::allowed('mpq',$ccdomain)) {	if (!&Apache::lonnet::allowed('mpq',$ccdomain)) {
if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {	if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
# Get the user's portfolio information
my %portq = &Apache::lonnet::get('environment',['portfolioquota'],
$ccdomain,$ccuname);
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'dska' => "Disk space allocated to user's portfolio files",	'dska' => "Disk quotas for user's portfolio and Authoring Space",
'youd' => "You do not have privileges to modify the portfolio quota for this user.",	'youd' => "You do not have privileges to modify the portfolio and/or Authoring Space quotas for this user.",
'ichr' => "If a change is required, contact a domain coordinator for the domain",	'ichr' => "If a change is required, contact a domain coordinator for the domain",
);	);
$user_text{'quota'} = <<ENDNOPORTPRIV;	$user_text{'quota'} = <<ENDNOPORTPRIV;
Line 1421 ENDNOTOOLSPRIV	Line 1443 ENDNOTOOLSPRIV
unless ($gotdiv) {	unless ($gotdiv) {
$r->print('<div class="LC_left_float">');	$r->print('<div class="LC_left_float">');
}	}
	my $credits;
	if ($showcredits) {
	$credits = &get_user_credits($ccuname,$ccdomain,$defaultcredits);
	if ($credits eq '') {
	$credits = $defaultcredits;
	}
	}
$r->print(&date_sections_select($context,$newuser,$formname,	$r->print(&date_sections_select($context,$newuser,$formname,
$permission,$crstype));	$permission,$crstype,$ccuname,
	$ccdomain,$showcredits));
}	}
if ($gotdiv) {	if ($gotdiv) {
$r->print('</div><div class="LC_clear_float_footer"></div>');	$r->print('</div><div class="LC_clear_float_footer"></div>');
Line 1441 ENDNOTOOLSPRIV	Line 1471 ENDNOTOOLSPRIV
}	}
$r->print('<br /><input type="button" value="'.$btntxt.'" onclick="setSections(this.form)" />'."\n");	$r->print('<br /><input type="button" value="'.$btntxt.'" onclick="setSections(this.form)" />'."\n");
} else {	} else {
$r->print('<h3>'.&mt('Add Roles').'</h3>');	$r->print('<div class="LC_left_float">'.
	'<fieldset><legend>'.&mt('Add Roles').'</legend>');
my $addrolesdisplay = 0;	my $addrolesdisplay = 0;
if ($context eq 'domain' \|\| $context eq 'author') {	if ($context eq 'domain' \|\| $context eq 'author') {
$addrolesdisplay = &new_coauthor_roles($r,$ccuname,$ccdomain);	$addrolesdisplay = &new_coauthor_roles($r,$ccuname,$ccdomain);
Line 1451 ENDNOTOOLSPRIV	Line 1482 ENDNOTOOLSPRIV
if (!$addrolesdisplay) {	if (!$addrolesdisplay) {
$addrolesdisplay = $add_domainroles;	$addrolesdisplay = $add_domainroles;
}	}
$r->print(&course_level_dc($env{'request.role.domain'},'Course'));	$r->print(&course_level_dc($env{'request.role.domain'},$showcredits));
$r->print('<br /><input type="button" value="'.&mt('Save').'" onclick="setCourse()" />'."\n");	$r->print('</fieldset></div><div class="LC_clear_float_footer"></div>'.
	'<br /><input type="button" value="'.&mt('Save').'" onclick="setCourse()" />'."\n");
} elsif ($context eq 'author') {	} elsif ($context eq 'author') {
if ($addrolesdisplay) {	if ($addrolesdisplay) {
$r->print('<br /><input type="button" value="'.&mt('Save').'"');	$r->print('</fieldset></div><div class="LC_clear_float_footer"></div>'.
	'<br /><input type="button" value="'.&mt('Save').'"');
if ($newuser) {	if ($newuser) {
$r->print(' onclick="auth_check()" \>'."\n");	$r->print(' onclick="auth_check()" \>'."\n");
} else {	} else {
$r->print('onclick="this.form.submit()" \>'."\n");	$r->print('onclick="this.form.submit()" \>'."\n");
}	}
} else {	} else {
$r->print('<br /><a href="javascript:backPage(document.cu)">'.	$r->print('</fieldset></div>'.
	'<div class="LC_clear_float_footer"></div>'.
	'<br /><a href="javascript:backPage(document.cu)">'.
&mt('Back to previous page').'</a>');	&mt('Back to previous page').'</a>');
}	}
} else {	} else {
$r->print(&course_level_table(%inccourses));	$r->print(&course_level_table(\%inccourses,$showcredits,$defaultcredits));
$r->print('<br /><input type="button" value="'.&mt('Save').'" onclick="setSections(this.form)" />'."\n");	$r->print('</fieldset></div><div class="LC_clear_float_footer"></div>'.
	'<br /><input type="button" value="'.&mt('Save').'" onclick="setSections(this.form)" />'."\n");
}	}
}	}
$r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));	$r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
$r->print('<input type="hidden" name="currstate" value="" />');	$r->print('<input type="hidden" name="currstate" value="" />');
$r->print('<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" /></form>');	$r->print('<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" /></form><br /><br />');
return;	return;
}	}

Line 1496 sub singleuser_breadcrumb {	Line 1532 sub singleuser_breadcrumb {
}	}

sub date_sections_select {	sub date_sections_select {
my ($context,$newuser,$formname,$permission,$crstype) = @_;	my ($context,$newuser,$formname,$permission,$crstype,$ccuname,$ccdomain,
	$showcredits) = @_;
	my $credits;
	if ($showcredits) {
	my $defaultcredits = &Apache::lonuserutils::get_defaultcredits();
	$credits = &get_user_credits($ccuname,$ccdomain,$defaultcredits);
	if ($credits eq '') {
	$credits = $defaultcredits;
	}
	}
my $cid = $env{'request.course.id'};	my $cid = $env{'request.course.id'};
my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity($cid);	my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity($cid);
my $date_table = '<h3>'.&mt('Starting and Ending Dates').'</h3>'."\n".	my $date_table = '<h3>'.&mt('Starting and Ending Dates').'</h3>'."\n".
&Apache::lonuserutils::date_setting_table(undef,undef,$context,	&Apache::lonuserutils::date_setting_table(undef,undef,$context,
undef,$formname,$permission);	undef,$formname,$permission);
my $rowtitle = 'Section';	my $rowtitle = 'Section';
my $secbox = '<h3>'.&mt('Section').'</h3>'."\n".	my $secbox = '<h3>'.&mt('Section and Credits').'</h3>'."\n".
&Apache::lonuserutils::section_picker($cdom,$cnum,'st',$rowtitle,	&Apache::lonuserutils::section_picker($cdom,$cnum,'st',$rowtitle,
$permission,$context,'',$crstype);	$permission,$context,'',$crstype,
	$showcredits,$credits);
my $output = $date_table.$secbox;	my $output = $date_table.$secbox;
return $output;	return $output;
}	}

sub validation_javascript {	sub validation_javascript {
my ($context,$ccdomain,$pjump_def,$groupslist,$newuser,$formname,	my ($context,$ccdomain,$pjump_def,$crstype,$groupslist,$newuser,$formname,
$loaditem) = @_;	$loaditem) = @_;
my $dc_setcourse_code = '';	my $dc_setcourse_code = '';
my $nondc_setsection_code = '';	my $nondc_setsection_code = '';
Line 1528 sub validation_javascript {	Line 1574 sub validation_javascript {
if ($context eq 'course') {	if ($context eq 'course') {
$nondc_setsection_code =	$nondc_setsection_code =
&Apache::lonuserutils::setsections_javascript($formname,$groupslist,	&Apache::lonuserutils::setsections_javascript($formname,$groupslist,
undef,$checkauth);	undef,$checkauth,
	$crstype);
}	}
if ($checkauth) {	if ($checkauth) {
$nondc_setsection_code .=	$nondc_setsection_code .=
Line 1548 sub validation_javascript {	Line 1595 sub validation_javascript {
}	}

sub display_existing_roles {	sub display_existing_roles {
my ($r,$ccuname,$ccdomain,$inccourses,$context,$roledom,$crstype) = @_;	my ($r,$ccuname,$ccdomain,$inccourses,$context,$roledom,$crstype,
	$showcredits) = @_;
my $now=time;	my $now=time;
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'rer' => "Existing Roles",	'rer' => "Existing Roles",
Line 1557 sub display_existing_roles {	Line 1605 sub display_existing_roles {
'ren' => "Re-Enable",	'ren' => "Re-Enable",
'rol' => "Role",	'rol' => "Role",
'ext' => "Extent",	'ext' => "Extent",
	'crd' => "Credits",
'sta' => "Start",	'sta' => "Start",
'end' => "End",	'end' => "End",
);	);
Line 1619 sub display_existing_roles {	Line 1668 sub display_existing_roles {
my $delallowed=0;	my $delallowed=0;
my $sortkey=$role_code;	my $sortkey=$role_code;
my $class='Unknown';	my $class='Unknown';
	my $credits='';
if ($area =~ m{^/($match_domain)/($match_courseid)} ) {	if ($area =~ m{^/($match_domain)/($match_courseid)} ) {
$class='Course';	$class='Course';
my ($coursedom,$coursedir) = ($1,$2);	my ($coursedom,$coursedir) = ($1,$2);
Line 1647 sub display_existing_roles {	Line 1697 sub display_existing_roles {
}	}
$sortkey.="\0$coursedir";	$sortkey.="\0$coursedir";
$inccourses->{$cid}=1;	$inccourses->{$cid}=1;
	if (($showcredits) && ($class eq 'Course') && ($role_code eq 'st')) {
	my $defaultcredits = $coursedata{'internal.defaultcredits'};
	$credits =
	&get_user_credits($ccuname,$ccdomain,$defaultcredits,
	$coursedom,$coursedir);
	if ($credits eq '') {
	$credits = $defaultcredits;
	}
	}
if ((&Apache::lonnet::allowed('c'.$role_code,$coursedom.'/'.$coursedir)) \|\|	if ((&Apache::lonnet::allowed('c'.$role_code,$coursedom.'/'.$coursedir)) \|\|
(&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {	(&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
$allowed=1;	$allowed=1;
Line 1703 sub display_existing_roles {	Line 1762 sub display_existing_roles {
}	}
}	}
if ($role_code eq 'ca' \|\| $role_code eq 'au' \|\| $role_code eq 'aa') {	if ($role_code eq 'ca' \|\| $role_code eq 'au' \|\| $role_code eq 'aa') {
$class='Construction Space';	$class='Authoring Space';
} elsif ($role_code eq 'su') {	} elsif ($role_code eq 'su') {
$class='System';	$class='System';
} else {	} else {
Line 1745 sub display_existing_roles {	Line 1804 sub display_existing_roles {
}	}
my $plaintext='';	my $plaintext='';
if (!$croletitle) {	if (!$croletitle) {
$plaintext=&Apache::lonnet::plaintext($role_code,$class)	$plaintext=&Apache::lonnet::plaintext($role_code,$class);
	if (($showcredits) && ($credits ne '')) {
	$plaintext .= '<br/ ><span class="LC_nobreak">'.
	'<span class="LC_fontsize_small">'.
	&mt('Credits: [_1]',$credits).
	'</span></span>';
	}
} else {	} else {
$plaintext=	$plaintext=
&mt('Customrole [_1][_2]defined by [_3]',	&mt('Custom role [_1][_2]defined by [_3]',
'"'.$croletitle.'"',	'"'.$croletitle.'"',
'<br />',	'<br />',
$croleuname.':'.$croleudom);	$croleuname.':'.$croleudom);
Line 1768 sub display_existing_roles {	Line 1833 sub display_existing_roles {

my $rolesdisplay = 0;	my $rolesdisplay = 0;
my %output = ();	my %output = ();
foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') {	foreach my $type ('Authoring Space','Course','Community','Domain','System','Unknown') {
$output{$type} = '';	$output{$type} = '';
foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) {	if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) {
Line 1794 sub display_existing_roles {	Line 1859 sub display_existing_roles {
$contextrole = &mt('Existing Roles in this Course');	$contextrole = &mt('Existing Roles in this Course');
}	}
} elsif ($env{'request.role'} =~ /^au\./) {	} elsif ($env{'request.role'} =~ /^au\./) {
$contextrole = &mt('Existing Co-Author Roles in your Construction Space');	$contextrole = &mt('Existing Co-Author Roles in your Authoring Space');
} else {	} else {
$contextrole = &mt('Existing Roles in this Domain');	$contextrole = &mt('Existing Roles in this Domain');
}	}
$r->print('	$r->print('<div class="LC_left_float">'.
<h3>'.$lt{'rer'}.'</h3>'.	'<fieldset><legend>'.$contextrole.'</legend>'.
'<div>'.$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'}.
'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.	'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.
'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.	'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
&Apache::loncommon::end_data_table_header_row());	&Apache::loncommon::end_data_table_header_row());
foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') {	foreach my $type ('Authoring Space','Course','Community','Domain','System','Unknown') {
if ($output{$type}) {	if ($output{$type}) {
$r->print($output{$type}."\n");	$r->print($output{$type}."\n");
}	}
}	}
$r->print(&Apache::loncommon::end_data_table());	$r->print(&Apache::loncommon::end_data_table().
	'</fieldset></div>');
}	}
return;	return;
}	}
Line 1831 sub new_coauthor_roles {	Line 1896 sub new_coauthor_roles {
my $cuname=$env{'user.name'};	my $cuname=$env{'user.name'};
my $cudom=$env{'request.role.domain'};	my $cudom=$env{'request.role.domain'};
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'cs' => "Construction Space",	'cs' => "Authoring Space",
'act' => "Activate",	'act' => "Activate",
'rol' => "Role",	'rol' => "Role",
'ext' => "Extent",	'ext' => "Extent",
Line 1882 sub new_coauthor_roles {	Line 1947 sub new_coauthor_roles {
'</span>');	'</span>');
} elsif (($env{'user.name'} eq $ccuname) &&	} elsif (($env{'user.name'} eq $ccuname) &&
($env{'user.domain'} eq $ccdomain)) {	($env{'user.domain'} eq $ccdomain)) {
$r->print(&mt('Assigning yourself a co-author or assistant co-author role in your own author area in Construction Space is not permitted'));	$r->print(&mt('Assigning yourself a co-author or assistant co-author role in your own author area in Authoring Space is not permitted'));
}	}
}	}
return $addrolesdisplay;;	return $addrolesdisplay;;
Line 2098 sub modify_login_block {	Line 2163 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,%canmodify_status);	$now,$captchaform,$emailusername,$usertype) = @_;
	my ($output,%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 =	my %textboxsize = (
	firstname => '15',
	middlename => '15',
	lastname => '15',
	generation => '5',
	permanentemail => '25',
	id => '15',
	);

	my %lt=&Apache::lonlocal::texthash(
	'pd' => "Personal Data",
	'firstname' => "First Name",
	'middlename' => "Middle Name",
	'lastname' => "Last Name",
	'generation' => "Generation",
	'permanentemail' => "Permanent e-mail address",
	'id' => "Student/Employee ID",
	'lg' => "Login Data",
	'inststatus' => "Affiliation",
	'email' => 'E-mail address',
	'valid' => 'Validation',
	);

	%canmodify_status =
&Apache::lonuserutils::can_modify_userinfo($context,$ccdomain,	&Apache::lonuserutils::can_modify_userinfo($context,$ccdomain,
['inststatus'],$rolesarray);	['inststatus'],$rolesarray);
if (!$newuser) {	if (!$newuser) {
Line 2116 sub personal_data_display {	Line 2205 sub personal_data_display {
&Apache::lonuserutils::can_modify_userinfo($context,$ccdomain,	&Apache::lonuserutils::can_modify_userinfo($context,$ccdomain,
\@userinfo,$rolesarray);	\@userinfo,$rolesarray);
} elsif ($context eq 'selfcreate') {	} elsif ($context eq 'selfcreate') {
%canmodify = &selfcreate_canmodify($context,$ccdomain,\@userinfo,	if ($newuser eq 'email') {
$inst_results,$rolesarray);	if (ref($emailusername) eq 'HASH') {
	if (ref($emailusername->{$usertype}) eq 'HASH') {
	my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
	@userinfo = ();
	if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
	foreach my $field (@{$infofields}) {
	if ($emailusername->{$usertype}->{$field}) {
	push(@userinfo,$field);
	$canmodify{$field} = 1;
	unless ($textboxsize{$field}) {
	$textboxsize{$field} = 25;
	}
	unless ($lt{$field}) {
	$lt{$field} = $infotitles->{$field};
	}
	if ($emailusername->{$usertype}->{$field} eq 'required') {
	$lt{$field} .= '<b>*</b>';
	}
	}
	}
	}
	}
	}
	} else {
	%canmodify = &selfcreate_canmodify($context,$ccdomain,\@userinfo,
	$inst_results,$rolesarray);
	}
}	}
my %lt=&Apache::lonlocal::texthash(
'pd' => "Personal Data",
'firstname' => "First Name",
'middlename' => "Middle Name",
'lastname' => "Last Name",
'generation' => "Generation",
'permanentemail' => "Permanent e-mail address",
'id' => "Student/Employee ID",
'lg' => "Login Data",
'inststatus' => "Affiliation",
);
my %textboxsize = (
firstname => '15',
middlename => '15',
lastname => '15',
generation => '5',
permanentemail => '25',
id => '15',
);
my $genhelp=&Apache::loncommon::help_open_topic('Generation');	my $genhelp=&Apache::loncommon::help_open_topic('Generation');
$output = '<h3>'.$lt{'pd'}.'</h3>'.	$output = '<h3>'.$lt{'pd'}.'</h3>'.
&Apache::lonhtmlcommon::start_pick_box();	&Apache::lonhtmlcommon::start_pick_box();
	if (($context eq 'selfcreate') && ($newuser eq 'email')) {
	$output .= &Apache::lonhtmlcommon::row_title($lt{'email'}.'<b>*</b>',undef,
	'LC_oddrow_value')."\n".
	'<input type="text" name="uname" size="25" value="" autocomplete="off" />';
	$rowcount ++;
	$output .= &Apache::lonhtmlcommon::row_closure(1);
	my $upassone = '<input type="password" name="upass'.$now.'" size="10" autocomplete="off" />';
	my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="10" autocomplete="off" />';
	$output .= &Apache::lonhtmlcommon::row_title(&mt('Password').'<b>*</b>',
	'LC_pick_box_title',
	'LC_oddrow_value')."\n".
	$upassone."\n".
	&Apache::lonhtmlcommon::row_closure(1)."\n".
	&Apache::lonhtmlcommon::row_title(&mt('Confirm password').'<b>*</b>',
	'LC_pick_box_title',
	'LC_oddrow_value')."\n".
	$upasstwo.
	&Apache::lonhtmlcommon::row_closure()."\n";
	}
foreach my $item (@userinfo) {	foreach my $item (@userinfo) {
my $rowtitle = $lt{$item};	my $rowtitle = $lt{$item};
my $hiderow = 0;	my $hiderow = 0;
Line 2154 sub personal_data_display {	Line 2270 sub personal_data_display {
$row .= '<input type="hidden" name="c'.$item.'" value="'.$inst_results->{$item}.'" />'.$inst_results->{$item};	$row .= '<input type="hidden" name="c'.$item.'" value="'.$inst_results->{$item}.'" />'.$inst_results->{$item};
} else {	} else {
if ($context eq 'selfcreate') {	if ($context eq 'selfcreate') {
if ($canmodify{$item}) {	if ($canmodify{$item}) {
$row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';	$row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />';
$editable ++;	$editable ++;
} else {	} else {
$hiderow = 1;	$hiderow = 1;
Line 2170 sub personal_data_display {	Line 2286 sub personal_data_display {
$row .= $ccuname;	$row .= $ccuname;
} else {	} else {
if ($canmodify{$item}) {	if ($canmodify{$item}) {
$row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';	if ($newuser eq 'email') {
	$row .= '<input type="text" name="'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />';
	} else {
	$row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />';
	}
$editable ++;	$editable ++;
} else {	} else {
$hiderow = 1;	$hiderow = 1;
Line 2183 sub personal_data_display {	Line 2303 sub personal_data_display {
} else {	} else {
if ($canmodify{$item}) {	if ($canmodify{$item}) {
$row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="'.$userenv{$item}.'" />';	$row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="'.$userenv{$item}.'" />';
	if (($item eq 'id') && (!$newuser)) {
	$row .= '<br />'.&Apache::lonuserutils::forceid_change($context);
	}
} else {	} else {
$row .= $userenv{$item};	$row .= $userenv{$item};
}	}
if ($item eq 'id') {
$showforceid = $canmodify{$item};
}
}	}
$row .= &Apache::lonhtmlcommon::row_closure(1);	$row .= &Apache::lonhtmlcommon::row_closure(1);
if (!$hiderow) {	if (!$hiderow) {
Line 2223 sub personal_data_display {	Line 2343 sub personal_data_display {
}	}
}	}
if (!$hiderow) {	if (!$hiderow) {
my $row = &Apache::lonhtmlcommon::row_title(&mt('Affliations'),undef,'LC_oddrow_value')."\n".	my $row = &Apache::lonhtmlcommon::row_title(&mt('Affiliations'),undef,'LC_oddrow_value')."\n".
$shown.&Apache::lonhtmlcommon::row_closure(1);	$shown.&Apache::lonhtmlcommon::row_closure(1);
if ($context eq 'selfcreate') {	if ($context eq 'selfcreate') {
$rowcount ++;	$rowcount ++;
Line 2233 sub personal_data_display {	Line 2353 sub personal_data_display {
}	}
}	}
}	}
	if (($context eq 'selfcreate') && ($newuser eq 'email')) {
	if ($captchaform) {
	$output .= &Apache::lonhtmlcommon::row_title($lt{'valid'},
	'LC_pick_box_title')."\n".
	$captchaform."\n".'<br /><br />'.
	&Apache::lonhtmlcommon::row_closure(1);
	$rowcount ++;
	}
	my $submit_text = &mt('Create account');
	$output .= &Apache::lonhtmlcommon::row_title()."\n".
	'<br /><input type="submit" name="createaccount" value="'.
	$submit_text.'" />'.
	'<input type="hidden" name="type" value="'.$usertype.'" />'.
	&Apache::lonhtmlcommon::row_closure(1);
	}
$output .= &Apache::lonhtmlcommon::end_pick_box();	$output .= &Apache::lonhtmlcommon::end_pick_box();
if (wantarray) {	if (wantarray) {
if ($context eq 'selfcreate') {	if ($context eq 'selfcreate') {
return($output,$rowcount,$editable);	return($output,$rowcount,$editable);
} else {	} else {
return ($output,$showforceid);	return $output;
}	}
} else {	} else {
return $output;	return $output;
Line 2315 sub get_inststatuses {	Line 2450 sub get_inststatuses {

# ================================================================= Phase Three	# ================================================================= Phase Three
sub update_user_data {	sub update_user_data {
my ($r,$context,$crstype,$brcrum) = @_;	my ($r,$context,$crstype,$brcrum,$showcredits) = @_;
my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'},	my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'},
$env{'form.ccdomain'});	$env{'form.ccdomain'});
# Error messages	# Error messages
Line 2403 sub update_user_data {	Line 2538 sub update_user_data {
if (! exists($env{'form.makeuser'})) {	if (! exists($env{'form.makeuser'})) {
# Modifying an existing user, so check the validity of the name	# Modifying an existing user, so check the validity of the name
if ($uhome eq 'no_host') {	if ($uhome eq 'no_host') {
$r->print($error.&mt('Unable to determine home server for ').	$r->print(
$env{'form.ccuname'}.&mt(' in domain ').	$error
$env{'form.ccdomain'}.'.');	.'<p class="LC_error">'
	.&mt('Unable to determine home server for [_1] in domain [_2].',
	'"'.$env{'form.ccuname'}.'"','"'.$env{'form.ccdomain'}.'"')
	.'</p>');
return;	return;
}	}
}	}
Line 2445 sub update_user_data {	Line 2583 sub update_user_data {
my (%alerts,%rulematch,%inst_results,%curr_rules);	my (%alerts,%rulematch,%inst_results,%curr_rules);
my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');	my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
my @usertools = ('aboutme','blog','webdav','portfolio');	my @usertools = ('aboutme','blog','webdav','portfolio');
my @requestcourses = ('official','unofficial','community');	my @requestcourses = ('official','unofficial','community','textbook');
my @requestauthor = ('requestauthor');	my @requestauthor = ('requestauthor');
my ($othertitle,$usertypes,$types) =	my ($othertitle,$usertypes,$types) =
&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});	&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
Line 2515 sub update_user_data {	Line 2653 sub update_user_data {
my (%changeHash,%newcustom,%changed,%changedinfo);	my (%changeHash,%newcustom,%changed,%changedinfo);
if ($uhome ne 'no_host') {	if ($uhome ne 'no_host') {
if ($context eq 'domain') {	if ($context eq 'domain') {
if ($env{'form.customquota'} == 1) {	foreach my $name ('portfolio','author') {
if ($env{'form.portfolioquota'} eq '') {	if ($env{'form.custom_'.$name.'quota'} == 1) {
$newcustom{'quota'} = 0;	if ($env{'form.'.$name.'quota'} eq '') {
} else {	$newcustom{$name.'quota'} = 0;
$newcustom{'quota'} = $env{'form.portfolioquota'};	} else {
$newcustom{'quota'} =~ s/[^\d\.]//g;	$newcustom{$name.'quota'} = $env{'form.'.$name.'quota'};
	$newcustom{$name.'quota'} =~ s/[^\d\.]//g;
	}
	if (&quota_admin($newcustom{$name.'quota'},\%changeHash,$name)) {
	$changed{$name.'quota'} = 1;
	}
}	}
$changed{'quota'} = &quota_admin($newcustom{'quota'},\%changeHash);
}	}
foreach my $item (@usertools) {	foreach my $item (@usertools) {
if ($env{'form.custom'.$item} == 1) {	if ($env{'form.custom'.$item} == 1) {
Line 2536 sub update_user_data {	Line 2678 sub update_user_data {
$newcustom{$item} = $env{'form.crsreq_'.$item};	$newcustom{$item} = $env{'form.crsreq_'.$item};
if ($env{'form.crsreq_'.$item} eq 'autolimit') {	if ($env{'form.crsreq_'.$item} eq 'autolimit') {
$newcustom{$item} .= '=';	$newcustom{$item} .= '=';
unless ($env{'form.crsreq_'.$item.'_limit'} =~ /\D/) {	$env{'form.crsreq_'.$item.'_limit'} =~ s/\D+//g;
	if ($env{'form.crsreq_'.$item.'_limit'}) {
$newcustom{$item} .= $env{'form.crsreq_'.$item.'_limit'};	$newcustom{$item} .= $env{'form.crsreq_'.$item.'_limit'};
}	}
}	}
Line 2578 sub update_user_data {	Line 2721 sub update_user_data {
$r->print($error.'Invalid login mode or password'.$end.$rtnlink);	$r->print($error.'Invalid login mode or password'.$end.$rtnlink);
return;	return;
}	}
# Only allow authentification modification if the person has authority	# Only allow authentication modification if the person has authority
if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) {	if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) {
$r->print('Modifying authentication: '.	$r->print('Modifying authentication: '.
&Apache::lonnet::modifyuserauth(	&Apache::lonnet::modifyuserauth(
Line 2588 sub update_user_data {	Line 2731 sub update_user_data {
($env{'form.ccuname'},$env{'form.ccdomain'}));	($env{'form.ccuname'},$env{'form.ccdomain'}));
} else {	} else {
# Okay, this is a non-fatal error.	# Okay, this is a non-fatal error.
$r->print($error.&mt('You do not have the authority to modify this users authentification information').'.'.$end);	$r->print($error.&mt('You do not have the authority to modify this users authentication information.').$end);
}	}
}	}
$r->rflush(); # Finish display of header before time consuming actions start	$r->rflush(); # Finish display of header before time consuming actions start
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state);	&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state);
##	##
my (@userroles,%userupdate,$cnum,$cdom,%namechanged);	my (@userroles,%userupdate,$cnum,$cdom,$defaultcredits,%namechanged);
if ($context eq 'course') {	if ($context eq 'course') {
($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();	($cnum,$cdom) =
	&Apache::lonuserutils::get_course_identity();
$crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum);	$crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum);
	if ($showcredits) {
	$defaultcredits = &Apache::lonuserutils::get_defaultcredits($cdom,$cnum);
	}
}	}
if (! $env{'form.makeuser'} ) {	if (! $env{'form.makeuser'} ) {
# Check for need to change	# Check for need to change
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','authorquota','inststatus',
'tools.blog','tools.webdav','tools.portfolio',	'tools.aboutme','tools.blog','tools.webdav','tools.portfolio',
'requestcourses.official','requestcourses.unofficial',	'requestcourses.official','requestcourses.unofficial',
'requestcourses.community','reqcrsotherdom.official',	'requestcourses.community','requestcourses.textbook',
'reqcrsotherdom.unofficial','reqcrsotherdom.community',	'reqcrsotherdom.official','reqcrsotherdom.unofficial',
	'reqcrsotherdom.community','reqcrsotherdom.textbook',
'requestauthor'],	'requestauthor'],
$env{'form.ccdomain'},$env{'form.ccuname'});	$env{'form.ccdomain'},$env{'form.ccuname'});
my ($tmp) = keys(%userenv);	my ($tmp) = keys(%userenv);
Line 2730 sub update_user_data {	Line 2878 sub update_user_data {
}	}
}	}
}	}
my ($quotachanged,$oldportfolioquota,$newportfolioquota,$oldinststatus,	my (%quotachanged,%oldquota,%newquota,%olddefquota,%newdefquota,
$newinststatus,$oldisdefault,$newisdefault,%oldsettings,	$oldinststatus,$newinststatus,%oldisdefault,%newisdefault,%oldsettings,
%oldsettingstext,%newsettings,%newsettingstext,@disporder,	%oldsettingstext,%newsettings,%newsettingstext,@disporder,
$olddefquota,$oldsettingstatus,$newdefquota,$newsettingstatus);	%oldsettingstatus,%newsettingstatus);
@disporder = ('inststatus');	@disporder = ('inststatus');
if ($env{'request.role.domain'} eq $env{'form.ccdomain'}) {	if ($env{'request.role.domain'} eq $env{'form.ccdomain'}) {
push(@disporder,'requestcourses','requestauthor');	push(@disporder,'requestcourses','requestauthor');
Line 2742 sub update_user_data {	Line 2890 sub update_user_data {
}	}
push(@disporder,('quota','tools'));	push(@disporder,('quota','tools'));
$oldinststatus = $userenv{'inststatus'};	$oldinststatus = $userenv{'inststatus'};
($olddefquota,$oldsettingstatus) =	foreach my $name ('portfolio','author') {
&Apache::loncommon::default_quota($env{'form.ccdomain'},$oldinststatus);	($olddefquota{$name},$oldsettingstatus{$name}) =
($newdefquota,$newsettingstatus) = ($olddefquota,$oldsettingstatus);	&Apache::loncommon::default_quota($env{'form.ccdomain'},$oldinststatus,$name);
	($newdefquota{$name},$newsettingstatus{$name}) = ($olddefquota{$name},$oldsettingstatus{$name});
	}
my %canshow;	my %canshow;
if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {	if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
$canshow{'quota'} = 1;	$canshow{'quota'} = 1;
Line 2783 sub update_user_data {	Line 2933 sub update_user_data {
$changeHash{'inststatus'} = $newinststatus;	$changeHash{'inststatus'} = $newinststatus;
if ($newinststatus ne $oldinststatus) {	if ($newinststatus ne $oldinststatus) {
$changed{'inststatus'} = $newinststatus;	$changed{'inststatus'} = $newinststatus;
($newdefquota,$newsettingstatus) =	foreach my $name ('portfolio','author') {
&Apache::loncommon::default_quota($env{'form.ccdomain'},$newinststatus);	($newdefquota{$name},$newsettingstatus{$name}) =
	&Apache::loncommon::default_quota($env{'form.ccdomain'},$newinststatus,$name);
	}
}	}
if (ref($usertypes) eq 'HASH') {	if (ref($usertypes) eq 'HASH') {
$newsettings{'inststatus'} = join(', ',map{ $usertypes->{$_}; } (@inststatuses));	$newsettings{'inststatus'} = join(', ',map{ $usertypes->{$_}; } (@inststatuses));
Line 2798 sub update_user_data {	Line 2950 sub update_user_data {
$newsettings{'inststatus'} = $othertitle;	$newsettings{'inststatus'} = $othertitle;
if ($newinststatus ne $oldinststatus) {	if ($newinststatus ne $oldinststatus) {
$changed{'inststatus'} = $changeHash{'inststatus'};	$changed{'inststatus'} = $changeHash{'inststatus'};
($newdefquota,$newsettingstatus) =	foreach my $name ('portfolio','author') {
&Apache::loncommon::default_quota($env{'form.ccdomain'},$newinststatus);	($newdefquota{$name},$newsettingstatus{$name}) =
	&Apache::loncommon::default_quota($env{'form.ccdomain'},$newinststatus,$name);
	}
}	}
}	}
} elsif ($context ne 'selfcreate') {	} elsif ($context ne 'selfcreate') {
$canshow{'inststatus'} = 1;	$canshow{'inststatus'} = 1;
$newsettings{'inststatus'} = $oldsettings{'inststatus'};	$newsettings{'inststatus'} = $oldsettings{'inststatus'};
}	}
$changeHash{'portfolioquota'} = $userenv{'portfolioquota'};	foreach my $name ('portfolio','author') {
	$changeHash{$name.'quota'} = $userenv{$name.'quota'};
	}
if ($context eq 'domain') {	if ($context eq 'domain') {
if ($userenv{'portfolioquota'} ne '') {	foreach my $name ('portfolio','author') {
$oldportfolioquota = $userenv{'portfolioquota'};	if ($userenv{$name.'quota'} ne '') {
if ($env{'form.customquota'} == 1) {	$oldquota{$name} = $userenv{$name.'quota'};
if ($env{'form.portfolioquota'} eq '') {	if ($env{'form.custom_'.$name.'quota'} == 1) {
$newportfolioquota = 0;	if ($env{'form.'.$name.'quota'} eq '') {
	$newquota{$name} = 0;
	} else {
	$newquota{$name} = $env{'form.'.$name.'quota'};
	$newquota{$name} =~ s/[^\d\.]//g;
	}
	if ($newquota{$name} != $oldquota{$name}) {
	if (&quota_admin($newquota{$name},\%changeHash,$name)) {
	$changed{$name.'quota'} = 1;
	}
	}
} else {	} else {
$newportfolioquota = $env{'form.portfolioquota'};	if (&quota_admin('',\%changeHash,$name)) {
$newportfolioquota =~ s/[^\d\.]//g;	$changed{$name.'quota'} = 1;
}	$newquota{$name} = $newdefquota{$name};
if ($newportfolioquota != $oldportfolioquota) {	$newisdefault{$name} = 1;
$changed{'quota'} = &quota_admin($newportfolioquota,\%changeHash);	}
}	}
} else {	} else {
$changed{'quota'} = &quota_admin('',\%changeHash);	$oldisdefault{$name} = 1;
$newportfolioquota = $newdefquota;	$oldquota{$name} = $olddefquota{$name};
$newisdefault = 1;	if ($env{'form.custom_'.$name.'quota'} == 1) {
}	if ($env{'form.'.$name.'quota'} eq '') {
} else {	$newquota{$name} = 0;
$oldisdefault = 1;	} else {
$oldportfolioquota = $olddefquota;	$newquota{$name} = $env{'form.'.$name.'quota'};
if ($env{'form.customquota'} == 1) {	$newquota{$name} =~ s/[^\d\.]//g;
if ($env{'form.portfolioquota'} eq '') {	}
$newportfolioquota = 0;	if (&quota_admin($newquota{$name},\%changeHash,$name)) {
	$changed{$name.'quota'} = 1;
	}
} else {	} else {
$newportfolioquota = $env{'form.portfolioquota'};	$newquota{$name} = $newdefquota{$name};
$newportfolioquota =~ s/[^\d\.]//g;	$newisdefault{$name} = 1;
}	}
$changed{'quota'} = &quota_admin($newportfolioquota,\%changeHash);	}
	if ($oldisdefault{$name}) {
	$oldsettingstext{'quota'}{$name} = &get_defaultquota_text($oldsettingstatus{$name});
	} else {
	$oldsettingstext{'quota'}{$name} = &mt('custom quota: [_1] MB',$oldquota{$name});
	}
	if ($newisdefault{$name}) {
	$newsettingstext{'quota'}{$name} = &get_defaultquota_text($newsettingstatus{$name});
} else {	} else {
$newportfolioquota = $newdefquota;	$newsettingstext{'quota'}{$name} = &mt('custom quota: [_1] MB',$newquota{$name});
$newisdefault = 1;
}	}
}	}
if ($oldisdefault) {
$oldsettingstext{'quota'} = &get_defaultquota_text($oldsettingstatus);
}
if ($newisdefault) {
$newsettingstext{'quota'} = &get_defaultquota_text($newsettingstatus);
}
&tool_changes('tools',\@usertools,\%oldsettings,\%oldsettingstext,\%userenv,	&tool_changes('tools',\@usertools,\%oldsettings,\%oldsettingstext,\%userenv,
\%changeHash,\%changed,\%newsettings,\%newsettingstext);	\%changeHash,\%changed,\%newsettings,\%newsettingstext);
if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) {	if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) {
&tool_changes('requestcourses',\@requestcourses,\%oldsettings,\%oldsettingstext,	&tool_changes('requestcourses',\@requestcourses,\%oldsettings,\%oldsettingstext,
\%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);	\%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
&tool_changes('requestauthor',\@requestauthor,\%oldsettings,\%oldsettingstext,\%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);	&tool_changes('requestauthor',\@requestauthor,\%oldsettings,\%oldsettingstext,
	\%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
} else {	} else {
&tool_changes('reqcrsotherdom',\@requestcourses,\%oldsettings,\%oldsettingstext,	&tool_changes('reqcrsotherdom',\@requestcourses,\%oldsettings,\%oldsettingstext,
\%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);	\%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
Line 2863 sub update_user_data {	Line 3032 sub update_user_data {
$namechanged{$item} = 1;	$namechanged{$item} = 1;
}	}
}	}
$oldsettings{'quota'} = $oldportfolioquota.' Mb';	foreach my $name ('portfolio','author') {
$newsettings{'quota'} = $newportfolioquota.' Mb';	$oldsettings{'quota'}{$name} = &mt('[_1] MB',$oldquota{$name});
	$newsettings{'quota'}{$name} = &mt('[_1] MB',$newquota{$name});
	}
if ((keys(%namechanged) > 0) \|\| (keys(%changed) > 0)) {	if ((keys(%namechanged) > 0) \|\| (keys(%changed) > 0)) {
my ($chgresult,$namechgresult);	my ($chgresult,$namechgresult);
if (keys(%changed) > 0) {	if (keys(%changed) > 0) {
Line 2962 sub update_user_data {	Line 3133 sub update_user_data {
&Apache::lonnet::appenv(\%newenvhash);	&Apache::lonnet::appenv(\%newenvhash);
}	}
} else { # error occurred	} else { # error occurred
$r->print('<span class="LC_error">'.&mt('Unable to successfully change environment for').' '.	$r->print(
$env{'form.ccuname'}.' '.&mt('in domain').' '.	'<p class="LC_error">'
$env{'form.ccdomain'}.'</span><br />');	.&mt('Unable to successfully change environment for [_1] in domain [_2].',
	'"'.$env{'form.ccuname'}.'"',
	'"'.$env{'form.ccdomain'}.'"')
	.'</p>');
}	}
} else { # End of if ($env ... ) logic	} else { # End of if ($env ... ) logic
# They did not want to change the users name, quota, tool availability,	# They did not want to change the users name, quota, tool availability,
Line 3010 sub update_user_data {	Line 3184 sub update_user_data {
}	}
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);	&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
if ($env{'form.action'} eq 'singlestudent') {	if ($env{'form.action'} eq 'singlestudent') {
&enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context,$crstype);	&enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context,
$r->print('<p><a href="javascript:backPage(document.userupdate)">');	$crstype,$showcredits,$defaultcredits);
if ($crstype eq 'Community') {	my $linktext = ($crstype eq 'Community' ?
$r->print(&mt('Enroll Another Member'));	&mt('Enroll Another Member') : &mt('Enroll Another Student'));
} else {	$r->print(
$r->print(&mt('Enroll Another Student'));	&Apache::lonhtmlcommon::actionbox([
}	'<a href="javascript:backPage(document.userupdate)">'
$r->print('</a></p>');	.($crstype eq 'Community' ?
	&mt('Enroll Another Member') : &mt('Enroll Another Student'))
	.'</a>']));
} else {	} else {
my @rolechanges = &update_roles($r,$context);	my @rolechanges = &update_roles($r,$context,$showcredits);
if (keys(%namechanged) > 0) {	if (keys(%namechanged) > 0) {
if ($context eq 'course') {	if ($context eq 'course') {
if (@userroles > 0) {	if (@userroles > 0) {
Line 3071 sub display_userinfo {	Line 3247 sub display_userinfo {
'generation' => 'Generation',	'generation' => 'Generation',
'id' => 'Student/Employee ID',	'id' => 'Student/Employee ID',
'permanentemail' => 'Permanent e-mail address',	'permanentemail' => 'Permanent e-mail address',
'quota' => 'Disk space allocated to portfolio files',	'portfolioquota' => 'Disk space allocated to portfolio files',
	'authorquota' => 'Disk space allocated to Authoring Space',
'blog' => 'Blog Availability',	'blog' => 'Blog Availability',
'webdav' => 'WebDAV Availability',	'webdav' => 'WebDAV Availability',
'aboutme' => 'Personal Information Page Availability',	'aboutme' => 'Personal Information Page Availability',
Line 3079 sub display_userinfo {	Line 3256 sub display_userinfo {
'official' => 'Can Request Official Courses',	'official' => 'Can Request Official Courses',
'unofficial' => 'Can Request Unofficial Courses',	'unofficial' => 'Can Request Unofficial Courses',
'community' => 'Can Request Communities',	'community' => 'Can Request Communities',
	'textbook' => 'Can Request Textbook Courses',
'requestauthor' => 'Can Request Author Role',	'requestauthor' => 'Can Request Author Role',
'inststatus' => "Affiliation",	'inststatus' => "Affiliation",
'prvs' => 'Previous Value:',	'prvs' => 'Previous Value:',
Line 3093 sub display_userinfo {	Line 3271 sub display_userinfo {
$r->print('<th><span class="LC_nobreak"><b>'.$lt{'chto'}.'</b></span></th>');	$r->print('<th><span class="LC_nobreak"><b>'.$lt{'chto'}.'</b></span></th>');
$r->print(&Apache::loncommon::end_data_table_header_row());	$r->print(&Apache::loncommon::end_data_table_header_row());
my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');	my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');


foreach my $item (@userinfo) {	foreach my $item (@userinfo) {
my $value = $env{'form.c'.$item};	my $value = $env{'form.c'.$item};
#show changes only:	#show changes only:
unless($value eq $userenv->{$item}){	unless ($value eq $userenv->{$item}){
$r->print(&Apache::loncommon::start_data_table_row());	$r->print(&Apache::loncommon::start_data_table_row());

$r->print("<td>$lt{$item}</td>\n");	$r->print("<td>$lt{$item}</td>\n");
$r->print('<td>'.$userenv->{$item}.' </td>');	$r->print("<td>".$userenv->{$item}."</td>\n");
$r->print("<td>$value </td>\n");	$r->print("<td>$value </td>\n");

$r->print(&Apache::loncommon::end_data_table_row());	$r->print(&Apache::loncommon::end_data_table_row());
}	}
}	}
foreach my $entry (@{$order}) {	foreach my $entry (@{$order}) {
if ($canshow->{$entry} && ($newsetting->{$entry} ne $newsetting->{$entry})) {	if ($canshow->{$entry}) {
$r->print(&Apache::loncommon::start_data_table_row());	if (($entry eq 'requestcourses') \|\| ($entry eq 'reqcrsotherdom') \|\| ($entry eq 'requestauthor')) {
if (($entry eq 'requestcourses') \|\| ($entry eq 'reqcrsotherdom')) {	my @items;
foreach my $item (@{$requestcourses}) {	if ($entry eq 'requestauthor') {
$r->print("<td>$lt{$item}</td>\n");	@items = ($entry);
$r->print("<td>$oldsetting->{$item} $oldsettingtext->{$item}</td>\n");	} else {
my $value = $newsetting->{$item}.' '.$newsettingtext->{$item};	@items = @{$requestcourses};
if ($changedhash->{$item}) {	}
$value = '<span class="LC_cusr_emph">'.$value.'</span>';	foreach my $item (@items) {
	if (($newsetting->{$item} ne $oldsetting->{$item}) \|\|
	($newsettingtext->{$item} ne $oldsettingtext->{$item})) {
	$r->print(&Apache::loncommon::start_data_table_row()."\n");
	$r->print("<td>$lt{$item}</td>\n");
	$r->print("<td>".$oldsetting->{$item});
	if ($oldsettingtext->{$item}) {
	if ($oldsetting->{$item}) {
	$r->print(' -- ');
	}
	$r->print($oldsettingtext->{$item});
	}
	$r->print("</td>\n");
	$r->print("<td>".$newsetting->{$item});
	if ($newsettingtext->{$item}) {
	if ($newsetting->{$item}) {
	$r->print(' -- ');
	}
	$r->print($newsettingtext->{$item});
	}
	$r->print("</td>\n");
	$r->print(&Apache::loncommon::end_data_table_row()."\n");
}	}
$r->print("<td>$value </td>\n");
}	}
} elsif ($entry eq 'tools') {	} elsif ($entry eq 'tools') {
foreach my $item (@{$usertools}) {	foreach my $item (@{$usertools}) {
$r->print("<td>$lt{$item}</td>\n");	if ($newsetting->{$item} ne $oldsetting->{$item}) {
$r->print("<td>$oldsetting->{$item} $oldsettingtext->{$item}</td>\n");	$r->print(&Apache::loncommon::start_data_table_row()."\n");
my $value = $newsetting->{$item}.' '.$newsettingtext->{$item};	$r->print("<td>$lt{$item}</td>\n");
if ($changedhash->{$item}) {	$r->print("<td>".$oldsetting->{$item}.' '.$oldsettingtext->{$item}."</td>\n");
$value = '<span class="LC_cusr_emph">'.$value.'</span>';	$r->print("<td>".$newsetting->{$item}.' '.$newsettingtext->{$item}."</td>\n");
}	$r->print(&Apache::loncommon::end_data_table_row()."\n");
$r->print("<td>$value </td>\n");	}
}	}
} else {	} elsif ($entry eq 'quota') {
$r->print("<td>$lt{$entry}</td>\n");	if ((ref($oldsetting->{$entry}) eq 'HASH') && (ref($oldsettingtext->{$entry}) eq 'HASH') &&
$r->print("<td>$oldsetting->{$entry} $oldsettingtext->{$entry} </td>\n");	(ref($newsetting->{$entry}) eq 'HASH') && (ref($newsettingtext->{$entry}) eq 'HASH')) {
my $value = $newsetting->{$entry}.' '.$newsettingtext->{$entry};	foreach my $name ('portfolio','author') {
if ($changedhash->{$entry}) {	if ($newsetting->{$entry}->{$name} ne $oldsetting->{$entry}->{$name}) {
$value = '<span class="LC_cusr_emph">'.$value.'</span>';	$r->print(&Apache::loncommon::start_data_table_row()."\n");
	$r->print("<td>$lt{$name.$entry}</td>\n");
	$r->print("<td>".$oldsettingtext->{$entry}->{$name}."</td>\n");
	$r->print("<td>".$newsettingtext->{$entry}->{$name}."</td>\n");
	$r->print(&Apache::loncommon::end_data_table_row()."\n");
	}
	}
	}
	} else {
	if ($newsetting->{$entry} ne $oldsetting->{$entry}) {
	$r->print(&Apache::loncommon::start_data_table_row()."\n");
	$r->print("<td>$lt{$entry}</td>\n");
	$r->print("<td>".$oldsetting->{$entry}.' '.$oldsettingtext->{$entry}."</td>\n");
	$r->print("<td>".$newsetting->{$entry}.' '.$newsettingtext->{$entry}."</td>\n");
	$r->print(&Apache::loncommon::end_data_table_row()."\n");
}	}
$r->print("<td>$value </td>\n");
}	}
$r->print(&Apache::loncommon::end_data_table_row());
}	}
}	}
$r->print(&Apache::loncommon::end_data_table().'<br />');	$r->print(&Apache::loncommon::end_data_table().'<br />');
Line 3160 sub tool_changes {	Line 3367 sub tool_changes {
(ref($newaccess) eq 'HASH') && (ref($newaccesstext) eq 'HASH'))) {	(ref($newaccess) eq 'HASH') && (ref($newaccesstext) eq 'HASH'))) {
return;	return;
}	}
	my %reqdisplay = &requestchange_display();
if ($context eq 'reqcrsotherdom') {	if ($context eq 'reqcrsotherdom') {
my @options = ('approval','validate','autolimit');	my @options = ('approval','validate','autolimit');
my $optregex = join('\|',@options);	my $optregex = join('\|',@options);
my %reqdisplay = &courserequest_display();
my $cdom = $env{'request.role.domain'};	my $cdom = $env{'request.role.domain'};
foreach my $tool (@{$usertools}) {	foreach my $tool (@{$usertools}) {
$oldaccesstext->{$tool} = &mt('No');	$oldaccesstext->{$tool} = &mt("availability set to 'off'");
$newaccesstext->{$tool} = $oldaccesstext->{$tool};	$newaccesstext->{$tool} = $oldaccesstext->{$tool};
$changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool};	$changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool};
my $newop;	my ($newop,$limit);
if ($env{'form.'.$context.'_'.$tool}) {	if ($env{'form.'.$context.'_'.$tool}) {
$newop = $env{'form.'.$context.'_'.$tool};	$newop = $env{'form.'.$context.'_'.$tool};
if ($newop eq 'autolimit') {	if ($newop eq 'autolimit') {
my $limit = $env{'form.'.$context.'_'.$tool.'_limit'};	$limit = $env{'form.'.$context.'_'.$tool.'_limit'};
$limit =~ s/\D+//g;	$limit =~ s/\D+//g;
$newop .= '='.$limit;	$newop .= '='.$limit;
}	}
Line 3183 sub tool_changes {	Line 3390 sub tool_changes {
$changed->{$tool}=&tool_admin($tool,$cdom.':'.$newop,	$changed->{$tool}=&tool_admin($tool,$cdom.':'.$newop,
$changeHash,$context);	$changeHash,$context);
if ($changed->{$tool}) {	if ($changed->{$tool}) {
$newaccesstext->{$tool} = &mt('Yes');	if ($newop =~ /^autolimit/) {
	if ($limit) {
	$newaccesstext->{$tool} = &mt('available with automatic approval, up to limit of [quant,_1,request] per user',$limit);
	} else {
	$newaccesstext->{$tool} = &mt('available with automatic approval (unlimited)');
	}
	} else {
	$newaccesstext->{$tool} = $reqdisplay{$newop};
	}
} else {	} else {
$newaccesstext->{$tool} = $oldaccesstext->{$tool};	$newaccesstext->{$tool} = $oldaccesstext->{$tool};
}	}
Line 3194 sub tool_changes {	Line 3409 sub tool_changes {
my $changedoms;	my $changedoms;
foreach my $req (@curr) {	foreach my $req (@curr) {
if ($req =~ /^\Q$cdom\E\:($optregex\=?\d*)$/) {	if ($req =~ /^\Q$cdom\E\:($optregex\=?\d*)$/) {
$oldaccesstext->{$tool} = &mt('Yes');
my $oldop = $1;	my $oldop = $1;
	if ($oldop =~ /^autolimit=(\d*)/) {
	my $limit = $1;
	if ($limit) {
	$oldaccesstext->{$tool} = &mt('available with automatic approval, up to limit of [quant,_1,request] per user',$limit);
	} else {
	$oldaccesstext->{$tool} = &mt('available with automatic approval (unlimited)');
	}
	} else {
	$oldaccesstext->{$tool} = $reqdisplay{$oldop};
	}
if ($oldop ne $newop) {	if ($oldop ne $newop) {
$changedoms = 1;	$changedoms = 1;
foreach my $item (@curr) {	foreach my $item (@curr) {
Line 3229 sub tool_changes {	Line 3453 sub tool_changes {
my $limit = $env{'form.'.$context.'_'.$tool.'_limit'};	my $limit = $env{'form.'.$context.'_'.$tool.'_limit'};
$limit =~ s/\D+//g;	$limit =~ s/\D+//g;
if ($limit) {	if ($limit) {
$newaccesstext->{$tool} = &mt('Yes, up to limit of [quant,_1,request] per user.',$limit);	$newaccesstext->{$tool} = &mt('available with automatic approval, up to limit of [quant,_1,request] per user',$limit);
} else {	} else {
$newaccesstext->{$tool} = &mt('Yes, processed automatically');	$newaccesstext->{$tool} = &mt('available with automatic approval (unlimited)');
}	}
} else {	} else {
$newaccesstext->{$tool} = $reqdisplay{$env{'form.'.$context.'_'.$tool}};	$newaccesstext->{$tool} = $reqdisplay{$env{'form.'.$context.'_'.$tool}};
}	}
} else {	} else {
$newaccesstext->{$tool} = &mt('No');	$newaccesstext->{$tool} = &mt("availability set to 'off'");
}	}
}	}
}	}
Line 3246 sub tool_changes {	Line 3470 sub tool_changes {
return;	return;
}	}
foreach my $tool (@{$usertools}) {	foreach my $tool (@{$usertools}) {
my ($newval,$envkey);	my ($newval,$limit,$envkey);
$envkey = $context.'.'.$tool;	$envkey = $context.'.'.$tool;
if ($context eq 'requestcourses') {	if ($context eq 'requestcourses') {
$newval = $env{'form.crsreq_'.$tool};	$newval = $env{'form.crsreq_'.$tool};
if ($newval eq 'autolimit') {	if ($newval eq 'autolimit') {
$newval .= '='.$env{'form.crsreq_'.$tool.'_limit'};	$limit = $env{'form.crsreq_'.$tool.'_limit'};
	$limit =~ s/\D+//g;
	$newval .= '='.$limit;
}	}
} elsif ($context eq 'requestauthor') {	} elsif ($context eq 'requestauthor') {
$newval = $env{'form.'.$context};	$newval = $env{'form.'.$context};
Line 3261 sub tool_changes {	Line 3487 sub tool_changes {
}	}
if ($userenv->{$envkey} ne '') {	if ($userenv->{$envkey} ne '') {
$oldaccess->{$tool} = &mt('custom');	$oldaccess->{$tool} = &mt('custom');
if ($userenv->{$envkey}) {	if (($context eq 'requestcourses') \|\| ($context eq 'requestauthor')) {
$oldaccesstext->{$tool} = &mt("availability set to 'on'");	if ($userenv->{$envkey} =~ /^autolimit=(\d*)$/) {
	my $currlimit = $1;
	if ($currlimit eq '') {
	$oldaccesstext->{$tool} = &mt('available with automatic approval (unlimited)');
	} else {
	$oldaccesstext->{$tool} = &mt('available with automatic approval, up to limit of [quant,_1,request] per user',$currlimit);
	}
	} elsif ($userenv->{$envkey}) {
	$oldaccesstext->{$tool} = $reqdisplay{$userenv->{$envkey}};
	} else {
	$oldaccesstext->{$tool} = &mt("availability set to 'off'");
	}
} else {	} else {
$oldaccesstext->{$tool} = &mt("availability set to 'off'");	if ($userenv->{$envkey}) {
	$oldaccesstext->{$tool} = &mt("availability set to 'on'");
	} else {
	$oldaccesstext->{$tool} = &mt("availability set to 'off'");
	}
}	}
$changeHash->{$envkey} = $userenv->{$envkey};	$changeHash->{$envkey} = $userenv->{$envkey};
if ($env{'form.custom'.$tool} == 1) {	if ($env{'form.custom'.$tool} == 1) {
Line 3273 sub tool_changes {	Line 3514 sub tool_changes {
$context);	$context);
if ($changed->{$tool}) {	if ($changed->{$tool}) {
$newaccess->{$tool} = &mt('custom');	$newaccess->{$tool} = &mt('custom');
if ($newval) {	if (($context eq 'requestcourses') \|\| ($context eq 'requestauthor')) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");	if ($newval =~ /^autolimit/) {
	if ($limit) {
	$newaccesstext->{$tool} = &mt('available with automatic approval, up to limit of [quant,_1,request] per user',$limit);
	} else {
	$newaccesstext->{$tool} = &mt('available with automatic approval (unlimited)');
	}
	} elsif ($newval) {
	$newaccesstext->{$tool} = $reqdisplay{$newval};
	} else {
	$newaccesstext->{$tool} = &mt("availability set to 'off'");
	}
} else {	} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");	if ($newval) {
	$newaccesstext->{$tool} = &mt("availability set to 'on'");
	} else {
	$newaccesstext->{$tool} = &mt("availability set to 'off'");
	}
}	}
} else {	} else {
$newaccess->{$tool} = $oldaccess->{$tool};	$newaccess->{$tool} = $oldaccess->{$tool};
if ($userenv->{$context.'.'.$tool}) {	if (($context eq 'requestcourses') \|\| ($context eq 'requestauthor')) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");	if ($newval =~ /^autolimit/) {
	if ($limit) {
	$newaccesstext->{$tool} = &mt('available with automatic approval, up to limit of [quant,_1,request] per user',$limit);
	} else {
	$newaccesstext->{$tool} = &mt('available with automatic approval (unlimited)');
	}
	} elsif ($newval) {
	$newaccesstext->{$tool} = $reqdisplay{$newval};
	} else {
	$newaccesstext->{$tool} = &mt("availability set to 'off'");
	}
} else {	} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");	if ($userenv->{$context.'.'.$tool}) {
	$newaccesstext->{$tool} = &mt("availability set to 'on'");
	} else {
	$newaccesstext->{$tool} = &mt("availability set to 'off'");
	}
}	}
}	}
} else {	} else {
Line 3296 sub tool_changes {	Line 3565 sub tool_changes {
$newaccess->{$tool} = &mt('default');	$newaccess->{$tool} = &mt('default');
} else {	} else {
$newaccess->{$tool} = $oldaccess->{$tool};	$newaccess->{$tool} = $oldaccess->{$tool};
if ($userenv->{$context.'.'.$tool}) {	if (($context eq 'requestcourses') \|\| ($context eq 'requestauthor')) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");	if ($newval =~ /^autolimit/) {
	if ($limit) {
	$newaccesstext->{$tool} = &mt('available with automatic approval, up to limit of [quant,_1,request] per user',$limit);
	} else {
	$newaccesstext->{$tool} = &mt('available with automatic approval (unlimited)');
	}
	} elsif ($newval) {
	$newaccesstext->{$tool} = $reqdisplay{$newval};
	} else {
	$newaccesstext->{$tool} = &mt("availability set to 'off'");
	}
} else {	} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");	if ($userenv->{$context.'.'.$tool}) {
	$newaccesstext->{$tool} = &mt("availability set to 'on'");
	} else {
	$newaccesstext->{$tool} = &mt("availability set to 'off'");
	}
}	}
}	}
}	}
Line 3310 sub tool_changes {	Line 3593 sub tool_changes {
$context);	$context);
if ($changed->{$tool}) {	if ($changed->{$tool}) {
$newaccess->{$tool} = &mt('custom');	$newaccess->{$tool} = &mt('custom');
if ($newval) {	if (($context eq 'requestcourses') \|\| ($context eq 'requestauthor')) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");	if ($newval =~ /^autolimit/) {
	if ($limit) {
	$newaccesstext->{$tool} = &mt('available with automatic approval, up to limit of [quant,_1,request] per user',$limit);
	} else {
	$newaccesstext->{$tool} = &mt('available with automatic approval (unlimited)');
	}
	} elsif ($newval) {
	$newaccesstext->{$tool} = $reqdisplay{$newval};
	} else {
	$newaccesstext->{$tool} = &mt("availability set to 'off'");
	}
} else {	} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");	if ($newval) {
	$newaccesstext->{$tool} = &mt("availability set to 'on'");
	} else {
	$newaccesstext->{$tool} = &mt("availability set to 'off'");
	}
}	}
} else {	} else {
$newaccess->{$tool} = $oldaccess->{$tool};	$newaccess->{$tool} = $oldaccess->{$tool};
Line 3327 sub tool_changes {	Line 3624 sub tool_changes {
}	}

sub update_roles {	sub update_roles {
my ($r,$context) = @_;	my ($r,$context,$showcredits) = @_;
my $now=time;	my $now=time;
my @rolechanges;	my @rolechanges;
my %disallowed;	my %disallowed;
Line 3437 sub update_roles {	Line 3734 sub update_roles {
if ($role eq 'st') {	if ($role eq 'st') {
if ($url =~ m-^/($match_domain)/($match_courseid)/?(\w*)$-) {	if ($url =~ m-^/($match_domain)/($match_courseid)/?(\w*)$-) {
my ($cdom,$cnum,$csec) = ($1,$2,$3);	my ($cdom,$cnum,$csec) = ($1,$2,$3);
my $result = &Apache::loncommon::commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$cdom,$cnum,$csec,$context);	my $credits;
	if ($showcredits) {
	my $defaultcredits =
	&Apache::lonuserutils::get_defaultcredits($cdom,$cnum);
	$credits = &get_user_credits($defaultcredits,$cdom,$cnum);
	}
	my $result = &Apache::loncommon::commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$cdom,$cnum,$csec,$context,$credits);
if (($result =~ /^error/) \|\| ($result eq 'not_in_class') \|\| ($result eq 'unknown_course') \|\| ($result eq 'refused')) {	if (($result =~ /^error/) \|\| ($result eq 'not_in_class') \|\| ($result eq 'unknown_course') \|\| ($result eq 'refused')) {
if ($result eq 'refused' && $logmsg) {	if ($result eq 'refused' && $logmsg) {
$output = $logmsg;	$output = $logmsg;
Line 3536 sub update_roles {	Line 3839 sub update_roles {
# split multiple sections	# split multiple sections
my %sections = ();	my %sections = ();
my $num_sections = &build_roles($env{'form.sec_'.$one.'_'.$two.'_'.$three},\%sections,$three);	my $num_sections = &build_roles($env{'form.sec_'.$one.'_'.$two.'_'.$three},\%sections,$three);
	my $credits;
	if ($three eq 'st') {
	if ($showcredits) {
	my $defaultcredits =
	&Apache::lonuserutils::get_defaultcredits($one,$two);
	$credits = $env{'form.credits_'.$one.'_'.$two.'_'.$three};
	$credits =~ s/[^\d\.]//g;
	if ($credits eq $defaultcredits) {
	undef($credits);
	}
	}
	}
if ($num_sections == 0) {	if ($num_sections == 0) {
$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,'',$context));	$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,'',$context,$credits));
} else {	} else {
my %curr_groups =	my %curr_groups =
&Apache::longroup::coursegroups($one,$two);	&Apache::longroup::coursegroups($one,$two);
Line 3551 sub update_roles {	Line 3866 sub update_roles {
next;	next;
}	}
my $securl = $url.'/'.$sec;	my $securl = $url.'/'.$sec;
$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec,$context));	$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec,$context,$credits));
} else {	} else {
$emptysec = 1;	$emptysec = 1;
}	}
}	}
if ($emptysec) {	if ($emptysec) {
$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,'',$context));	$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,'',$context,$credits));
}	}
}	}
if (!grep(/^\Q$three\E$/,@rolechanges)) {	if (!grep(/^\Q$three\E$/,@rolechanges)) {
Line 3624 sub update_roles {	Line 3939 sub update_roles {
return @rolechanges;	return @rolechanges;
}	}

	sub get_user_credits {
	my ($uname,$udom,$defaultcredits,$cdom,$cnum) = @_;
	if ($cdom eq '' \|\| $cnum eq '') {
	return unless ($env{'request.course.id'});
	$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
	$cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
	}
	my $credits;
	my %currhash =
	&Apache::lonnet::get('classlist',[$uname.':'.$udom],$cdom,$cnum);
	if (keys(%currhash) > 0) {
	my @items = split(/:/,$currhash{$uname.':'.$udom});
	my $crdidx = &Apache::loncoursedata::CL_CREDITS() - 3;
	$credits = $items[$crdidx];
	$credits =~ s/[^\d\.]//g;
	}
	if ($credits eq $defaultcredits) {
	undef($credits);
	}
	return $credits;
	}

sub enroll_single_student {	sub enroll_single_student {
my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context,$crstype) = @_;	my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context,$crstype,
	$showcredits,$defaultcredits) = @_;
$r->print('<h3>');	$r->print('<h3>');
if ($crstype eq 'Community') {	if ($crstype eq 'Community') {
$r->print(&mt('Enrolling Member'));	$r->print(&mt('Enrolling Member'));
Line 3637 sub enroll_single_student {	Line 3975 sub enroll_single_student {
# Remove non alphanumeric values from section	# Remove non alphanumeric values from section
$env{'form.sections'}=~s/\W//g;	$env{'form.sections'}=~s/\W//g;

	my $credits;
	if (($showcredits) && ($env{'form.credits'} ne '')) {
	$credits = $env{'form.credits'};
	$credits =~ s/[^\d\.]//g;
	if ($credits ne '') {
	if ($credits eq $defaultcredits) {
	undef($credits);
	}
	}
	}

# Clean out any old student roles the user has in this class.	# Clean out any old student roles the user has in this class.
&Apache::lonuserutils::modifystudent($env{'form.ccdomain'},	&Apache::lonuserutils::modifystudent($env{'form.ccdomain'},
$env{'form.ccuname'},$env{'request.course.id'},undef,$uhome);	$env{'form.ccuname'},$env{'request.course.id'},undef,$uhome);
Line 3646 sub enroll_single_student {	Line 3995 sub enroll_single_student {
$env{'form.ccuname'},$env{'form.cid'},$env{'form.cfirstname'},	$env{'form.ccuname'},$env{'form.cid'},$env{'form.cfirstname'},
$env{'form.cmiddlename'},$env{'form.clastname'},	$env{'form.cmiddlename'},$env{'form.clastname'},
$env{'form.generation'},$env{'form.sections'},$enddate,	$env{'form.generation'},$env{'form.sections'},$enddate,
$startdate,'manual',undef,$env{'request.course.id'},'',$context);	$startdate,'manual',undef,$env{'request.course.id'},'',$context,
	$credits);
if ($enroll_result =~ /^ok/) {	if ($enroll_result =~ /^ok/) {
$r->print(&mt('<b>[_1]</b> enrolled',$env{'form.ccuname'}.':'.$env{'form.ccdomain'}));	$r->print(&mt('[_1] enrolled','<b>'.$env{'form.ccuname'}.':'.$env{'form.ccdomain'}.'</b>'));
if ($env{'form.sections'} ne '') {	if ($env{'form.sections'} ne '') {
$r->print(' '.&mt('in section [_1]',$env{'form.sections'}));	$r->print(' '.&mt('in section [_1]',$env{'form.sections'}));
}	}
Line 3665 sub enroll_single_student {	Line 4015 sub enroll_single_student {
}	}
$r->print('.<br />'.$showstart.'; '.$showend);	$r->print('.<br />'.$showstart.'; '.$showend);
if ($startdate <= $now && !$newuser) {	if ($startdate <= $now && !$newuser) {
$r->print('<p> ');	$r->print('<p class="LC_info">');
if ($crstype eq 'Community') {	if ($crstype eq 'Community') {
$r->print(&mt('If the member is currently logged-in to LON-CAPA, the new role will be available when the member next logs in.'));	$r->print(&mt('If the member is currently logged-in to LON-CAPA, the new role can be displayed by using the "Check for changes" link on the Roles/Courses page.'));
} else {	} else {
$r->print(&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.'));	$r->print(&mt('If the student is currently logged-in to LON-CAPA, the new role can be displayed by using the "Check for changes" link on the Roles/Courses page.'));
}	}
$r->print('</p>');	$r->print('</p>');
}	}
Line 3683 sub get_defaultquota_text {	Line 4033 sub get_defaultquota_text {
my ($settingstatus) = @_;	my ($settingstatus) = @_;
my $defquotatext;	my $defquotatext;
if ($settingstatus eq '') {	if ($settingstatus eq '') {
$defquotatext = &mt('(default)');	$defquotatext = &mt('default');
} else {	} else {
my ($usertypes,$order) =	my ($usertypes,$order) =
&Apache::lonnet::retrieve_inst_usertypes($env{'form.ccdomain'});	&Apache::lonnet::retrieve_inst_usertypes($env{'form.ccdomain'});
if ($usertypes->{$settingstatus} eq '') {	if ($usertypes->{$settingstatus} eq '') {
$defquotatext = &mt('(default)');	$defquotatext = &mt('default');
} else {	} else {
$defquotatext = &mt('(default for [_1])',$usertypes->{$settingstatus});	$defquotatext = &mt('default for [_1]',$usertypes->{$settingstatus});
}	}
}	}
return $defquotatext;	return $defquotatext;
Line 3715 sub update_result_form {	Line 4065 sub update_result_form {
$outcome .= '<input type="hidden" name="forcenewuser" value="1" />'."\n";	$outcome .= '<input type="hidden" name="forcenewuser" value="1" />'."\n";
}	}
$outcome .= '<input type="hidden" name="phase" value="" />'."\n".	$outcome .= '<input type="hidden" name="phase" value="" />'."\n".
'<input type ="hidden" name="currstate" value="" />'."\n".	'<input type="hidden" name="currstate" value="" />'."\n".
'<input type ="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".	'<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
'</form>';	'</form>';
return $outcome;	return $outcome;
}	}

sub quota_admin {	sub quota_admin {
my ($setquota,$changeHash) = @_;	my ($setquota,$changeHash,$name) = @_;
my $quotachanged;	my $quotachanged;
if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {	if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
# Current user has quota modification privileges	# Current user has quota modification privileges
if (ref($changeHash) eq 'HASH') {	if (ref($changeHash) eq 'HASH') {
$quotachanged = 1;	$quotachanged = 1;
$changeHash->{'portfolioquota'} = $setquota;	$changeHash->{$name.'quota'} = $setquota;
}	}
}	}
return $quotachanged;	return $quotachanged;
Line 3835 sub custom_role_editor {	Line 4185 sub custom_role_editor {
my $dompriv='';	my $dompriv='';
my $coursepriv='';	my $coursepriv='';
my $body_top;	my $body_top;
	my $newrole;
my ($rdummy,$roledef)=	my ($rdummy,$roledef)=
&Apache::lonnet::get('roles',["rolesdef_$rolename"]);	&Apache::lonnet::get('roles',["rolesdef_$rolename"]);
# ------------------------------------------------------- Does this role exist?	# ------------------------------------------------------- Does this role exist?
Line 3847 sub custom_role_editor {	Line 4198 sub custom_role_editor {
$syspriv =~ s/bre\&S//;	$syspriv =~ s/bre\&S//;
}	}
} else {	} else {
	$newrole = 1;
$body_top .= &mt('New Role').' "';	$body_top .= &mt('New Role').' "';
$roledef='';	$roledef='';
}	}
Line 3973 sub custom_role_editor {	Line 4325 sub custom_role_editor {
$r->print('<br clear="all" />');	$r->print('<br clear="all" />');

$r->print(<<ENDCCF);	$r->print(<<ENDCCF);
<form name="form1" method="post">	<form name="form1" method="post" action="">
<input type="hidden" name="phase" value="set_custom_roles" />	<input type="hidden" name="phase" value="set_custom_roles" />
<input type="hidden" name="rolename" value="$rolename" />	<input type="hidden" name="rolename" value="$rolename" />
ENDCCF	ENDCCF
Line 4116 sub set_custom_role {	Line 4468 sub set_custom_role {
bread_crumbs_component => 'User Management'};	bread_crumbs_component => 'User Management'};
$r->print(&Apache::loncommon::start_page('Save Custom Role',$jscript,$args));	$r->print(&Apache::loncommon::start_page('Save Custom Role',$jscript,$args));

	my $newrole;
my ($rdummy,$roledef)=	my ($rdummy,$roledef)=
&Apache::lonnet::get('roles',["rolesdef_$rolename"]);	&Apache::lonnet::get('roles',["rolesdef_$rolename"]);

Line 4126 sub set_custom_role {	Line 4479 sub set_custom_role {
} else {	} else {
$r->print(&mt('New Role').' "');	$r->print(&mt('New Role').' "');
$roledef='';	$roledef='';
	$newrole = 1;
}	}
$r->print($rolename.'"</h3>');	$r->print($rolename.'"</h3>');
# ------------------------------------------------------- What can be assigned?	# ------------------------------------------------------- What can be assigned?
Line 4156 sub set_custom_role {	Line 4510 sub set_custom_role {
$sysrole.=':'.$item;	$sysrole.=':'.$item;
}	}
}	}
$r->print('<br />Defining Role: '.	# Assign role; Compile and show result
&Apache::lonnet::definerole($rolename,$sysrole,$domrole,$courole));	my $errmsg;
	my $result =
	&Apache::lonnet::definerole($rolename,$sysrole,$domrole,$courole);
	if ($result ne 'ok') {
	$errmsg = ': '.$result;
	}
	my $message =
	&Apache::lonhtmlcommon::confirm_success(
	&mt('Defining Role').$errmsg, ($result eq 'ok' ? 0 : 1));
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
my $url='/'.$env{'request.course.id'};	my $url='/'.$env{'request.course.id'};
$url=~s/\_/\//g;	$url=~s/\_/\//g;
$r->print('<br />'.&mt('Assigning Role to Self').': '.	$result =
&Apache::lonnet::assigncustomrole($env{'user.domain'},	&Apache::lonnet::assigncustomrole(
$env{'user.name'},	$env{'user.domain'},$env{'user.name'},
$url,	$url,
$env{'user.domain'},	$env{'user.domain'},$env{'user.name'},
$env{'user.name'},	$rolename,undef,undef,undef,$context);
$rolename,undef,undef,undef,$context));	if ($result ne 'ok') {
}	$errmsg = ': '.$result;
$r->print('<p><a href="javascript:backPage(document.customresult,'."'pickrole'".')">'.&mt('Create or edit another custom role').'</a></p><form name="customresult" method="post">');	}
$r->print(&Apache::lonhtmlcommon::echo_form_input([]).'</form>');	$message .=
	'<br />'
	.&Apache::lonhtmlcommon::confirm_success(
	&mt('Assigning Role to Self').$errmsg, ($result eq 'ok' ? 0 : 1));
	}
	$r->print(
	&Apache::loncommon::confirmwrapper($message)
	.'<br />'
	.&Apache::lonhtmlcommon::actionbox([
	'<a href="javascript:backPage(document.customresult,'."'pickrole'".')">'
	.&mt('Create or edit another custom role')
	.'</a>'])
	.'<form name="customresult" method="post" action="">'
	.&Apache::lonhtmlcommon::echo_form_input([])
	.'</form>'
	);
}	}

# ================================================================ Main Handler	# ================================================================ Main Handler
Line 4190 sub handler {	Line 4567 sub handler {
} else {	} else {
$context = 'domain';	$context = 'domain';
}	}

&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['action','state','callingform','roletype','showrole','bulkaction','popup','phase',	['action','state','callingform','roletype','showrole','bulkaction','popup','phase',
'username','domain','srchterm','srchdomain','srchin','srchby','srchtype']);	'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue']);
&Apache::lonhtmlcommon::clear_breadcrumbs();	&Apache::lonhtmlcommon::clear_breadcrumbs();
my $args;	my $args;
my $brcrum = [];	my $brcrum = [];
my $bread_crumbs_component = 'User Management';	my $bread_crumbs_component = 'User Management';
if ($env{'form.action'} ne 'dateselect') {	if (($env{'form.action'} ne 'dateselect') && ($env{'form.action'} ne 'displayuserreq')) {
$brcrum = [{href=>"/adm/createuser",	$brcrum = [{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'}	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'}
Line 4221 sub handler {	Line 4599 sub handler {
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;	$r->send_http_header;

	my $showcredits;
	if ((($context eq 'course') && ($crstype eq 'Course')) \|\|
	($context eq 'domain')) {
	my %domdefaults =
	&Apache::lonnet::get_domain_defaults($env{'request.role.domain'});
	if ($domdefaults{'officialcredits'} \|\| $domdefaults{'unofficialcredits'}) {
	$showcredits = 1;
	}
	}

# Main switch on form.action and form.state, as appropriate	# Main switch on form.action and form.state, as appropriate
if (! exists($env{'form.action'})) {	if (! exists($env{'form.action'})) {
$args = {bread_crumbs => $brcrum,	$args = {bread_crumbs => $brcrum,
Line 4243 sub handler {	Line 4631 sub handler {
if (! exists($env{'form.state'})) {	if (! exists($env{'form.state'})) {
&Apache::lonuserutils::print_first_users_upload_form($r,$context);	&Apache::lonuserutils::print_first_users_upload_form($r,$context);
} elsif ($env{'form.state'} eq 'got_file') {	} elsif ($env{'form.state'} eq 'got_file') {
&Apache::lonuserutils::print_upload_manager_form($r,$context,	&Apache::lonuserutils::print_upload_manager_form($r,$context,$permission,
$permission,$crstype);	$crstype,$showcredits);
} elsif ($env{'form.state'} eq 'enrolling') {	} elsif ($env{'form.state'} eq 'enrolling') {
if ($env{'form.datatoken'}) {	if ($env{'form.datatoken'}) {
&Apache::lonuserutils::upfile_drop_add($r,$context,$permission);	&Apache::lonuserutils::upfile_drop_add($r,$context,$permission,
	$showcredits);
}	}
} else {	} else {
&Apache::lonuserutils::print_first_users_upload_form($r,$context);	&Apache::lonuserutils::print_first_users_upload_form($r,$context);
Line 4272 sub handler {	Line 4661 sub handler {
.' letters numbers - . @')	.' letters numbers - . @')
.'</span>';	.'</span>';
$env{'form.phase'} = '';	$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response,$srch,undef,$crstype,$brcrum);	&print_username_entry_form($r,$context,$response,$srch,undef,
	$crstype,$brcrum,$showcredits);
} else {	} else {
my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'});	my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'});
my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'});	my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'});
&print_user_modification_page($r,$ccuname,$ccdomain,	&print_user_modification_page($r,$ccuname,$ccdomain,
$srch,$response,$context,	$srch,$response,$context,
$permission,$crstype,$brcrum);	$permission,$crstype,$brcrum,
	$showcredits);
}	}
} elsif ($env{'form.phase'} eq 'get_user_info') {	} elsif ($env{'form.phase'} eq 'get_user_info') {
my ($currstate,$response,$forcenewuser,$results) =	my ($currstate,$response,$forcenewuser,$results) =
Line 4323 sub handler {	Line 4714 sub handler {
$brcrum);	$brcrum);
}	}
} elsif ($env{'form.phase'} eq 'update_user_data') {	} elsif ($env{'form.phase'} eq 'update_user_data') {
&update_user_data($r,$context,$crstype,$brcrum);	&update_user_data($r,$context,$crstype,$brcrum,$showcredits);
} else {	} else {
&print_username_entry_form($r,$context,undef,$srch,undef,$crstype,	&print_username_entry_form($r,$context,undef,$srch,undef,$crstype,
$brcrum);	$brcrum);
Line 4339 sub handler {	Line 4730 sub handler {
(&Apache::lonnet::allowed('cau',$env{'request.role.domain'}))) {	(&Apache::lonnet::allowed('cau',$env{'request.role.domain'}))) {
push(@{$brcrum},	push(@{$brcrum},
{href => '/adm/createuser?action=processauthorreq',	{href => '/adm/createuser?action=processauthorreq',
text => 'Authoring space requests',	text => 'Authoring Space requests',
help => 'Domain_Role_Approvals'});	help => 'Domain_Role_Approvals'});
$bread_crumbs_component = 'Authoring requests';	$bread_crumbs_component = 'Authoring requests';
if ($env{'form.state'} eq 'done') {	if ($env{'form.state'} eq 'done') {
Line 4351 sub handler {	Line 4742 sub handler {
}	}
$args = { bread_crumbs => $brcrum,	$args = { bread_crumbs => $brcrum,
bread_crumbs_component => $bread_crumbs_component};	bread_crumbs_component => $bread_crumbs_component};
$r->print(&header(undef,$args));	my $js = &usernamerequest_javascript();
	$r->print(&header(&add_script($js),$args));
if (!exists($env{'form.state'})) {	if (!exists($env{'form.state'})) {
$r->print(&Apache::loncoursequeueadmin::display_queued_requests('requestauthor',	$r->print(&Apache::loncoursequeueadmin::display_queued_requests('requestauthor',
$env{'request.role.domain'}));	$env{'request.role.domain'}));
Line 4360 sub handler {	Line 4752 sub handler {
$r->print(&Apache::loncoursequeueadmin::update_request_queue('requestauthor',	$r->print(&Apache::loncoursequeueadmin::update_request_queue('requestauthor',
$env{'request.role.domain'}));	$env{'request.role.domain'}));
}	}
	} elsif (($env{'form.action'} eq 'processusernamereq') &&
	($permission->{'cusr'}) &&
	(&Apache::lonnet::allowed('cau',$env{'request.role.domain'}))) {
	push(@{$brcrum},
	{href => '/adm/createuser?action=processusernamereq',
	text => 'LON-CAPA account requests',
	help => 'Domain_Username_Approvals'});
	$bread_crumbs_component = 'Account requests';
	if ($env{'form.state'} eq 'done') {
	push(@{$brcrum},
	{href => '/adm/createuser?action=usernamereqqueue',
	text => 'Result',
	help => 'Domain_Username_Approvals'});
	$bread_crumbs_component = 'LON-CAPA account request result';
	}
	$args = { bread_crumbs => $brcrum,
	bread_crumbs_component => $bread_crumbs_component};
	my $js = &usernamerequest_javascript();
	$r->print(&header(&add_script($js),$args));
	if (!exists($env{'form.state'})) {
	$r->print(&Apache::loncoursequeueadmin::display_queued_requests('requestusername',
	$env{'request.role.domain'}));
	} elsif ($env{'form.state'} eq 'done') {
	$r->print('<h3>'.&mt('LON-CAPA account request processing').'</h3>'."\n");
	$r->print(&Apache::loncoursequeueadmin::update_request_queue('requestusername',
	$env{'request.role.domain'}));
	}
	} elsif (($env{'form.action'} eq 'displayuserreq') &&
	($permission->{'cusr'})) {
	my $dom = $env{'form.domain'};
	my $uname = $env{'form.username'};
	my $warning;
	if (($dom =~ /^$match_domain$/) && (&Apache::lonnet::domain($dom) ne '')) {
	if (($dom eq $env{'request.role.domain'}) && (&Apache::lonnet::allowed('ccc',$dom))) {
	if (($uname =~ /^$match_username$/) && ($env{'form.queue'} eq 'approval')) {
	my $uhome = &Apache::lonnet::homeserver($uname,$dom);
	if ($uhome eq 'no_host') {
	my $queue = $env{'form.queue'};
	my $reqkey = &escape($uname).'_'.$queue;
	my $namespace = 'usernamequeue';
	my $domconfig = &Apache::lonnet::get_domainconfiguser($dom);
	my %queued =
	&Apache::lonnet::get($namespace,[$reqkey],$dom,$domconfig);
	unless ($queued{$reqkey}) {
	$warning = &mt('No information was found for this LON-CAPA account request.');
	}
	} else {
	$warning = &mt('A LON-CAPA account already exists for the requested username and domain.');
	}
	} else {
	$warning = &mt('LON-CAPA account request status check is for an invalid username.');
	}
	} else {
	$warning = &mt('You do not have rights to view LON-CAPA account requests in the domain specified.');
	}
	} else {
	$warning = &mt('LON-CAPA account request status check is for an invalid domain.');
	}
	my $args = { only_body => 1 };
	$r->print(&header(undef,$args).
	'<h3>'.&mt('LON-CAPA Account Request Details').'</h3>');
	if ($warning ne '') {
	$r->print('<div class="LC_warning">'.$warning.'</div>');
	} else {
	my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
	my $domconfiguser = &Apache::lonnet::get_domainconfiguser($dom);
	my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
	if (ref($domconfig{'usercreation'}) eq 'HASH') {
	if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') {
	if (ref($domconfig{'usercreation'}{'cancreate'}{'emailusername'}) eq 'HASH') {
	my %info =
	&Apache::lonnet::get('nohist_requestedusernames',[$uname],$dom,$domconfiguser);
	if (ref($info{$uname}) eq 'HASH') {
	my $usertype = $info{$uname}{'inststatus'};
	unless ($usertype) {
	$usertype = 'default';
	}
	if (ref($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}) eq 'HASH') {
	if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
	$r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box());
	my ($num,$count,$showstatus);
	$count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}}));
	unless ($usertype eq 'default') {
	my ($othertitle,$usertypes,$types) =
	&Apache::loncommon::sorted_inst_types($dom);
	if (ref($usertypes) eq 'HASH') {
	if ($usertypes->{$usertype}) {
	$showstatus = $usertypes->{$usertype};
	$count ++;
	}
	}
	}
	foreach my $field (@{$infofields}) {
	next unless ($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}{$field});
	next unless ($infotitles->{$field});
	$r->print(&Apache::lonhtmlcommon::row_title($infotitles->{$field}).
	$info{$uname}{$field});
	$num ++;
	if ($count == $num) {
	$r->print(&Apache::lonhtmlcommon::row_closure(1));
	} else {
	$r->print(&Apache::lonhtmlcommon::row_closure());
	}
	}
	if ($showstatus) {
	$r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type (self-reported)')).
	$showstatus.
	&Apache::lonhtmlcommon::row_closure(1));
	}
	$r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>');
	}
	}
	}
	}
	}
	}
	$r->print(&close_popup_form());
	}
} elsif (($env{'form.action'} eq 'listusers') &&	} elsif (($env{'form.action'} eq 'listusers') &&
($permission->{'view'} \|\| $permission->{'cusr'})) {	($permission->{'view'} \|\| $permission->{'cusr'})) {
if ($env{'form.phase'} eq 'bulkchange') {	if ($env{'form.phase'} eq 'bulkchange') {
Line 4426 sub handler {	Line 4936 sub handler {
$r->print(&header(&add_script($jscript),$args));	$r->print(&header(&add_script($jscript),$args));
}	}
&Apache::lonuserutils::print_userlist($r,undef,$permission,$context,	&Apache::lonuserutils::print_userlist($r,undef,$permission,$context,
$formname,$totcodes,$codetitles,$idlist,$idlist_titles);	$formname,$totcodes,$codetitles,$idlist,$idlist_titles,
	$showcredits);
}	}
} elsif ($env{'form.action'} eq 'drop' && $permission->{'cusr'}) {	} elsif ($env{'form.action'} eq 'drop' && $permission->{'cusr'}) {
my $brtext;	my $brtext;
Line 4457 sub handler {	Line 4968 sub handler {
} elsif ($env{'form.action'} eq 'dateselect') {	} elsif ($env{'form.action'} eq 'dateselect') {
if ($permission->{'cusr'}) {	if ($permission->{'cusr'}) {
$r->print(&header(undef,{'no_nav_bar' => 1}).	$r->print(&header(undef,{'no_nav_bar' => 1}).
&Apache::lonuserutils::date_section_selector($context,	&Apache::lonuserutils::date_section_selector($context,$permission,
$permission,$crstype));	$crstype,$showcredits));
} else {	} else {
$r->print(&header(undef,{'no_nav_bar' => 1}).	$r->print(&header(undef,{'no_nav_bar' => 1}).
'<span class="LC_error">'.&mt('You do not have permission to modify dates or sections for users').'</span>');	'<span class="LC_error">'.&mt('You do not have permission to modify dates or sections for users').'</span>');
Line 4558 sub add_script {	Line 5069 sub add_script {
.'</script>'."\n";	.'</script>'."\n";
}	}

	sub usernamerequest_javascript {
	my $js = <<ENDJS;

	function openusernamereqdisplay(dom,uname,queue) {
	var url = '/adm/createuser?action=displayuserreq';
	url += '&domain='+dom+'&username='+uname+'&queue='+queue;
	var title = 'Account_Request_Browser';
	var options = 'scrollbars=1,resizable=1,menubar=0';
	options += ',width=700,height=600';
	var stdeditbrowser = open(url,title,options,'1');
	stdeditbrowser.focus();
	return;
	}

	ENDJS
	}

	sub close_popup_form {
	my $close= &mt('Close Window');
	return << "END";
	<p><form name="displayreq" action="" method="post">
	<input type="button" name="closeme" value="$close" onclick="javascript:self.close();" />
	</form></p>
	END
	}

sub verify_user_display {	sub verify_user_display {
my ($context) = @_;	my ($context) = @_;
my %lt = &Apache::lonlocal::texthash (	my %lt = &Apache::lonlocal::texthash (
Line 4633 function updateCols(caller) {	Line 5170 function updateCols(caller) {
document.getElementById('showcolrole').disabled = 'disabled';	document.getElementById('showcolrole').disabled = 'disabled';
}	}
if (context == 'domain') {	if (context == 'domain') {
	var quotausageshow = 0;
if ((document.studentform.roletype.options[document.studentform.roletype.selectedIndex].value == 'course') \|\|	if ((document.studentform.roletype.options[document.studentform.roletype.selectedIndex].value == 'course') \|\|
(document.studentform.roletype.options[document.studentform.roletype.selectedIndex].value == 'community')) {	(document.studentform.roletype.options[document.studentform.roletype.selectedIndex].value == 'community')) {
document.getElementById('showcolstatus').checked = false;	document.getElementById('showcolstatus').checked = false;
Line 4652 function updateCols(caller) {	Line 5190 function updateCols(caller) {
document.getElementById('showcolextent').checked = 'false';	document.getElementById('showcolextent').checked = 'false';
document.getElementById('showextent').style.display='none';	document.getElementById('showextent').style.display='none';
document.getElementById('showcoltextextent').innerHTML = '';	document.getElementById('showcoltextextent').innerHTML = '';
	if ((document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'au') \|\|
	(document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'Any')) {
	if (document.getElementById('showcolauthorusage')) {
	document.getElementById('showcolauthorusage').disabled = '';
	}
	if (document.getElementById('showcolauthorquota')) {
	document.getElementById('showcolauthorquota').disabled = '';
	}
	quotausageshow = 1;
	}
} else {	} else {
document.getElementById('showextent').style.display='block';	document.getElementById('showextent').style.display='block';
document.getElementById('showextent').style.textAlign='left';	document.getElementById('showextent').style.textAlign='left';
Line 4670 function updateCols(caller) {	Line 5218 function updateCols(caller) {
}	}
}	}
}	}
	if (quotausageshow == 0) {
	if (document.getElementById('showcolauthorusage')) {
	document.getElementById('showcolauthorusage').checked = false;
	document.getElementById('showcolauthorusage').disabled = 'disabled';
	}
	if (document.getElementById('showcolauthorquota')) {
	document.getElementById('showcolauthorquota').checked = false;
	document.getElementById('showcolauthorquota').disabled = 'disabled';
	}
	}
}	}
}	}
return;	return;
Line 4790 sub print_main_menu {	Line 5348 sub print_main_menu {
linktitle => 'Approve or reject author role requests',	linktitle => 'Approve or reject author role requests',
},	},
{	{
	linktext => 'LON-CAPA Account Requests',
	icon => 'list-add.png',
	#help => 'Domain_Username_Approvals',
	url => '/adm/createuser?action=processusernamereq',
	permission => $permission->{'cusr'},
	linktitle => 'Approve or reject LON-CAPA account requests',
	},
	{
linktext => 'Change Log',	linktext => 'Change Log',
icon => 'document-properties.png',	icon => 'document-properties.png',
#help => 'Course_User_Logs',	#help => 'Course_User_Logs',
Line 5910 sub role_display_filter {	Line 6476 sub role_display_filter {
&mt('Context:').'</b><br /><select name="chgcontext">';	&mt('Context:').'</b><br /><select name="chgcontext">';
my @posscontexts;	my @posscontexts;
if ($context eq 'course') {	if ($context eq 'course') {
@posscontexts = ('any','auto','updatenow','createcourse','course','domain','selfenroll','requestcourses');	@posscontexts = ('any','automated','updatenow','createcourse','course','domain','selfenroll','requestcourses');
} elsif ($context eq 'domain') {	} elsif ($context eq 'domain') {
@posscontexts = ('any','domain','requestauthor','domconfig','server');	@posscontexts = ('any','domain','requestauthor','domconfig','server');
} else {	} else {
Line 5922 sub role_display_filter {	Line 6488 sub role_display_filter {
$selstr = ' selected="selected"';	$selstr = ' selected="selected"';
}	}
if ($context eq 'course') {	if ($context eq 'course') {
if (($chgtype eq 'auto') \|\| ($chgtype eq 'updatenow')) {	if (($chgtype eq 'automated') \|\| ($chgtype eq 'updatenow')) {
next if (!&Apache::lonnet::auto_run($cnum,$cdom));	next if (!&Apache::lonnet::auto_run($cnum,$cdom));
}	}
}	}
Line 5958 sub rolechg_contexts {	Line 6524 sub rolechg_contexts {
if ($context eq 'course') {	if ($context eq 'course') {
%lt = &Apache::lonlocal::texthash (	%lt = &Apache::lonlocal::texthash (
any => 'Any',	any => 'Any',
auto => 'Automated enrollment',	automated => 'Automated Enrollment',
updatenow => 'Roster Update',	updatenow => 'Roster Update',
createcourse => 'Course Creation',	createcourse => 'Course Creation',
course => 'User Management in course',	course => 'User Management in course',
Line 6483 function backPage(formname,prevphase,pre	Line 7049 function backPage(formname,prevphase,pre
}	}

sub course_level_table {	sub course_level_table {
my (%inccourses) = @_;	my ($inccourses,$showcredits,$defaultcredits) = @_;
	return unless (ref($inccourses) eq 'HASH');
my $table = '';	my $table = '';
# Custom Roles?	# Custom Roles?

Line 6498 sub course_level_table {	Line 7065 sub course_level_table {
'rol' => "Role",	'rol' => "Role",
'ext' => "Extent",	'ext' => "Extent",
'grs' => "Section",	'grs' => "Section",
	'crd' => "Credits",
'sta' => "Start",	'sta' => "Start",
'end' => "End"	'end' => "End"
);	);

foreach my $protectedcourse (sort(keys(%inccourses))) {	foreach my $protectedcourse (sort(keys(%{$inccourses}))) {
my $thiscourse=$protectedcourse;	my $thiscourse=$protectedcourse;
$thiscourse=~s:_:/:g;	$thiscourse=~s:_:/:g;
my %coursedata=&Apache::lonnet::coursedescription($thiscourse);	my %coursedata=&Apache::lonnet::coursedescription($thiscourse);
Line 6524 sub course_level_table {	Line 7092 sub course_level_table {
if ((&Apache::lonnet::allowed('c'.$role,$thiscourse)) \|\|	if ((&Apache::lonnet::allowed('c'.$role,$thiscourse)) \|\|
((($role eq 'cc') \|\| ($role eq 'co')) && ($isowner))) {	((($role eq 'cc') \|\| ($role eq 'co')) && ($isowner))) {
$table .= &course_level_row($protectedcourse,$role,$area,$domain,	$table .= &course_level_row($protectedcourse,$role,$area,$domain,
$plrole,\%sections_count,\%lt);	$plrole,\%sections_count,\%lt,
	$defaultcredits,$crstype);
} elsif ($env{'request.course.sec'} ne '') {	} elsif ($env{'request.course.sec'} ne '') {
if (&Apache::lonnet::allowed('c'.$role,$thiscourse.'/'.	if (&Apache::lonnet::allowed('c'.$role,$thiscourse.'/'.
$env{'request.course.sec'})) {	$env{'request.course.sec'})) {
$table .= &course_level_row($protectedcourse,$role,$area,$domain,	$table .= &course_level_row($protectedcourse,$role,$area,$domain,
$plrole,\%sections_count,\%lt);	$plrole,\%sections_count,\%lt,
	$defaultcredits,$crstype);
}	}
}	}
}	}
Line 6551 sub course_level_table {	Line 7121 sub course_level_table {
$result .=	$result .=
&Apache::loncommon::start_data_table().	&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().	&Apache::loncommon::start_data_table_header_row().
'<th>'.$lt{'act'}.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.'</th>	'<th>'.$lt{'act'}.'</th><th>'.$lt{'rol'}.'</th>'."\n".
<th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.	'<th>'.$lt{'ext'}.'</th><th>'.$lt{'crd'}.'</th>'."\n".
	'<th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th>'."\n".
	'<th>'.$lt{'end'}.'</th>'.
&Apache::loncommon::end_data_table_header_row().	&Apache::loncommon::end_data_table_header_row().
$table.	$table.
&Apache::loncommon::end_data_table();	&Apache::loncommon::end_data_table();
Line 6560 $table.	Line 7132 $table.
}	}

sub course_level_row {	sub course_level_row {
my ($protectedcourse,$role,$area,$domain,$plrole,$sections_count,$lt) = @_;	my ($protectedcourse,$role,$area,$domain,$plrole,$sections_count,
	$lt,$defaultcredits,$crstype) = @_;
	my $creditem;
my $row = &Apache::loncommon::start_data_table_row().	my $row = &Apache::loncommon::start_data_table_row().
' <td><input type="checkbox" name="act_'.	' <td><input type="checkbox" name="act_'.
$protectedcourse.'_'.$role.'" /></td>'."\n".	$protectedcourse.'_'.$role.'" /></td>'."\n".
' <td>'.$plrole.'</td>'."\n".	' <td>'.$plrole.'</td>'."\n".
' <td>'.$area.'<br />Domain: '.$domain.'</td>'."\n";	' <td>'.$area.'<br />Domain: '.$domain.'</td>'."\n";
	if (($role eq 'st') && ($crstype eq 'Course')) {
	$row .=
	'<td><input type="text" name="credits_'.$protectedcourse.'_'.
	$role.'" size="3" value="'.$defaultcredits.'" /></td>';
	} else {
	$row .= '<td> </td>';
	}
if (($role eq 'cc') \|\| ($role eq 'co')) {	if (($role eq 'cc') \|\| ($role eq 'co')) {
$row .= '<td> </td>';	$row .= '<td> </td>';
} elsif ($env{'request.course.sec'} ne '') {	} elsif ($env{'request.course.sec'} ne '') {
Line 6591 sub course_level_row {	Line 7172 sub course_level_row {
'</tr></table></td>'."\n";	'</tr></table></td>'."\n";
} else {	} else {
$row .= '<td><input type="text" size="10" '.	$row .= '<td><input type="text" size="10" '.
'name="sec_'.$protectedcourse.'_'.$role.'" /></td>'."\n";	'name="sec_'.$protectedcourse.'_'.$role.'" /></td>'."\n";
}	}
}	}
$row .= <<ENDTIMEENTRY;	$row .= <<ENDTIMEENTRY;
Line 6607 ENDTIMEENTRY	Line 7188 ENDTIMEENTRY
}	}

sub course_level_dc {	sub course_level_dc {
my ($dcdom) = @_;	my ($dcdom,$showcredits) = @_;
my %customroles=&Apache::lonuserutils::my_custom_roles();	my %customroles=&Apache::lonuserutils::my_custom_roles();
my @roles = &Apache::lonuserutils::roles_by_context('course');	my @roles = &Apache::lonuserutils::roles_by_context('course');
my $hiddenitems = '<input type="hidden" name="dcdomain" value="'.$dcdom.'" />'.	my $hiddenitems = '<input type="hidden" name="dcdomain" value="'.$dcdom.'" />'.
Line 6615 sub course_level_dc {	Line 7196 sub course_level_dc {
'<input type="hidden" name="dccourse" value="" />';	'<input type="hidden" name="dccourse" value="" />';
my $courseform=&Apache::loncommon::selectcourse_link	my $courseform=&Apache::loncommon::selectcourse_link
('cu','dccourse','dcdomain','coursedesc',undef,undef,'Select','crstype');	('cu','dccourse','dcdomain','coursedesc',undef,undef,'Select','crstype');
my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu','role','Course/Community Browser');	my $credit_elem;
	if ($showcredits) {
	$credit_elem = 'credits';
	}
	my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu','role','Course/Community Browser',$credit_elem);
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'rol' => "Role",	'rol' => "Role",
'grs' => "Section",	'grs' => "Section",
Line 6625 sub course_level_dc {	Line 7210 sub course_level_dc {
'end' => "End",	'end' => "End",
'ssd' => "Set Start Date",	'ssd' => "Set Start Date",
'sed' => "Set End Date",	'sed' => "Set End Date",
'scc' => "Course/Community"	'scc' => "Course/Community",
	'crd' => "Credits",
);	);
my $header = '<h4>'.&mt('Course/Community Level').'</h4>'.	my $header = '<h4>'.&mt('Course/Community Level').'</h4>'.
&Apache::loncommon::start_data_table().	&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().	&Apache::loncommon::start_data_table_header_row().
'<th>'.$lt{'scc'}.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.	'<th>'.$lt{'scc'}.'</th><th>'.$lt{'rol'}.'</th>'."\n".
	'<th>'.$lt{'grs'}.'</th><th>'.$lt{'crd'}.'</th>'."\n".
	'<th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'."\n".
&Apache::loncommon::end_data_table_header_row();	&Apache::loncommon::end_data_table_header_row();
my $otheritems = &Apache::loncommon::start_data_table_row()."\n".	my $otheritems = &Apache::loncommon::start_data_table_row()."\n".
'<td><br /><span class="LC_nobreak"><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc','','','','crstype'".')" />'.	'<td><br /><span class="LC_nobreak"><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc','','','','crstype'".')" />'.
$courseform.(' ' x4).'</span></td>'."\n".	$courseform.(' ' x4).'</span></td>'."\n".
'<td valign><br /><select name="role">'."\n";	'<td valign="top"><br /><select name="role">'."\n";
foreach my $role (@roles) {	foreach my $role (@roles) {
my $plrole=&Apache::lonnet::plaintext($role);	my $plrole=&Apache::lonnet::plaintext($role);
$otheritems .= ' <option value="'.$role.'">'.$plrole;	$otheritems .= ' <option value="'.$role.'">'.$plrole.'</option>';
}	}
if ( keys %customroles > 0) {	if ( keys %customroles > 0) {
foreach my $cust (sort keys %customroles) {	foreach my $cust (sort keys %customroles) {
my $custrole='cr_cr_'.$env{'user.domain'}.	my $custrole='cr_cr_'.$env{'user.domain'}.
'_'.$env{'user.name'}.'_'.$cust;	'_'.$env{'user.name'}.'_'.$cust;
$otheritems .= ' <option value="'.$custrole.'">'.$cust;	$otheritems .= ' <option value="'.$custrole.'">'.$cust.'</option>';
}	}
}	}
$otheritems .= '</select></td><td>'.	$otheritems .= '</select></td><td>'.
'<table border="0" cellspacing="0" cellpadding="0">'.	'<table border="0" cellspacing="0" cellpadding="0">'.
'<tr><td valign="top"><b>'.$lt{'exs'}.'</b><br /><select name="currsec">'.	'<tr><td valign="top"><b>'.$lt{'exs'}.'</b><br /><select name="currsec">'.
' <option value=""><--'.&mt('Pick course first').'</select></td>'.	' <option value=""><--'.&mt('Pick course first').'</option></select></td>'.
'<td>  </td>'.	'<td>  </td>'.
'<td valign="top"> <b>'.$lt{'new'}.'</b><br />'.	'<td valign="top"> <b>'.$lt{'new'}.'</b><br />'.
'<input type="text" name="newsec" value="" />'.	'<input type="text" name="newsec" value="" />'.
'<input type="hidden" name="section" value="" />'.	'<input type="hidden" name="section" value="" />'.
'<input type="hidden" name="groups" value="" />'.	'<input type="hidden" name="groups" value="" />'.
'<input type="hidden" name="crstype" value="" /></td>'.	'<input type="hidden" name="crstype" value="" /></td>'.
'</tr></table></td>';	'</tr></table></td>'."\n";
	if ($showcredits) {
	$otheritems .= '<td><br />'."\n".
	'<input type="text" size="3" name="credits" value="" />'."\n";
	}
$otheritems .= <<ENDTIMEENTRY;	$otheritems .= <<ENDTIMEENTRY;
<td><br /><input type="hidden" name="start" value='' />	<td><br /><input type="hidden" name="start" value='' />
<a href=	<a href=

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

Removed from v.1.374
changed lines
	Added in v.1.396