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.125.2.2 and 1.145

version 1.125.2.2, 2006/06/29 17:48:21	version 1.145, 2007/01/16 20:09:49
Line 66 use Apache::loncommon;	Line 66 use Apache::loncommon;
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::longroup;	use Apache::longroup;
use lib '/home/httpd/lib/perl/';	use lib '/home/httpd/lib/perl/';
use LONCAPA;	use LONCAPA qw(:DEFAULT :match);

my $loginscript; # piece of javascript used in two separate instances	my $loginscript; # piece of javascript used in two separate instances
my $generalrule;	my $generalrule;
Line 99 sub initialize_authen_forms {	Line 99 sub initialize_authen_forms {
sub my_custom_roles {	sub my_custom_roles {
my %returnhash=();	my %returnhash=();
my %rolehash=&Apache::lonnet::dump('roles');	my %rolehash=&Apache::lonnet::dump('roles');
foreach (keys %rolehash) {	foreach my $key (keys %rolehash) {
if ($_=~/^rolesdef\_(\w+)$/) {	if ($key=~/^rolesdef\_(\w+)$/) {
$returnhash{$1}=$1;	$returnhash{$1}=$1;
}	}
}	}
Line 116 sub authorpriv {	Line 116 sub authorpriv {
return 1;	return 1;
}	}

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

	sub portfolio_quota {
	my ($ccuname,$ccdomain) = @_;
	my %lt = &Apache::lonlocal::texthash(
	'disk' => "Disk space allocated to user's portfolio files",
	);
	my $output = '<h3>'.$lt{'disk'}.'</h3>'.
	'<input type="text" name="portfolioquota" size ="5" value="'.
	&Apache::loncommon::get_user_quota($ccuname,$ccdomain).
	'" /> Mb';
	return $output;
	}

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

sub print_username_entry_form {	sub print_username_entry_form {
Line 202 END	Line 216 END
# =================================================================== Phase two	# =================================================================== Phase two
sub print_user_modification_page {	sub print_user_modification_page {
my $r=shift;	my $r=shift;
my $ccuname=$env{'form.ccuname'};	my $ccuname =&LONCAPA::clean_username($env{'form.ccuname'});
my $ccdomain=$env{'form.ccdomain'};	my $ccdomain=&LONCAPA::clean_domain($env{'form.ccdomain'});

$ccuname=~s/\W//g;
$ccdomain=~s/\W//g;

unless (($ccuname) && ($ccdomain)) {	unless (($ccuname) && ($ccdomain)) {
&print_username_entry_form($r);	&print_username_entry_form($r);
Line 224 sub print_user_modification_page {	Line 235 sub print_user_modification_page {
);	);
$loginscript = &Apache::loncommon::authform_header(%param);	$loginscript = &Apache::loncommon::authform_header(%param);
$authformkrb = &Apache::loncommon::authform_kerberos(%param);	$authformkrb = &Apache::loncommon::authform_kerberos(%param);

$ccuname=~s/\W//g;	$ccuname =&LONCAPA::clean_username($ccuname);
$ccdomain=~s/\W//g;	$ccdomain=&LONCAPA::clean_domain($ccdomain);
my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();	my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
my $dc_setcourse_code = '';	my $dc_setcourse_code = '';
my $nondc_setsection_code = '';	my $nondc_setsection_code = '';
Line 240 sub print_user_modification_page {	Line 251 sub print_user_modification_page {
$groupslist = '"'.$groupslist.'"';	$groupslist = '"'.$groupslist.'"';
}	}

if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {	if ($env{'request.role'} =~ m-^dc\./($match_domain)/$-) {
my $dcdom = $1;	my $dcdom = $1;
$loaditem{'onload'} = "document.cu.coursedesc.value='';";	$loaditem{'onload'} = "document.cu.coursedesc.value='';";
my @rolevals = ('st','ta','ep','in','cc');	my @rolevals = ('st','ta','ep','in','cc');
Line 313 sub print_user_modification_page {	Line 324 sub print_user_modification_page {
alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections.");	alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections.");
section = "";	section = "";
}	}
	var coursename = "_$dcdom"+"_"+course+"_"+userrole
var numcourse = getIndex(document.cu.dccourse);	var numcourse = getIndex(document.cu.dccourse);
if (numcourse == "-1") {	if (numcourse == "-1") {
alert("There was a problem with your course selection");	alert("There was a problem with your course selection");
return	return
}	}
else {	else {
var coursename = "_$dcdom"+"_"+course+"_"+userrole	document.cu.elements[numcourse].name = "act"+coursename;
document.cu.elements[numcourse].name = "act"+coursename	var numnewsec = getIndex(document.cu.newsec);
document.cu.elements[numcourse+5].name = "sec"+coursename	if (numnewsec != "-1") {
document.cu.elements[numcourse+5].value = section	document.cu.elements[numnewsec].name = "sec"+coursename;
document.cu.elements[numcourse+7].name = "start"+coursename	document.cu.elements[numnewsec].value = section;
document.cu.elements[numcourse+8].name = "end"+coursename	}
	var numstart = getIndex(document.cu.start);
	if (numstart != "-1") {
	document.cu.elements[numstart].name = "start"+coursename;
	}
	var numend = getIndex(document.cu.end);
	if (numend != "-1") {
	document.cu.elements[numend].name = "end"+coursename
	}
}	}
}	}
document.cu.submit();	document.cu.submit();
Line 338 sub print_user_modification_page {	Line 358 sub print_user_modification_page {
}	}
return -1;	return -1;
}	}

function setType() {
var crstype = 'Course'
rolevals = new Array("$rolevalslist");
if (crstype == 'Group') {
if (document.cu.currsec.options[0].text == "$pickcrsfirst") {
document.cu.currsec.options[0].text = "$pickgrpfirst";
}
grprolenames = new Array("$grprolenameslist");
for (var i=0; i<rolevals.length; i++) {
if (document.cu.role.selectedIndex == i) {
document.cu.role.options[i] = new Option(grprolenames[i],rolevals[i],true,false);
} else {
document.cu.role.options[i] = new Option(grprolenames[i],rolevals[i],false,false);
}
}
} else {
if (document.cu.currsec.options[0].text == "$pickgrpfirst") {
document.cu.currsec.options[0].text = "$pickcrsfirst";
}
crsrolenames = new Array("$crsrolenameslist");
for (var i=0; i<rolevals.length; i++) {
if (document.cu.role.selectedIndex == i) {
document.cu.role.options[i] = new Option(crsrolenames[i],rolevals[i],true,false);
} else {
document.cu.role.options[i] = new Option(crsrolenames[i],rolevals[i],false,false);
}
}
}
}
ENDSCRIPT	ENDSCRIPT
} else {	} else {
$nondc_setsection_code = <<"ENDSECCODE";	$nondc_setsection_code = <<"ENDSECCODE";
Line 378 ENDSCRIPT	Line 368 ENDSCRIPT
var str = document.cu.elements[i].name;	var str = document.cu.elements[i].name;
var checkcurr = str.match(re1);	var checkcurr = str.match(re1);
if (checkcurr != null) {	if (checkcurr != null) {
var re2 = /^currsec_[a-zA-Z0-9]+_[a-zA-Z0-9]+_(\\w+)\$/;
if (document.cu.elements[i-1].checked == true) {	if (document.cu.elements[i-1].checked == true) {
var re2 = /^currsec_[a-zA-Z0-9]+_[a-zA-Z0-9]+_(\\w+)\$/;	var re2 = /^currsec_[a-zA-Z0-9]+_[a-zA-Z0-9]+_(\\w+)\$/;
match = re2.exec(str);	match = re2.exec(str);
Line 439 ENDSCRIPT	Line 428 ENDSCRIPT
}	}
}	}
}	}
document.cu.elements[i+2].value = sections;
}	}
	document.cu.elements[i+2].value = sections;
}	}
}	}
}	}
Line 467 ENDFORMINFO	Line 456 ENDFORMINFO
my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);	my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
my %incdomains;	my %incdomains;
my %inccourses;	my %inccourses;
foreach (values(%Apache::lonnet::hostdom)) {	foreach my $item (values(%Apache::lonnet::hostdom)) {
$incdomains{$_}=1;	$incdomains{$item}=1;
}	}
foreach (keys(%env)) {	foreach my $key (keys(%env)) {
if ($_=~/^user\.priv\.cm\.\/(\w+)\/(\w+)/) {	if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) {
$inccourses{$1.'_'.$2}=1;	$inccourses{$1.'_'.$2}=1;
}	}
}	}
Line 493 ENDFORMINFO	Line 482 ENDFORMINFO
'hs' => "Home Server",	'hs' => "Home Server",
'lg' => "Login Data"	'lg' => "Login Data"
);	);
	my $portfolioform;
	if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
	# Current user has quota modification privileges
	$portfolioform = &portfolio_quota($ccuname,$ccdomain);
	}
