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.311 and 1.328

version 1.311, 2009/08/28 00:02:37	version 1.328, 2009/11/23 13:03:58
Line 51 In LON-CAPA, roles are actually collecti	Line 51 In LON-CAPA, roles are actually collecti
Assistant", "Course Coordinator", and other such roles are really just	Assistant", "Course Coordinator", and other such roles are really just
collection of privileges that are useful in many circumstances.	collection of privileges that are useful in many circumstances.

Creating custom roles can be done by the Domain Coordinator through	Custom roles can be defined by a Domain Coordinator, Course Coordinator
the Create User functionality. That screen will show all privileges	or Community Coordinator via the Manage User functionality.
that can be assigned to users. For a complete list of privileges,	The custom role editor screen will show all privileges which can be
please see C</home/httpd/lonTabs/rolesplain.tab>.	assigned to users. For a complete list of privileges, please see
	C</home/httpd/lonTabs/rolesplain.tab>.

Custom role definitions are stored in the C<roles.db> file of the role	Custom role definitions are stored in the C<roles.db> file of the creator
author.	of the role.

=cut	=cut

Line 261 sub build_tools_display {	Line 262 sub build_tools_display {
}	}
if ($context eq 'requestcourses') {	if ($context eq 'requestcourses') {
if ($userenv{$context.'.'.$item} eq '') {	if ($userenv{$context.'.'.$item} eq '') {
$custom_access = &mt('Currently from default setting.');	$custom_access = &mt('Currently from default setting.');
} else {	} else {
$custom_access = &mt('Currently from custom setting.');	$custom_access = &mt('Currently from custom setting.');
}	}
} else {	} else {
if ($userenv{$context.'.'.$item} eq '') {	if ($userenv{$context.'.'.$item} eq '') {
$custom_access =	$custom_access =
&mt('Availability determined currently from default setting.');	&mt('Availability determined currently from default setting.');
if (!$curr_access) {	if (!$curr_access) {
$tool_off = 'checked="checked" ';	$tool_off = 'checked="checked" ';
$tool_on = '';	$tool_on = '';
}	}
} else {	} else {
$custom_access =	$custom_access =
&mt('Availability determined currently from custom setting.');	&mt('Availability determined currently from custom setting.');
if ($userenv{$context.'.'.$item} == 0) {	if ($userenv{$context.'.'.$item} == 0) {
$tool_off = 'checked="checked" ';	$tool_off = 'checked="checked" ';
Line 294 sub build_tools_display {	Line 295 sub build_tools_display {
}	}
if ($curroption =~ /^autolimit=(\d*)$/) {	if ($curroption =~ /^autolimit=(\d*)$/) {
$currlimit = $1;	$currlimit = $1;
$currdisp = &mt('Yes, up to [quant,_1,request]/user',$currlimit);	if ($currlimit eq '') {
	$currdisp = &mt('Yes, automatic creation');
	} else {
	$currdisp = &mt('Yes, up to [quant,_1,request]/user',$currlimit);
	}
} else {	} else {
$currdisp = $reqdisplay{$curroption};	$currdisp = $reqdisplay{$curroption};
}	}
Line 328 sub build_tools_display {	Line 333 sub build_tools_display {
if ($option eq 'autolimit') {	if ($option eq 'autolimit') {
$custdisp .= '<input type="text" name="crsreq_'.	$custdisp .= '<input type="text" name="crsreq_'.
$item.'_limit" size="1" '.	$item.'_limit" size="1" '.
'value="'.$currlimit.'" />';	'value="'.$currlimit.'" /></span><br />'.
	$reqtitles{'unlimited'};
	} else {
	$custdisp .= '</span>';
}	}
$custdisp .= '</span></td></tr>';	$custdisp .= '</td></tr>';
}	}
$custdisp .= '</table>';	$custdisp .= '</table>';
$custradio = '</span></td><td>'.&mt('Custom setting').'<br />'.$custdisp;	$custradio = '</span></td><td>'.&mt('Custom setting').'<br />'.$custdisp;
} else {	} else {
$currdisp = ($curr_access?&mt('Yes'):&mt('No'));	$currdisp = ($curr_access?&mt('Yes'):&mt('No'));
$custdisp = '<span class="LC_nobreak"><label>'.	$custdisp = '<span class="LC_nobreak"><label>'.
'<input type="radio" name="'.$context.'_'.$item.'"'.	'<input type="radio" name="'.$context.'_'.$item.'"'.
' value="1"'. $tool_on.'/>'.&mt('On').'</label> <label>'.	' value="1"'. $tool_on.'/>'.&mt('On').'</label> <label>'.
'<input type="radio" name="'.$context.'_'.$item.'" value="0" '.	'<input type="radio" name="'.$context.'_'.$item.'" value="0" '.
$tool_off.'/>'.&mt('Off').'</label></span>';	$tool_off.'/>'.&mt('Off').'</label></span>';
Line 380 sub coursereq_externaluser {	Line 388 sub coursereq_externaluser {
my ($curroption,$currlimit,$tooloff);	my ($curroption,$currlimit,$tooloff);
if ($userenv{'reqcrsotherdom.'.$item} ne '') {	if ($userenv{'reqcrsotherdom.'.$item} ne '') {
my @curr = split(',',$userenv{'reqcrsotherdom.'.$item});	my @curr = split(',',$userenv{'reqcrsotherdom.'.$item});
if (grep(/^\Q$cdom\E:($optregex)=?(\d*)$/,@curr)) {	foreach my $req (@curr) {
$curroption = $1;	if ($req =~ /^\Q$cdom\E\:($optregex)=?(\d*)$/) {
$currlimit = $2;	$curroption = $1;
if (!$curroption) {	$currlimit = $2;
$curroption = 'norequest';	last;
}	}
}	}
	if (!$curroption) {
	$curroption = 'norequest';
	$tooloff = ' checked="checked"';
	}
} else {	} else {
$curroption = 'norequest';	$curroption = 'norequest';
$tooloff = ' checked="checked"';	$tooloff = ' checked="checked"';
}	}
$output.= &Apache::loncommon::start_data_table_row()."\n".	$output.= &Apache::loncommon::start_data_table_row()."\n".
' <td><span class="LC_nobreak">'.$lt{$item}.': '.	' <td><span class="LC_nobreak">'.$lt{$item}.': </span></td><td>'.
	'<table><tr><td valign="top">'."\n".
'<label><input type="radio" name="reqcrsotherdom_'.$item.	'<label><input type="radio" name="reqcrsotherdom_'.$item.
'" value="0"'.$tooloff.' />'.$reqtitles{'norequest'}.	'" value=""'.$tooloff.' />'.$reqtitles{'norequest'}.
'</label> ';	'</label></td>';
foreach my $option (@options) {	foreach my $option (@options) {
if ($option eq 'validate') {	if ($option eq 'validate') {
my $canvalidate = 0;	my $canvalidate = 0;
Line 410 sub coursereq_externaluser {	Line 423 sub coursereq_externaluser {
if ($option eq $curroption) {	if ($option eq $curroption) {
$checked = ' checked="checked"';	$checked = ' checked="checked"';
}	}
$output .= '<span class="LC_nobreak"><label>'.	$output .= '<td valign="top"><span class="LC_nobreak"><label>'.
'<input type="radio" name="reqcrsotherdom_'.$item.	'<input type="radio" name="reqcrsotherdom_'.$item.
'" value="'.$option.'"'.$checked.' />'.	'" value="'.$option.'"'.$checked.' />'.
$reqtitles{$option}.'</label> ';	$reqtitles{$option}.'</label>';
if ($option eq 'autolimit') {	if ($option eq 'autolimit') {
$output .= '<input type="text" name="reqcrsotherdom_'.	$output .= ' <input type="text" name="reqcrsotherdom_'.
$item.'_limit" size="1" '.	$item.'_limit" size="1" '.
'value="'.$currlimit.'" />';	'value="'.$currlimit.'" /></span>'.
	'<br />'.$reqtitles{'unlimited'};
	} else {
	$output .= '</span>';
}	}
$output .= ' '	$output .= '</td>';
}	}
$output .= '</span></td>'."\n".	$output .= '</td></tr></table></td>'."\n".
&Apache::loncommon::end_data_table_row()."\n";	&Apache::loncommon::end_data_table_row()."\n";
}	}
return $output;	return $output;
Line 436 sub courserequest_titles {	Line 452 sub courserequest_titles {
approval => 'Approval by Dom. Coord.',	approval => 'Approval by Dom. Coord.',
validate => 'With validation',	validate => 'With validation',
autolimit => 'Numerical limit',	autolimit => 'Numerical limit',
	unlimited => '(blank for unlimited)',
);	);
return %titles;	return %titles;
}	}
Line 452 sub courserequest_display {	Line 469 sub courserequest_display {
# =================================================================== Phase one	# =================================================================== Phase one

sub print_username_entry_form {	sub print_username_entry_form {
my ($r,$context,$response,$srch,$forcenewuser) = @_;	my ($r,$context,$response,$srch,$forcenewuser,$crstype) = @_;
my $defdom=$env{'request.role.domain'};	my $defdom=$env{'request.role.domain'};
my $formtoset = 'crtuser';	my $formtoset = 'crtuser';
if (exists($env{'form.startrolename'})) {	if (exists($env{'form.startrolename'})) {
Line 471 sub print_username_entry_form {	Line 488 sub print_username_entry_form {
'// ]]>'."\n".	'// ]]>'."\n".
'</script>'."\n";	'</script>'."\n";

	my %existingroles=&Apache::lonuserutils::my_custom_roles($crstype);
	if (($env{'form.action'} eq 'custom') && (keys(%existingroles) > 0)
	&& (&Apache::lonnet::allowed('mcr','/'))) {
	$jscript .= &customrole_javascript();
	}
my %loaditems = (	my %loaditems = (
'onload' => "javascript:setFormElements(document.$formtoset)",	'onload' => "javascript:setFormElements(document.$formtoset)",
);	);
my %breadcrumb_text = &singleuser_breadcrumb();	my %breadcrumb_text = &singleuser_breadcrumb($crstype);
my $start_page =	my $start_page =
&Apache::loncommon::start_page('User Management',	&Apache::loncommon::start_page('User Management',
$jscript,{'add_entries' => \%loaditems,});	$jscript,{'add_entries' => \%loaditems,});
Line 496 sub print_username_entry_form {	Line 518 sub print_username_entry_form {
}	}
my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management',	my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management',
$helpitem);	$helpitem);
my %existingroles=&Apache::lonuserutils::my_custom_roles();
my $choice=&Apache::loncommon::select_form('make new role','rolename',
('make new role' => 'Generate new role ...',%existingroles));
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'srst' => 'Search for a user and enroll as a student',	'srst' => 'Search for a user and enroll as a student',
	'srme' => 'Search for a user and enroll as a member',
'srad' => 'Search for a user and modify/add user information or roles',	'srad' => 'Search for a user and modify/add user information or roles',
'usr' => "Username",	'usr' => "Username",
'dom' => "Domain",	'dom' => "Domain",
'ecrp' => "Edit Custom Role Privileges",	'ecrp' => "Define or Edit Custom Role",
'nr' => "Name of Role",	'nr' => "role name",
'cre' => "Next",	'cre' => "Next",
);	);
$r->print($start_page."\n".$crumbs);	$r->print($start_page."\n".$crumbs);
if ($env{'form.action'} eq 'custom') {	if ($env{'form.action'} eq 'custom') {
if (&Apache::lonnet::allowed('mcr','/')) {	if (&Apache::lonnet::allowed('mcr','/')) {
$r->print(<<ENDCUSTOM);	my $newroletext = &mt('Define new custom role:');
<form action="/adm/createuser" method="post" name="docustom">	$r->print('<form action="/adm/createuser" method="post" name="docustom">'.
<input type="hidden" name="action" value="$env{'form.action'}" />	'<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.
<input type="hidden" name="phase" value="selected_custom_edit" />	'<input type="hidden" name="phase" value="selected_custom_edit" />'.
<h3>$lt{'ecrp'}</h3>	'<h3>'.$lt{'ecrp'}.'</h3>'.
$choice $lt{'nr'}: <input type="text" size="15" name="newrolename" /><br />	&Apache::loncommon::start_data_table().
<input name="customeditor" type="submit" value="$lt{'cre'}" />	&Apache::loncommon::start_data_table_row().
</form>	'<td>');
ENDCUSTOM	if (keys(%existingroles) > 0) {
	$r->print('<br /><label><input type="radio" name="customroleaction" value="new" checked="checked" onclick="setCustomFields();" /><b>'.$newroletext.'</b></label>');
	} else {
	$r->print('<br /><input type="hidden" name="customroleaction" value="new" /><b>'.$newroletext.'</b>');
	}
	$r->print('</td><td align="center">'.$lt{'nr'}.'<br /><input type="text" size="15" name="newrolename" onfocus="setCustomAction('."'new'".');" /></td>'.
	&Apache::loncommon::end_data_table_row());
	if (keys(%existingroles) > 0) {
	$r->print(&Apache::loncommon::start_data_table_row().'<td><br />'.
	'<label><input type="radio" name="customroleaction" value="edit" onclick="setCustomFields();"/><b>'.
	&mt('View/Modify existing role:').'</b></label></td>'.
	'<td align="center"><br />'.
	'<select name="rolename" onchange="setCustomAction('."'edit'".');">'.
	'<option value="" selected="selected">'.
	&mt('Select'));
	foreach my $role (sort(keys(%existingroles))) {
	$r->print('<option value="'.$role.'">'.$role.'</option>');
	}
	$r->print('</select>'.
	'</td>'.
	&Apache::loncommon::end_data_table_row());
	}
	$r->print(&Apache::loncommon::end_data_table().'<p>'.
	'<input name="customeditor" type="submit" value="'.
	$lt{'cre'}.'" /></p>'.
	'</form>');
}	}
} else {	} else {
my $actiontext = $lt{'srad'};	my $actiontext = $lt{'srad'};
if ($env{'form.action'} eq 'singlestudent') {	if ($env{'form.action'} eq 'singlestudent') {
$actiontext = $lt{'srst'};	if ($crstype eq 'Community') {
	$actiontext = $lt{'srme'};
	} else {
	$actiontext = $lt{'srst'};
	}
}	}
$r->print("	$r->print("<h3>$actiontext</h3>");
<h3>$actiontext</h3>");
if ($env{'form.origform'} ne 'crtusername') {	if ($env{'form.origform'} ne 'crtusername') {
$r->print("\n".$response);	$r->print("\n".$response);
}	}
$r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response));	$r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype));
}	}
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
}	}

	sub customrole_javascript {
	my $js = <<"END";
	<script type="text/javascript">
	// <![CDATA[

	function setCustomFields() {
	if (document.docustom.customroleaction.length > 0) {
	for (var i=0; i<document.docustom.customroleaction.length; i++) {
	if (document.docustom.customroleaction[i].checked) {
	if (document.docustom.customroleaction[i].value == 'new') {
	document.docustom.rolename.selectedIndex = 0;
	} else {
	document.docustom.newrolename.value = '';
	}
	}
	}
	}
	return;
	}

	function setCustomAction(caller) {
	if (document.docustom.customroleaction.length > 0) {
	for (var i=0; i<document.docustom.customroleaction.length; i++) {
	if (document.docustom.customroleaction[i].value == caller) {
	document.docustom.customroleaction[i].checked = true;
	}
	}
	}
	setCustomFields();
	return;
	}

	// ]]>
	</script>
	END
	return $js;
	}

sub entry_form {	sub entry_form {
my ($dom,$srch,$forcenewuser,$context,$responsemsg) = @_;	my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype) = @_;
my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);	my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
my ($usertype,$inexact);	my ($usertype,$inexact);
if (ref($srch) eq 'HASH') {	if (ref($srch) eq 'HASH') {
Line 577 ENDBLOCK	Line 663 ENDBLOCK
my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');	my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'enro' => 'Enroll one student',	'enro' => 'Enroll one student',
	'enrm' => 'Enroll one member',
'admo' => 'Add/modify a single user',	'admo' => 'Add/modify a single user',
'crea' => 'create new user if required',	'crea' => 'create new user if required',
'uskn' => "username is known",	'uskn' => "username is known",
Line 588 ENDBLOCK	Line 675 ENDBLOCK
);	);
my $sellink=&Apache::loncommon::selectstudent_link('crtusername','srchterm','srchdomain');	my $sellink=&Apache::loncommon::selectstudent_link('crtusername','srchterm','srchdomain');
my ($title,$buttontext,$showresponse);	my ($title,$buttontext,$showresponse);
if ($env{'form.action'} eq 'singlestudent') {	if ($env{'form.action'} eq 'singlestudent') {
$title = $lt{'enro'};	if ($crstype eq 'Community') {
	$title = $lt{'enrm'};
	} else {
	$title = $lt{'enro'};
	}
$buttontext = $lt{'enrl'};	$buttontext = $lt{'enrl'};
} else {	} else {
$title = $lt{'admo'};	$title = $lt{'admo'};
Line 636 sub user_modification_js {	Line 727 sub user_modification_js {
return <<END;	return <<END;
<script type="text/javascript" language="Javascript">	<script type="text/javascript" language="Javascript">
// <![CDATA[	// <![CDATA[

function pclose() {	function pclose() {
parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",	parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
"height=350,width=350,scrollbars=no,menubar=no");	"height=350,width=350,scrollbars=no,menubar=no");
Line 659 END	Line 751 END

# =================================================================== Phase two	# =================================================================== Phase two
sub print_user_selection_page {	sub print_user_selection_page {
my ($r,$response,$srch,$srch_results,$srcharray,$context,$opener_elements) = @_;	my ($r,$response,$srch,$srch_results,$srcharray,$context,$opener_elements,$crstype) = @_;
my @fields = ('username','domain','lastname','firstname','permanentemail');	my @fields = ('username','domain','lastname','firstname','permanentemail');
my $sortby = $env{'form.sortby'};	my $sortby = $env{'form.sortby'};

Line 687 ENDSCRIPT	Line 779 ENDSCRIPT
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'usrch' => "User Search to add/modify roles",	'usrch' => "User Search to add/modify roles",
'stusrch' => "User Search to enroll student",	'stusrch' => "User Search to enroll student",
	'memsrch' => "User Search to enroll member",
'usel' => "Select a user to add/modify roles",	'usel' => "Select a user to add/modify roles",
'stusel' => "Select a user to enroll as a student",	'stusel' => "Select a user to enroll as a student",
	'memsel' => "Select a user to enroll as a member",
'username' => "username",	'username' => "username",
'domain' => "domain",	'domain' => "domain",
'lastname' => "last name",	'lastname' => "last name",
Line 700 ENDSCRIPT	Line 794 ENDSCRIPT
} else {	} else {
$r->print(&Apache::loncommon::start_page('User Management',$jscript));	$r->print(&Apache::loncommon::start_page('User Management',$jscript));

my %breadcrumb_text = &singleuser_breadcrumb();	my %breadcrumb_text = &singleuser_breadcrumb($crstype);
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage(document.usersrchform,'','')",	({href=>"javascript:backPage(document.usersrchform,'','')",
text=>$breadcrumb_text{'search'},	text=>$breadcrumb_text{'search'},
Line 712 ENDSCRIPT	Line 806 ENDSCRIPT
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',	$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
'Course_Change_Privileges'));	'Course_Change_Privileges'));
$r->print("<b>$lt{'usrch'}</b><br />");	$r->print("<b>$lt{'usrch'}</b><br />");
$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));	$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,$crstype));
$r->print('<h3>'.$lt{'usel'}.'</h3>');	$r->print('<h3>'.$lt{'usel'}.'</h3>');
} elsif ($env{'form.action'} eq 'singlestudent') {	} elsif ($env{'form.action'} eq 'singlestudent') {
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',	$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
'Course_Add_Student'));	'Course_Add_Student'));
$r->print($jscript."<b>$lt{'stusrch'}</b><br />");	$r->print($jscript."<b>");
$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));	if ($crstype eq 'Community') {
$r->print('</form><h3>'.$lt{'stusel'}.'</h3>');	$r->print($lt{'memsrch'});
	} else {
	$r->print($lt{'stusrch'});
	}
	$r->print("</b><br />");
	$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,$crstype));
	$r->print('</form><h3>');
	if ($crstype eq 'Community') {
	$r->print($lt{'memsel'});
	} else {
	$r->print($lt{'stusel'});
	}
	$r->print('</h3>');
}	}
}	}
$r->print('<form name="usersrchform" method="post">'.	$r->print('<form name="usersrchform" method="post">'.
Line 747 ENDSCRIPT	Line 853 ENDSCRIPT
my ($uname,$udom) = split(/:/,$user);	my ($uname,$udom) = split(/:/,$user);
my $onclick;	my $onclick;
if ($context eq 'requestcrs') {	if ($context eq 'requestcrs') {
$onclick =	$onclick =
'onclick="javascript:gochoose('."'$uname','$udom',".	'onclick="javascript:gochoose('."'$uname','$udom',".
"'$srch_results->{$user}->{firstname}',".	"'$srch_results->{$user}->{firstname}',".
"'$srch_results->{$user}->{lastname}',".	"'$srch_results->{$user}->{lastname}',".
"'$srch_results->{$user}->{permanentemail}'".');"';	"'$srch_results->{$user}->{permanentemail}'".');"';
} else {	} else {
$onclick =	$onclick =
' onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".');"';	' onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".');"';
}	}
$r->print(&Apache::loncommon::start_data_table_row().	$r->print(&Apache::loncommon::start_data_table_row().
Line 794 sub print_user_query_page {	Line 900 sub print_user_query_page {
}	}

sub print_user_modification_page {	sub print_user_modification_page {
my ($r,$ccuname,$ccdomain,$srch,$response,$context,$permission) = @_;	my ($r,$ccuname,$ccdomain,$srch,$response,$context,$permission,$crstype) = @_;
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'} = '';
&print_username_entry_form($r,$context,$usermsg);	&print_username_entry_form($r,$context,$usermsg,'','',$crstype);
return;	return;
}	}
my ($form,$formname);	my ($form,$formname);
Line 839 sub print_user_modification_page {	Line 945 sub print_user_modification_page {
,'<a href="'.$helplink.'">','</a>')	,'<a href="'.$helplink.'">','</a>')
.'</p><br />';	.'</p><br />';
$env{'form.phase'} = '';	$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response);	&print_username_entry_form($r,$context,$response,undef,undef,$crstype);
return;	return;
}	}
$newuser = 1;	$newuser = 1;
Line 863 sub print_user_modification_page {	Line 969 sub print_user_modification_page {
'username');	'username');
}	}
$env{'form.phase'} = '';	$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$userchkmsg);	&print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype);
return;	return;
}	}
}	}
Line 890 sub print_user_modification_page {	Line 996 sub print_user_modification_page {
}	}
my $start_page =	my $start_page =
&Apache::loncommon::start_page('User Management',$js,$args);	&Apache::loncommon::start_page('User Management',$js,$args);
my %breadcrumb_text = &singleuser_breadcrumb();	my %breadcrumb_text = &singleuser_breadcrumb($crstype);
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage($form)",	({href=>"javascript:backPage($form)",
text=>$breadcrumb_text{'search'},	text=>$breadcrumb_text{'search'},
Line 939 ENDFORMINFO	Line 1045 ENDFORMINFO
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'cnu' => 'Create New User',	'cnu' => 'Create New User',
'ast' => 'as a student',	'ast' => 'as a student',
	'ame' => 'as a member',
