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.323 and 1.329.2.4

version 1.323, 2009/11/04 14:13:32	version 1.329.2.4, 2010/09/19 16:44:44
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 471 sub print_username_entry_form {	Line 472 sub print_username_entry_form {
my ($r,$context,$response,$srch,$forcenewuser,$crstype) = @_;	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';
	my $is_custom = &Apache::loncommon::needs_gci_custom();
if (exists($env{'form.startrolename'})) {	if (exists($env{'form.startrolename'})) {
$formtoset = 'docustom';	$formtoset = 'docustom';
$env{'form.rolename'} = $env{'form.startrolename'};	$env{'form.rolename'} = $env{'form.startrolename'};
Line 487 sub print_username_entry_form {	Line 489 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($crstype);	my %breadcrumb_text = &singleuser_breadcrumb($crstype);
	my $title = 'User Management';
	if ($context eq 'course') {
	if ($is_custom) {
	$title = 'Enrollment and Student Activity';
	}
	}
my $start_page =	my $start_page =
&Apache::loncommon::start_page('User Management',	&Apache::loncommon::start_page($title,
$jscript,{'add_entries' => \%loaditems,});	$jscript,{'add_entries' => \%loaditems,});
if ($env{'form.action'} eq 'custom') {	if ($env{'form.action'} eq 'custom') {
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
Line 510 sub print_username_entry_form {	Line 523 sub print_username_entry_form {
} elsif ($env{'form.action'} eq 'singlestudent') {	} elsif ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';	$helpitem = 'Course_Add_Student';
}	}
my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management',	my $crumbs = &Apache::lonhtmlcommon::breadcrumbs($title,
$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',	'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'};
Line 547 ENDCUSTOM	Line 582 ENDCUSTOM
$actiontext = $lt{'srst'};	$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);
}	}
Line 557 ENDCUSTOM	Line 591 ENDCUSTOM
$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,$crstype) = @_;	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);
Line 595 $userpicker	Line 667 $userpicker
ENDBLOCK	ENDBLOCK
if ($env{'form.phase'} eq '') {	if ($env{'form.phase'} eq '') {
my $defdom=$env{'request.role.domain'};	my $defdom=$env{'request.role.domain'};
my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');	my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain','',1);
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'enro' => 'Enroll one student',	'enro' => 'Enroll one student',
'enrm' => 'Enroll one member',	'enrm' => 'Enroll one member',
Line 644 $showresponse	Line 716 $showresponse
<table>	<table>
<tr>	<tr>
<td>$lt{'usr'}:</td>	<td>$lt{'usr'}:</td>
<td><input type="text" size="15" name="srchterm" /></td>	<td><input type="text" size="25" name="srchterm" /></td>
<td> $lt{'dom'}:</td><td>$domform</td>	<td> $lt{'dom'}:</td><td>$domform</td>
<td> $sellink </td>	<td> $sellink </td>
<td> <input name="userrole" type="submit" value="$buttontext" /></td>	<td> <input name="userrole" type="submit" value="$buttontext" /></td>
Line 689 sub print_user_selection_page {	Line 761 sub print_user_selection_page {
my ($r,$response,$srch,$srch_results,$srcharray,$context,$opener_elements,$crstype) = @_;	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'};
	my $is_custom = &Apache::loncommon::needs_gci_custom();

if (!grep(/^\Q$sortby\E$/,@fields)) {	if (!grep(/^\Q$sortby\E$/,@fields)) {
$sortby = 'lastname';	$sortby = 'lastname';
Line 727 ENDSCRIPT	Line 800 ENDSCRIPT
if ($context eq 'requestcrs') {	if ($context eq 'requestcrs') {
$r->print('<div>');	$r->print('<div>');
} else {	} else {
$r->print(&Apache::loncommon::start_page('User Management',$jscript));	my $title = 'User Management';
	if ($context eq 'course') {
	if ($is_custom) {
	$title = 'Enrollment and Student Activity';
	}
	}
	$r->print(&Apache::loncommon::start_page($title,$jscript));

my %breadcrumb_text = &singleuser_breadcrumb($crstype);	my %breadcrumb_text = &singleuser_breadcrumb($crstype);
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
Line 738 ENDSCRIPT	Line 817 ENDSCRIPT
text=>$breadcrumb_text{'userpicked'},	text=>$breadcrumb_text{'userpicked'},
faq=>282,bug=>'Instructor Interface',});	faq=>282,bug=>'Instructor Interface',});
if ($env{'form.action'} eq 'singleuser') {	if ($env{'form.action'} eq 'singleuser') {
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',	$r->print(&Apache::lonhtmlcommon::breadcrumbs($title,
'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,undef,$crstype));	$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($title,
'Course_Add_Student'));	'Course_Add_Student'));
$r->print($jscript."<b>");	$r->print($jscript."<b>");
if ($crstype eq 'Community') {	if ($crstype eq 'Community') {
Line 853 sub print_user_modification_page {	Line 932 sub print_user_modification_page {
my %abv_auth = &auth_abbrev();	my %abv_auth = &auth_abbrev();
my (%rulematch,%inst_results,$newuser,%alerts,%curr_rules,%got_rules);	my (%rulematch,%inst_results,$newuser,%alerts,%curr_rules,%got_rules);
my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);	my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
	my $is_custom = &Apache::loncommon::needs_gci_custom();
	if ($is_custom) {
	if ($uhome eq 'no_host') {
	my $lc_ccuname = lc($ccuname);
	if ($lc_ccuname ne $ccuname) {
	$uhome = &Apache::lonnet::homeserver($lc_ccuname,$ccdomain);
	$ccuname = $lc_ccuname;
	}
	}
	}
if ($uhome eq 'no_host') {	if ($uhome eq 'no_host') {
my $usertype;
my ($rules,$ruleorder) =	my ($rules,$ruleorder) =
&Apache::lonnet::inst_userrules($ccdomain,'username');	&Apache::lonnet::inst_userrules($ccdomain,'username');
$usertype =	my $usertype =
&Apache::lonuserutils::check_usertype($ccdomain,$ccuname,$rules);	&Apache::lonuserutils::check_usertype($ccdomain,$ccuname,$rules);
my $cancreate =	my $cancreate =
&Apache::lonuserutils::can_create_user($ccdomain,$context,	&Apache::lonuserutils::can_create_user($ccdomain,$context,
$usertype);	$usertype);
Line 868 sub print_user_modification_page {	Line 956 sub print_user_modification_page {
official => 'institutional',	official => 'institutional',
unofficial => 'non-institutional',	unofficial => 'non-institutional',
);	);
	if ($ccdomain eq 'gci') {
	$usertypetext{'unofficial'} = 'institutional',
	}
my $response;	my $response;
if ($env{'form.origform'} eq 'crtusername') {	if ($env{'form.origform'} eq 'crtusername') {
$response = '<span class="LC_warning">'.&mt('No match was found for the username ([_1]) in LON-CAPA domain: [_2]',$ccuname,$ccdomain).	if ($is_custom) {
'</span><br />';	$response = '<span class="LC_warning">'.&mt('Invalid format for username for new user: [_1]','<b>'.$ccuname.'</b>').
	'</span><br />';
	} else {
	$response = '<span class="LC_warning">'.&mt('No match was found for the username ([_1]) in LON-CAPA domain: [_2]',$ccuname,$ccdomain).'</span><br />';
	}
}	}
$response .= '<p class="LC_warning">'	$response .= '<p class="LC_warning">'
.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.")	.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.")
.' '	.'<br />';
.&mt('Please contact the [_1]helpdesk[_2] for assistance.'	if ($ccdomain eq 'gcitest') {
,'<a href="'.$helplink.'">','</a>')	$response .= &mt('Enter a valid e-mail address as the username for the new user.').' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.'
.'</p><br />';	,'<a href="'.$helplink.'">','</a>')
	.'</p><br />';
	}
$env{'form.phase'} = '';	$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response,undef,undef,$crstype);	&print_username_entry_form($r,$context,$response,undef,undef,$crstype);
return;	return;
Line 929 sub print_user_modification_page {	Line 1026 sub print_user_modification_page {
if ($env{'form.popup'}) {	if ($env{'form.popup'}) {
$args->{'no_nav_bar'} = 1;	$args->{'no_nav_bar'} = 1;
}	}
	my $title = 'User Management';
	if ($context eq 'course') {
	if ($is_custom) {
	$title = 'Enrollment and Student Activity';
	}
	}
my $start_page =	my $start_page =
&Apache::loncommon::start_page('User Management',$js,$args);	&Apache::loncommon::start_page($title,$js,$args);
my %breadcrumb_text = &singleuser_breadcrumb($crstype);	my %breadcrumb_text = &singleuser_breadcrumb($crstype);
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage($form)",	({href=>"javascript:backPage($form)",
Line 951 sub print_user_modification_page {	Line 1054 sub print_user_modification_page {
if ($env{'form.action'} eq 'singlestudent') {	if ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';	$helpitem = 'Course_Add_Student';
}	}
my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management',	my $crumbs = &Apache::lonhtmlcommon::breadcrumbs($title,
$helpitem);	$helpitem);

my $forminfo =<<"ENDFORMINFO";	my $forminfo =<<"ENDFORMINFO";
Line 963 sub print_user_modification_page {	Line 1066 sub print_user_modification_page {
<input type="hidden" name="pres_type" value="" />	<input type="hidden" name="pres_type" value="" />
<input type="hidden" name="pres_marker" value="" />	<input type="hidden" name="pres_marker" value="" />
ENDFORMINFO	ENDFORMINFO
my %inccourses;	my (%inccourses,$roledom);
foreach my $key (keys(%env)) {	if ($context eq 'course') {
if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) {	$inccourses{$env{'request.course.id'}}=1;
$inccourses{$1.'_'.$2}=1;	$roledom = $env{'course.'.$env{'request.course.id'}.'.domain'};
	} elsif ($context eq 'author') {
	$roledom = $env{'request.role.domain'};
	} elsif ($context eq 'domain') {
	foreach my $key (keys(%env)) {
	$roledom = $env{'request.role.domain'};
	if ($key=~/^user\.priv\.cm\.\/($roledom)\/($match_username)/) {
	$inccourses{$1.'_'.$2}=1;
	}
	}
	} else {
	foreach my $key (keys(%env)) {
	if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) {
	$inccourses{$1.'_'.$2}=1;
	}
}	}
}	}
if ($newuser) {	if ($newuser) {
Line 1203 ENDNOTOOLSPRIV	Line 1320 ENDNOTOOLSPRIV
}	}
$r->print('</div><div class="LC_clear_float_footer"></div>');	$r->print('</div><div class="LC_clear_float_footer"></div>');
if ($env{'form.action'} ne 'singlestudent') {	if ($env{'form.action'} ne 'singlestudent') {
&display_existing_roles($r,$ccuname,$ccdomain,\%inccourses);	&display_existing_roles($r,$ccuname,$ccdomain,\%inccourses,$context,
	$roledom,$crstype);
}	}
} ## 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') {
my $btntxt;	my $btntxt;
if ($crstype eq 'Community') {	if ($crstype eq 'Community') {
Line 1324 sub validation_javascript {	Line 1441 sub validation_javascript {
}	}

sub display_existing_roles {	sub display_existing_roles {
my ($r,$ccuname,$ccdomain,$inccourses) = @_;	my ($r,$ccuname,$ccdomain,$inccourses,$context,$roledom,$crstype) = @_;
my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname);	my $now=time;
# Build up table of user roles to allow revocation and re-enabling of roles.	my %lt=&Apache::lonlocal::texthash(
my ($tmp) = keys(%rolesdump);
if ($tmp !~ /^(con_lost\|error)/i) {
my $now=time;
my %lt=&Apache::lonlocal::texthash(
'rer' => "Existing Roles",	'rer' => "Existing Roles",
'rev' => "Revoke",	'rev' => "Revoke",
'del' => "Delete",	'del' => "Delete",
Line 1340 sub display_existing_roles {	Line 1453 sub display_existing_roles {
'sta' => "Start",	'sta' => "Start",
'end' => "End",	'end' => "End",
);	);
my (%roletext,%sortrole,%roleclass,%rolepriv);	my (%rolesdump,%roletext,%sortrole,%roleclass,%rolepriv);
foreach my $area (sort { my $a1=join('_',(split('_',$a))[1,0]);	if ($context eq 'course' \|\| $context eq 'author') {
my $b1=join('_',(split('_',$b))[1,0]);	my @roles = &Apache::lonuserutils::roles_by_context($context,1,$crstype);
return $a1 cmp $b1;	my %roleshash =
} keys(%rolesdump)) {	&Apache::lonnet::get_my_roles($ccuname,$ccdomain,'userroles',
next if ($area =~ /^rolesdef/);	['active','previous','future'],\@roles,$roledom,1);
my $envkey=$area;	foreach my $key (keys(%roleshash)) {
my $role = $rolesdump{$area};	my ($start,$end) = split(':',$roleshash{$key});
my $thisrole=$area;	next if ($start eq '-1' \|\| $end eq '-1');
$area =~ s/\_\w\w$//;	my ($rnum,$rdom,$role,$sec) = split(':',$key);
my ($role_code,$role_end_time,$role_start_time) =	if ($context eq 'course') {
split(/_/,$role);	next unless (($rnum eq $env{'course.'.$env{'request.course.id'}.'.num'})
	&& ($rdom eq $env{'course.'.$env{'request.course.id'}.'.domain'}));
	} elsif ($context eq 'author') {
	next unless (($rnum eq $env{'user.name'}) && ($rdom eq $env{'request.role.domain'}));
	}
	my ($newkey,$newvalue,$newrole);
	$newkey = '/'.$rdom.'/'.$rnum;
	if ($sec ne '') {
	$newkey .= '/'.$sec;
	}
	$newvalue = $role;
	if ($role =~ /^cr/) {
	$newrole = 'cr';
	} else {
	$newrole = $role;
	}
	$newkey .= '_'.$newrole;
	if ($start ne '' && $end ne '') {
	$newvalue .= '_'.$end.'_'.$start;
	}
	$rolesdump{$newkey} = $newvalue;
	}
	} else {
	%rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname);
	}
	# Build up table of user roles to allow revocation and re-enabling of roles.
	my ($tmp) = keys(%rolesdump);
	return if ($tmp =~ /^(con_lost\|error)/i);
	foreach my $area (sort { my $a1=join('_',(split('_',$a))[1,0]);
	my $b1=join('_',(split('_',$b))[1,0]);
	return $a1 cmp $b1;
	} keys(%rolesdump)) {
	next if ($area =~ /^rolesdef/);
	my $envkey=$area;
	my $role = $rolesdump{$area};
	my $thisrole=$area;
	$area =~ s/\_\w\w$//;
	my ($role_code,$role_end_time,$role_start_time) =
	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=~m{^cr/($match_domain)/($match_username)/(\w+)$});	($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$});
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 =~ m{^/($match_domain)/($match_courseid)} ) {	if ($area =~ m{^/($match_domain)/($match_courseid)} ) {
$class='Course';	$class='Course';
my ($coursedom,$coursedir) = ($1,$2);	my ($coursedom,$coursedir) = ($1,$2);
$sortkey.="\0$coursedom";	my $cid = $1.'_'.$2;
# $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($cid);
my $carea;	if ($coursedir =~ /^$match_community$/) {
if (defined($coursedata{'description'})) {	$class='Community';
$carea=$coursedata{'description'}.	}
'<br />'.&mt('Domain').': '.$coursedom.(' 'x8).	$sortkey.="\0$coursedom";
&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$coursedir,$coursedom);	my $carea;
$sortkey.="\0".$coursedata{'description'};	if (defined($coursedata{'description'})) {
$class=$coursedata{'type'};	$carea=$coursedata{'description'}.
	'<br />'.&mt('Domain').': '.$coursedom.(' 'x8).
	&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$coursedir,$coursedom);
	$sortkey.="\0".$coursedata{'description'};
	} else {
	if ($class eq 'Community') {
	$carea=&mt('Unavailable community').': '.$area;
	$sortkey.="\0".&mt('Unavailable community').': '.$area;
} else {	} else {
$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;	$sortkey.="\0$coursedir";
if ((&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2)) \|\|	$inccourses->{$cid}=1;
(&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {	if ((&Apache::lonnet::allowed('c'.$role_code,$coursedom.'/'.$coursedir)) \|\|
$allowed=1;	(&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
}	$allowed=1;
if ((&Apache::lonnet::allowed('dro',$1)) \|\|	}
(&Apache::lonnet::allowed('dro',$ccdomain))) {	unless ($allowed) {
$delallowed=1;	my $isowner = &is_courseowner($cid,$coursedata{'internal.courseowner'});
	if ($isowner) {
	if (($role_code eq 'co') && ($class eq 'Community')) {
	$allowed = 1;
	} elsif (($role_code eq 'cc') && ($class eq 'Course')) {
	$allowed = 1;
	}
}	}
	}
	if ((&Apache::lonnet::allowed('dro',$coursedom)) \|\|
	(&Apache::lonnet::allowed('dro',$ccdomain))) {
	$delallowed=1;
	}
# - custom role. Needs more info, too	# - custom role. Needs more info, too
if ($croletitle) {	if ($croletitle) {
if (&Apache::lonnet::allowed('ccr',$1.'/'.$2)) {	if (&Apache::lonnet::allowed('ccr',$coursedom.'/'.$coursedir)) {
$allowed=1;	$allowed=1;
$thisrole.='.'.$role_code;	$thisrole.='.'.$role_code;
}
}	}
# Compute the background color based on $area	}
if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) {	if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) {
$carea.='<br />Section: '.$3;	$carea.='<br />Section: '.$3;
$sortkey.="\0$3";	$sortkey.="\0$3";
if (!$allowed) {	if (!$allowed) {
if ($env{'request.course.sec'} eq $3) {	if ($env{'request.course.sec'} eq $3) {
if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2.'/'.$3)) {	if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2.'/'.$3)) {
$allowed = 1;	$allowed = 1;
}
}	}
}	}
}	}
$area=$carea;	}
} else {	$area=$carea;
$sortkey.="\0".$area;	} else {
# Determine if current user is able to revoke privileges	$sortkey.="\0".$area;
if ($area=~m{^/($match_domain)/}) {	# Determine if current user is able to revoke privileges
if ((&Apache::lonnet::allowed('c'.$role_code,$1)) \|\|	if ($area=~m{^/($match_domain)/}) {
(&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {	if ((&Apache::lonnet::allowed('c'.$role_code,$1)) \|\|
$allowed=1;	(&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
}	$allowed=1;
if (((&Apache::lonnet::allowed('dro',$1)) \|\|
(&Apache::lonnet::allowed('dro',$ccdomain))) &&
($role_code ne 'dc')) {
$delallowed=1;
}
} else {
if (&Apache::lonnet::allowed('c'.$role_code,'/')) {
$allowed=1;
}
}	}
if ($role_code eq 'ca' \|\| $role_code eq 'au') {	if (((&Apache::lonnet::allowed('dro',$1)) \|\|
$class='Construction Space';	(&Apache::lonnet::allowed('dro',$ccdomain))) &&
} elsif ($role_code eq 'su') {	($role_code ne 'dc')) {
$class='System';	$delallowed=1;
} else {
$class='Domain';
}	}
}	} else {
if (($role_code eq 'ca') \|\| ($role_code eq 'aa')) {	if (&Apache::lonnet::allowed('c'.$role_code,'/')) {
$area=~m{/($match_domain)/($match_username)};
if (&Apache::lonuserutils::authorpriv($2,$1)) {
$allowed=1;	$allowed=1;
} else {
$allowed=0;
}	}
}	}
my $row = '';	if ($role_code eq 'ca' \|\| $role_code eq 'au') {
$row.= '<td>';	$class='Construction Space';
my $active=1;	} elsif ($role_code eq 'su') {
$active=0 if (($role_end_time) && ($now>$role_end_time));	$class='System';
if (($active) && ($allowed)) {
$row.= '<input type="checkbox" name="rev:'.$thisrole.'" />';
} else {	} else {
if ($active) {	$class='Domain';
$row.=' ';
} else {
$row.=&mt('expired or revoked');
}
}	}
$row.='</td><td>';	}
if ($allowed && !$active) {	if (($role_code eq 'ca') \|\| ($role_code eq 'aa')) {
$row.= '<input type="checkbox" name="ren:'.$thisrole.'" />';	$area=~m{/($match_domain)/($match_username)};
	if (&Apache::lonuserutils::authorpriv($2,$1)) {
	$allowed=1;
} else {	} else {
$row.=' ';	$allowed=0;
}	}
$row.='</td><td>';	}
if ($delallowed) {	my $row = '';
$row.= '<input type="checkbox" name="del:'.$thisrole.'" />';	$row.= '<td>';
	my $active=1;
	$active=0 if (($role_end_time) && ($now>$role_end_time));
	if (($active) && ($allowed)) {
	$row.= '<input type="checkbox" name="rev:'.$thisrole.'" />';
	} else {
	if ($active) {
	$row.=' ';
} else {	} else {
$row.=' ';	$row.=&mt('expired or revoked');
}	}
my $plaintext='';	}
if (!$croletitle) {	$row.='</td><td>';
$plaintext=&Apache::lonnet::plaintext($role_code,$class)	if ($allowed && !$active) {
} else {	$row.= '<input type="checkbox" name="ren:'.$thisrole.'" />';
$plaintext=	} else {
	$row.=' ';
	}
	$row.='</td><td>';
	if ($delallowed) {
	$row.= '<input type="checkbox" name="del:'.$thisrole.'" />';
	} else {
	$row.=' ';
	}
	my $plaintext='';
	if (!$croletitle) {
	$plaintext=&Apache::lonnet::plaintext($role_code,$class)
	} else {
	$plaintext=
"Customrole '$croletitle'<br />defined by $croleuname\@$croleudom";	"Customrole '$croletitle'<br />defined by $croleuname\@$croleudom";
}	}
$row.= '</td><td>'.$plaintext.	$row.= '</td><td>'.$plaintext.
'</td><td>'.$area.	'</td><td>'.$area.
'</td><td>'.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time)	'</td><td>'.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time)
: ' ' ).	: ' ' ).
'</td><td>'.($role_end_time ?&Apache::lonlocal::locallocaltime($role_end_time)	'</td><td>'.($role_end_time ?&Apache::lonlocal::locallocaltime($role_end_time)
: ' ' )	: ' ' )
."</td>";	."</td>";
$sortrole{$sortkey}=$envkey;	$sortrole{$sortkey}=$envkey;
$roletext{$envkey}=$row;	$roletext{$envkey}=$row;
$roleclass{$envkey}=$class;	$roleclass{$envkey}=$class;
$rolepriv{$envkey}=$allowed;	$rolepriv{$envkey}=$allowed;
#$r->print($row);	} # 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','Community','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}}) ) {
$output{$type}.=	$output{$type}.=
&Apache::loncommon::start_data_table_row().	&Apache::loncommon::start_data_table_row().
$roletext{$sortrole{$which}}.	$roletext{$sortrole{$which}}.
&Apache::loncommon::end_data_table_row();	&Apache::loncommon::end_data_table_row();
}	}
}	}
unless($output{$type} eq '') {	unless($output{$type} eq '') {
$output{$type} = '<tr class="LC_info_row">'.	$output{$type} = '<tr class="LC_info_row">'.
"<td align='center' colspan='7'>".&mt($type)."</td></tr>".	"<td align='center' colspan='7'>".&mt($type)."</td></tr>".
$output{$type};	$output{$type};
$rolesdisplay = 1;	$rolesdisplay = 1;
}	}
}	}
if ($rolesdisplay == 1) {	if ($rolesdisplay == 1) {
my $contextrole='';	my $contextrole='';
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
my $crstype = &Apache::loncommon::course_type();	if (&Apache::loncommon::course_type() eq 'Community') {
$contextrole = "Existing Roles in this $crstype";	$contextrole = &mt('Existing Roles in this Community');
} elsif ($env{'request.role'} =~ /^au\./) {
$contextrole = 'Existing Co-Author Roles in your Construction Space';
} else {	} else {
$contextrole = 'Existing Roles in this Domain';	$contextrole = &mt('Existing Roles in this Course');
}	}
$r->print('	} elsif ($env{'request.role'} =~ /^au\./) {
	$contextrole = &mt('Existing Co-Author Roles in your Construction Space');
	} else {
	$contextrole = &mt('Existing Roles in this Domain');
	}
	$r->print('
<h3>'.$lt{'rer'}.'</h3>'.	<h3>'.$lt{'rer'}.'</h3>'.
'<div>'.&mt($contextrole).'</div>'.	'<div>'.$contextrole.'</div>'.
&Apache::loncommon::start_data_table("LC_createuser").	&Apache::loncommon::start_data_table("LC_createuser").
&Apache::loncommon::start_data_table_header_row().	&Apache::loncommon::start_data_table_header_row().
'<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}.	'<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}.
'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.	'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.
'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.	'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
&Apache::loncommon::end_data_table_header_row());	&Apache::loncommon::end_data_table_header_row());
foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') {	foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') {
if ($output{$type}) {	if ($output{$type}) {
$r->print($output{$type}."\n");	$r->print($output{$type}."\n");
}
}	}
$r->print(&Apache::loncommon::end_data_table());
}	}
} # End of check for keys in rolesdump	$r->print(&Apache::loncommon::end_data_table());
	}