my $genhelp=&Apache::loncommon::help_open_topic('Generation');	my $genhelp=&Apache::loncommon::help_open_topic('Generation');
&initialize_authen_forms();	&initialize_authen_forms();
$r->print(<<ENDNEWUSER);	$r->print(<<ENDNEWUSER);
Line 525 $lt{'hs'}: <select name="hserver" size="	Line 519 $lt{'hs'}: <select name="hserver" size="
<p>$authformint </p>	<p>$authformint </p>
<p>$authformfsys</p>	<p>$authformfsys</p>
<p>$authformloc </p>	<p>$authformloc </p>
	<hr />
	$portfolioform
ENDNEWUSER	ENDNEWUSER
} else { # user already exists	} else { # user already exists
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
Line 544 $forminfo	Line 540 $forminfo
ENDCHANGEUSER	ENDCHANGEUSER
# Get the users information	# Get the users information
my %userenv = &Apache::lonnet::get('environment',	my %userenv = &Apache::lonnet::get('environment',
['firstname','middlename','lastname','generation'],	['firstname','middlename','lastname','generation',
$ccdomain,$ccuname);	'portfolioquota'],$ccdomain,$ccuname);
my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname);	my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname);
$r->print(<<END);	$r->print('
<hr />	<hr />'.
<table border="2">	&Apache::loncommon::start_data_table().
<tr>	&Apache::loncommon::start_data_table_header_row().
<th>$lt{'fn'}</th><th>$lt{'mn'}</th><th>$lt{'ln'}</th><th>$lt{'gen'}</th>	'<th>'.$lt{'fn'}.'</th><th>'.$lt{'mn'}.'</th><th>'.$lt{'ln'}.'</th><th>'.$lt{'gen'}.'</th>'.
</tr>	&Apache::loncommon::end_data_table_header_row().
<tr>	&Apache::loncommon::start_data_table_row());
END	foreach my $item ('firstname','middlename','lastname','generation') {
foreach ('firstname','middlename','lastname','generation') {
if (&Apache::lonnet::allowed('mau',$ccdomain)) {	if (&Apache::lonnet::allowed('mau',$ccdomain)) {
$r->print(<<"END");	$r->print(<<"END");
<td><input type="text" name="c$_" value="$userenv{$_}" size="15" /></td>	<td><input type="text" name="c$item" value="$userenv{$item}" size="15" /></td>
END	END
} else {	} else {
$r->print('<td>'.$userenv{$_}.'</td>');	$r->print('<td>'.$userenv{$item}.'</td>');
}	}
}	}
$r->print(<<END);	$r->print(&Apache::loncommon::end_data_table_row().
</tr>	&Apache::loncommon::end_data_table());
</table>
END
# Build up table of user roles to allow revocation of a role.	# Build up table of user roles to allow revocation of a role.
my ($tmp) = keys(%rolesdump);	my ($tmp) = keys(%rolesdump);
unless ($tmp =~ /^(con_lost\|error)/i) {	unless ($tmp =~ /^(con_lost\|error)/i) {
Line 596 END	Line 589 END
split(/_/,$role);	split(/_/,$role);
# Is this a custom role? Get role owner and title.	# Is this a custom role? Get role owner and title.
my ($croleudom,$croleuname,$croletitle)=	my ($croleudom,$croleuname,$croletitle)=
($role_code=~/^cr\/(\w+)\/(\w+)\/(\w+)$/);	($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$});
my $bgcol='ffffff';
my $allowed=0;	my $allowed=0;
my $delallowed=0;	my $delallowed=0;
my $sortkey=$role_code;	my $sortkey=$role_code;
my $class='Unknown';	my $class='Unknown';
if ($area =~ /^\/(\w+)\/(\d\w+)/ ) {	if ($area =~ m{^/($match_domain)/($match_courseid)} ) {
$class='Course';	$class='Course';
my ($coursedom,$coursedir) = ($1,$2);	my ($coursedom,$coursedir) = ($1,$2);
$sortkey.="\0$1";	$sortkey.="\0$coursedom";
# $1.'_'.$2 is the course id (eg. 103_12345abcef103l3).	# $1.'_'.$2 is the course id (eg. 103_12345abcef103l3).
my %coursedata=	my %coursedata=
&Apache::lonnet::coursedescription($1.'_'.$2);	&Apache::lonnet::coursedescription($1.'_'.$2);
Line 620 END	Line 612 END
$carea=&mt('Unavailable course').': '.$area;	$carea=&mt('Unavailable course').': '.$area;
$sortkey.="\0".&mt('Unavailable course').': '.$area;	$sortkey.="\0".&mt('Unavailable course').': '.$area;
}	}
	$sortkey.="\0$coursedir";
$inccourses{$1.'_'.$2}=1;	$inccourses{$1.'_'.$2}=1;
if ((&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2)) \|\|	if ((&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2)) \|\|
(&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {	(&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
Line 637 END	Line 630 END
}	}
}	}
# Compute the background color based on $area	# Compute the background color based on $area
$bgcol=$1.'_'.$2;	if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) {
$bgcol=~s/[^7-9a-e]//g;
$bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6);
if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) {
$carea.='<br />Section: '.$3;	$carea.='<br />Section: '.$3;
$sortkey.="\0$3";	$sortkey.="\0$3";
}	}
Line 648 END	Line 638 END
} else {	} else {
$sortkey.="\0".$area;	$sortkey.="\0".$area;
# Determine if current user is able to revoke privileges	# Determine if current user is able to revoke privileges
if ($area=~ /^\/(\w+)\//) {	if ($area=~m{^/($match_domain)/}) {
if ((&Apache::lonnet::allowed('c'.$role_code,$1)) \|\|	if ((&Apache::lonnet::allowed('c'.$role_code,$1)) \|\|
(&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {	(&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
$allowed=1;	$allowed=1;
Line 672 END	Line 662 END
}	}
}	}
if (($role_code eq 'ca') \|\| ($role_code eq 'aa')) {	if (($role_code eq 'ca') \|\| ($role_code eq 'aa')) {
$area=~/\/(\w+)\/(\w+)/;	$area=~m{/($match_domain)/($match_username)};
if (&authorpriv($2,$1)) {	if (&authorpriv($2,$1)) {
$allowed=1;	$allowed=1;
} else {	} else {
$allowed=0;	$allowed=0;
}	}
}	}
$bgcol='77FF77';
my $row = '';	my $row = '';
$row.='<tr bgcolor="#'.$bgcol.'"><td>';	$row.= '<td>';
my $active=1;	my $active=1;
$active=0 if (($role_end_time) && ($now>$role_end_time));	$active=0 if (($role_end_time) && ($now>$role_end_time));
if (($active) && ($allowed)) {	if (($active) && ($allowed)) {
Line 718 END	Line 707 END
: ' ' ).	: ' ' ).
'</td><td>'.($role_end_time ?localtime($role_end_time)	'</td><td>'.($role_end_time ?localtime($role_end_time)
: ' ' )	: ' ' )
."</td></tr>\n";	."</td>";
$sortrole{$sortkey}=$envkey;	$sortrole{$sortkey}=$envkey;
$roletext{$envkey}=$row;	$roletext{$envkey}=$row;
$roleclass{$envkey}=$class;	$roleclass{$envkey}=$class;
Line 731 END	Line 720 END
$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}}) ) {
$output{$type}.=$roletext{$sortrole{$which}};	$output{$type}.=
	&Apache::loncommon::start_data_table_row().
	$roletext{$sortrole{$which}}.
	&Apache::loncommon::end_data_table_row();
}	}
}	}
unless($output{$type} eq '') {	unless($output{$type} eq '') {
$output{$type} = "<tr bgcolor='#BBffBB'>".	$output{$type} = '<tr class="LC_info_row">'.
"<td align='center' colspan='7'>".&mt($type)."</td>".	"<td align='center' colspan='7'>".&mt($type)."</td></tr>".
$output{$type};	$output{$type};
$rolesdisplay = 1;	$rolesdisplay = 1;
}	}
}	}
if ($rolesdisplay == 1) {	if ($rolesdisplay == 1) {
$r->print(<<END);	$r->print('
<hr />	<hr />
<h3>$lt{'rer'}</h3>	<h3>'.$lt{'rer'}.'</h3>'.
<table>	&Apache::loncommon::start_data_table("LC_createuser").
<tr><th>$lt{'rev'}</th><th>$lt{'ren'}</th><th>$lt{'del'}</th><th>$lt{'rol'}</th><th>$lt{'e	&Apache::loncommon::start_data_table_header_row().
xt'}</th><th>$lt{'sta'}</th><th>$lt{'end'}</th>	'<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}.
END	'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.
	'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
	&Apache::loncommon::end_data_table_header_row());
foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {	foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
if ($output{$type}) {	if ($output{$type}) {
$r->print($output{$type}."\n");	$r->print($output{$type}."\n");
}	}
}	}
$r->print('</table>');	$r->print(&Apache::loncommon::end_data_table());
}	}
} # End of unless	} # End of unless
my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);	my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
Line 772 END	Line 766 END
$currentauth=~/^internal:/ or	$currentauth=~/^internal:/ or
$currentauth=~/^localauth:/	$currentauth=~/^localauth:/
) { # bad authentication scheme	) { # bad authentication scheme
if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {	if (&Apache::lonnet::allowed('mau',$ccdomain)) {
&initialize_authen_forms();	&initialize_authen_forms();
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'err' => "ERROR",	'err' => "ERROR",
Line 795 $lt{'uuas'} ($currentauth). $lt{'sldb'}.	Line 789 $lt{'uuas'} ($currentauth). $lt{'sldb'}.
<p>$authformloc</p>	<p>$authformloc</p>
ENDBADAUTH	ENDBADAUTH
} else {	} else {
# This user is not allowed to modify the users	# This user is not allowed to modify the user's
# authentication scheme, so just notify them of the problem	# authentication scheme, so just notify them of the problem
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'err' => "ERROR",	'err' => "ERROR",
Line 804 ENDBADAUTH	Line 798 ENDBADAUTH
);	);
$r->print(<<ENDBADAUTH);	$r->print(<<ENDBADAUTH);
<hr />	<hr />
<script type="text/javascript" language="Javascript">
$loginscript
</script>
<font color="#ff0000"> $lt{'err'}: </font>	<font color="#ff0000"> $lt{'err'}: </font>
$lt{'uuas'} ($currentauth). $lt{'adcs'}.	$lt{'uuas'} ($currentauth). $lt{'adcs'}.
<hr />	<hr />
Line 837 ENDBADAUTH	Line 828 ENDBADAUTH
"<p>$authformint</p><p>$authformfsys</p>";	"<p>$authformint</p><p>$authformfsys</p>";
}	}
$authformcurrent.=' <i>(will override current values)</i><br />';	$authformcurrent.=' <i>(will override current values)</i><br />';
if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {	if (&Apache::lonnet::allowed('mau',$ccdomain)) {
# Current user has login modification privileges	# Current user has login modification privileges
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'ccld' => "Change Current Login Data",	'ccld' => "Change Current Login Data",
Line 855 $loginscript	Line 846 $loginscript
<h3>$lt{'enld'}</h3>	<h3>$lt{'enld'}</h3>
$authform_other	$authform_other
ENDOTHERAUTHS	ENDOTHERAUTHS
	} else {
	if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {
	my %lt=&Apache::lonlocal::texthash(
	'ccld' => "Change Current Login Data",
	'yodo' => "You do not have privileges to modify the authentication configuration for this user.",
	'ifch' => "If a change is required, contact a domain coordinator for the domain",
	);
	$r->print(<<ENDNOPRIV);
	<hr />
	<h3>$lt{'ccld'}</h3>
	$lt{'yodo'} $lt{'ifch'}: $ccdomain
	ENDNOPRIV
	}
	}
	if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
	# Current user has quota modification privileges
	$r->print(&portfolio_quota($ccuname,$ccdomain));
}	}
} ## End of "check for bad authentication type" logic	} ## End of "check for bad authentication type" logic
} ## End of new user/old user logic	} ## End of new user/old user logic
Line 879 ENDOTHERAUTHS	Line 887 ENDOTHERAUTHS
'ssd' => "Set Start Date",	'ssd' => "Set Start Date",
'sed' => "Set End Date"	'sed' => "Set End Date"
);	);
$r->print(<<ENDCOAUTH);	$r->print('<h4>'.$lt{'cs'}.'</h4>'."\n".
<h4>$lt{'cs'}</h4>	&Apache::loncommon::start_data_table()."\n".
<table border=2><tr><th>$lt{'act'}</th><th>$lt{'rol'}</th><th>$lt{'ext'}</th>	&Apache::loncommon::start_data_table_header_row()."\n".
<th>$lt{'sta'}</th><th>$lt{'end'}</th></tr>	'<th>'.$lt{'act'}.'</th><th>'.$lt{'rol'}.'</th>'.
<tr>	'<th>'.$lt{'ext'}.'</th><th>'.$lt{'sta'}.'</th>'.
<td><input type=checkbox name="act_$cudom\_$cuname\_ca" /></td>	'<th>'.$lt{'end'}.'</th>'."\n".
<td>$lt{'cau'}</td>	&Apache::loncommon::end_data_table_header_row()."\n".
<td>$cudom\_$cuname</td>	&Apache::loncommon::start_data_table_row()."\n".
<td><input type=hidden name="start_$cudom\_$cuname\_ca" value='' />	'<td>
	<input type=checkbox name="act_'.$cudom.'_'.$cuname.'_ca" />
	</td>
	<td>'.$lt{'cau'}.'</td>
	<td>'.$cudom.'_'.$cuname.'</td>
	<td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_ca" value="" />
	<a href=
	"javascript:pjump('."'date_start','Start Date Co-Author',document.cu.start_$cudom\_$cuname\_ca.value,'start_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
	<td><input type=hidden name="end_'.$cudom.'_'.$cuname.'_ca" value="" />
<a href=	<a href=
"javascript:pjump('date_start','Start Date Co-Author',document.cu.start_$cudom\_$cuname\_ca.value,'start_$cudom\_$cuname\_ca','cu.pres','dateset')">$lt{'ssd'}</a></td>	"javascript:pjump('."'date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".
<td><input type=hidden name="end_$cudom\_$cuname\_ca" value='' />	&Apache::loncommon::end_data_table_row()."\n".
<a href=	&Apache::loncommon::start_data_table_row()."\n".
"javascript:pjump('date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset')">$lt{'sed'}</a></td>	'<td><input type=checkbox name="act_'.$cudom.'_'.$cuname.'_aa" /></td>
</tr>	<td>'.$lt{'caa'}.'</td>
<tr>	<td>'.$cudom.'_'.$cuname.'</td>
<td><input type=checkbox name="act_$cudom\_$cuname\_aa" /></td>	<td><input type=hidden name="start_'.$cudom.'_'.$cuname.'_aa" value="" />
<td>$lt{'caa'}</td>
<td>$cudom\_$cuname</td>
<td><input type=hidden name="start_$cudom\_$cuname\_aa" value='' />
<a href=	<a href=
"javascript:pjump('date_start','Start Date Assistant Co-Author',document.cu.start_$cudom\_$cuname\_aa.value,'start_$cudom\_$cuname\_aa','cu.pres','dateset')">$lt{'ssd'}</a></td>	"javascript:pjump('."'date_start','Start Date Assistant Co-Author',document.cu.start_$cudom\_$cuname\_aa.value,'start_$cudom\_$cuname\_aa','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
<td><input type=hidden name="end_$cudom\_$cuname\_aa" value='' />	<td><input type=hidden name="end_'.$cudom.'_'.$cuname.'_aa" value="" />
<a href=	<a href=
"javascript:pjump('date_end','End Date Assistant Co-Author',document.cu.end_$cudom\_$cuname\_aa.value,'end_$cudom\_$cuname\_aa','cu.pres','dateset')">$lt{'sed'}</a></td>	"javascript:pjump('."'date_end','End Date Assistant Co-Author',document.cu.end_$cudom\_$cuname\_aa.value,'end_$cudom\_$cuname\_aa','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".
</tr>	&Apache::loncommon::end_data_table_row()."\n".
</table>	&Apache::loncommon::end_data_table());
ENDCOAUTH
}	}
#	#
# Domain level	# Domain level
Line 914 ENDCOAUTH	Line 926 ENDCOAUTH
my $num_domain_level = 0;	my $num_domain_level = 0;
my $domaintext =	my $domaintext =
'<h4>'.&mt('Domain Level').'</h4>'.	'<h4>'.&mt('Domain Level').'</h4>'.
'<table border=2><tr><th>'.&mt('Activate').'</th><th>'.&mt('Role').'</th><th>'.&mt('Extent').'</th>'.	&Apache::loncommon::start_data_table().
'<th>'.&mt('Start').'</th><th>'.&mt('End').'</th></tr>';	&Apache::loncommon::start_data_table_header_row().
foreach ( sort( keys(%incdomains))) {	'<th>'.&mt('Activate').'</th><th>'.&mt('Role').'</th><th>'.
my $thisdomain=$_;	&mt('Extent').'</th>'.
foreach ('dc','li','dg','au','sc') {	'<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'.
if (&Apache::lonnet::allowed('c'.$_,$thisdomain)) {	&Apache::loncommon::end_data_table_header_row();
my $plrole=&Apache::lonnet::plaintext($_);	foreach my $thisdomain ( sort( keys(%incdomains))) {
	foreach my $role ('dc','li','dg','au','sc') {
	if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) {
	my $plrole=&Apache::lonnet::plaintext($role);
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'ssd' => "Set Start Date",	'ssd' => "Set Start Date",
'sed' => "Set End Date"	'sed' => "Set End Date"
);	);
$num_domain_level ++;	$num_domain_level ++;
$domaintext .= <<"ENDDROW";	$domaintext .=
<tr>	&Apache::loncommon::start_data_table_row().
<td><input type=checkbox name="act_$thisdomain\_$_"></td>	'<td><input type=checkbox name="act_'.$thisdomain.'_'.$role.'"></td>
<td>$plrole</td>	<td>'.$plrole.'</td>
<td>$thisdomain</td>	<td>'.$thisdomain.'</td>
<td><input type=hidden name="start_$thisdomain\_$_" value=''>	<td><input type=hidden name="start_'.$thisdomain.'_'.$role.'" value="">
<a href=	<a href=
"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$thisdomain\_$_.value,'start_$thisdomain\_$_','cu.pres','dateset')">$lt{'ssd'}</a></td>	"javascript:pjump('."'date_start','Start Date $plrole',document.cu.start_$thisdomain\_$role.value,'start_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
<td><input type=hidden name="end_$thisdomain\_$_" value=''>	<td><input type=hidden name="end_'.$thisdomain.'_'.$role.'" value="">
<a href=	<a href=
"javascript:pjump('date_end','End Date $plrole',document.cu.end_$thisdomain\_$_.value,'end_$thisdomain\_$_','cu.pres','dateset')">$lt{'sed'}</a></td>	"javascript:pjump('."'date_end','End Date $plrole',document.cu.end_$thisdomain\_$role.value,'end_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'.
</tr>	&Apache::loncommon::end_data_table_row();
ENDDROW
}	}
}	}
}	}
$domaintext.='</table>';	$domaintext.= &Apache::loncommon::end_data_table();
if ($num_domain_level > 0) {	if ($num_domain_level > 0) {
$r->print($domaintext);	$r->print($domaintext);
}	}
Line 950 ENDDROW	Line 964 ENDDROW
# Course and group levels	# Course and group levels
#	#

