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.370 and 1.379

version 1.370, 2012/12/28 04:12:32	version 1.379, 2013/07/03 04:04:13
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",	'cuqu' => "Current quota",
'cust' => "Custom quota",	'cust' => "Custom quota",
'defa' => "Default",	'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 165 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>'.$lt{'cuqu'}.': '.
	$currquota.' Mb.  '.
	$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'".');"'.
	' />'.$lt{'defa'}.' ('.$defquota.' Mb).</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'".');"'.
	' /> 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 1042 sub print_user_query_page {	Line 1060 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 1152 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 1195 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 1201 ENDFORMINFO	Line 1223 ENDFORMINFO
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'})) {
$domroleform = '<br />'.&domainrole_req($ccuname,$ccdomain);	$domroleform = '<br />'.&domainrole_req($ccuname,$ccdomain);
Line 1319 ENDAUTH	Line 1341 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));	$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
Line 1376 ENDCHANGEUSER	Line 1399 ENDCHANGEUSER
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 1441 ENDNOTOOLSPRIV
unless ($gotdiv) {	unless ($gotdiv) {
$r->print('<div class="LC_left_float">');	$r->print('<div class="LC_left_float">');
}	}
$r->print(&date_sections_select($context,$newuser,$formname));	my $credits;
}	if ($showcredits) {
	$credits = &get_user_credits($ccuname,$ccdomain,$defaultcredits);
	if ($credits eq '') {
	$credits = $defaultcredits;
	}
	}
	$r->print(&date_sections_select($context,$newuser,$formname,
	$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 1440 ENDNOTOOLSPRIV	Line 1469 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('<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 1450 ENDNOTOOLSPRIV	Line 1479 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><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><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><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><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']));
Line 1495 sub singleuser_breadcrumb {	Line 1524 sub singleuser_breadcrumb {
}	}