return;	return;
}	}

Line 2019 sub get_inststatuses {	Line 2189 sub get_inststatuses {

# ================================================================= Phase Three	# ================================================================= Phase Three
sub update_user_data {	sub update_user_data {
my ($r,$context,$crstype) = @_;	my ($r,$context,$crstype) = @_;
	my $is_custom = &Apache::loncommon::needs_gci_custom();
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 2072 sub update_user_data {	Line 2243 sub update_user_data {
if ($env{'form.action'} eq 'singlestudent') {	if ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';	$helpitem = 'Course_Add_Student';
}	}
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',	my $title = 'User Management';
	if ($context eq 'course') {
	if ($is_custom) {
	$title = 'Enrollment and Student Activity';
	}
	}
	$r->print(&Apache::lonhtmlcommon::breadcrumbs($title,
$helpitem));	$helpitem));
$r->print(&update_result_form($uhome));	$r->print(&update_result_form($uhome));
# Check Inputs	# Check Inputs
Line 2563 sub update_user_data {	Line 2740 sub update_user_data {
$changeHash{'tools.'.$key};	$changeHash{'tools.'.$key};
} else {	} else {
$newenvhash{'environment.availabletools.'.$key} =	$newenvhash{'environment.availabletools.'.$key} =
&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'}, $key,'reload','tools');	&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
	$key,'reload','tools');
}	}
}	}
}	}
Line 3478 sub build_roles {	Line 3656 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'};
	}
	my $is_custom = &Apache::loncommon::needs_gci_custom();
	my $title = 'User Management';
	if ($context eq 'course') {
	if ($is_custom) {
	$title = 'Enrollment and Student Activity';
	}
	}