'ind' => 'in domain',	'ind' => 'in domain',
'lg' => 'Login Data',	'lg' => 'Login Data',
'hs' => "Home Server",	'hs' => "Home Server",
Line 957 $loginscript	Line 1064 $loginscript
<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain	<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain
ENDTITLE	ENDTITLE
if ($env{'form.action'} eq 'singlestudent') {	if ($env{'form.action'} eq 'singlestudent') {
$r->print(' ('.$lt{'ast'}.')');	if ($crstype eq 'Community') {
	$r->print(' ('.$lt{'ame'}.')');
	} else {
	$r->print(' ('.$lt{'ast'}.')');
	}
}	}
$r->print('</h2>'."\n".'<div class="LC_left_float">');	$r->print('</h2>'."\n".'<div class="LC_left_float">');
my $personal_table =	my $personal_table =
&personal_data_display($ccuname,$ccdomain,$newuser,$context,	&personal_data_display($ccuname,$ccdomain,$newuser,$context,
$inst_results{$ccuname.':'.$ccdomain});	$inst_results{$ccuname.':'.$ccdomain});
$r->print($personal_table);	$r->print($personal_table);
#FIXME
my ($home_server_pick,$numlib) =	my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($ccdomain,'hserver',	&Apache::loncommon::home_server_form_item($ccdomain,'hserver',
'default','hide');	'default','hide');
Line 977 $lt{'hs'}: $home_server_pick	Line 1087 $lt{'hs'}: $home_server_pick
$r->print($home_server_pick);	$r->print($home_server_pick);
}	}
if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {	if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
$r->print('<br /><h3>'.&mt('User Can Request Creation of Courses in this Domain?').'</h3>'.	$r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
&Apache::loncommon::start_data_table().	&Apache::loncommon::start_data_table().
&build_tools_display($ccuname,$ccdomain,	&build_tools_display($ccuname,$ccdomain,
'requestcourses').	'requestcourses').
Line 1051 ENDAUTH	Line 1161 ENDAUTH
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'cup' => "Modify existing user: ",	'cup' => "Modify existing user: ",
'ens' => "Enroll one student: ",	'ens' => "Enroll one student: ",
	'enm' => "Enroll one member: ",
'id' => "in domain",	'id' => "in domain",
);	);
$r->print(<<ENDCHANGEUSER);	$r->print(<<ENDCHANGEUSER);
Line 1060 $forminfo	Line 1171 $forminfo
<h2>	<h2>
ENDCHANGEUSER	ENDCHANGEUSER
if ($env{'form.action'} eq 'singlestudent') {	if ($env{'form.action'} eq 'singlestudent') {
$r->print($lt{'ens'});	if ($crstype eq 'Community') {
	$r->print($lt{'enm'});
	} else {
	$r->print($lt{'ens'});
	}
} else {	} else {
$r->print($lt{'cup'});	$r->print($lt{'cup'});
}	}
Line 1074 ENDCHANGEUSER	Line 1189 ENDCHANGEUSER
$r->print(&Apache::lonuserutils::forceid_change($context));	$r->print(&Apache::lonuserutils::forceid_change($context));
}	}
if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {	if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
$r->print('<h3>'.&mt('User Can Request Creation of Courses in this Domain?').'</h3>'.	$r->print('<h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
&Apache::loncommon::start_data_table());	&Apache::loncommon::start_data_table());
if ($env{'request.role.domain'} eq $ccdomain) {	if ($env{'request.role.domain'} eq $ccdomain) {
$r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));	$r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
} else {	} else {
$r->print(&coursereq_externaluser($ccuname,$ccdomain,	$r->print(&coursereq_externaluser($ccuname,$ccdomain,
Line 1158 ENDNOTOOLSPRIV	Line 1273 ENDNOTOOLSPRIV
} ## End of new user/old user logic	} ## End of new user/old user logic

if ($env{'form.action'} eq 'singlestudent') {	if ($env{'form.action'} eq 'singlestudent') {
$r->print('<br /><input type="button" value="'.&mt('Enroll Student').'" onclick="setSections(this.form)" />'."\n");	my $btntxt;
	if ($crstype eq 'Community') {
	$btntxt = &mt('Enroll Member');
	} else {
	$btntxt = &mt('Enroll Student');
	}
	$r->print('<br /><input type="button" value="'.$btntxt.'" onclick="setSections(this.form)" />'."\n");
} else {	} else {
$r->print('<h3>'.&mt('Add Roles').'</h3>');	$r->print('<h3>'.&mt('Add Roles').'</h3>');
my $addrolesdisplay = 0;	my $addrolesdisplay = 0;
Line 1197 ENDNOTOOLSPRIV	Line 1318 ENDNOTOOLSPRIV
}	}

sub singleuser_breadcrumb {	sub singleuser_breadcrumb {
	my ($crstype) = @_;
my %breadcrumb_text;	my %breadcrumb_text;
if ($env{'form.action'} eq 'singlestudent') {	if ($env{'form.action'} eq 'singlestudent') {
$breadcrumb_text{'search'} = 'Enroll a student';	if ($crstype eq 'Community') {
	$breadcrumb_text{'search'} = 'Enroll a member';
	} else {
	$breadcrumb_text{'search'} = 'Enroll a student';
	}
$breadcrumb_text{'userpicked'} = 'Select a user',	$breadcrumb_text{'userpicked'} = 'Select a user',
$breadcrumb_text{'modify'} = 'Set section/dates',	$breadcrumb_text{'modify'} = 'Set section/dates',
} else {	} else {
Line 1414 sub display_existing_roles {	Line 1540 sub display_existing_roles {
}	}
$row.= '</td><td>'.$plaintext.	$row.= '</td><td>'.$plaintext.
'</td><td>'.$area.	'</td><td>'.$area.
'</td><td>'.($role_start_time?localtime($role_start_time)	'</td><td>'.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time)
: ' ' ).	: ' ' ).
'</td><td>'.($role_end_time ?localtime($role_end_time)	'</td><td>'.($role_end_time ?&Apache::lonlocal::locallocaltime($role_end_time)
: ' ' )	: ' ' )
."</td>";	."</td>";
$sortrole{$sortkey}=$envkey;	$sortrole{$sortkey}=$envkey;
Line 1427 sub display_existing_roles {	Line 1553 sub display_existing_roles {
} # end of foreach (table building loop)	} # end of foreach (table building loop)
my $rolesdisplay = 0;	my $rolesdisplay = 0;
my %output = ();	my %output = ();
foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {	foreach my $type ('Construction 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 1447 sub display_existing_roles {	Line 1573 sub display_existing_roles {
if ($rolesdisplay == 1) {	if ($rolesdisplay == 1) {
my $contextrole='';	my $contextrole='';
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
$contextrole = 'Existing Roles in this Course';	my $crstype = &Apache::loncommon::course_type();
	$contextrole = "Existing Roles in this $crstype";
} elsif ($env{'request.role'} =~ /^au\./) {	} elsif ($env{'request.role'} =~ /^au\./) {
$contextrole = 'Existing Co-Author Roles in your Construction Space';	$contextrole = 'Existing Co-Author Roles in your Construction Space';
} else {	} else {
Line 1462 sub display_existing_roles {	Line 1589 sub display_existing_roles {
'</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','Group','Domain','System','Unknown') {	foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') {
if ($output{$type}) {	if ($output{$type}) {
$r->print($output{$type}."\n");	$r->print($output{$type}."\n");
}	}
Line 1559 sub new_domain_roles {	Line 1686 sub new_domain_roles {
&mt('Extent').'</th>'.	&mt('Extent').'</th>'.
'<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'.	'<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'.
&Apache::loncommon::end_data_table_header_row();	&Apache::loncommon::end_data_table_header_row();
	my @allroles = &Apache::lonuserutils::roles_by_context('domain');
foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) {	foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) {
foreach my $role ('dc','li','dg','au','sc') {	foreach my $role (@allroles) {
	next if ($role eq 'ad');
if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) {	if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) {
my $plrole=&Apache::lonnet::plaintext($role);	my $plrole=&Apache::lonnet::plaintext($role);
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
Line 1955 sub get_inststatuses {	Line 2084 sub get_inststatuses {

# ================================================================= Phase Three	# ================================================================= Phase Three
sub update_user_data {	sub update_user_data {
my ($r,$context) = @_;	my ($r,$context,$crstype) = @_;
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 1979 sub update_user_data {	Line 2108 sub update_user_data {
$jsback."\n".	$jsback."\n".
'// ]]>'."\n".	'// ]]>'."\n".
'</script>'."\n";	'</script>'."\n";
my %breadcrumb_text = &singleuser_breadcrumb();	my %breadcrumb_text = &singleuser_breadcrumb($crstype);
my $args;	my $args;
if ($env{'form.popup'}) {	if ($env{'form.popup'}) {
$args->{'no_nav_bar'} = 1;	$args->{'no_nav_bar'} = 1;
Line 2211 sub update_user_data {	Line 2340 sub update_user_data {
}	}
}	}
##	##
my (@userroles,%userupdate,$cnum,$cdom,$namechanged);	my (@userroles,%userupdate,$cnum,$cdom,$crstype,$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);
}	}
if (! $env{'form.makeuser'} ) {	if (! $env{'form.makeuser'} ) {
# Check for need to change	# Check for need to change
Line 2297 sub update_user_data {	Line 2427 sub update_user_data {
if ($role eq 'cr') {	if ($role eq 'cr') {
push(@longroles,'Custom');	push(@longroles,'Custom');
} else {	} else {
push(@longroles,&Apache::lonnet::plaintext($role));	push(@longroles,&Apache::lonnet::plaintext($role,$crstype));
}	}
}	}
my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');	my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
Line 2451 sub update_user_data {	Line 2581 sub update_user_data {
\%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext);	\%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext);
} else {	} else {
&tool_changes('reqcrsotherdom',\@requestcourses,\%oldaccess,\%oldaccesstext,	&tool_changes('reqcrsotherdom',\@requestcourses,\%oldaccess,\%oldaccesstext,
\%userenv,	\%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext);
\%changeHash,\%changed,\%newaccess,\%newaccesstext);
}	}
if ($env{'form.cfirstname'} ne $userenv{'firstname'} \|\|	if ($env{'form.cfirstname'} ne $userenv{'firstname'} \|\|
$env{'form.cmiddlename'} ne $userenv{'middlename'} \|\|	$env{'form.cmiddlename'} ne $userenv{'middlename'} \|\|
Line 2767 END	Line 2896 END
.'</span>');	.'</span>');
}	}
if ($env{'form.action'} eq 'singlestudent') {	if ($env{'form.action'} eq 'singlestudent') {
&enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context);	&enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context,$crstype);
$r->print('<p><a href="javascript:backPage(document.userupdate)">'.	$r->print('<p><a href="javascript:backPage(document.userupdate)">');
&mt('Enroll Another Student').'</a></p>');	if ($crstype eq 'Community') {
	$r->print(&mt('Enroll Another Member'));
	} else {
	$r->print(&mt('Enroll Another Student'));
	}
	$r->print('</a></p>');
} else {	} else {
my @rolechanges = &update_roles($r,$context);	my @rolechanges = &update_roles($r,$context);
if ($namechanged) {	if ($namechanged) {
Line 2816 sub tool_changes {	Line 2950 sub tool_changes {
my %reqdisplay = &courserequest_display();	my %reqdisplay = &courserequest_display();
my $cdom = $env{'request.role.domain'};	my $cdom = $env{'request.role.domain'};
foreach my $tool (@{$usertools}) {	foreach my $tool (@{$usertools}) {
$oldaccesstext->{$tool} = &mt('no');	$oldaccesstext->{$tool} = &mt('No');
	$newaccesstext->{$tool} = $oldaccesstext->{$tool};
$changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool};	$changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool};
	my $newop;
	if ($env{'form.'.$context.'_'.$tool}) {
	$newop = $env{'form.'.$context.'_'.$tool};
	if ($newop eq 'autolimit') {
	my $limit = $env{'form.'.$context.'_'.$tool.'_limit'};
	$limit =~ s/\D+//g;
	$newop .= '='.$limit;
	}
	}
if ($userenv->{$context.'.'.$tool} eq '') {	if ($userenv->{$context.'.'.$tool} eq '') {
if ($env{'form.'.$context.'_'.$tool}) {	if ($newop) {
$changed->{$tool}=&tool_admin($tool,$cdom,	$changed->{$tool}=&tool_admin($tool,$cdom.':'.$newop,
$changeHash,$context);	$changeHash,$context);
if ($changed->{$tool}) {	if ($changed->{$tool}) {
$newaccesstext->{$tool} = &mt('yes');	$newaccesstext->{$tool} = &mt('Yes');
} else {	} else {
$newaccesstext->{$tool} = $oldaccesstext->{$tool};	$newaccesstext->{$tool} = $oldaccesstext->{$tool};
}	}
Line 2832 sub tool_changes {	Line 2976 sub tool_changes {
my @curr = split(',',$userenv->{$context.'.'.$tool});	my @curr = split(',',$userenv->{$context.'.'.$tool});
my @new;	my @new;
my $changedoms;	my $changedoms;
my $newop = $env{'form.'.$context.'_'.$tool};	foreach my $req (@curr) {
if ($newop eq 'autolimit') {	if ($req =~ /^\Q$cdom\E\:($optregex\=?\d*)$/) {
$newop .= '=';	$oldaccesstext->{$tool} = &mt('Yes');
unless ($env{'form.'.$context.'_'.$tool.'_limit'} =~ /\D/) {	my $oldop = $1;
$newop .= $env{'form.'.$context.'_'.$tool.'_limit'};	if ($oldop ne $newop) {
}	$changedoms = 1;
}	foreach my $item (@curr) {
if (grep(/^\Q$cdom:($optregex\=?\d*)\E$/,@curr)) {	my ($reqdom,$option) = split(':',$item);
$oldaccesstext->{$tool} = &mt('yes');	unless ($reqdom eq $cdom) {
my $oldop = $1;	push(@new,$item);
if ($oldop ne $newop) {	}
$changedoms = 1;
foreach my $dom (@curr) {
unless ($dom eq $cdom) {
push(@new,$dom);
}	}
	if ($newop) {
	push(@new,$cdom.':'.$newop);
	}
	@new = sort(@new);
}	}
if ($newop) {	last;
push(@new,$cdom.':'.$newop);
}
@new = sort(@new);
}	}
} elsif ($env{'form.'.$context.'_'.$tool}) {	}
	if ((!$changedoms) && ($newop)) {
$changedoms = 1;	$changedoms = 1;
@new = sort(@curr,$cdom.':'.$newop);	@new = sort(@curr,$cdom.':'.$newop);
}	}
$newaccesstext->{$tool} = $oldaccesstext->{$tool};
if ($changedoms) {	if ($changedoms) {
my $newdomstr;	my $newdomstr;
if (@new) {	if (@new) {
$newdomstr = join(',',@new);	$newdomstr = join(',',@new);
}	}
Line 2869 sub tool_changes {	Line 3010 sub tool_changes {
if ($changed->{$tool}) {	if ($changed->{$tool}) {
if ($env{'form.'.$context.'_'.$tool}) {	if ($env{'form.'.$context.'_'.$tool}) {
if ($env{'form.'.$context.'_'.$tool} eq 'autolimit') {	if ($env{'form.'.$context.'_'.$tool} eq 'autolimit') {
if ($env{'form.'.$context.'_'.$tool.'_limit'} =~ /\D/) {	my $limit = $env{'form.'.$context.'_'.$tool.'_limit'};
$newaccesstext->{$tool} = &mt('Yes, processed automatically');	$limit =~ s/\D+//g;
	if ($limit) {
	$newaccesstext->{$tool} = &mt('Yes, up to limit of [quant,_1,request] per user.',$limit);
} else {	} else {
$newaccesstext->{$tool} = &mt('Yes, up to limit of [quant,_1,request] per user).',$env{'form.'.$context.'_'.$tool.'_limit'});	$newaccesstext->{$tool} = &mt('Yes, processed automatically');
}	}
} else {	} else {
$newaccesstext->{$tool} = $reqdisplay{$env{'form.'.$context.'_'.$tool}};	$newaccesstext->{$tool} = $reqdisplay{$env{'form.'.$context.'_'.$tool}};
}	}
} else {	} else {
Line 2893 sub tool_changes {	Line 3036 sub tool_changes {
if ($newval eq 'autolimit') {	if ($newval eq 'autolimit') {
$newval .= '='.$env{'form.crsreq_'.$tool.'_limit'};	$newval .= '='.$env{'form.crsreq_'.$tool.'_limit'};
}	}
} else {	} else {
$newval = $env{'form.'.$context.'_'.$tool};	$newval = $env{'form.'.$context.'_'.$tool};
}	}
if ($userenv->{$context.'.'.$tool} ne '') {	if ($userenv->{$context.'.'.$tool} ne '') {
Line 3229 sub update_roles {	Line 3372 sub update_roles {
}	}

sub enroll_single_student {	sub enroll_single_student {
my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context) = @_;	my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context,$crstype) = @_;
$r->print('<h3>'.&mt('Enrolling Student').'</h3>');	$r->print('<h3>');
	if ($crstype eq 'Community') {
	$r->print(&mt('Enrolling Member'));
	} else {
	$r->print(&mt('Enrolling Student'));
	}
	$r->print('</h3>');

# Remove non alphanumeric values from section	# Remove non alphanumeric values from section
$env{'form.sections'}=~s/\W//g;	$env{'form.sections'}=~s/\W//g;
Line 3263 sub enroll_single_student {	Line 3412 sub enroll_single_student {
}	}
$r->print('.<br />'.$showstart.'; '.$showend);	$r->print('.<br />'.$showstart.'; '.$showend);
if ($startdate <= $now && !$newuser) {	if ($startdate <= $now && !$newuser) {
$r->print("<p> ".&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.')."</p>");	$r->print('<p> ');
	if ($crstype eq 'Community') {
	$r->print(&mt('If the member is currently logged-in to LON-CAPA, the new role will be available when the member next logs in.'));
	} else {
	$r->print(&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.'));
	}
	$r->print('</p>');
}	}
} else {	} else {
$r->print(&mt('unable to enroll').": ".$enroll_result);	$r->print(&mt('unable to enroll').": ".$enroll_result);
Line 3388 sub build_roles {	Line 3543 sub build_roles {

sub custom_role_editor {	sub custom_role_editor {
my ($r) = @_;	my ($r) = @_;
my $rolename=$env{'form.rolename'};	my $action = $env{'form.customroleaction'};
	my $rolename;
if ($rolename eq 'make new role') {	if ($action eq 'new') {
$rolename=$env{'form.newrolename'};	$rolename=$env{'form.newrolename'};
	} else {
	$rolename=$env{'form.rolename'};
}	}

$rolename=~s/[^A-Za-z0-9]//gs;	$rolename=~s/[^A-Za-z0-9]//gs;

if (!$rolename \|\| $env{'form.phase'} eq 'pickrole') {	if (!$rolename \|\| $env{'form.phase'} eq 'pickrole') {
&print_username_entry_form($r);	&print_username_entry_form($r);
return;	return;
}	}
	my ($crstype,$context);
	if ($env{'request.course.id'}) {
	$crstype = &Apache::loncommon::course_type();
	$context = 'course';
	} else {
	$context = 'domain';
	$crstype = $env{'form.templatecrstype'};
	}
# ------------------------------------------------------- What can be assigned?	# ------------------------------------------------------- What can be assigned?
my %full=();	my %full=();
my %courselevel=();	my %courselevel=();
Line 3408 sub custom_role_editor {	Line 3572 sub custom_role_editor {
my $dompriv='';	my $dompriv='';
my $coursepriv='';	my $coursepriv='';
my $body_top;	my $body_top;
my ($disp_dummy,$disp_roles) = &Apache::lonnet::get('roles',["st"]);
my ($rdummy,$roledef)=	my ($rdummy,$roledef)=
&Apache::lonnet::get('roles',["rolesdef_$rolename"]);	&Apache::lonnet::get('roles',["rolesdef_$rolename"]);
# ------------------------------------------------------- Does this role exist?	# ------------------------------------------------------- Does this role exist?
Line 3417 sub custom_role_editor {	Line 3580 sub custom_role_editor {
$body_top .= &mt('Existing Role').' "';	$body_top .= &mt('Existing Role').' "';
# ------------------------------------------------- Get current role privileges	# ------------------------------------------------- Get current role privileges
($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef);	($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef);
	if ($crstype eq 'Community') {
	$syspriv =~ s/bre\&S//;
	}
} else {	} else {
$body_top .= &mt('New Role').' "';	$body_top .= &mt('New Role').' "';
$roledef='';	$roledef='';
Line 3458 sub custom_role_editor {	Line 3624 sub custom_role_editor {
my $head_script = "\n";	my $head_script = "\n";
$head_script .= '<script type="text/javascript">'."\n"	$head_script .= '<script type="text/javascript">'."\n"
.'// <![CDATA['."\n";	.'// <![CDATA['."\n";
my @template_roles = ("cc","in","ta","ep","st");	my @template_roles = ("in","ta","ep");
	if ($context eq 'domain') {
	push(@template_roles,"ad");
	}
	push(@template_roles,"st");
	if ($crstype eq 'Community') {
	unshift(@template_roles,'co');
	} else {
	unshift(@template_roles,'cc');
	}
foreach my $role (@template_roles) {	foreach my $role (@template_roles) {
$head_script .= &make_script_template($role);	$head_script .= &make_script_template($role,$crstype);
$button_code .= &make_button_code($role).' ';	$button_code .= &make_button_code($role,$crstype).' ';
}	}
	my $context_code;
	if ($context eq 'domain') {
	my $checkedCommunity = '';
	my $checkedCourse = ' checked="checked"';
	if ($env{'form.templatecrstype'} eq 'Community') {
	$checkedCommunity = $checkedCourse;
	$checkedCourse = '';
	}
	$context_code = '<label>'.
	'<input type="radio" name="templatecrstype" value="Course"'.$checkedCourse.' onclick="this.form.submit();">'.
	&mt('Course').
	'</label>'.(' ' x2).
	'<label>'.
	'<input type="radio" name="templatecrstype" value="Community"'.$checkedCommunity.' onclick="this.form.submit();">'.
	&mt('Community').
	'</label>'.
	'</fieldset>'.
	'<input type="hidden" name="customroleaction" value="'.
	$action.'" />';
	if ($env{'form.customroleaction'} eq 'new') {
	$context_code .= '<input type="hidden" name="newrolename" value="'.
	$rolename.'" />';
	} else {
	$context_code .= '<input type="hidden" name="rolename" value="'.
	$rolename.'" />';
	}
	$context_code .= '<input type="hidden" name="action" value="custom" />'.
	'<input type="hidden" name="phase" value="selected_custom_edit" />';
	}

$head_script .= "\n".$jsback."\n"	$head_script .= "\n".$jsback."\n"
.'// ]]>'."\n"	.'// ]]>'."\n"
.'</script>'."\n";	.'</script>'."\n";
Line 3484 sub custom_role_editor {	Line 3689 sub custom_role_editor {
'dml' => "Domain Level",	'dml' => "Domain Level",
'ssl' => "System Level");	'ssl' => "System Level");

$r->print('<div>'
	$r->print('<div class="LC_left_float">'
.'<form action=""><fieldset>'	.'<form action=""><fieldset>'
.'<legend>'.&mt('Select a Template').'</legend>'	.'<legend>'.&mt('Select a Template').'</legend>'
.$button_code	.$button_code
.'</fieldset></form>'	.'</fieldset></form></div>');
.'</div>'	if ($context_code) {
);	$r->print('<div class="LC_left_float">'
	.'<form action="/adm/createuser" method="post"><fieldset>'
	.'<legend>'.&mt('Context').'</legend>'
	.$context_code
	.'</form>'
	.'</div>'
	);
	}
	$r->print('<br clear="all" />');

$r->print(<<ENDCCF);	$r->print(<<ENDCCF);
<form name="form1" method="post">	<form name="form1" method="post">
Line 3502 ENDCCF	Line 3716 ENDCCF
'<th>'.$lt{'prv'}.'</th><th>'.$lt{'crl'}.'</th><th>'.$lt{'dml'}.	'<th>'.$lt{'prv'}.'</th><th>'.$lt{'crl'}.'</th><th>'.$lt{'dml'}.
'</th><th>'.$lt{'ssl'}.'</th>'.	'</th><th>'.$lt{'ssl'}.'</th>'.
&Apache::loncommon::end_data_table_header_row());	&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,$crstype);
$r->print(&Apache::loncommon::start_data_table_row().	$r->print(&Apache::loncommon::start_data_table_row().
'<td>'.$privtext.'</td><td>'.	'<td>'.$privtext.'</td><td>'.
($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c"'.	($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c"'.
Line 3511 ENDCCF	Line 3725 ENDCCF
'</td><td>'.	'</td><td>'.
($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d"'.	($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d"'.
($domainlevelcurrent{$priv}?' checked="checked"':'').' />':' ').	($domainlevelcurrent{$priv}?' checked="checked"':'').' />':' ').
'</td><td>'.	'</td><td>');
($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s"'.	if ($priv eq 'bre' && $crstype eq 'Community') {
($systemlevelcurrent{$priv}?' checked="checked"':'').' />':' ').	$r->print(' ');
'</td>'.	} else {
&Apache::loncommon::end_data_table_row());	$r->print($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s"'.
	($systemlevelcurrent{$priv}?' checked="checked"':'').' />':' ');
	}
	$r->print('</td>'.
	&Apache::loncommon::end_data_table_row());
}	}
$r->print(&Apache::loncommon::end_data_table().	$r->print(&Apache::loncommon::end_data_table().
'<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.	'<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.
Line 3527 ENDCCF	Line 3745 ENDCCF
}	}
# --------------------------------------------------------	# --------------------------------------------------------
sub make_script_template {	sub make_script_template {
my ($role) = @_;	my ($role,$crstype) = @_;
my %full_c=();	my %full_c=();
my %full_d=();	my %full_d=();
my %full_s=();	my %full_s=();
Line 3541 sub make_script_template {	Line 3759 sub make_script_template {
$full_d{$priv}=1;	$full_d{$priv}=1;
}	}
foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {	foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
	next if (($crstype eq 'Community') && ($item eq 'bre&S'));
my ($priv,$restrict)=split(/\&/,$item);	my ($priv,$restrict)=split(/\&/,$item);
$full_s{$priv}=1;	$full_s{$priv}=1;
}	}
Line 3593 sub make_script_template {	Line 3812 sub make_script_template {
}	}
# ----------------------------------------------------------	# ----------------------------------------------------------
sub make_button_code {	sub make_button_code {
my ($role) = @_;	my ($role,$crstype) = @_;
my $label = &Apache::lonnet::plaintext($role);	my $label = &Apache::lonnet::plaintext($role,$crstype);
my $button_code = '<input type="button" onclick="set_'.$role.'()" value="'.$label.'" />';	my $button_code = '<input type="button" onclick="set_'.$role.'()" value="'.$label.'" />';
return ($button_code);	return ($button_code);
}	}
Line 3694 sub handler {	Line 3913 sub handler {
$r->send_http_header;	$r->send_http_header;
return OK;	return OK;
}	}
my $context;	my ($context,$crstype);
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
$context = 'course';	$context = 'course';
	$crstype = &Apache::loncommon::course_type();
} elsif ($env{'request.role'} =~ /^au\./) {	} elsif ($env{'request.role'} =~ /^au\./) {
$context = 'author';	$context = 'author';
} else {	} else {
Line 3715 sub handler {	Line 3935 sub handler {
#SD Following files not added to help, because the corresponding .tex-files seem to	#SD Following files not added to help, because the corresponding .tex-files seem to
#be missing: Course_Approve_Selfenroll,Course_User_Logs,	#be missing: Course_Approve_Selfenroll,Course_User_Logs,
my ($permission,$allowed) =	my ($permission,$allowed) =
&Apache::lonuserutils::get_permission($context);	&Apache::lonuserutils::get_permission($context,$crstype);
if (!$allowed) {	if (!$allowed) {
$env{'user.error.msg'}=	$env{'user.error.msg'}=
"/adm/createuser:cst:0:0:Cannot create/modify user data ".	"/adm/createuser:cst:0:0:Cannot create/modify user data ".
Line 3730 sub handler {	Line 3950 sub handler {
if (! exists($env{'form.action'})) {	if (! exists($env{'form.action'})) {
$r->print(&header());	$r->print(&header());
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));	$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
$r->print(&print_main_menu($permission,$context));	$r->print(&print_main_menu($permission,$context,$crstype));
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
} elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) {	} elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) {
$r->print(&header());	$r->print(&header());
Line 3746 sub handler {	Line 3966 sub handler {
&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);
} 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);
Line 3771 sub handler {	Line 3991 sub handler {
if ($env{'form.srchterm'} !~ /^$match_username$/) {	if ($env{'form.srchterm'} !~ /^$match_username$/) {
my $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @');	my $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @');
$env{'form.phase'} = '';	$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response,$srch);	&print_username_entry_form($r,$context,$response,$srch,undef,$crstype);
} 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);	$permission,$crstype);
}	}
} 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 3787 sub handler {	Line 4007 sub handler {
}	}
if ($currstate eq 'select') {	if ($currstate eq 'select') {
&print_user_selection_page($r,$response,$srch,$results,	&print_user_selection_page($r,$response,$srch,$results,
\@search,$context);	\@search,$context,undef,$crstype);
} elsif ($currstate eq 'modify') {	} elsif ($currstate eq 'modify') {
my ($ccuname,$ccdomain);	my ($ccuname,$ccdomain);
if (($srch->{'srchby'} eq 'uname') &&	if (($srch->{'srchby'} eq 'uname') &&
Line 3805 sub handler {	Line 4025 sub handler {
}	}
&print_user_modification_page($r,$ccuname,$ccdomain,	&print_user_modification_page($r,$ccuname,$ccdomain,
$srch,$response,$context,	$srch,$response,$context,
$permission);	$permission,$crstype);
} elsif ($currstate eq 'query') {	} elsif ($currstate eq 'query') {
&print_user_query_page($r,'createuser');	&print_user_query_page($r,'createuser');
} else {	} else {
$env{'form.phase'} = '';	$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response,$srch,	&print_username_entry_form($r,$context,$response,$srch,
$forcenewuser);	$forcenewuser,$crstype);
}	}
} elsif ($env{'form.phase'} eq 'userpicked') {	} elsif ($env{'form.phase'} eq 'userpicked') {
my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});	my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'});	my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'});
&print_user_modification_page($r,$ccuname,$ccdomain,$srch,'',	&print_user_modification_page($r,$ccuname,$ccdomain,$srch,'',
$context,$permission);	$context,$permission,$crstype);
}	}
} elsif ($env{'form.phase'} eq 'update_user_data') {	} elsif ($env{'form.phase'} eq 'update_user_data') {
&update_user_data($r,$context);	&update_user_data($r,$context,$crstype);
} else {	} else {
&print_username_entry_form($r,$context,undef,$srch);	&print_username_entry_form($r,$context,undef,$srch,undef,$crstype);
}	}
} elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {	} elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
if ($env{'form.phase'} eq 'set_custom_roles') {	if ($env{'form.phase'} eq 'set_custom_roles') {
Line 3857 sub handler {	Line 4077 sub handler {
text=>"List Users"});	text=>"List Users"});
my ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles);	my ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles);
my $formname = 'studentform';	my $formname = 'studentform';
if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {	if (($context eq 'domain') && (($env{'form.roletype'} eq 'course') \|\|
($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) =	($env{'form.roletype'} eq 'community'))) {
&Apache::lonuserutils::courses_selector($env{'request.role.domain'},	if ($env{'form.roletype'} eq 'course') {
$formname);	($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) =
	&Apache::lonuserutils::courses_selector($env{'request.role.domain'},
	$formname);
	} elsif ($env{'form.roletype'} eq 'community') {
	$cb_jscript =
	&Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'});
	my %elements = (
	coursepick => 'radio',
	coursetotal => 'text',
	courselist => 'text',
	);
	$jscript = &Apache::lonhtmlcommon::set_form_elements(\%elements);
	}
$jscript .= &verify_user_display();	$jscript .= &verify_user_display();
my $js = &add_script($jscript).$cb_jscript;	my $js = &add_script($jscript).$cb_jscript;
my $loadcode =	my $loadcode =
Line 3881 sub handler {	Line 4113 sub handler {
}	}
} elsif ($env{'form.action'} eq 'drop' && $permission->{'cusr'}) {	} elsif ($env{'form.action'} eq 'drop' && $permission->{'cusr'}) {
$r->print(&header());	$r->print(&header());
	my $brtext;
	if ($crstype eq 'Community') {
	$brtext = 'Drop Members';
	} else {
	$brtext = 'Drop Students';
	}
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/createuser?action=drop',	({href=>'/adm/createuser?action=drop',
text=>"Drop Students"});	text=>$brtext});
if (!exists($env{'form.state'})) {	if (!exists($env{'form.state'})) {
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',	$r->print(&Apache::lonhtmlcommon::breadcrumbs($brtext,
'Course_Drop_Student'));	'Course_Drop_Student'));

&Apache::lonuserutils::print_drop_menu($r,$context,$permission);	&Apache::lonuserutils::print_drop_menu($r,$context,$permission,$crstype);
} elsif ($env{'form.state'} eq 'done') {	} elsif ($env{'form.state'} eq 'done') {
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/createuser?action=drop',	({href=>'/adm/createuser?action=drop',
text=>"Result"});	text=>"Result"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',	$r->print(&Apache::lonhtmlcommon::breadcrumbs($brtext,
'Course_Drop_Student'));	'Course_Drop_Student'));
&Apache::lonuserutils::update_user_list($r,$context,undef,	&Apache::lonuserutils::update_user_list($r,$context,undef,
$env{'form.action'});	$env{'form.action'});
Line 3903 sub handler {	Line 4141 sub handler {
if ($permission->{'cusr'}) {	if ($permission->{'cusr'}) {
$r->print(&header(undef,undef,{'no_nav_bar' => 1}).	$r->print(&header(undef,undef,{'no_nav_bar' => 1}).
&Apache::lonuserutils::date_section_selector($context,	&Apache::lonuserutils::date_section_selector($context,
$permission).	$permission,$crstype).
&Apache::loncommon::end_page());	&Apache::loncommon::end_page());
} else {	} else {
$r->print(&header().	$r->print(&header().
Line 3968 sub handler {	Line 4206 sub handler {
} else {	} else {
$r->print(&header());	$r->print(&header());
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));	$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
$r->print(&print_main_menu($permission,$context));	$r->print(&print_main_menu($permission,$context,$crstype));
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
}	}
return OK;	return OK;
Line 4012 END	Line 4250 END
###############################################################	###############################################################
# Menu Phase One	# Menu Phase One
sub print_main_menu {	sub print_main_menu {
my ($permission,$context) = @_;	my ($permission,$context,$crstype) = @_;
	my $linkcontext = $context;
	my $stuterm = lc(&Apache::lonnet::plaintext('st',$crstype));
	if (($context eq 'course') && ($crstype eq 'Community')) {
	$linkcontext = lc($crstype);
	$stuterm = 'Members';
	}
my %links = (	my %links = (
domain => {	domain => {
upload => 'Upload a File of Users',	upload => 'Upload a File of Users',
Line 4029 sub print_main_menu {	Line 4273 sub print_main_menu {
singleuser => 'Add/Modify a Course User',	singleuser => 'Add/Modify a Course User',
listusers => 'Manage Course Users',	listusers => 'Manage Course Users',
},	},
	community => {
	upload => 'Upload a File of Community Users',
	singleuser => 'Add/Modify a Community User',
	listusers => 'Manage Community Users',
	},
	);
	my %linktitles = (
	domain => {
	singleuser => 'Add a user to the domain, and/or a course or community in the domain.',
	listusers => 'Show and manage users in this domain.',
	},
	author => {
	singleuser => 'Add a user with a co- or assistant author role.',
	listusers => 'Show and manage co- or assistant authors.',
	},
	course => {
	singleuser => 'Add a user with a certain role to this course.',
	listusers => 'Show and manage users in this course.',
	},
	community => {
	singleuser => 'Add a user with a certain role to this community.',
	listusers => 'Show and manage users in this community.',
	},
);	);
my @menu = ( {categorytitle => 'Single Users',	my @menu = ( {categorytitle => 'Single Users',
items =>	items =>
[	[
{	{
linktext => $links{$context}{'singleuser'},	linktext => $links{$linkcontext}{'singleuser'},
icon => 'edit-redo.png',	icon => 'edit-redo.png',
#help => 'Course_Change_Privileges',	#help => 'Course_Change_Privileges',
url => '/adm/createuser?action=singleuser',	url => '/adm/createuser?action=singleuser',
permission => $permission->{'cusr'},	permission => $permission->{'cusr'},
linktitle => 'Add a user with a certain role to this course.',	linktitle => $linktitles{$linkcontext}{'singleuser'},
},	},
]},	]},

Line 4047 sub print_main_menu {	Line 4314 sub print_main_menu {
items =>	items =>
[	[
{	{
linktext => $links{$context}{'upload'},	linktext => $links{$linkcontext}{'upload'},
icon => 'sctr.png',	icon => 'sctr.png',
#help => 'Course_Create_Class_List',	#help => 'Course_Create_Class_List',
url => '/adm/createuser?action=upload',	url => '/adm/createuser?action=upload',
Line 4055 sub print_main_menu {	Line 4322 sub print_main_menu {
linktitle => 'Upload a CSV or a text file containing users.',	linktitle => 'Upload a CSV or a text file containing users.',
},	},
{	{
linktext => $links{$context}{'listusers'},	linktext => $links{$linkcontext}{'listusers'},
icon => 'edit-find.png',	icon => 'edit-find.png',
#help => 'Course_View_Class_List',	#help => 'Course_View_Class_List',
url => '/adm/createuser?action=listusers',	url => '/adm/createuser?action=listusers',
permission => ($permission->{'view'} \|\| $permission->{'cusr'}),	permission => ($permission->{'view'} \|\| $permission->{'cusr'}),
linktitle => 'Show and manage users of this course.',	linktitle => $linktitles{$linkcontext}{'listusers'},
},	},

]},	]},
Line 4084 sub print_main_menu {	Line 4351 sub print_main_menu {

}elsif ($context eq 'course'){	}elsif ($context eq 'course'){
my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();	my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();

	my %linktext = (
	'Course' => {
	single => 'Add/Modify a Student',
	drop => 'Drop Students',
	groups => 'Course Groups',
	},
	'Community' => {
	single => 'Add/Modify a Member',
	drop => 'Drop Members',
	groups => 'Community Groups',
	},
	);

	my %linktitle = (
	'Course' => {
	single => 'Add a user with the role of student to this course',
	drop => 'Remove a student from this course.',
	groups => 'Manage course groups',
	},
	'Community' => {
	single => 'Add a user with the role of member to this community',
	drop => 'Remove a member from this community.',
	groups => 'Manage community groups',
	},
	);

push(@{ $menu[0]->{items} }, #Category: Single Users	push(@{ $menu[0]->{items} }, #Category: Single Users
{	{
linktext => 'Add/Modify a Student',	linktext => $linktext{$crstype}{'single'},
#help => 'Course_Add_Student',	#help => 'Course_Add_Student',
icon => 'list-add.png',	icon => 'list-add.png',
url => '/adm/createuser?action=singlestudent',	url => '/adm/createuser?action=singlestudent',
permission => $permission->{'cusr'},	permission => $permission->{'cusr'},
linktitle => 'Add a user with the role student to this course.',	linktitle => $linktitle{$crstype}{'single'},
},	},
);	);

push(@{ $menu[1]->{items} }, #Category: Multiple Users	push(@{ $menu[1]->{items} }, #Category: Multiple Users
{	{
linktext => 'Drop Students',	linktext => $linktext{$crstype}{'drop'},
icon => 'edit-undo.png',	icon => 'edit-undo.png',
#help => 'Course_Drop_Student',	#help => 'Course_Drop_Student',
url => '/adm/createuser?action=drop',	url => '/adm/createuser?action=drop',
permission => $permission->{'cusr'},	permission => $permission->{'cusr'},
linktitle =>'Remove a student from this course.',	linktitle => $linktitle{$crstype}{'drop'},
},	},
);	);
push(@{ $menu[2]->{items} }, #Category: Administration	push(@{ $menu[2]->{items} }, #Category: Administration
Line 4116 sub print_main_menu {	Line 4409 sub print_main_menu {
linktitle => 'Configure a custom role.',	linktitle => 'Configure a custom role.',
},	},
{	{
linktext => 'Course Groups',	linktext => $linktext{$crstype}{'groups'},
icon => 'conf.png',	icon => 'conf.png',
#help => 'Course_Manage_Group',	#help => 'Course_Manage_Group',
url => '/adm/coursegroups?refpage=cusr',	url => '/adm/coursegroups?refpage=cusr',
permission => $permission->{'grp_manage'},	permission => $permission->{'grp_manage'},
linktitle => 'Manage course groups.',	linktitle => $linktitle{$crstype}{'groups'},
},	},
{	{
linktext => 'Change Logs',	linktext => 'Change Log',
icon => 'document-properties.png',	icon => 'document-properties.png',
#help => 'Course_User_Logs',	#help => 'Course_User_Logs',
url => '/adm/createuser?action=changelogs',	url => '/adm/createuser?action=changelogs',
Line 4146 sub print_main_menu {	Line 4439 sub print_main_menu {
}	}

if (!exists($permission->{'cusr_section'})){	if (!exists($permission->{'cusr_section'})){
	if ($crstype ne 'Community') {
push(@{ $menu[2]->{items} },	push(@{ $menu[2]->{items} },
{	{
linktext => 'Automated Enrollment',	linktext => 'Automated Enrollment',
icon => 'roles.png',	icon => 'roles.png',
#help => 'Course_Automated_Enrollment',	#help => 'Course_Automated_Enrollment',
permission => (&Apache::lonnet::auto_run($cnum,$cdom)	permission => (&Apache::lonnet::auto_run($cnum,$cdom)
&& $permission->{'cusr'}),	&& $permission->{'cusr'}),
url => '/adm/populate',	url => '/adm/populate',
linktitle => 'Automated enrollment manager.',	linktitle => 'Automated enrollment manager.',
},	}
	);
	}
	push(@{ $menu[2]->{items} },
{	{
linktext => 'User Self-Enrollment',	linktext => 'User Self-Enrollment',
icon => 'cstr.png',	icon => 'cstr.png',
#help => 'Course_Self_Enrollment',	#help => 'Course_Self_Enrollment',
url => '/adm/createuser?action=selfenroll',	url => '/adm/createuser?action=selfenroll',
permission => $permission->{'cusr'},	permission => $permission->{'cusr'},
linktitle => 'Configure user self enrollment.',	linktitle => 'Configure user self-enrollment.',
},	},
);	);

}	}
};	};
return Apache::lonhtmlcommon::generate_menu(@menu);	return Apache::lonhtmlcommon::generate_menu(@menu);
Line 4190 sub restore_prev_selections {	Line 4485 sub restore_prev_selections {

sub print_selfenroll_menu {	sub print_selfenroll_menu {
my ($r,$context,$permission) = @_;	my ($r,$context,$permission) = @_;
	my $crstype = &Apache::loncommon::course_type();
my $formname = 'enrollstudent';	my $formname = 'enrollstudent';
my $nolink = 1;	my $nolink = 1;
my ($row,$lt) = &get_selfenroll_titles();	my ($row,$lt) = &get_selfenroll_titles();
Line 4551 ENDSCRIPT	Line 4847 ENDSCRIPT
&mt('No').'</label>';	&mt('No').'</label>';
my %advhash = &Apache::lonnet::get_course_adv_roles($cid,1);	my %advhash = &Apache::lonnet::get_course_adv_roles($cid,1);
my (@ccs,%notified);	my (@ccs,%notified);
if ($advhash{'cc'}) {	my $ccrole = 'cc';
@ccs = split(/,/,$advhash{'cc'});	if ($crstype eq 'Community') {
	$ccrole = 'co';
	}
	if ($advhash{$ccrole}) {
	@ccs = split(/,/,$advhash{$ccrole});
}	}
if ($currnotified) {	if ($currnotified) {
foreach my $current (split(/,/,$currnotified)) {	foreach my $current (split(/,/,$currnotified)) {
Line 4639 sub visible_in_cat {	Line 4939 sub visible_in_cat {
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);	my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
my ($cathash,%settable,@vismsgs,$cansetvis);	my ($cathash,%settable,@vismsgs,$cansetvis);
my %visactions = &Apache::lonlocal::texthash(	my %visactions = &Apache::lonlocal::texthash(
vis => 'Your course currently appears in the Course Catalog for this domain.',	vis => 'Your course/community currently appears in the Course/Community Catalog for this domain.',
gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.',	gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.',
miss => 'Your course does not currently appear in the Course Catalog for this domain.',	miss => 'Your course/community does not currently appear in the Course/Community Catalog for this domain.',
yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.',	yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.',
coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.',	coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.',
make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:',	make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:',
Line 4857 sub print_userchangelogs_display {	Line 5157 sub print_userchangelogs_display {
my $formname = 'roleslog';	my $formname = 'roleslog';
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
	my $crstype = &Apache::loncommon::course_type();
my %roleslog=&Apache::lonnet::dump('nohist_rolelog',$cdom,$cnum);	my %roleslog=&Apache::lonnet::dump('nohist_rolelog',$cdom,$cnum);
if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); }	if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); }

$r->print('<form action="/adm/createuser" method="post" name="'.$formname.'">');
my %saveable_parameters = ('show' => 'scalar',);	my %saveable_parameters = ('show' => 'scalar',);
&Apache::loncommon::store_course_settings('roles_log',	&Apache::loncommon::store_course_settings('roles_log',
\%saveable_parameters);	\%saveable_parameters);
Line 4895 sub print_userchangelogs_display {	Line 5195 sub print_userchangelogs_display {
}	}
my (%whodunit,%changed,$version);	my (%whodunit,%changed,$version);
($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/);	($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/);
$r->print(&role_display_filter($formname,$cdom,$cnum,\%curr,$version));
my ($minshown,$maxshown);	my ($minshown,$maxshown);
$minshown = 1;	$minshown = 1;
my $count = 0;	my $count = 0;
Line 4906 sub print_userchangelogs_display {	Line 5205 sub print_userchangelogs_display {
}	}
}	}

# Collect user change log data	# Form Header
my $content = '';	$r->print('<form action="/adm/createuser" method="post" name="'.$formname.'">'.
	&role_display_filter($formname,$cdom,$cnum,\%curr,$version,$crstype));

	# Create navigation
	my ($nav_script,$nav_links) = &userlogdisplay_nav($formname,\%curr,$more_records);
	my $showntableheader = 0;

	# Table Header
	my $tableheader =
	&Apache::loncommon::start_data_table_header_row()
	.'<th> </th>'
	.'<th>'.&mt('When').'</th>'
	.'<th>'.&mt('Who made the change').'</th>'
	.'<th>'.&mt('Changed User').'</th>'
	.'<th>'.&mt('Role').'</th>'
	.'<th>'.&mt('Section').'</th>'
	.'<th>'.&mt('Context').'</th>'
	.'<th>'.&mt('Start').'</th>'
	.'<th>'.&mt('End').'</th>'
	.&Apache::loncommon::end_data_table_header_row();

	# Display user change log data
foreach my $id (sort { $roleslog{$b}{'exe_time'}<=>$roleslog{$a}{'exe_time'} } (keys(%roleslog))) {	foreach my $id (sort { $roleslog{$b}{'exe_time'}<=>$roleslog{$a}{'exe_time'} } (keys(%roleslog))) {
next if (($roleslog{$id}{'exe_time'} < $curr{'rolelog_start_date'}) \|\|	next if (($roleslog{$id}{'exe_time'} < $curr{'rolelog_start_date'}) \|\|
($roleslog{$id}{'exe_time'} > $curr{'rolelog_end_date'}));	($roleslog{$id}{'exe_time'} > $curr{'rolelog_end_date'}));
Line 4929 sub print_userchangelogs_display {	Line 5249 sub print_userchangelogs_display {
}	}
$count ++;	$count ++;
next if ($count < $minshown);	next if ($count < $minshown);
	unless ($showntableheader) {
	$r->print($nav_script
	.$nav_links
	.&Apache::loncommon::start_data_table()
	.$tableheader);
	$r->rflush();
	$showntableheader = 1;
	}
if ($whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} eq '') {	if ($whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} eq '') {
$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} =	$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} =
&Apache::loncommon::plainname($roleslog{$id}{'exe_uname'},$roleslog{$id}{'exe_udom'});	&Apache::loncommon::plainname($roleslog{$id}{'exe_uname'},$roleslog{$id}{'exe_udom'});
Line 4964 sub print_userchangelogs_display {	Line 5291 sub print_userchangelogs_display {
if ($roleslog{$id}{'logentry'}{'selfenroll'}) {	if ($roleslog{$id}{'logentry'}{'selfenroll'}) {
$chgcontext = 'selfenroll';	$chgcontext = 'selfenroll';
}	}
my %lt = &rolechg_contexts();	my %lt = &rolechg_contexts($crstype);
if ($chgcontext ne '' && $lt{$chgcontext} ne '') {	if ($chgcontext ne '' && $lt{$chgcontext} ne '') {
$chgcontext = $lt{$chgcontext};	$chgcontext = $lt{$chgcontext};
}	}
$content .=	$r->print(
&Apache::loncommon::start_data_table_row()	&Apache::loncommon::start_data_table_row()
.'<td>'.$count.'</td>'	.'<td>'.$count.'</td>'
.'<td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td>'	.'<td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td>'
.'<td>'.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.'</td>'	.'<td>'.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.'</td>'
.'<td>'.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.'</td>'	.'<td>'.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.'</td>'
.'<td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'}).'</td>'	.'<td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'},$crstype).'</td>'
.'<td>'.$sec.'</td>'	.'<td>'.$sec.'</td>'
.'<td>'.$chgcontext.'</td>'	.'<td>'.$chgcontext.'</td>'
.'<td>'.$rolestart.'</td>'	.'<td>'.$rolestart.'</td>'
.'<td>'.$roleend.'</td>'	.'<td>'.$roleend.'</td>'
.&Apache::loncommon::end_data_table_row();	.&Apache::loncommon::end_data_table_row()."\n");
}	}

# Form Footer	if ($showntableheader) { # Table footer, if content displayed above
my $form_footer =	$r->print(&Apache::loncommon::end_data_table()
'<input type="hidden" name="page" value="'.$curr{'page'}.'" />'	.$nav_links);
.'<input type="hidden" name="action" value="changelogs" />'	} else { # No content displayed above
.'</form>';

# Only display table, if content is available (has been collected above)
if (!$content) {
$r->print('<p class="LC_info">'	$r->print('<p class="LC_info">'
.&mt('There are no records to display.')	.&mt('There are no records to display.')
.'</p>'	.'</p>'
);	);
$r->print($form_footer);
return;
}	}

# Content to display, so create navigation and display table	# Form Footer
	$r->print(
	'<input type="hidden" name="page" value="'.$curr{'page'}.'" />'
	.'<input type="hidden" name="action" value="changelogs" />'
	.'</form>');
	return;
	}

# Create Navigation:	sub userlogdisplay_nav {
# Navigation Script	my ($formname,$curr,$more_records) = @_;
my $nav_script = <<"ENDSCRIPT";	my ($nav_script,$nav_links);
	if (ref($curr) eq 'HASH') {
	# Create Navigation:
	# Navigation Script
	$nav_script = <<"ENDSCRIPT";
<script type="text/javascript">	<script type="text/javascript">
// <![CDATA[	// <![CDATA[
function chgPage(caller) {	function chgPage(caller) {
Line 5012 function chgPage(caller) {	Line 5343 function chgPage(caller) {
if (caller == 'next') {	if (caller == 'next') {
document.$formname.page.value ++;	document.$formname.page.value ++;
}	}
document.$formname.submit();	document.$formname.submit();
return;	return;
}	}
// ]]>	// ]]>
</script>	</script>
ENDSCRIPT	ENDSCRIPT
# Navigation Buttons	# Navigation Buttons
my $nav_links;	$nav_links = '<p>';
$nav_links = '<p>';	if (($curr->{'page'} > 1) \|\| ($more_records)) {
if (($curr{'page'} > 1) \|\| ($more_records)) {	if ($curr->{'page'} > 1) {
if ($curr{'page'} > 1) {	$nav_links .= '<input type="button"'
$nav_links .= '<input type="button"'	.' onclick="javascript:chgPage('."'previous'".');"'
.' onclick="javascript:chgPage('."'previous'".');"'	.' value="'.&mt('Previous [_1] changes',$curr->{'show'})
.' value="'.&mt('Previous [_1] changes',$curr{'show'})	.'" /> ';
.'" /> ';	}
}	if ($more_records) {
if ($more_records) {	$nav_links .= '<input type="button"'
$nav_links .= '<input type="button"'	.' onclick="javascript:chgPage('."'next'".');"'
.' onclick="javascript:chgPage('."'next'".');"'	.' value="'.&mt('Next [_1] changes',$curr->{'show'})
.' value="'.&mt('Next [_1] changes',$curr{'show'})	.'" />';
.'" />';	}
}	}
	$nav_links .= '</p>';
}	}
$nav_links .= '</p>';	return ($nav_script,$nav_links);

# Table Header
my $tableheader =
&Apache::loncommon::start_data_table_header_row()
.'<th> </th>'
.'<th>'.&mt('When').'</th>'
.'<th>'.&mt('Who made the change').'</th>'
.'<th>'.&mt('Changed User').'</th>'
.'<th>'.&mt('Role').'</th>'
.'<th>'.&mt('Section').'</th>'
.'<th>'.&mt('Context').'</th>'
.'<th>'.&mt('Start').'</th>'
.'<th>'.&mt('End').'</th>'
.&Apache::loncommon::end_data_table_header_row();

# Print Content
$r->print(
$nav_script
.$nav_links
.&Apache::loncommon::start_data_table()
.$tableheader
.$content
.&Apache::loncommon::end_data_table()
.$nav_links
.$form_footer
);
return;
}	}

sub role_display_filter {	sub role_display_filter {
my ($formname,$cdom,$cnum,$curr,$version) = @_;	my ($formname,$cdom,$cnum,$curr,$version,$crstype) = @_;
my $context = 'course';	my $context = 'course';
	my $lctype = lc($crstype);
my $nolink = 1;	my $nolink = 1;
my $output = '<table><tr><td valign="top">'.	my $output = '<table><tr><td valign="top">'.
'<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b></span><br />'.	'<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b></span><br />'.
Line 5082 sub role_display_filter {	Line 5388 sub role_display_filter {
&Apache::lonhtmlcommon::date_setter($formname,'rolelog_end_date',	&Apache::lonhtmlcommon::date_setter($formname,'rolelog_end_date',
$curr->{'rolelog_end_date'},undef,	$curr->{'rolelog_end_date'},undef,
undef,undef,undef,undef,undef,undef,$nolink);	undef,undef,undef,undef,undef,undef,$nolink);
my %lt = &rolechg_contexts();	my %lt = &rolechg_contexts($crstype);
$output .= '<td valign="top"><b>'.&mt('Window during which changes occurred:').'</b><br />'.	$output .= '<td valign="top"><b>'.&mt('Window during which changes occurred:').'</b><br />'.
'<table><tr><td>'.&mt('After:').	'<table><tr><td>'.&mt('After:').
'</td><td>'.$startform.'</td></tr>'.	'</td><td>'.$startform.'</td></tr>'.
Line 5096 sub role_display_filter {	Line 5402 sub role_display_filter {
$output .= ' selected="selected"';	$output .= ' selected="selected"';
}	}
$output .= '>'.&mt('Any').'</option>'."\n";	$output .= '>'.&mt('Any').'</option>'."\n";
my @roles = &Apache::lonuserutils::course_roles($context,undef,1);	my @roles = &Apache::lonuserutils::course_roles($context,undef,1,$lctype);
foreach my $role (@roles) {	foreach my $role (@roles) {
my $plrole;	my $plrole;
if ($role eq 'cr') {	if ($role eq 'cr') {
$plrole = &mt('Custom Role');	$plrole = &mt('Custom Role');
} else {	} else {
$plrole=&Apache::lonnet::plaintext($role);	$plrole=&Apache::lonnet::plaintext($role,$crstype);
}	}
my $selstr = '';	my $selstr = '';
if ($role eq $curr->{'role'}) {	if ($role eq $curr->{'role'}) {
Line 5114 sub role_display_filter {	Line 5420 sub role_display_filter {
'<td>  </td>'.	'<td>  </td>'.
'<td valign="top"><b>'.	'<td valign="top"><b>'.
&mt('Context:').'</b><br /><select name="chgcontext">';	&mt('Context:').'</b><br /><select name="chgcontext">';
foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll') {	foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll','requestcourses') {
my $selstr = '';	my $selstr = '';
if ($curr->{'chgcontext'} eq $chgtype) {	if ($curr->{'chgcontext'} eq $chgtype) {
$selstr = ' selected="selected"';	$selstr = ' selected="selected"';
Line 5144 sub role_display_filter {	Line 5450 sub role_display_filter {
}	}

sub rolechg_contexts {	sub rolechg_contexts {
	my ($crstype) = @_;
my %lt = &Apache::lonlocal::texthash (	my %lt = &Apache::lonlocal::texthash (
any => 'Any',	any => 'Any',
auto => 'Automated enrollment',	auto => 'Automated enrollment',
Line 5151 sub rolechg_contexts {	Line 5458 sub rolechg_contexts {
createcourse => 'Course Creation',	createcourse => 'Course Creation',
course => 'User Management in course',	course => 'User Management in course',
domain => 'User Management in domain',	domain => 'User Management in domain',
selfenroll => 'Self-enrolled',	selfenroll => 'Self-enrolled',
	requestcourses => 'Course Request',
);	);
	if ($crstype eq 'Community') {
	$lt{'createcourse'} = &mt('Community Creation');
	$lt{'course'} = &mt('User Management in community');
	$lt{'requestcourses'} = &mt('Community Request');
	}
return %lt;	return %lt;
}	}

Line 5569 sub build_search_response {	Line 5882 sub build_search_response {
my $helplink = ' href="javascript:helpMenu('."'display'".')"';	my $helplink = ' href="javascript:helpMenu('."'display'".')"';
$response .= '<br /><br />';	$response .= '<br /><br />';
if ($context eq 'requestcrs') {	if ($context eq 'requestcrs') {
$response .= &mt("You are not authorized to defined new users in the new course's domain - [_1].",$targetdom);	$response .= &mt("You are not authorized to define new users in the new course's domain - [_1].",$targetdom);
} else {	} else {
$response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom);	$response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom);
}	}
Line 5668 sub course_level_table {	Line 5981 sub course_level_table {
$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 $crstype=$coursedata{'type'};
if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; }	if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; }
my ($domain,$cnum)=split(/\//,$thiscourse);	my ($domain,$cnum)=split(/\//,$thiscourse);
my %sections_count;	my %sections_count;
Line 5678 sub course_level_table {	Line 5991 sub course_level_table {
&Apache::loncommon::get_sections($domain,$cnum);	&Apache::loncommon::get_sections($domain,$cnum);
}	}
}	}
my @roles = &Apache::lonuserutils::roles_by_context('course');	my @roles = &Apache::lonuserutils::roles_by_context('course','',$crstype);
foreach my $role (@roles) {	foreach my $role (@roles) {
my $plrole=&Apache::lonnet::plaintext($role);	my $plrole=&Apache::lonnet::plaintext($role,$crstype);
if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) {	if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) {
$table .= &course_level_row($protectedcourse,$role,$area,$domain,	$table .= &course_level_row($protectedcourse,$role,$area,$domain,
$plrole,\%sections_count,\%lt);	$plrole,\%sections_count,\%lt);
Line 5693 sub course_level_table {	Line 6006 sub course_level_table {
}	}
}	}
if (&Apache::lonnet::allowed('ccr',$thiscourse)) {	if (&Apache::lonnet::allowed('ccr',$thiscourse)) {
foreach my $cust (sort keys %customroles) {	foreach my $cust (sort(keys(%customroles))) {
	next if ($crstype eq 'Community' && $customroles{$cust} =~ /bre\&S/);
my $role = 'cr_cr_'.$env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cust;	my $role = 'cr_cr_'.$env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cust;
$table .= &course_level_row($protectedcourse,$role,$area,$domain,	$table .= &course_level_row($protectedcourse,$role,$area,$domain,
$cust,\%sections_count,\%lt);	$cust,\%sections_count,\%lt);
Line 5724 sub course_level_row {	Line 6038 sub course_level_row {
$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 'cc') {	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 '') {
$row .= ' <td><input type="hidden" value="'.	$row .= ' <td><input type="hidden" value="'.
Line 5772 sub course_level_dc {	Line 6086 sub course_level_dc {
'<input type="hidden" name="origdom" value="'.$dcdom.'" />'.	'<input type="hidden" name="origdom" value="'.$dcdom.'" />'.
'<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/Community','crstype').'</b>';
my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu');	my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu','role','Course/Community Browser');
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'rol' => "Role",	'rol' => "Role",
'grs' => "Section",	'grs' => "Section",
Line 5784 sub course_level_dc {	Line 6098 sub course_level_dc {
'ssd' => "Set Start Date",	'ssd' => "Set Start Date",
'sed' => "Set End Date"	'sed' => "Set End Date"
);	);
my $header = '<h4>'.&mt('Course 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>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.	'<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();	&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><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".	'<td><br /><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc','','','','crstype'".')" /></td>'."\n".
'<td><select name="role">'."\n";	'<td valign><br /><select name="role">'."\n";
foreach my $role (@roles) {	foreach my $role (@roles) {
my $plrole=&Apache::lonnet::plaintext($role);	my $plrole=&Apache::lonnet::plaintext($role);
$otheritems .= ' <option value="'.$role.'">'.$plrole;	$otheritems .= ' <option value="'.$role.'">'.$plrole;
Line 5811 sub course_level_dc {	Line 6125 sub course_level_dc {
'<td valign="top"> <b>'.$lt{'new'}.'</b><br />'.	'<td valign="top"> <b>'.$lt{'new'}.'</b><br />'.
'<input type="text" name="newsec" value="" />'.	'<input type="text" name="newsec" value="" />'.
'<input type="hidden" name="section" value="" />'.	'<input type="hidden" name="section" value="" />'.
'<input type="hidden" name="groups" value="" /></td>'.	'<input type="hidden" name="groups" value="" />'.
	'<input type="hidden" name="crstype" value="" /></td>'.
'</tr></table></td>';	'</tr></table></td>';
$otheritems .= <<ENDTIMEENTRY;	$otheritems .= <<ENDTIMEENTRY;
<td><input type="hidden" name="start" value='' />	<td><br /><input type="hidden" name="start" value='' />
<a href=	<a href=
"javascript:pjump('date_start','Start Date',document.cu.start.value,'start','cu.pres','dateset')">$lt{'ssd'}</a></td>	"javascript:pjump('date_start','Start Date',document.cu.start.value,'start','cu.pres','dateset')">$lt{'ssd'}</a></td>
<td><input type="hidden" name="end" value='' />	<td><br /><input type="hidden" name="end" value='' />
<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

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

Removed from v.1.311
changed lines
	Added in v.1.328