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

version 1.295.2.17, 2010/01/03 03:17:23	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 230 sub build_tools_display {	Line 231 sub build_tools_display {
'uscu' => "Use custom",	'uscu' => "Use custom",
'official' => 'Can request creation of official courses',	'official' => 'Can request creation of official courses',
'unofficial' => 'Can request creation of unofficial courses',	'unofficial' => 'Can request creation of unofficial courses',
	'community' => 'Can request creation of communities',
);	);
if ($context eq 'requestcourses') {	if ($context eq 'requestcourses') {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,	%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'requestcourses.official','requestcourses.unofficial');	'requestcourses.official','requestcourses.unofficial',
@usertools = ('official','unofficial');	'requestcourses.community');
	@usertools = ('official','unofficial','community');
@options =('norequest','approval','autolimit','validate');	@options =('norequest','approval','autolimit','validate');
%validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);	%validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);
%reqtitles = &courserequest_titles();	%reqtitles = &courserequest_titles();
Line 466 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 485 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 510 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 591 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 602 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 674 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 702 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 715 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 727 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 809 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 854 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 878 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 905 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 954 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 972 $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 =
Line 991 $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 1065 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 1074 $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 1088 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'));
Line 1172 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 1211 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 1441 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 1461 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 1476 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 1971 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 1995 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 2094 sub update_user_data {	Line 2207 sub update_user_data {
$env{'form.ccuname'}, $env{'form.ccdomain'}).'</h3>');	$env{'form.ccuname'}, $env{'form.ccdomain'}).'</h3>');
my (%alerts,%rulematch,%inst_results,%curr_rules);	my (%alerts,%rulematch,%inst_results,%curr_rules);
my @usertools = ('aboutme','blog','portfolio');	my @usertools = ('aboutme','blog','portfolio');
my @requestcourses = ('official','unofficial');	my @requestcourses = ('official','unofficial','community');
my ($othertitle,$usertypes,$types) =	my ($othertitle,$usertypes,$types) =
&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});	&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
if ($env{'form.makeuser'}) {	if ($env{'form.makeuser'}) {
Line 2227 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 2313 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 2494 sub update_user_data {	Line 2608 sub update_user_data {
($env{'user.domain'} eq $env{'form.ccdomain'})) {	($env{'user.domain'} eq $env{'form.ccdomain'})) {
my %newenvhash;	my %newenvhash;
foreach my $key (keys(%changed)) {	foreach my $key (keys(%changed)) {
if (($key eq 'official') \|\| ($key eq 'unofficial')) {	if (($key eq 'official') \|\| ($key eq 'unofficial')
	\|\| ($key eq 'community')) {
$newenvhash{'environment.requestcourses.'.$key} =	$newenvhash{'environment.requestcourses.'.$key} =
$changeHash{'requestcourses.'.$key};	$changeHash{'requestcourses.'.$key};
if ($changeHash{'requestcourses.'.$key} ne '') {	if ($changeHash{'requestcourses.'.$key} ne '') {
$newenvhash{'environment.canrequest.'.$key} = 1;	$newenvhash{'environment.canrequest.'.$key} =
	$changeHash{'requestcourses.'.$key};
} else {	} else {
$newenvhash{'environment.canrequest.'.$key} =	$newenvhash{'environment.canrequest.'.$key} =
&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},	&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
Line 2555 sub update_user_data {	Line 2671 sub update_user_data {
'portfolio' => 'Portfolio Availability',	'portfolio' => 'Portfolio Availability',
'official' => 'Can Request Official Courses',	'official' => 'Can Request Official Courses',
'unofficial' => 'Can Request Unofficial Courses',	'unofficial' => 'Can Request Unofficial Courses',
	'community' => 'Can Request Communities',
'inststatus' => "Affiliation",	'inststatus' => "Affiliation",
'prvs' => 'Previous Value:',	'prvs' => 'Previous Value:',
'chto' => 'Changed To:'	'chto' => 'Changed To:'
Line 2708 END	Line 2825 END
'portfolio' => "Portfolio Availability",	'portfolio' => "Portfolio Availability",
'official' => "Can Request Official Courses",	'official' => "Can Request Official Courses",
'unofficial' => "Can Request Unofficial Courses",	'unofficial' => "Can Request Unofficial Courses",
	'community' => "Can Request Communities",
'inststatus' => "Affiliation",	'inststatus' => "Affiliation",
);	);
$r->print(<<"END");	$r->print(<<"END");
Line 2778 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 3249 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 3283 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 3408 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 3428 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 3437 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 3476 sub custom_role_editor {	Line 3622 sub custom_role_editor {
my ($jsback,$elements) = &crumb_utilities();	my ($jsback,$elements) = &crumb_utilities();
my $button_code = "\n";	my $button_code = "\n";
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).' ';
}	}
$head_script .= "\n".$jsback."\n".	my $context_code;
'// ]]>'."\n".	if ($context eq 'domain') {
'</script>'."\n";	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"
	.'// ]]>'."\n"
	.'</script>'."\n";
$r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));	$r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage(document.form1,'pickrole','')",	({href=>"javascript:backPage(document.form1,'pickrole','')",
Line 3504 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 3522 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 3531 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 3547 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 3561 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 3613 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 3628 sub set_custom_role {	Line 3827 sub set_custom_role {
return;	return;
}	}
my ($jsback,$elements) = &crumb_utilities();	my ($jsback,$elements) = &crumb_utilities();
my $jscript = '<script type="text/javascript">'.	my $jscript = '<script type="text/javascript">'
'// <![CDATA['."\n".	.'// <![CDATA['."\n"
$jsback."\n".	.$jsback."\n"
'// ]]>'."\n".	.'// ]]>'."\n"
'</script>';	.'</script>'."\n";

$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
Line 3714 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 3735 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 3750 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 3766 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 3791 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 3807 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 3825 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 3877 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 3901 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 3923 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 3965 sub handler {	Line 4183 sub handler {
$r->print('<h3>'.&mt('Pending enrollment requests').'</h3>'."\n");	$r->print('<h3>'.&mt('Pending enrollment requests').'</h3>'."\n");
$r->print(&Apache::loncoursequeueadmin::display_queued_requests($context,	$r->print(&Apache::loncoursequeueadmin::display_queued_requests($context,
$cdom,$cnum));	$cdom,$cnum));

} elsif ($env{'form.state'} eq 'done') {	} elsif ($env{'form.state'} eq 'done') {
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/createuser?action=selfenrollqueue',	({href=>'/adm/createuser?action=selfenrollqueue',
Line 3989 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 4008 sub header {	Line 4225 sub header {

sub add_script {	sub add_script {
my ($js) = @_;	my ($js) = @_;
return '<script type="text/javascript">'."\n".	return '<script type="text/javascript">'."\n"
'// <![CDATA['."\n".	.'// <![CDATA['."\n"
"\n".$js."\n".	.$js."\n"
'// ]]>'."\n".	.'// ]]>'."\n"
'</script>'."\n";	.'</script>'."\n";
}	}

sub verify_user_display {	sub verify_user_display {
Line 4033 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',
singleuser => 'Add/Modify a Single User',	singleuser => 'Add/Modify a User',
listusers => 'Manage Multiple Users',	listusers => 'Manage Users',
},	},
author => {	author => {
upload => 'Upload a File of Co-authors',	upload => 'Upload a File of Co-authors',
singleuser => 'Add/Modify a Single Co-author',	singleuser => 'Add/Modify a Co-author',
listusers => 'Display Co-authors and Manage Multiple Users',	listusers => 'Manage Co-authors',
},	},
course => {	course => {
upload => 'Upload a File of Course Users',	upload => 'Upload a File of Course Users',
singleuser => 'Add/Modify a Single Course User',	singleuser => 'Add/Modify a Course User',
listusers => 'Display Class Lists and Manage Multiple 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',
	items =>
	[
	{
	linktext => $links{$linkcontext}{'singleuser'},
	icon => 'edit-redo.png',
	#help => 'Course_Change_Privileges',
	url => '/adm/createuser?action=singleuser',
	permission => $permission->{'cusr'},
	linktitle => $linktitles{$linkcontext}{'singleuser'},
	},
	]},

my @menu =	{categorytitle => 'Multiple Users',
(	items =>
{ text => $links{$context}{'upload'},	[
help => 'Course_Create_Class_List',	{
action => 'upload',	linktext => $links{$linkcontext}{'upload'},
permission => $permission->{'cusr'},	icon => 'sctr.png',
	#help => 'Course_Create_Class_List',
	url => '/adm/createuser?action=upload',
	permission => $permission->{'cusr'},
	linktitle => 'Upload a CSV or a text file containing users.',
},	},
{ text => $links{$context}{'singleuser'},	{
help => 'Course_Change_Privileges',	linktext => $links{$linkcontext}{'listusers'},
action => 'singleuser',	icon => 'edit-find.png',
permission => $permission->{'cusr'},	#help => 'Course_View_Class_List',
	url => '/adm/createuser?action=listusers',
	permission => ($permission->{'view'} \|\| $permission->{'cusr'}),
	linktitle => $linktitles{$linkcontext}{'listusers'},
	},

	]},

	{categorytitle => 'Administration',
	items => [ ]},
	);

	if ($context eq 'domain'){

	push(@{ $menu[2]->{items} }, #Category: Administration
	{
	linktext => 'Custom Roles',
	icon => 'emblem-photos.png',
	#help => 'Course_Editing_Custom_Roles',
	url => '/adm/createuser?action=custom',
	permission => $permission->{'custom'},
	linktitle => 'Configure a custom role.',
},	},
{ text => $links{$context}{'listusers'},
help => 'Course_View_Class_List',
action => 'listusers',
permission => ($permission->{'view'} \|\| $permission->{'cusr'}),
},
);	);
if ($context eq 'domain' \|\| $context eq 'course') {
my $customlink = { text => 'Edit Custom Roles',	}elsif ($context eq 'course'){
help => 'Course_Editing_Custom_Roles',
action => 'custom',
permission => $permission->{'custom'},
};
push(@menu,$customlink);
}
if ($context eq 'course') {
my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();	my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
my @courselinks =
(	my %linktext = (
{ text => 'Enroll a Single Student',	'Course' => {
help => 'Course_Add_Student',	single => 'Add/Modify a Student',
action => 'singlestudent',	drop => 'Drop Students',
permission => $permission->{'cusr'},	groups => 'Course Groups',
},	},
{ text => 'Drop Students',	'Community' => {
help => 'Course_Drop_Student',	single => 'Add/Modify a Member',
action => 'drop',	drop => 'Drop Members',
permission => $permission->{'cusr'},	groups => 'Community Groups',
});	},
if (!exists($permission->{'cusr_section'})) {	);
push(@courselinks,
{ text => 'Automated Enrollment Manager',	my %linktitle = (
help => 'Course_Automated_Enrollment',	'Course' => {
permission => (&Apache::lonnet::auto_run($cnum,$cdom)	single => 'Add a user with the role of student to this course',
&& $permission->{'cusr'}),	drop => 'Remove a student from this course.',
url => '/adm/populate',	groups => 'Manage course groups',
},	},
{ text => 'Configure User Self-enrollment',	'Community' => {
help => 'Course_Self_Enrollment',	single => 'Add a user with the role of member to this community',
action => 'selfenroll',	drop => 'Remove a member from this community.',
permission => $permission->{'cusr'},	groups => 'Manage community groups',
});	},
}	);

	push(@{ $menu[0]->{items} }, #Category: Single Users
	{
	linktext => $linktext{$crstype}{'single'},
	#help => 'Course_Add_Student',
	icon => 'list-add.png',
	url => '/adm/createuser?action=singlestudent',
	permission => $permission->{'cusr'},
	linktitle => $linktitle{$crstype}{'single'},
	},
	);

	push(@{ $menu[1]->{items} }, #Category: Multiple Users
	{
	linktext => $linktext{$crstype}{'drop'},
	icon => 'edit-undo.png',
	#help => 'Course_Drop_Student',
	url => '/adm/createuser?action=drop',
	permission => $permission->{'cusr'},
	linktitle => $linktitle{$crstype}{'drop'},
	},
	);
	push(@{ $menu[2]->{items} }, #Category: Administration
	{
	linktext => 'Custom Roles',
	icon => 'emblem-photos.png',
	#help => 'Course_Editing_Custom_Roles',
	url => '/adm/createuser?action=custom',
	permission => $permission->{'custom'},
	linktitle => 'Configure a custom role.',
	},
	{
	linktext => $linktext{$crstype}{'groups'},
	icon => 'conf.png',
	#help => 'Course_Manage_Group',
	url => '/adm/coursegroups?refpage=cusr',
	permission => $permission->{'grp_manage'},
	linktitle => $linktitle{$crstype}{'groups'},
	},
	{
	linktext => 'Change Log',
	icon => 'document-properties.png',
	#help => 'Course_User_Logs',
	url => '/adm/createuser?action=changelogs',
	permission => $permission->{'cusr'},
	linktitle => 'View change log.',
	},
	);
if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {	if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {
push(@courselinks,	push(@{ $menu[2]->{items} },
{ text => 'Enrollment Requests',	{
help => 'Course_Approve_Selfenroll',	linktext => 'Enrollment Requests',
action => 'selfenrollqueue',	icon => 'selfenrl-queue.png',
permission => $permission->{'cusr'},	#help => 'Course_Approve_Selfenroll',
});	url => '/adm/createuser?action=selfenrollqueue',
}	permission => $permission->{'cusr'},
push(@courselinks,	linktitle =>'Approve or reject enrollment requests.',
{ text => 'Manage Course Groups',	},
help => 'Course_Manage_Group',	);
permission => $permission->{'grp_manage'},	}
url => '/adm/coursegroups?refpage=cusr',
},	if (!exists($permission->{'cusr_section'})){
{ text => 'View Change Logs',	if ($crstype ne 'Community') {
help => 'Course_User_Logs',	push(@{ $menu[2]->{items} },
action => 'changelogs',	{
	linktext => 'Automated Enrollment',
	icon => 'roles.png',
	#help => 'Course_Automated_Enrollment',
	permission => (&Apache::lonnet::auto_run($cnum,$cdom)
	&& $permission->{'cusr'}),
	url => '/adm/populate',
	linktitle => 'Automated enrollment manager.',
	}
	);
	}
	push(@{ $menu[2]->{items} },
	{
	linktext => 'User Self-Enrollment',
	icon => 'cstr.png',
	#help => 'Course_Self_Enrollment',
	url => '/adm/createuser?action=selfenroll',
permission => $permission->{'cusr'},	permission => $permission->{'cusr'},
},);	linktitle => 'Configure user self-enrollment.',
	},
	);
	}
	};
	return Apache::lonhtmlcommon::generate_menu(@menu);
# { text => 'View Log-in History',	# { text => 'View Log-in History',
# help => 'Course_User_Logins',	# help => 'Course_User_Logins',
# action => 'logins',	# action => 'logins',
# permission => $permission->{'cusr'},	# permission => $permission->{'cusr'},
# });	# });
push(@menu,@courselinks);
}
my $menu_html = '';
foreach my $menu_item (@menu) {
next if (! $menu_item->{'permission'});
$menu_html.='<p>';
if (exists($menu_item->{'help'})) {
$menu_html.=
&Apache::loncommon::help_open_topic($menu_item->{'help'});
}
$menu_html.='<font size="+1">';
if (exists($menu_item->{'url'})) {
$menu_html.=qq{<a href="$menu_item->{'url'}">};
} else {
$menu_html.=
qq{<a href="/adm/createuser?action=$menu_item->{'action'}">}; }
$menu_html.= &mt($menu_item->{'text'}).'</a></font>';
$menu_html.='</p>';
}
return $menu_html;
}	}

sub restore_prev_selections {	sub restore_prev_selections {
Line 4165 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 4377 ENDSCRIPT	Line 4698 ENDSCRIPT
if (ref($lt) eq 'HASH') {	if (ref($lt) eq 'HASH') {
$title = $lt->{$item};	$title = $lt->{$item};
}	}
$output .=	$output .= &Apache::lonhtmlcommon::row_title($title);
&Apache::lonhtmlcommon::row_title($title,
'LC_selfenroll_pick_box_title','LC_oddrow_value')."\n";
if ($item eq 'types') {	if ($item eq 'types') {
my $curr_types = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_types'};	my $curr_types = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_types'};
my $showdomdesc = 1;	my $showdomdesc = 1;
Line 4528 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 4834 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 4872 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 $showntablehdr = 0;
my $tablehdr = &Apache::loncommon::start_data_table().
&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();
my ($minshown,$maxshown);	my ($minshown,$maxshown);
$minshown = 1;	$minshown = 1;
my $count = 0;	my $count = 0;
Line 4889 sub print_userchangelogs_display {	Line 5204 sub print_userchangelogs_display {
$minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};	$minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
}	}
}	}

	# Form Header
	$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 4910 sub print_userchangelogs_display {	Line 5249 sub print_userchangelogs_display {
}	}
$count ++;	$count ++;
next if ($count < $minshown);	next if ($count < $minshown);
if (!$showntablehdr) {	unless ($showntableheader) {
$r->print($tablehdr);	$r->print($nav_script
$showntablehdr = 1;	.$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'}} =
Line 4948 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};
}	}
$r->print(&Apache::loncommon::start_data_table_row().'<td>'.$count.'</td><td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td><td>'.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.'</td><td>'.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.'</td><td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'}).'</td><td>'.$sec.'</td><td>'.$chgcontext.'</td><td>'.$rolestart.'</td><td>'.$roleend.'</td>'.&Apache::loncommon::end_data_table_row()."\n");	$r->print(
	&Apache::loncommon::start_data_table_row()
	.'<td>'.$count.'</td>'
	.'<td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td>'
	.'<td>'.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.'</td>'
	.'<td>'.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.'</td>'
	.'<td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'},$crstype).'</td>'
	.'<td>'.$sec.'</td>'
	.'<td>'.$chgcontext.'</td>'
	.'<td>'.$rolestart.'</td>'
	.'<td>'.$roleend.'</td>'
	.&Apache::loncommon::end_data_table_row()."\n");
	}

	if ($showntableheader) { # Table footer, if content displayed above
	$r->print(&Apache::loncommon::end_data_table()
	.$nav_links);
	} else { # No content displayed above
	$r->print('<p class="LC_info">'
	.&mt('There are no records to display.')
	.'</p>'
	);
}	}
if ($showntablehdr) {
$r->print(&Apache::loncommon::end_data_table().'<br />');	# Form Footer
if (($curr{'page'} > 1) \|\| ($more_records)) {	$r->print(
$r->print('<table><tr>');	'<input type="hidden" name="page" value="'.$curr{'page'}.'" />'
if ($curr{'page'} > 1) {	.'<input type="hidden" name="action" value="changelogs" />'
$r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>');	.'</form>');
}	return;
if ($more_records) {	}
$r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>');
}	sub userlogdisplay_nav {
$r->print('</tr></table>');	my ($formname,$curr,$more_records) = @_;
$r->print(<<"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 4975 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
	$nav_links = '<p>';
	if (($curr->{'page'} > 1) \|\| ($more_records)) {
	if ($curr->{'page'} > 1) {
	$nav_links .= '<input type="button"'
	.' onclick="javascript:chgPage('."'previous'".');"'
	.' value="'.&mt('Previous [_1] changes',$curr->{'show'})
	.'" /> ';
	}
	if ($more_records) {
	$nav_links .= '<input type="button"'
	.' onclick="javascript:chgPage('."'next'".');"'
	.' value="'.&mt('Next [_1] changes',$curr->{'show'})
	.'" />';
	}
}	}
} else {	$nav_links .= '</p>';
$r->print('<p class="LC_info">'.
&mt('There are no records to display').
'</p>');
}	}
$r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.	return ($nav_script,$nav_links);
'<input type="hidden" name="action" value="changelogs" /></form>');
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 5009 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 /><table><tr><td>'.&mt('After:').	$output .= '<td valign="top"><b>'.&mt('Window during which changes occurred:').'</b><br />'.
'</td><td>'.$startform.'</td></tr><tr><td>'.&mt('Before:').'</td><td>'.	'<table><tr><td>'.&mt('After:').
$endform.'</td></tr></table></td><td>  </td>'.	'</td><td>'.$startform.'</td></tr>'.
	'<tr><td>'.&mt('Before:').'</td>'.
	'<td>'.$endform.'</td></tr></table>'.
	'</td>'.
	'<td>  </td>'.
'<td valign="top"><b>'.&mt('Role:').'</b><br />'.	'<td valign="top"><b>'.&mt('Role:').'</b><br />'.
'<select name="role"><option value="any"';	'<select name="role"><option value="any"';
if ($curr->{'role'} eq 'any') {	if ($curr->{'role'} eq 'any') {
$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 5033 sub role_display_filter {	Line 5416 sub role_display_filter {
}	}
$output .= ' <option value="'.$role.'"'.$selstr.'>'.$plrole.'</option>';	$output .= ' <option value="'.$role.'"'.$selstr.'>'.$plrole.'</option>';
}	}
$output .= '</select></td><td>  </td><td valign="top"><b>'.	$output .= '</select></td>'.
	'<td>  </td>'.
	'<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 5054 sub role_display_filter {	Line 5439 sub role_display_filter {
.'</p>';	.'</p>';

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

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 5075 sub rolechg_contexts {	Line 5461 sub rolechg_contexts {
selfenroll => 'Self-enrolled',	selfenroll => 'Self-enrolled',
requestcourses => 'Course Request',	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 5469 sub build_search_response {	Line 5860 sub build_search_response {
&Apache::lonuserutils::can_create_user($createdom,$context);	&Apache::lonuserutils::can_create_user($createdom,$context);
my $targetdom = '<span class="LC_cusr_emph">'.$createdom.'</span>';	my $targetdom = '<span class="LC_cusr_emph">'.$createdom.'</span>';
if ($cancreate) {	if ($cancreate) {
my $showdom = &display_domain_info($createdom);	my $showdom = &display_domain_info($createdom);
$response .= '<br /><br />'	$response .= '<br /><br />'
.'<b>'.&mt('To add a new user:').'</b>'	.'<b>'.&mt('To add a new user:').'</b>'
.'<br />';	.'<br />';
Line 5478 sub build_search_response {	Line 5869 sub build_search_response {
} else {	} else {
$response .= &mt("(You can only create new users in your current role's domain - [_1])",$targetdom);	$response .= &mt("(You can only create new users in your current role's domain - [_1])",$targetdom);
}	}
$response .= '<ul><li>'	$response .='<ul><li>'
.&mt("Set 'Domain/institution to search' to: [_1]",'<span class="LC_cusr_emph">'.$showdom.'</span>')	.&mt("Set 'Domain/institution to search' to: [_1]",'<span class="LC_cusr_emph">'.$showdom.'</span>')
.'</li><li>'	.'</li><li>'
.&mt("Set 'Search criteria' to: [_1]username is ..... in selected LON-CAPA domain[_2]",'<span class="LC_cusr_emph">','</span>')	.&mt("Set 'Search criteria' to: [_1]username is ..... in selected LON-CAPA domain[_2]",'<span class="LC_cusr_emph">','</span>')
Line 5496 sub build_search_response {	Line 5887 sub build_search_response {
$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);
}	}
$response .= '<br />'	$response .= '<br />'
.&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.'	.&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.'
,' <a'.$helplink.'>'	,' <a'.$helplink.'>'
,'</a>')	,'</a>')
.'<br /><br />';	.'<br /><br />';
}	}
}	}
}	}
Line 5590 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 5600 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 5615 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 5646 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 5694 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 5706 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 5733 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.295.2.17
changed lines
	Added in v.1.328