# ------------------------------------------------------- What can be assigned?	# ------------------------------------------------------- What can be assigned?
my %full=();	my %full=();
my %courselevel=();	my %courselevel=();
Line 3498 sub custom_role_editor {	Line 3692 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 3507 sub custom_role_editor {	Line 3700 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 3548 sub custom_role_editor {	Line 3744 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 $crstype;	my @template_roles = ("in","ta","ep");
if ($env{'request.course.id'}) {	if ($context eq 'domain') {
$crstype = &Apache::loncommon::course_type();	push(@template_roles,"ad");
}	}
my @template_roles = ("in","ta","ep","st");	push(@template_roles,"st");
if ($crstype eq 'Community') {	if ($crstype eq 'Community') {
unshift(@template_roles,'co');	unshift(@template_roles,'co');
} else {	} else {
unshift(@template_roles,'cc');	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,$crstype).' ';	$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 3573 sub custom_role_editor {	Line 3799 sub custom_role_editor {
{href=>"javascript:backPage(document.form1,'','')",	{href=>"javascript:backPage(document.form1,'','')",
text=>"Edit custom role",	text=>"Edit custom role",
faq=>282,bug=>'Instructor Interface',});	faq=>282,bug=>'Instructor Interface',});
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',	$r->print(&Apache::lonhtmlcommon::breadcrumbs($title,
'Course_Editing_Custom_Roles'));	'Course_Editing_Custom_Roles'));