if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {	if ($env{'request.role'} =~ m{^dc\./($match_domain)/$}) {
$r->print(&course_level_dc($1,'Course'));	$r->print(&course_level_dc($1,'Course'));
$r->print('<hr /><input type="button" value="'.&mt('Modify User').'" onClick="setCourse()">'."\n");	$r->print('<hr /><input type="button" value="'.&mt('Modify User').'" onClick="setCourse()">'."\n");
} else {	} else {
Line 982 sub update_user_data {	Line 996 sub update_user_data {
$r->print($error.&mt('No login name specified').'.'.$end);	$r->print($error.&mt('No login name specified').'.'.$end);
return;	return;
}	}
if ( $env{'form.ccuname'} =~/\W/) {	if ( $env{'form.ccuname'} ne
	&LONCAPA::clean_username($env{'form.ccuname'}) ) {
$r->print($error.&mt('Invalid login name').'. '.	$r->print($error.&mt('Invalid login name').'. '.
&mt('Only letters, numbers, and underscores are valid').'.'.	&mt('Only letters, numbers, and underscores are valid').'.'.
$end);	$end);
Line 992 sub update_user_data {	Line 1007 sub update_user_data {
$r->print($error.&mt('No domain specified').'.'.$end);	$r->print($error.&mt('No domain specified').'.'.$end);
return;	return;
}	}
if ( $env{'form.ccdomain'} =~/\W/) {	if ( $env{'form.ccdomain'} ne
	&LONCAPA::clean_domain($env{'form.ccdomain'}) ) {
$r->print($error.&mt ('Invalid domain name').'. '.	$r->print($error.&mt ('Invalid domain name').'. '.
&mt('Only letters, numbers, and underscores are valid').'.'.	&mt('Only letters, numbers, periods, dashes, and underscores are valid').'.'.
$end);	$end);
return;	return;
}	}
Line 1103 ENDMODIFYUSERHEAD	Line 1119 ENDMODIFYUSERHEAD
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',
$env{'form.ccdomain'},$env{'form.ccuname'});	'portfolioquota'],$env{'form.ccdomain'},$env{'form.ccuname'});
my ($tmp) = keys(%userenv);	my ($tmp) = keys(%userenv);
if ($tmp =~ /^(con_lost\|error)/i) {	if ($tmp =~ /^(con_lost\|error)/i) {
%userenv = ();	%userenv = ();
}	}
# Check to see if we need to change user information	# Check to see if we need to change user information
foreach ('firstname','middlename','lastname','generation') {	foreach my $item ('firstname','middlename','lastname','generation') {
# Strip leading and trailing whitespace	# Strip leading and trailing whitespace
$env{'form.c'.$_} =~ s/(\s+$\|^\s+)//g;	$env{'form.c'.$item} =~ s/(\s+$\|^\s+)//g;
	}
	my ($quotachanged,$namechanged,$oldportfolioquota);
	my %changeHash;
	if (exists($userenv{'portfolioquota'})) {
	$oldportfolioquota = $userenv{'portfolioquota'};
	if (exists($env{'form.portfolioquota'})) {
	if ($env{'form.portfolioquota'} ne $userenv{'portfolioquota'}) {
	if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
	# Current user has quota modification privileges
	$quotachanged = 1;
	$changeHash{'portfolioquota'} = $env{'form.portfolioquota'};
	}
	}
	}
	} else {
	$oldportfolioquota =
	&Apache::loncommon::default_quota($env{'form.ccdomain'});
}	}
if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}) &&	if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}) &&
($env{'form.cfirstname'} ne $userenv{'firstname'} \|\|	($env{'form.cfirstname'} ne $userenv{'firstname'} \|\|
$env{'form.cmiddlename'} ne $userenv{'middlename'} \|\|	$env{'form.cmiddlename'} ne $userenv{'middlename'} \|\|
$env{'form.clastname'} ne $userenv{'lastname'} \|\|	$env{'form.clastname'} ne $userenv{'lastname'} \|\|
$env{'form.cgeneration'} ne $userenv{'generation'} )) {	$env{'form.cgeneration'} ne $userenv{'generation'} )) {
	$namechanged = 1;
	}
	if ($namechanged) {
# Make the change	# Make the change
my %changeHash;
$changeHash{'firstname'} = $env{'form.cfirstname'};	$changeHash{'firstname'} = $env{'form.cfirstname'};
$changeHash{'middlename'} = $env{'form.cmiddlename'};	$changeHash{'middlename'} = $env{'form.cmiddlename'};
$changeHash{'lastname'} = $env{'form.clastname'};	$changeHash{'lastname'} = $env{'form.clastname'};
Line 1136 ENDMODIFYUSERHEAD	Line 1171 ENDMODIFYUSERHEAD
'mddl' => "middle",	'mddl' => "middle",
'lst' => "last",	'lst' => "last",
'gen' => "generation",	'gen' => "generation",
	'disk' => "disk space allocated to portfolio files",
'prvs' => "Previous",	'prvs' => "Previous",
'chto' => "Changed To"	'chto' => "Changed To"
);	);
Line 1146 ENDMODIFYUSERHEAD	Line 1182 ENDMODIFYUSERHEAD
<th>$lt{'frst'}</th>	<th>$lt{'frst'}</th>
<th>$lt{'mddl'}</th>	<th>$lt{'mddl'}</th>
<th>$lt{'lst'}</th>	<th>$lt{'lst'}</th>
<th>$lt{'gen'}</th></tr>	<th>$lt{'gen'}</th>
	<th>$lt{'disk'}<th></tr>