sub date_sections_select {	sub date_sections_select {
my ($context,$newuser,$formname,$permission) = @_;	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);	$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 1527 sub validation_javascript {	Line 1566 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 1547 sub validation_javascript {	Line 1587 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 1556 sub display_existing_roles {	Line 1597 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 1618 sub display_existing_roles {	Line 1660 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 1646 sub display_existing_roles {	Line 1689 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 1672 sub display_existing_roles {	Line 1724 sub display_existing_roles {
}	}
}	}
if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) {	if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) {
$carea.='<br />Section: '.$3;	$carea.='<br />'.&mt('Section: [_1]',$3);
$sortkey.="\0$3";	$sortkey.="\0$3";
if (!$allowed) {	if (!$allowed) {
if ($env{'request.course.sec'} eq $3) {	if ($env{'request.course.sec'} eq $3) {
Line 1702 sub display_existing_roles {	Line 1754 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 1744 sub display_existing_roles {	Line 1796 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('Customrole [_1][_2]defined by [_3]',
Line 1767 sub display_existing_roles {	Line 1825 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 1793 sub display_existing_roles {	Line 1851 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>'.
<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 1830 sub new_coauthor_roles {	Line 1888 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 1881 sub new_coauthor_roles {	Line 1939 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 2314 sub get_inststatuses {	Line 2372 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 2514 sub update_user_data {	Line 2572 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 2593 sub update_user_data {	Line 2655 sub update_user_data {
$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','reqcrsotherdom.official',
'reqcrsotherdom.unofficial','reqcrsotherdom.community',	'reqcrsotherdom.unofficial','reqcrsotherdom.community',
Line 2729 sub update_user_data {	Line 2795 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 2741 sub update_user_data {	Line 2807 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 2782 sub update_user_data {	Line 2850 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 2797 sub update_user_data {	Line 2867 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);
} else {
$newportfolioquota = $newdefquota;
$newisdefault = 1;
}	}
}	if ($oldisdefault{$name}) {
if ($oldisdefault) {	$oldsettingstext{'quota'}{$name} = &get_defaultquota_text($oldsettingstatus{$name});
$oldsettingstext{'quota'} = &get_defaultquota_text($oldsettingstatus);	}
}	if ($newisdefault{$name}) {
if ($newisdefault) {	$newsettingstext{'quota'}{$name} = &get_defaultquota_text($newsettingstatus{$name});
$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);
Line 2862 sub update_user_data {	Line 2944 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} = $oldquota{$name}.' Mb';
	$newsettings{'quota'}{$name} = $newquota{$name}.' Mb';
	}
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 3009 sub update_user_data {	Line 3093 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,
	$crstype,$showcredits,$defaultcredits);
$r->print('<p><a href="javascript:backPage(document.userupdate)">');	$r->print('<p><a href="javascript:backPage(document.userupdate)">');
if ($crstype eq 'Community') {	if ($crstype eq 'Community') {
$r->print(&mt('Enroll Another Member'));	$r->print(&mt('Enroll Another Member'));
Line 3018 sub update_user_data {	Line 3103 sub update_user_data {
}	}
$r->print('</a></p>');	$r->print('</a></p>');
} 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 3062 sub display_userinfo {	Line 3147 sub display_userinfo {
ref($newsetting) eq 'HASH' &&	ref($newsetting) eq 'HASH' &&
ref($newsettingtext) eq 'HASH');	ref($newsettingtext) eq 'HASH');
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'ui' => 'User Information (unchanged)',	'ui' => 'User Information',
'uic' => 'User Information Changed',	'uic' => 'User Information Changed',
'firstname' => 'First Name',	'firstname' => 'First Name',
'middlename' => 'Middle Name',	'middlename' => 'Middle Name',
Line 3070 sub display_userinfo {	Line 3155 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 3083 sub display_userinfo {	Line 3169 sub display_userinfo {
'prvs' => 'Previous Value:',	'prvs' => 'Previous Value:',
'chto' => 'Changed To:'	'chto' => 'Changed To:'
);	);
my $title = $lt{'ui'};
if ($changed) {	if ($changed) {
$title = $lt{'uic'};	$r->print('<h3>'.$lt{'uic'}.'</h3>'.
$r->print('<h4>'.$title.'</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());
$r->print("<th> </th>\n");	$r->print("<th> </th>\n");
Line 3132 sub display_userinfo {	Line 3216 sub display_userinfo {
}	}
$r->print("<td>$value </td>\n");	$r->print("<td>$value </td>\n");
}	}
	} elsif ($entry eq 'quota') {
	if ((ref($oldsetting->{$entry}) eq 'HASH') && (ref($oldsettingtext->{$entry}) eq 'HASH') &&
	(ref($newsetting->{$entry}) eq 'HASH') && (ref($newsettingtext->{$entry}) eq 'HASH')) {
	foreach my $name ('portfolio','author') {
	$r->print("<td>$lt{$name.$entry}</td>\n");
	$r->print("<td>$oldsetting->{$entry}->{$name} $oldsettingtext->{$entry}->{$name} </td>\n");
	my $value = $newsetting->{$entry}->{$name}.' '.$newsettingtext->{$entry}->{$name};
	if ($changedhash->{$entry}) {
	$value = '<span class="LC_cusr_emph">'.$value.'</span>';
	}
	$r->print("<td>$value </td>\n");
	}
	}
} else {	} else {
$r->print("<td>$lt{$entry}</td>\n");	$r->print("<td>$lt{$entry}</td>\n");
$r->print("<td>$oldsetting->{$entry} $oldsettingtext->{$entry} </td>\n");	$r->print("<td>$oldsetting->{$entry} $oldsettingtext->{$entry} </td>\n");
Line 3145 sub display_userinfo {	Line 3242 sub display_userinfo {
}	}
}	}
$r->print(&Apache::loncommon::end_data_table().'<br />');	$r->print(&Apache::loncommon::end_data_table().'<br />');
	} else {
	$r->print('<h3>'.$lt{'ui'}.'</h3>'.
	'<p>'.&mt('No changes made to user information').'</p>');
}	}
return;	return;
}	}
Line 3325 sub tool_changes {	Line 3425 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 3345 sub update_roles {	Line 3445 sub update_roles {
$r->print(&Apache::lonhtmlcommon::confirm_success(	$r->print(&Apache::lonhtmlcommon::confirm_success(
&mt('Revoking [_1] in [_2]',	&mt('Revoking [_1] in [_2]',
&Apache::lonnet::plaintext($role),	&Apache::lonnet::plaintext($role),
'"'.&cid_to_cname($scope).'"'),	&Apache::loncommon::show_role_extent($scope,$context,$role)),
$result ne "ok").'<br />');	$result ne "ok").'<br />');
if ($result ne "ok") {	if ($result ne "ok") {
$r->print(&mt('Error: [_1]',$result).'<br />');	$r->print(&mt('Error: [_1]',$result).'<br />');
Line 3367 sub update_roles {	Line 3467 sub update_roles {
$env{'form.ccdomain'},$env{'form.ccuname'},$1,$2,$3,$4,'','',$context);	$env{'form.ccdomain'},$env{'form.ccuname'},$1,$2,$3,$4,'','',$context);
$r->print(&Apache::lonhtmlcommon::confirm_success(	$r->print(&Apache::lonhtmlcommon::confirm_success(
&mt('Revoking custom role [_1] by [_2] in [_3]',	&mt('Revoking custom role [_1] by [_2] in [_3]',
$4,$3.':'.$2,'"'.&cid_to_cname($1).'"'),	$4,$3.':'.$2,&Apache::loncommon::show_role_extent($1,$context,'cr')),
$result ne 'ok').'<br />');	$result ne 'ok').'<br />');
if ($result ne "ok") {	if ($result ne "ok") {
$r->print(&mt('Error: [_1]',$result).'<br />');	$r->print(&mt('Error: [_1]',$result).'<br />');
Line 3388 sub update_roles {	Line 3488 sub update_roles {
$r->print(&Apache::lonhtmlcommon::confirm_success(	$r->print(&Apache::lonhtmlcommon::confirm_success(
&mt('Deleting [_1] in [_2]',	&mt('Deleting [_1] in [_2]',
&Apache::lonnet::plaintext($role),	&Apache::lonnet::plaintext($role),
'"'.&cid_to_cname($scope).'"'),	&Apache::loncommon::show_role_extent($scope,$context,$role)),
$result ne 'ok').'<br />');	$result ne 'ok').'<br />');
if ($result ne "ok") {	if ($result ne "ok") {
$r->print(&mt('Error: [_1]',$result).'<br />');	$r->print(&mt('Error: [_1]',$result).'<br />');
Line 3413 sub update_roles {	Line 3513 sub update_roles {
$env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,	$env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
0,1,$context);	0,1,$context);
$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Deleting custom role [_1] by [_2] in [_3]',	$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Deleting custom role [_1] by [_2] in [_3]',
$rolename,$rnam.':'.$rdom,'"'.&cid_to_cname($1).'"'),	$rolename,$rnam.':'.$rdom,&Apache::loncommon::show_role_extent($1,$context,'cr')),
$result ne "ok").'<br />');	$result ne "ok").'<br />');
if ($result ne "ok") {	if ($result ne "ok") {
$r->print(&mt('Error: [_1]',$result).'<br />');	$r->print(&mt('Error: [_1]',$result).'<br />');
Line 3434 sub update_roles {	Line 3534 sub update_roles {
my $output;	my $output;
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 $result = &Apache::loncommon::commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$1,$2,$3);	my ($cdom,$cnum,$csec) = ($1,$2,$3);
	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 3442 sub update_roles {	Line 3549 sub update_roles {
$output = &mt('Error: [_1]',$result)."\n";	$output = &mt('Error: [_1]',$result)."\n";
}	}
} else {	} else {
$output = &Apache::lonhtmlcommon::confirm_success(&mt('Assigning [_1] in [_2] starting [_3]',&Apache::lonnet::plaintext($role),	$output = &Apache::lonhtmlcommon::confirm_success(&mt('Assigning [_1] in [_2] starting [_3]',
'"'.&cid_to_cname($url).'"',&Apache::lonlocal::locallocaltime($now))).'<br />'.$logmsg.'<br />';	&Apache::lonnet::plaintext($role),
	&Apache::loncommon::show_role_extent($url,$context,'st'),
	&Apache::lonlocal::locallocaltime($now))).'<br />'.$logmsg.'<br />';
}	}
}	}
} else {	} else {
Line 3451 sub update_roles {	Line 3560 sub update_roles {
$env{'form.ccuname'},$url,$role,0,$now,'','',	$env{'form.ccuname'},$url,$role,0,$now,'','',
$context);	$context);
$output = &Apache::lonhtmlcommon::confirm_success(&mt('Re-enabling [_1] in [_2]',	$output = &Apache::lonhtmlcommon::confirm_success(&mt('Re-enabling [_1] in [_2]',
&Apache::lonnet::plaintext($role),'"'.&cid_to_cname($url).'"'),$result ne "ok").'<br />';	&Apache::lonnet::plaintext($role),
	&Apache::loncommon::show_role_extent($url,$context,$role)),$result ne "ok").'<br />';
if ($result ne "ok") {	if ($result ne "ok") {
$output .= &mt('Error: [_1]',$result).'<br />';	$output .= &mt('Error: [_1]',$result).'<br />';
}	}
Line 3469 sub update_roles {	Line 3579 sub update_roles {
$url,$rdom,$rnam,$rolename,0,$now,undef,$context);	$url,$rdom,$rnam,$rolename,0,$now,undef,$context);
$r->print(&Apache::lonhtmlcommon::confirm_success(	$r->print(&Apache::lonhtmlcommon::confirm_success(
&mt('Re-enabling custom role [_1] by [_2] in [_3]',	&mt('Re-enabling custom role [_1] by [_2] in [_3]',
$rolename,$rnam.':'.$rdom,'"'.&cid_to_cname($1).'"'),	$rolename,$rnam.':'.$rdom,&Apache::loncommon::show_role_extent($1,$context,'cr')),
$result ne "ok").'<br />');	$result ne "ok").'<br />');
if ($result ne "ok") {	if ($result ne "ok") {
$r->print(&mt('Error: [_1]',$result).'<br />');	$r->print(&mt('Error: [_1]',$result).'<br />');
Line 3530 sub update_roles {	Line 3640 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 3545 sub update_roles {	Line 3667 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 3613 sub update_roles {	Line 3735 sub update_roles {
# Flush the course logs so reverse user roles immediately updated	# Flush the course logs so reverse user roles immediately updated
$r->register_cleanup(\&Apache::lonnet::flushcourselogs);	$r->register_cleanup(\&Apache::lonnet::flushcourselogs);
if (@rolechanges == 0) {	if (@rolechanges == 0) {
$r->print(&mt('No roles to modify'));	$r->print('<p>'.&mt('No roles to modify').'</p>');
}	}
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 3631 sub enroll_single_student {	Line 3776 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 3640 sub enroll_single_student {	Line 3796 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('<b>[_1]</b> enrolled',$env{'form.ccuname'}.':'.$env{'form.ccdomain'}));
if ($env{'form.sections'} ne '') {	if ($env{'form.sections'} ne '') {
Line 3716 sub update_result_form {	Line 3873 sub update_result_form {
}	}

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 4184 sub handler {	Line 4341 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']);
Line 4215 sub handler {	Line 4373 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 4237 sub handler {	Line 4405 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 4266 sub handler {	Line 4435 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 4317 sub handler {	Line 4488 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 4420 sub handler {	Line 4591 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 4451 sub handler {	Line 4623 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 4554 sub add_script {	Line 4726 sub add_script {

sub verify_user_display {	sub verify_user_display {
my ($context) = @_;	my ($context) = @_;
	my %lt = &Apache::lonlocal::texthash (
	course => 'course(s): description, section(s), status',
	community => 'community(s): description, section(s), status',
	author => 'author',
	);
my $photos;	my $photos;
if (($context eq 'course') && $env{'request.course.id'}) {	if (($context eq 'course') && $env{'request.course.id'}) {
$photos = $env{'course.'.$env{'request.course.id'}.'.internal.showphoto'};	$photos = $env{'course.'.$env{'request.course.id'}.'.internal.showphoto'};
Line 4577 function updateCols(caller) {	Line 4754 function updateCols(caller) {
var context = '$context';	var context = '$context';
var photos = '$photos';	var photos = '$photos';
if (caller == 'Status') {	if (caller == 'Status') {
if (document.studentform.Status.options[document.studentform.Status.selectedIndex].value == 'Any') {	if ((context == 'domain') &&
document.getElementById('showcolstatus').checked = true;	((document.studentform.roletype.options[document.studentform.roletype.selectedIndex].value == 'course') \|\|
document.getElementById('showcolstatus').disabled = '';	(document.studentform.roletype.options[document.studentform.roletype.selectedIndex].value == 'community'))) {
document.getElementById('showcolstart').checked = true;
document.getElementById('showcolend').checked = true;
} else {
document.getElementById('showcolstatus').checked = false;	document.getElementById('showcolstatus').checked = false;
document.getElementById('showcolstatus').disabled = 'disabled';	document.getElementById('showcolstatus').disabled = 'disabled';
document.getElementById('showcolstart').checked = false;	document.getElementById('showcolstart').checked = false;
document.getElementById('showcolend').checked = false;	document.getElementById('showcolend').checked = false;
	} else {
	if (document.studentform.Status.options[document.studentform.Status.selectedIndex].value == 'Any') {
	document.getElementById('showcolstatus').checked = true;
	document.getElementById('showcolstatus').disabled = '';
	document.getElementById('showcolstart').checked = true;
	document.getElementById('showcolend').checked = true;
	} else {
	document.getElementById('showcolstatus').checked = false;
	document.getElementById('showcolstatus').disabled = 'disabled';
	document.getElementById('showcolstart').checked = false;
	document.getElementById('showcolend').checked = false;
	}
}	}
}	}
if (caller == 'output') {	if (caller == 'output') {
Line 4604 function updateCols(caller) {	Line 4790 function updateCols(caller) {
}	}
}	}
if (caller == 'showrole') {	if (caller == 'showrole') {
if (document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'Any') {	if ((document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'Any') \|\|
	(document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'cr')) {
document.getElementById('showcolrole').checked = true;	document.getElementById('showcolrole').checked = true;
document.getElementById('showcolrole').disabled = '';	document.getElementById('showcolrole').disabled = '';
} else {	} else {
document.getElementById('showcolrole').checked = false;	document.getElementById('showcolrole').checked = false;
document.getElementById('showcolrole').disabled = 'disabled';	document.getElementById('showcolrole').disabled = 'disabled';
}	}
	if (context == 'domain') {
	if ((document.studentform.roletype.options[document.studentform.roletype.selectedIndex].value == 'course') \|\|
	(document.studentform.roletype.options[document.studentform.roletype.selectedIndex].value == 'community')) {
	document.getElementById('showcolstatus').checked = false;
	document.getElementById('showcolstatus').disabled = 'disabled';
	document.getElementById('showcolstart').checked = false;
	document.getElementById('showcolend').checked = false;
	} else {
	if (document.studentform.Status.options[document.studentform.Status.selectedIndex].value == 'Any') {
	document.getElementById('showcolstatus').checked = true;
	document.getElementById('showcolstatus').disabled = '';
	document.getElementById('showcolstart').checked = true;
	document.getElementById('showcolend').checked = true;
	}
	}
	if (document.studentform.roletype.options[document.studentform.roletype.selectedIndex].value == 'domain') {
	document.getElementById('showcolextent').disabled = 'disabled';
	document.getElementById('showcolextent').checked = 'false';
	document.getElementById('showextent').style.display='none';
	document.getElementById('showcoltextextent').innerHTML = '';
	} else {
	document.getElementById('showextent').style.display='block';
	document.getElementById('showextent').style.textAlign='left';
	document.getElementById('showextent').style.textFace='normal';
	if (document.studentform.roletype.options[document.studentform.roletype.selectedIndex].value == 'author') {
	document.getElementById('showcolextent').disabled = '';
	document.getElementById('showcolextent').checked = 'true';
	document.getElementById('showcoltextextent').innerHTML="$lt{'author'}";
	} else {
	document.getElementById('showcolextent').disabled = '';
	document.getElementById('showcolextent').checked = 'true';
	if (document.studentform.roletype.options[document.studentform.roletype.selectedIndex].value == 'community') {
	document.getElementById('showcoltextextent').innerHTML="$lt{'community'}";
	} else {
	document.getElementById('showcoltextextent').innerHTML="$lt{'course'}";
	}
	}
	}
	}
}	}
return;	return;
}	}
Line 5850 sub role_display_filter {	Line 6076 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 5862 sub role_display_filter {	Line 6088 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 5898 sub rolechg_contexts {	Line 6124 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 6423 function backPage(formname,prevphase,pre	Line 6649 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 6438 sub course_level_table {	Line 6665 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 6464 sub course_level_table {	Line 6692 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 6491 sub course_level_table {	Line 6721 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 6500 $table.	Line 6732 $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 6531 sub course_level_row {	Line 6772 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 6547 ENDTIMEENTRY	Line 6788 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 6555 sub course_level_dc {	Line 6796 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 6565 sub course_level_dc {	Line 6810 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'".')" />'.
Line 6597 sub course_level_dc {	Line 6845 sub course_level_dc {
'<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=
Line 6975 sub get_selfenroll_titles {	Line 7227 sub get_selfenroll_titles {
#--------------------------------- functions for &phase_two and &phase_three	#--------------------------------- functions for &phase_two and &phase_three

#--------------------------end of functions for &phase_two and &phase_three	#--------------------------end of functions for &phase_two and &phase_three
sub cid_to_cname(){
my $courseid = shift;
$courseid =~ s/^\///;
$courseid =~ s/\//_/;
return $env{'course.'.$courseid.'.description'};
}
1;	1;
__END__	__END__

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

Removed from v.1.370
changed lines
	Added in v.1.379