$r->print($body_top);	$r->print($body_top);
Line 3583 sub custom_role_editor {	Line 3809 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 3601 ENDCCF	Line 3836 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,$crstype);	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>'.
Line 3610 ENDCCF	Line 3845 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 3626 ENDCCF	Line 3865 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 3640 sub make_script_template {	Line 3879 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 3712 sub set_custom_role {	Line 3952 sub set_custom_role {
.$jsback."\n"	.$jsback."\n"
.'// ]]>'."\n"	.'// ]]>'."\n"
.'</script>'."\n";	.'</script>'."\n";
	my $title = 'User Management';
	my $is_custom = &Apache::loncommon::needs_gci_custom();
	if ($context eq 'course') {
	if ($is_custom) {
	$title = 'Enrollment and Student Activity';
	}
	}
$r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript);	$r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript);
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage(document.customresult,'pickrole','')",	({href=>"javascript:backPage(document.customresult,'pickrole','')",
Line 3724 sub set_custom_role {	Line 3970 sub set_custom_role {
{href=>"javascript:backPage(document.customresult,'set_custom_roles','')",	{href=>"javascript:backPage(document.customresult,'set_custom_roles','')",
text=>"Result",	text=>"Result",
faq=>282,bug=>'Instructor Interface',});	faq=>282,bug=>'Instructor Interface',});
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',	$r->print(&Apache::lonhtmlcommon::breadcrumbs($title,
'Course_Editing_Custom_Roles'));	'Course_Editing_Custom_Roles'));