<tr><td>$lt{'prvs'}</td>	<tr><td>$lt{'prvs'}</td>
<td>$userenv{'firstname'} </td>	<td>$userenv{'firstname'} </td>
<td>$userenv{'middlename'} </td>	<td>$userenv{'middlename'} </td>
<td>$userenv{'lastname'} </td>	<td>$userenv{'lastname'} </td>
<td>$userenv{'generation'} </td></tr>	<td>$userenv{'generation'} </td>
	<td>$oldportfolioquota</td>
	</tr>
<tr><td>$lt{'chto'}</td>	<tr><td>$lt{'chto'}</td>
<td>$env{'form.cfirstname'} </td>	<td>$env{'form.cfirstname'} </td>
<td>$env{'form.cmiddlename'} </td>	<td>$env{'form.cmiddlename'} </td>
<td>$env{'form.clastname'} </td>	<td>$env{'form.clastname'} </td>
<td>$env{'form.cgeneration'} </td></tr>	<td>$env{'form.cgeneration'} </td>
	<td>$env{'form.portfolioquota'} Mb</td></tr>
</table>	</table>
END	END
} else { # error occurred	} else { # error occurred
Line 1165 END	Line 1205 END
$env{'form.ccdomain'}."</h2>");	$env{'form.ccdomain'}."</h2>");
}	}
} else { # End of if ($env ... ) logic	} else { # End of if ($env ... ) logic
	my $putresult;
	if ($quotachanged) {
	$putresult = &Apache::lonnet::put
	('environment',\%changeHash,
	$env{'form.ccdomain'},$env{'form.ccuname'});
	}
# They did not want to change the users name but we can	# They did not want to change the users name but we can
# still tell them what the name is	# still tell them what the name is
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'usr' => "User",	'usr' => "User",
'id' => "in domain",	'id' => "in domain",
'gen' => "Generation"	'gen' => "Generation",
	'disk' => "Disk space allocated to user's portfolio files",
);	);
$r->print(<<"END");	$r->print(<<"END");
<h2>$lt{'usr'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"</h2>	<h2>$lt{'usr'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"</h2>
<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} </h4>	<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} </h4>
<h4>$lt{'gen'}: $userenv{'generation'}</h4>	<h4>$lt{'gen'}: $userenv{'generation'}</h4>
END	END
	if ($putresult eq 'ok') {
	if ($oldportfolioquota ne $env{'form.portfolioquota'}) {
	$r->print('<h4>'.$lt{'disk'}.': '.$env{'form.portfolioquota'}.' Mb</h4>');
	}
	}
}	}
}	}
##	##
my $now=time;	my $now=time;
$r->print('<h3>'.&mt('Modifying Roles').'</h3>');	$r->print('<h3>'.&mt('Modifying Roles').'</h3>');
foreach (keys (%env)) {	foreach my $key (keys (%env)) {
next if (! $env{$_});	next if (! $env{$key});
# Revoke roles	# Revoke roles
if ($_=~/^form\.rev/) {	if ($key=~/^form\.rev/) {
if ($_=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {	if ($key=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {
# Revoke standard role	# Revoke standard role
$r->print(&mt('Revoking').' '.$2.' in '.$1.': <b>'.	$r->print(&mt('Revoking').' '.$2.' in '.$1.': <b>'.
&Apache::lonnet::revokerole($env{'form.ccdomain'},	&Apache::lonnet::revokerole($env{'form.ccdomain'},
$env{'form.ccuname'},$1,$2).'</b><br />');	$env{'form.ccuname'},$1,$2).'</b><br />');
if ($2 eq 'st') {	if ($2 eq 'st') {
$1=~/^\/(\w+)\/(\w+)/;	$1=~m{^/($match_domain)/($match_courseid)};
my $cid=$1.'_'.$2;	my $cid=$1.'_'.$2;
$r->print(&mt('Drop from classlist').': <b>'.	$r->print(&mt('Drop from classlist').': <b>'.
&Apache::lonnet::critical('put:'.	&Apache::lonnet::critical('put:'.
Line 1204 END	Line 1256 END
$env{'course.'.$cid.'.home'}).'</b><br />');	$env{'course.'.$cid.'.home'}).'</b><br />');
}	}
}	}
if ($_=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {	if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
# Revoke custom role	# Revoke custom role
$r->print(&mt('Revoking custom role:').	$r->print(&mt('Revoking custom role:').
' '.$4.' by '.$3.'@'.$2.' in '.$1.': <b>'.	' '.$4.' by '.$3.':'.$2.' in '.$1.': <b>'.
&Apache::lonnet::revokecustomrole($env{'form.ccdomain'},	&Apache::lonnet::revokecustomrole($env{'form.ccdomain'},
$env{'form.ccuname'},$1,$2,$3,$4).	$env{'form.ccuname'},$1,$2,$3,$4).
'</b><br />');	'</b><br />');
}	}
} elsif ($_=~/^form\.del/) {	} elsif ($key=~/^form\.del/) {
if ($_=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {	if ($key=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {
# Delete standard role	# Delete standard role
$r->print(&mt('Deleting').' '.$2.' in '.$1.': '.	$r->print(&mt('Deleting').' '.$2.' in '.$1.': '.
&Apache::lonnet::assignrole($env{'form.ccdomain'},	&Apache::lonnet::assignrole($env{'form.ccdomain'},
$env{'form.ccuname'},$1,$2,$now,0,1).'<br />');	$env{'form.ccuname'},$1,$2,$now,0,1).'<br />');
if ($2 eq 'st') {	if ($2 eq 'st') {
$1=~/^\/(\w+)\/(\w+)/;	$1=~m{^/($match_domain)/($match_courseid)};
my $cid=$1.'_'.$2;	my $cid=$1.'_'.$2;
$r->print(&mt('Drop from classlist').': <b>'.	$r->print(&mt('Drop from classlist').': <b>'.
&Apache::lonnet::critical('put:'.	&Apache::lonnet::critical('put:'.
Line 1231 END	Line 1283 END
$env{'course.'.$cid.'.home'}).'</b><br />');	$env{'course.'.$cid.'.home'}).'</b><br />');
}	}
}	}
if ($_=~/^form\.del\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {	if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);	my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
# Delete custom role	# Delete custom role
$r->print(&mt('Deleting custom role [_1] by [_2]@[_3] in [_4]',	$r->print(&mt('Deleting custom role [_1] by [_2]@[_3] in [_4]',
Line 1240 END	Line 1292 END
$env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,	$env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
0,1).'</b><br />');	0,1).'</b><br />');
}	}
} elsif ($_=~/^form\.ren/) {	} elsif ($key=~/^form\.ren/) {
my $udom = $env{'form.ccdomain'};	my $udom = $env{'form.ccdomain'};
my $uname = $env{'form.ccuname'};	my $uname = $env{'form.ccuname'};
# Re-enable standard role	# Re-enable standard role
if ($_=~/^form\.ren\:([^\_]+)\_([^\_\.]+)$/) {	if ($key=~/^form\.ren\:([^\_]+)\_([^\_\.]+)$/) {
my $url = $1;	my $url = $1;
my $role = $2;	my $role = $2;
my $logmsg;	my $logmsg;
my $output;	my $output;
if ($role eq 'st') {	if ($role eq 'st') {
if ($url =~ m-^/(\w+)/(\w+)/?(\w*)$-) {	if ($url =~ m-^/($match_domain)/($match_courseid)/?(\w*)$-) {
my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$1,$2,$3);	my $result = &Apache::loncommon::commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$1,$2,$3);
if (($result =~ /^error/) \|\| ($result eq 'not_in_class') \|\| ($result eq 'unknown_course')) {	if (($result =~ /^error/) \|\| ($result eq 'not_in_class') \|\| ($result eq 'unknown_course')) {
$output = "Error: $result\n";	$output = "Error: $result\n";
} else {	} else {
Line 1270 END	Line 1322 END
$r->print($output);	$r->print($output);
}	}
# Re-enable custom role	# Re-enable custom role
if ($_=~/^form\.ren\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {	if ($key=~m{^form\.ren\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);	my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
my $result = &Apache::lonnet::assigncustomrole(	my $result = &Apache::lonnet::assigncustomrole(
$env{'form.ccdomain'}, $env{'form.ccuname'},	$env{'form.ccdomain'}, $env{'form.ccuname'},
Line 1278 END	Line 1330 END
$r->print(&mt('Re-enabling custom role [_1] by [_2]@[_3] in [_4] : <b>[_5]</b>',	$r->print(&mt('Re-enabling custom role [_1] by [_2]@[_3] in [_4] : <b>[_5]</b>',
$rolename,$rnam,$rdom,$url,$result).'<br />');	$rolename,$rnam,$rdom,$url,$result).'<br />');
}	}
} elsif ($_=~/^form\.act/) {	} elsif ($key=~/^form\.act/) {
my $udom = $env{'form.ccdomain'};	my $udom = $env{'form.ccdomain'};
my $uname = $env{'form.ccuname'};	my $uname = $env{'form.ccuname'};
if ($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_cr_cr_([^\_]+)_(\w+)_([^\_]+)$/) {	if ($key=~/^form\.act\_($match_domain)\_($match_courseid)\_cr_cr_($match_domain)_($match_username)_([^\_]+)$/) {
# Activate a custom role	# Activate a custom role
my ($one,$two,$three,$four,$five)=($1,$2,$3,$4,$5);	my ($one,$two,$three,$four,$five)=($1,$2,$3,$4,$5);
my $url='/'.$one.'/'.$two;	my $url='/'.$one.'/'.$two;
Line 1298 END	Line 1350 END
my %sections = ();	my %sections = ();
my $num_sections = &build_roles($env{'form.sec_'.$full},\%sections,$5);	my $num_sections = &build_roles($env{'form.sec_'.$full},\%sections,$5);
if ($num_sections == 0) {	if ($num_sections == 0) {
$r->print(&commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end));	$r->print(&Apache::loncommon::commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end));
} else {	} else {
my %curr_groups =	my %curr_groups =
&Apache::longroup::coursegroups($one,$two);	&Apache::longroup::coursegroups($one,$two);
Line 1309 END	Line 1361 END
next;	next;
}	}
my $securl = $url.'/'.$sec;	my $securl = $url.'/'.$sec;
$r->print(&commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end));	$r->print(&Apache::loncommon::commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end));
}	}
}	}
} elsif ($_=~/^form\.act\_([^\_]+)\_(\w+)\_([^\_]+)$/) {	} elsif ($key=~/^form\.act\_($match_domain)\_($match_name)\_([^\_]+)$/) {
# Activate roles for sections with 3 id numbers	# Activate roles for sections with 3 id numbers
# set start, end times, and the url for the class	# set start, end times, and the url for the class
my ($one,$two,$three)=($1,$2,$3);	my ($one,$two,$three)=($1,$2,$3);
Line 1328 END	Line 1380 END
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);
if ($num_sections == 0) {	if ($num_sections == 0) {
$r->print(&commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));	$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
} else {	} else {
my %curr_groups =	my %curr_groups =
&Apache::longroup::coursegroups($one,$two);	&Apache::longroup::coursegroups($one,$two);
Line 1342 END	Line 1394 END
next;	next;
}	}
my $securl = $url.'/'.$sec;	my $securl = $url.'/'.$sec;
$r->print(&commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec));	$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec));
} else {	} else {
$emptysec = 1;	$emptysec = 1;
}	}
}	}
if ($emptysec) {	if ($emptysec) {
$r->print(&commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));	$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
}	}
}	}
} elsif ($_=~/^form\.act\_([^\_]+)\_([^\_]+)$/) {	} elsif ($key=~/^form\.act\_([^\_]+)\_([^\_]+)$/) {
# Activate roles for sections with two id numbers	# Activate roles for sections with two id numbers
# set start, end times, and the url for the class	# set start, end times, and the url for the class
my $start = ( $env{'form.start_'.$1.'_'.$2} ?	my $start = ( $env{'form.start_'.$1.'_'.$2} ?
Line 1365 END	Line 1417 END
my %sections = ();	my %sections = ();
my $num_sections = &build_roles($env{'form.sec_'.$1.'_'.$2},\%sections,$2);	my $num_sections = &build_roles($env{'form.sec_'.$1.'_'.$2},\%sections,$2);
if ($num_sections == 0) {	if ($num_sections == 0) {
$r->print(&commit_standardrole($udom,$uname,$url,$2,$start,$end,$1,undef,''));	$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$2,$start,$end,$1,undef,''));
} else {	} else {
my $emptysec = 0;	my $emptysec = 0;
foreach my $sec (sort {$a cmp $b} keys %sections) {	foreach my $sec (sort {$a cmp $b} keys %sections) {
if ($sec ne '') {	if ($sec ne '') {
my $securl = $url.'/'.$sec;	my $securl = $url.'/'.$sec;
$r->print(&commit_standardrole($udom,$uname,$securl,$2,$start,$end,$1,undef,$sec));	$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$2,$start,$end,$1,undef,$sec));
} else {	} else {
$emptysec = 1;	$emptysec = 1;
}	}
}	}
if ($emptysec) {	if ($emptysec) {
$r->print(&commit_standardrole($udom,$uname,$url,$2,$start,$end,$1,undef,''));	$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$2,$start,$end,$1,undef,''));
}	}
}	}
} else {	} else {
$r->print('<p>'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$_.'</tt></p><br />');	$r->print('<p>'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$key.'</tt></p><br />');
}	}
foreach my $key (sort(keys(%disallowed))) {	foreach my $key (sort(keys(%disallowed))) {
if (($key eq 'none') \|\| ($key eq 'all')) {	if (($key eq 'none') \|\| ($key eq 'all')) {
Line 1399 END	Line 1451 END
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
}	}

sub commit_customrole {
my ($udom,$uname,$url,$three,$four,$five,$start,$end) = @_;
my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.'@'.$three.' in '.$url.
($start?', '.&mt('starting').' '.localtime($start):'').
($end?', ending '.localtime($end):'').': <b>'.
&Apache::lonnet::assigncustomrole(
$udom,$uname,$url,$three,$four,$five,$end,$start).
'</b><br />';
return $output;
}

sub commit_standardrole {
my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_;
my $output;
my $logmsg;
if ($three eq 'st') {
my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec);
if (($result =~ /^error/) \|\| ($result eq 'not_in_class') \|\| ($result eq 'unknown_course')) {
$output = "Error: $result\n";
} else {
$output = &mt('Assigning').' '.$three.' in '.$url.
($start?', '.&mt('starting').' '.localtime($start):'').
($end?', '.&mt('ending').' '.localtime($end):'').
': <b>'.$result.'</b><br />'.
&mt('Add to classlist').': <b>ok</b><br />';
}
} else {
$output = &mt('Assigning').' '.$three.' in '.$url.
($start?', '.&mt('starting').' '.localtime($start):'').
($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
&Apache::lonnet::assignrole(
$udom,$uname,$url,$three,$end,$start).
'</b><br />';
}
return $output;
}

sub commit_studentrole {
my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_;
my $linefeed = '<br />'."\n";
my $result;
if (defined($one) && defined($two)) {
my $cid=$one.'_'.$two;
my $oldsec=&Apache::lonnet::getsection($udom,$uname,$cid);
my $secchange = 0;
my $expire_role_result;
my $modify_section_result;
unless ($oldsec eq '-1') {
unless ($sec eq $oldsec) {
$secchange = 1;
my $uurl='/'.$cid;
$uurl=~s/\_/\//g;
if ($oldsec) {
$uurl.='/'.$oldsec;
}
$expire_role_result = &Apache::lonnet::assignrole($udom,$uname,$uurl,'st',time);
$result = $expire_role_result;
}
}
if (($expire_role_result eq 'ok') \|\| ($secchange == 0)) {
$modify_section_result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,'','',$cid);
if ($modify_section_result =~ /^ok/) {
if ($secchange == 1) {
$$logmsg .= "Section for $uname switched from old section: $oldsec to new section: $sec".$linefeed;
} elsif ($oldsec eq '-1') {
$$logmsg .= "New student role for $uname in section $sec in course $cid".$linefeed;
} else {
$$logmsg .= "Student $uname assigned to unchanged section $sec in course $cid".$linefeed;
}
} else {
$$logmsg .= "Error when attempting section change for $uname from old section $oldsec to new section: $sec in course $cid -error: $modify_section_result".$linefeed;
}
$result = $modify_section_result;
} elsif ($secchange == 1) {
$$logmsg .= "Error when attempting to expire role for $uname in old section $oldsec in course $cid -error: $expire_role_result".$linefeed;
}
} else {
$$logmsg .= "Incomplete course id defined. Addition of user $uname from domain $udom to course $one\_$two, section $sec not completed.$linefeed";
$result = "error: incomplete course id\n";
}
return $result;
}

sub build_roles {	sub build_roles {
my ($sectionstr,$sections,$role) = @_;	my ($sectionstr,$sections,$role) = @_;
my $num_sections = 0;	my $num_sections = 0;
Line 1511 sub build_roles {	Line 1480 sub build_roles {
$num_sections ++;	$num_sections ++;
}	}
}	}

return $num_sections;	return $num_sections;
}	}