my ($rdummy,$roledef)=	my ($rdummy,$roledef)=
Line 3802 sub handler {	Line 4048 sub handler {
} else {	} else {
$context = 'domain';	$context = 'domain';
}	}
	my $title = 'User Management';
	my $is_custom = &Apache::loncommon::needs_gci_custom();
	if ($context eq 'course') {
	if ($is_custom) {
	$title = 'Enrollment and Student Activity';
	}
	}
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['action','state','callingform','roletype','showrole','bulkaction','popup','phase',	['action','state','callingform','roletype','showrole','bulkaction','popup','phase',
'username','domain','srchterm','srchdomain','srchin','srchby','srchtype']);	'username','domain','srchterm','srchdomain','srchin','srchby','srchtype']);
Line 3809 sub handler {	Line 4062 sub handler {
if ($env{'form.action'} ne 'dateselect') {	if ($env{'form.action'} ne 'dateselect') {
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/createuser",	({href=>"/adm/createuser",
text=>"User Management",	text=>$title,
help=>'Course_Create_Class_List,Course_Change_Privileges,Course_View_Class_List,Course_Editing_Custom_Roles,Course_Add_Student,Course_Drop_Student,Course_Automated_Enrollment,Course_Self_Enrollment,Course_Manage_Group'});	help=>'Course_Create_Class_List,Course_Change_Privileges,Course_View_Class_List,Course_Editing_Custom_Roles,Course_Add_Student,Course_Drop_Student,Course_Automated_Enrollment,Course_Self_Enrollment,Course_Manage_Group'});
}	}
#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
Line 3829 sub handler {	Line 4082 sub handler {
# Main switch on form.action and form.state, as appropriate	# Main switch on form.action and form.state, as appropriate
if (! exists($env{'form.action'})) {	if (! exists($env{'form.action'})) {
$r->print(&header());	$r->print(&header());
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));	$r->print(&Apache::lonhtmlcommon::breadcrumbs($title));
$r->print(&print_main_menu($permission,$context,$crstype));	$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'}) {
Line 3845 sub handler {	Line 4098 sub handler {
if (! exists($env{'form.state'})) {	if (! exists($env{'form.state'})) {
&Apache::lonuserutils::print_first_users_upload_form($r,$context);	&Apache::lonuserutils::print_first_users_upload_form($r,$context);
} elsif ($env{'form.state'} eq 'got_file') {	} elsif ($env{'form.state'} eq 'got_file') {
	my $formname;
	if ($env{'form.caller'} eq 'requestcrs') {
	$formname = 'studentform';
	}
&Apache::lonuserutils::print_upload_manager_form($r,$context,	&Apache::lonuserutils::print_upload_manager_form($r,$context,
$permission,$crstype);	$permission,$crstype,$formname);
} 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 3869 sub handler {	Line 4126 sub handler {
if ($env{'form.phase'} eq 'createnewuser') {	if ($env{'form.phase'} eq 'createnewuser') {
my $response;	my $response;
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 = '<p class="LC_warning">'.&mt('You must specify a valid username. Only the following are allowed: letters numbers - . @').'</p>';
$env{'form.phase'} = '';	$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response,$srch,undef,$crstype);	&print_username_entry_form($r,$context,$response,$srch,undef,$crstype);
} else {	} else {
Line 4085 sub handler {	Line 4342 sub handler {
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
} else {	} else {
$r->print(&header());	$r->print(&header());
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));	$r->print(&Apache::lonhtmlcommon::breadcrumbs($title));
$r->print(&print_main_menu($permission,$context,$crstype));	$r->print(&print_main_menu($permission,$context,$crstype));
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
}	}
Line 4131 END	Line 4388 END
# Menu Phase One	# Menu Phase One
sub print_main_menu {	sub print_main_menu {
my ($permission,$context,$crstype) = @_;	my ($permission,$context,$crstype) = @_;
	my $is_custom = &Apache::loncommon::needs_gci_custom();
	if (($context eq 'course') && ($is_custom)) {
	return &print_gci_main_menu($permission,$context,$crstype)
	}
my $linkcontext = $context;	my $linkcontext = $context;
my $stuterm = lc(&Apache::lonnet::plaintext('st',$crstype));	my $stuterm = lc(&Apache::lonnet::plaintext('st',$crstype));
if (($context eq 'course') && ($crstype eq 'Community')) {	if (($context eq 'course') && ($crstype eq 'Community')) {
Line 4297 sub print_main_menu {	Line 4558 sub print_main_menu {
linktitle => $linktitle{$crstype}{'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 4352 return Apache::lonhtmlcommon::generate_m	Line 4613 return Apache::lonhtmlcommon::generate_m
# });	# });
}	}

	sub print_gci_main_menu {
	my ($permission,$context,$crstype) = @_;
	my $stuterm = lc(&Apache::lonnet::plaintext('st',$crstype));
	my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
	my %links = (
	course => {
	single => 'Add/Modify a Student',
	drop => 'Drop Students',
	upload => 'Upload a File of Course Users',
	singleuser => 'Add/Modify a Course User',
	listusers => 'Concept Test Roster and Student Activity',
	},
	);
	my %linktitles = (
	course => {
	singleuser => 'Add a user with a certain role to this course.',
	listusers => 'Show and manage users in this course.',
	single => 'Add a user with the role of student to this course',
	drop => 'Remove a student from this course.',
	upload => 'Upload a CSV or a text file containing users.',
	},
	);
	my @menu = ( {categorytitle => 'Manage Users',
	items =>
	[
	{
	linktext => $links{$context}{'single'},
	#help => 'Course_Add_Student',
	icon => 'list-add.png',
	url => '/adm/createuser?action=singlestudent',
	permission => $permission->{'cusr'},
	linktitle => $linktitles{$context}{'single'},

	},
	{
	linktext => $links{$context}{'drop'},
	icon => 'edit-undo.png',
	#help => 'Course_Drop_Student',
	url => '/adm/createuser?action=drop',
	permission => $permission->{'cusr'},
	linktitle => $linktitles{$context}{'drop'},
	},
	{
	linktext => $links{$context}{'upload'},
	icon => 'sctr.png',
	#help => 'Course_Create_Class_List',
	url => '/adm/createuser?action=upload',
	permission => $permission->{'cusr'},
	linktitle => $linktitles{$context}{'upload'},
	},
	{
	linktext => $links{$context}{'listusers'},
	icon => 'edit-find.png',
	#help => 'Course_View_Class_List',
	url => '/adm/createuser?action=listusers',
	permission => ($permission->{'view'} \|\| $permission->{'cusr'}),
	linktitle => $linktitles{$context}{'listusers'},
	},
	]},
	{categorytitle => 'Administration',
	items => [ ]},
	);

	push(@{ $menu[1]->{items} }, #Category: Administration
	{
	linktext => 'Change Log',
	icon => 'document-properties.png',
	#help => 'Course_User_Logs',
	url => '/adm/createuser?action=changelogs',
	permission => $permission->{'cusr'},
	linktitle => 'View change log.',
	},
	);
	return Apache::lonhtmlcommon::generate_menu(@menu);
	}

sub restore_prev_selections {	sub restore_prev_selections {
my %saveable_parameters = ('srchby' => 'scalar',	my %saveable_parameters = ('srchby' => 'scalar',
'srchin' => 'scalar',	'srchin' => 'scalar',
Line 5041 sub print_userchangelogs_display {	Line 5378 sub print_userchangelogs_display {
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 5076 sub print_userchangelogs_display {	Line 5412 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,$crstype));
my ($minshown,$maxshown);	my ($minshown,$maxshown);
$minshown = 1;	$minshown = 1;
my $count = 0;	my $count = 0;
Line 5087 sub print_userchangelogs_display {	Line 5422 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 5110 sub print_userchangelogs_display {	Line 5466 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 5149 sub print_userchangelogs_display {	Line 5512 sub print_userchangelogs_display {
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>'
Line 5160 sub print_userchangelogs_display {	Line 5523 sub print_userchangelogs_display {
.'<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 5193 function chgPage(caller) {	Line 5560 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 {
Line 5312 sub role_display_filter {	Line 5653 sub role_display_filter {
# Update Display button	# Update Display button
$output .= '<p>'	$output .= '<p>'
.'<input type="submit" value="'.&mt('Update Display').'" />'	.'<input type="submit" value="'.&mt('Update Display').'" />'
.'</p>';	.'</p><hr />';

# Server version info
$output .= '<p class="LC_info">'
.&mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.'
,'2.6.99.0');
if ($version) {
$output .= ' '.&mt('This LON-CAPA server is version [_1]',$version);
}
$output .= '</p><hr />';
return $output;	return $output;
}	}

Line 5371 sub user_search_result {	Line 5703 sub user_search_result {
if (($srch->{'srchin'} eq 'dom') \|\| ($srch->{'srchin'} eq 'instd')) {	if (($srch->{'srchin'} eq 'dom') \|\| ($srch->{'srchin'} eq 'instd')) {
if (($srch->{'srchdomain'} eq '') \|\|	if (($srch->{'srchdomain'} eq '') \|\|
! (&Apache::lonnet::domain($srch->{'srchdomain'}))) {	! (&Apache::lonnet::domain($srch->{'srchdomain'}))) {
$response = &mt('You must specify a valid domain when searching in a domain or institutional directory.')	$response = '<p class="LC_warning">'.&mt('You must specify a valid domain when searching in a domain or institutional directory.').'</p>';
}	}
}	}
if (($srch->{'srchin'} eq 'dom') \|\| ($srch->{'srchin'} eq 'crs') \|\|	if (($srch->{'srchin'} eq 'dom') \|\| ($srch->{'srchin'} eq 'crs') \|\|
Line 5384 sub user_search_result {	Line 5716 sub user_search_result {
}	}
}	}
if ($unamecheck !~ /^$match_username$/) {	if ($unamecheck !~ /^$match_username$/) {
$response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @');	$response = '<p class="LC_warning">'.&mt('You must specify a valid username. Only the following are allowed: letters numbers - . @').'</p>';
}	}
}	}
}	}
Line 5559 sub user_search_result {	Line 5891 sub user_search_result {
($currstate,$response,$forcenewuser) =	($currstate,$response,$forcenewuser) =
&build_search_response($context,$srch,%srch_results);	&build_search_response($context,$srch,%srch_results);
} else {	} else {
my $showdom = &display_domain_info($srch->{'srchdomain'}); $response = '<span class="LC_warning">'.	my $showdom = &display_domain_info($srch->{'srchdomain'});
	$response = '<span class="LC_warning">'.
&mt('Institutional directory search is not available in domain: [_1]',$showdom).	&mt('Institutional directory search is not available in domain: [_1]',$showdom).
'</span><br />'.	'</span><br />'.
&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').	&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').
Line 5852 sub course_level_table {	Line 6185 sub course_level_table {
'end' => "End"	'end' => "End"
);	);

foreach my $protectedcourse (sort( keys(%inccourses))) {	foreach my $protectedcourse (sort(keys(%inccourses))) {
my $thiscourse=$protectedcourse;	my $thiscourse=$protectedcourse;
$thiscourse=~s:_:/:g;	$thiscourse=~s:_:/:g;
my %coursedata=&Apache::lonnet::coursedescription($thiscourse);	my %coursedata=&Apache::lonnet::coursedescription($thiscourse);
	my $isowner = &is_courseowner($protectedcourse,$coursedata{'internal.courseowner'});
my $area=$coursedata{'description'};	my $area=$coursedata{'description'};
my $crstype=$coursedata{'type'};	my $crstype=$coursedata{'type'};
if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; }	if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; }
Line 5870 sub course_level_table {	Line 6204 sub course_level_table {
my @roles = &Apache::lonuserutils::roles_by_context('course','',$crstype);	my @roles = &Apache::lonuserutils::roles_by_context('course','',$crstype);
foreach my $role (@roles) {	foreach my $role (@roles) {
my $plrole=&Apache::lonnet::plaintext($role,$crstype);	my $plrole=&Apache::lonnet::plaintext($role,$crstype);
if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) {	if ((&Apache::lonnet::allowed('c'.$role,$thiscourse)) \|\|
	((($role eq 'cc') \|\| ($role eq 'co')) && ($isowner))) {
$table .= &course_level_row($protectedcourse,$role,$area,$domain,	$table .= &course_level_row($protectedcourse,$role,$area,$domain,
$plrole,\%sections_count,\%lt);	$plrole,\%sections_count,\%lt);
} elsif ($env{'request.course.sec'} ne '') {	} elsif ($env{'request.course.sec'} ne '') {
if (&Apache::lonnet::allowed('c'.$role,$thiscourse.'/'.	if (&Apache::lonnet::allowed('c'.$role,$thiscourse.'/'.
$env{'request.course.sec'})) {	$env{'request.course.sec'})) {
Line 5882 sub course_level_table {	Line 6217 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 6374 sub get_selfenroll_titles {	Line 6710 sub get_selfenroll_titles {
return (\@row,\%lt);	return (\@row,\%lt);
}	}

	sub is_courseowner {
	my ($thiscourse,$courseowner) = @_;
	if ($courseowner eq '') {
	if ($env{'request.course.id'} eq $thiscourse) {
	$courseowner = $env{'course.'.$env{'request.course.id'}.'.internal.courseowner'};
	}
	}
	if ($courseowner ne '') {
	if ($courseowner eq $env{'user.name'}.':'.$env{'user.domain'}) {
	return 1;
	}
	}
	return;
	}

#---------------------------------------------- end functions for &phase_two	#---------------------------------------------- end functions for &phase_two

#--------------------------------- functions for &phase_two and &phase_three	#--------------------------------- functions for &phase_two and &phase_three

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

Removed from v.1.323
changed lines
	Added in v.1.329.2.4