Line 1553 sub custom_role_editor {	Line 1522 sub custom_role_editor {
my %full=();	my %full=();
my %courselevel=();	my %courselevel=();
my %courselevelcurrent=();	my %courselevelcurrent=();
foreach (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {	foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
my ($priv,$restrict)=split(/\&/,$_);	my ($priv,$restrict)=split(/\&/,$item);
unless ($restrict) { $restrict='F'; }	unless ($restrict) { $restrict='F'; }
$courselevel{$priv}=$restrict;	$courselevel{$priv}=$restrict;
if ($coursepriv=~/\:$priv/) {	if ($coursepriv=~/\:$priv/) {
Line 1564 sub custom_role_editor {	Line 1533 sub custom_role_editor {
}	}
my %domainlevel=();	my %domainlevel=();
my %domainlevelcurrent=();	my %domainlevelcurrent=();
foreach (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {	foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
my ($priv,$restrict)=split(/\&/,$_);	my ($priv,$restrict)=split(/\&/,$item);
unless ($restrict) { $restrict='F'; }	unless ($restrict) { $restrict='F'; }
$domainlevel{$priv}=$restrict;	$domainlevel{$priv}=$restrict;
if ($dompriv=~/\:$priv/) {	if ($dompriv=~/\:$priv/) {
Line 1575 sub custom_role_editor {	Line 1544 sub custom_role_editor {
}	}
my %systemlevel=();	my %systemlevel=();
my %systemlevelcurrent=();	my %systemlevelcurrent=();
foreach (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {	foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
my ($priv,$restrict)=split(/\&/,$_);	my ($priv,$restrict)=split(/\&/,$item);
unless ($restrict) { $restrict='F'; }	unless ($restrict) { $restrict='F'; }
$systemlevel{$priv}=$restrict;	$systemlevel{$priv}=$restrict;
if ($syspriv=~/\:$priv/) {	if ($syspriv=~/\:$priv/) {
Line 1594 sub custom_role_editor {	Line 1563 sub custom_role_editor {
<form method="post">	<form method="post">
<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" />
<table border="2">
<tr><th>$lt{'prv'}</th><th>$lt{'crl'}</th><th>$lt{'dml'}</th>
<th>$lt{'ssl'}</th></tr>
ENDCCF	ENDCCF
	$r->print(&Apache::loncommon::start_data_table().
	&Apache::loncommon::start_data_table_header_row().
	'<th>'.$lt{'prv'}.'</th><th>'.$lt{'crl'}.'</th><th>'.$lt{'dml'}.
	'</th><th>'.$lt{'ssl'}.'</th>'.
	&Apache::loncommon::end_data_table_header_row());
foreach my $priv (sort keys %full) {	foreach my $priv (sort keys %full) {
my $privtext = &Apache::lonnet::plaintext($priv);	my $privtext = &Apache::lonnet::plaintext($priv);
$r->print('<tr><td>'.$privtext.'</td><td>'.	$r->print(&Apache::loncommon::start_data_table_row().
	'<td>'.$privtext.'</td><td>'.
($courselevel{$priv}?'<input type="checkbox" name="'.$priv.':c" '.	($courselevel{$priv}?'<input type="checkbox" name="'.$priv.':c" '.
($courselevelcurrent{$priv}?'checked="1"':'').' />':' ').	($courselevelcurrent{$priv}?'checked="1"':'').' />':' ').
'</td><td>'.	'</td><td>'.
Line 1609 ENDCCF	Line 1581 ENDCCF
'</td><td>'.	'</td><td>'.
($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.':s" '.	($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.':s" '.
($systemlevelcurrent{$priv}?'checked="1"':'').' />':' ').	($systemlevelcurrent{$priv}?'checked="1"':'').' />':' ').
'</td></tr>');	'</td>'.
	&Apache::loncommon::end_data_table_row());
}	}
$r->print(	$r->print(&Apache::loncommon::end_data_table().
'<table><input type="submit" value="'.&mt('Define Role').'" /></form>'.	'<input type="submit" value="'.&mt('Define Role').'" /></form>'.
&Apache::loncommon::end_page());	&Apache::loncommon::end_page());
}	}

Line 1646 sub set_custom_role {	Line 1619 sub set_custom_role {
my $domrole='';	my $domrole='';
my $courole='';	my $courole='';

foreach (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {	foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
my ($priv,$restrict)=split(/\&/,$_);	my ($priv,$restrict)=split(/\&/,$item);
unless ($restrict) { $restrict=''; }	unless ($restrict) { $restrict=''; }
if ($env{'form.'.$priv.':c'}) {	if ($env{'form.'.$priv.':c'}) {
$courole.=':'.$_;	$courole.=':'.$item;
}	}
}	}

foreach (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {	foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
my ($priv,$restrict)=split(/\&/,$_);	my ($priv,$restrict)=split(/\&/,$item);
unless ($restrict) { $restrict=''; }	unless ($restrict) { $restrict=''; }
if ($env{'form.'.$priv.':d'}) {	if ($env{'form.'.$priv.':d'}) {
$domrole.=':'.$_;	$domrole.=':'.$item;
}	}
}	}

foreach (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {	foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
my ($priv,$restrict)=split(/\&/,$_);	my ($priv,$restrict)=split(/\&/,$item);
unless ($restrict) { $restrict=''; }	unless ($restrict) { $restrict=''; }
if ($env{'form.'.$priv.':s'}) {	if ($env{'form.'.$priv.':s'}) {
$sysrole.=':'.$_;	$sysrole.=':'.$item;
}	}
}	}
$r->print('<br />Defining Role: '.	$r->print('<br />Defining Role: '.
Line 1745 sub course_level_table {	Line 1718 sub course_level_table {
'end' => "End"	'end' => "End"
);	);

foreach (sort( keys(%inccourses))) {	foreach my $protectedcourse (sort( keys(%inccourses))) {
my $thiscourse=$_;	my $thiscourse=$protectedcourse;
my $protectedcourse=$_;
$thiscourse=~s:_:/:g;	$thiscourse=~s:_:/:g;
my %coursedata=&Apache::lonnet::coursedescription($thiscourse);	my %coursedata=&Apache::lonnet::coursedescription($thiscourse);
my $area=$coursedata{'description'};	my $area=$coursedata{'description'};
my $type=$coursedata{'type'};	my $type=$coursedata{'type'};
if (!defined($area)) { $area=&mt('Unavailable course').': '.$_; }	if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; }
my $bgcol=$thiscourse;
$bgcol=~s/[^7-9a-e]//g;
$bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6);
my ($domain,$cnum)=split(/\//,$thiscourse);	my ($domain,$cnum)=split(/\//,$thiscourse);
my %sections_count;	my %sections_count;
if (defined($env{'request.course.id'})) {	if (defined($env{'request.course.id'})) {
Line 1764 sub course_level_table {	Line 1733 sub course_level_table {
&Apache::loncommon::get_sections($domain,$cnum);	&Apache::loncommon::get_sections($domain,$cnum);
}	}
}	}
foreach ('st','ta','ep','in','cc') {	foreach my $role ('st','ta','ep','in','cc') {
if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) {	if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) {
my $plrole=&Apache::lonnet::plaintext($_);	my $plrole=&Apache::lonnet::plaintext($role);
$table .= <<ENDEXTENT;	$table .= &Apache::loncommon::start_data_table_row().
<tr bgcolor="#$bgcol">	'<td><input type="checkbox" name="act_'.$protectedcourse.'_'.$role.'"></td>
<td><input type="checkbox" name="act_$protectedcourse\_$_"></td>	<td>'.$plrole.'</td>
<td>$plrole</td>	<td>'.$area.'<br />Domain: '.$domain.'</td>'."\n";
<td>$area<br />Domain: $domain</td>	if ($role ne 'cc') {
ENDEXTENT
if ($_ ne 'cc') {
if (%sections_count) {	if (%sections_count) {
my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$_);	my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$role);
$table .=	$table .=
'<td><table border="0" cellspacing="0" cellpadding="0">'.	'<td><table class="LC_createuser">'.
'<tr><td valign="top">'.$lt{'exs'}.'<br />'.	'<tr class="LC_section_row">
	<td valign="top">'.$lt{'exs'}.'<br />'.
$currsec.'</td>'.	$currsec.'</td>'.
'<td>  </td>'.	'<td>  </td>'.
'<td valign="top"> '.$lt{'new'}.'<br />'.	'<td valign="top"> '.$lt{'new'}.'<br />'.
'<input type="text" name="newsec_'.$protectedcourse.'_'.$_.'" value="" /></td>'.	'<input type="text" name="newsec_'.$protectedcourse.'_'.$role.'" value="" /></td>'.
'<input type="hidden" '.	'<input type="hidden" '.
'name="sec_'.$protectedcourse.'_'.$_.'"></td>'.	'name="sec_'.$protectedcourse.'_'.$role.'"></td>'.
'</tr></table></td>';	'</tr></table></td>';
} else {	} else {
$table .= '<td><input type="text" size="10" '.	$table .= '<td><input type="text" size="10" '.
'name="sec_'.$protectedcourse.'_'.$_.'"></td>';	'name="sec_'.$protectedcourse.'_'.$role.'"></td>';
}	}
} else {	} else {
$table .= '<td>&nbsp</td>';	$table .= '<td>&nbsp</td>';
}	}
$table .= <<ENDTIMEENTRY;	$table .= <<ENDTIMEENTRY;
<td><input type=hidden name="start_$protectedcourse\_$_" value=''>	<td><input type=hidden name="start_$protectedcourse\_$role" value=''>
<a href=	<a href=
"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$_.value,'start_$protectedcourse\_$_','cu.pres','dateset')">$lt{'ssd'}</a></td>	"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$role.value,'start_$protectedcourse\_$role','cu.pres','dateset')">$lt{'ssd'}</a></td>
<td><input type=hidden name="end_$protectedcourse\_$_" value=''>	<td><input type=hidden name="end_$protectedcourse\_$role" value=''>
<a href=	<a href=
"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$_.value,'end_$protectedcourse\_$_','cu.pres','dateset')">$lt{'sed'}</a></td>	"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$role.value,'end_$protectedcourse\_$role','cu.pres','dateset')">$lt{'sed'}</a></td>
ENDTIMEENTRY	ENDTIMEENTRY
$table.= "</tr>\n";	$table.= &Apache::loncommon::end_data_table_row();
}	}
}	}
foreach (sort keys %customroles) {	foreach my $cust (sort keys %customroles) {
if (&Apache::lonnet::allowed('ccr',$thiscourse)) {	if (&Apache::lonnet::allowed('ccr',$thiscourse)) {
my $plrole=$_;	my $plrole=$cust;
my $customrole=$protectedcourse.'_cr_cr_'.$env{'user.domain'}.	my $customrole=$protectedcourse.'_cr_cr_'.$env{'user.domain'}.
'_'.$env{'user.name'}.'_'.$plrole;	'_'.$env{'user.name'}.'_'.$plrole;
$table .= <<END;	$table .= &Apache::loncommon::start_data_table_row().
<tr bgcolor="#$bgcol">	'<td><input type="checkbox" name="act_'.$customrole.'"></td>
<td><input type="checkbox" name="act_$customrole"></td>	<td>'.$plrole.'</td>
<td>$plrole</td>	<td>'.$area.'</td>'."\n";
<td>$area</td>
END
if (%sections_count) {	if (%sections_count) {
my $currsec = &course_sections(\%sections_count,$customrole);	my $currsec = &course_sections(\%sections_count,$customrole);
$table.=	$table.=
Line 1837 END	Line 1803 END
"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$customrole.value,'start_$customrole','cu.pres','dateset')">$lt{'ssd'}</a></td>	"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$customrole.value,'start_$customrole','cu.pres','dateset')">$lt{'ssd'}</a></td>
<td><input type=hidden name="end_$customrole" value=''>	<td><input type=hidden name="end_$customrole" value=''>
<a href=	<a href=
"javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">$lt{'sed'}</a></td></tr>	"javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">$lt{'sed'}</a></td>
ENDENTRY	ENDENTRY
	$table .= &Apache::loncommon::end_data_table_row();
}	}
}	}
}	}
return '' if ($table eq ''); # return nothing if there is nothing	return '' if ($table eq ''); # return nothing if there is nothing
# in the table	# in the table
my $result = <<ENDTABLE;	my $result = '
<h4>$lt{'crl'}</h4>	<h4>'.$lt{'crl'}.'</h4>'.
<table border=2><tr><th>$lt{'act'}</th><th>$lt{'rol'}</th><th>$lt{'ext'}</th>	&Apache::loncommon::start_data_table().
<th>$lt{'grs'}</th><th>$lt{'sta'}</th><th>$lt{'end'}</th></tr>	&Apache::loncommon::start_data_table_header_row().
$table	'<th>'.$lt{'act'}.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.'</th>
</table>	<th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
ENDTABLE	&Apache::loncommon::end_data_table_header_row().
	&Apache::loncommon::start_data_table_row().
	$table.
	&Apache::loncommon::end_data_table_row().
	&Apache::loncommon::end_data_table();
return $result;	return $result;
}	}

Line 1867 sub course_sections {	Line 1838 sub course_sections {
$output = '<select name="currsec_'.$role.'" ';	$output = '<select name="currsec_'.$role.'" ';
my $multiple = 4;	my $multiple = 4;
if (scalar(@sections) < 4) { $multiple = scalar(@sections); }	if (scalar(@sections) < 4) { $multiple = scalar(@sections); }
$output .= '"multiple" size="'.$multiple.'">'."\n";	$output .= 'multiple="multiple" size="'.$multiple.'">'."\n";
foreach (@sections) {	foreach my $sec (@sections) {
$output .= '<option value="'.$_.'">'.$_."</option>\n";	$output .= '<option value="'.$sec.'">'.$sec."</option>\n";
}	}
}	}
$output .= '</select>';	$output .= '</select>';
Line 1884 sub course_level_dc {	Line 1855 sub course_level_dc {
'<input type="hidden" name="dccourse" value="" />';	'<input type="hidden" name="dccourse" value="" />';
my $courseform='<b>'.&Apache::loncommon::selectcourse_link	my $courseform='<b>'.&Apache::loncommon::selectcourse_link
('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').'</b>';	('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').'</b>';
my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom);	my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu');
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'typ' => "Type",
'rol' => "Role",	'rol' => "Role",
'grs' => "Section",	'grs' => "Section",
'exs' => "Existing sections",	'exs' => "Existing sections",
Line 1897 sub course_level_dc {	Line 1867 sub course_level_dc {
'sed' => "Set End Date"	'sed' => "Set End Date"
);	);
my $header = '<h4>'.&mt('Course Level').'</h4>'.	my $header = '<h4>'.&mt('Course Level').'</h4>'.
'<table border="2"><tr><th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th></tr>';	&Apache::loncommon::start_data_table().
my $otheritems = '<tr><td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',".')" /></td>'."\n".	&Apache::loncommon::start_data_table_header_row().
	'<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
	&Apache::loncommon::end_data_table_header_row();
	my $otheritems = &Apache::loncommon::start_data_table_row()."\n".
	'<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
'<td><select name="role">'."\n";	'<td><select name="role">'."\n";
foreach ('st','ta','ep','in','cc') {	foreach my $role ('st','ta','ep','in','cc') {
my $plrole=&Apache::lonnet::plaintext($_);	my $plrole=&Apache::lonnet::plaintext($role);
$otheritems .= ' <option value="'.$_.'">'.$plrole;	$otheritems .= ' <option value="'.$role.'">'.$plrole;
}	}
if ( keys %customroles > 0) {	if ( keys %customroles > 0) {
foreach (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'}.'_'.$_;	'_'.$env{'user.name'}.'_'.$cust;
$otheritems .= ' <option value="'.$custrole.'">'.$_;	$otheritems .= ' <option value="'.$custrole.'">'.$cust;
}	}
}	}
$otheritems .= '</select></td><td>'.	$otheritems .= '</select></td><td>'.
Line 1928 sub course_level_dc {	Line 1902 sub course_level_dc {
<a href=	<a href=
"javascript:pjump('date_end','End Date',document.cu.end.value,'end','cu.pres','dateset')">$lt{'sed'}</a></td>	"javascript:pjump('date_end','End Date',document.cu.end.value,'end','cu.pres','dateset')">$lt{'sed'}</a></td>
ENDTIMEENTRY	ENDTIMEENTRY
$otheritems .= "</tr></table>\n";	$otheritems .= &Apache::loncommon::end_data_table_row().
	&Apache::loncommon::end_data_table()."\n";
return $cb_jscript.$header.$hiddenitems.$otheritems;	return $cb_jscript.$header.$hiddenitems.$otheritems;
}	}

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

Removed from v.1.125.2.2
changed lines
	Added in v.1.145