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.406.2.11 and 1.406.2.17

version 1.406.2.11, 2017/01/24 05:35:35	version 1.406.2.17, 2019/08/27 14:45:04
Line 641 sub curr_requestauthor {	Line 641 sub curr_requestauthor {
# =================================================================== Phase one	# =================================================================== Phase one

sub print_username_entry_form {	sub print_username_entry_form {
my ($r,$context,$response,$srch,$forcenewuser,$crstype,$brcrum) = @_;	my ($r,$context,$response,$srch,$forcenewuser,$crstype,$brcrum,
	$permission) = @_;
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 667 sub print_username_entry_form {	Line 668 sub print_username_entry_form {
}	}
my $helpitem = 'Course_Change_Privileges';	my $helpitem = 'Course_Change_Privileges';
if ($env{'form.action'} eq 'custom') {	if ($env{'form.action'} eq 'custom') {
$helpitem = 'Course_Editing_Custom_Roles';	if ($context eq 'course') {
	$helpitem = 'Course_Editing_Custom_Roles';
	} elsif ($context eq 'domain') {
	$helpitem = 'Domain_Editing_Custom_Roles';
	}
} elsif ($env{'form.action'} eq 'singlestudent') {	} elsif ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';	$helpitem = 'Course_Add_Student';
} elsif ($env{'form.action'} eq 'accesslogs') {	} elsif ($env{'form.action'} eq 'accesslogs') {
$helpitem = 'Domain_User_Access_Logs';	$helpitem = 'Domain_User_Access_Logs';
	} elsif ($context eq 'author') {
	$helpitem = 'Author_Change_Privileges';
	} elsif ($context eq 'domain') {
	if ($permission->{'cusr'}) {
	$helpitem = 'Domain_Change_Privileges';
	} elsif ($permission->{'view'}) {
	$helpitem = 'Domain_View_Privileges';
	} else {
	undef($helpitem);
	}
}	}
my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$defdom);	my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$defdom);
if ($env{'form.action'} eq 'custom') {	if ($env{'form.action'} eq 'custom') {
Line 749 sub print_username_entry_form {	Line 764 sub print_username_entry_form {
}	}
} else {	} else {
my $actiontext = $lt{'srad'};	my $actiontext = $lt{'srad'};
	my $fixeddom;
if ($env{'form.action'} eq 'singlestudent') {	if ($env{'form.action'} eq 'singlestudent') {
if ($crstype eq 'Community') {	if ($crstype eq 'Community') {
$actiontext = $lt{'srme'};	$actiontext = $lt{'srme'};
Line 757 sub print_username_entry_form {	Line 773 sub print_username_entry_form {
}	}
} elsif ($env{'form.action'} eq 'accesslogs') {	} elsif ($env{'form.action'} eq 'accesslogs') {
$actiontext = $lt{'srva'};	$actiontext = $lt{'srva'};
	$fixeddom = 1;
} elsif (($env{'form.action'} eq 'singleuser') &&	} elsif (($env{'form.action'} eq 'singleuser') &&
($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$defdom))) {	($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$defdom))) {
$actiontext = $lt{'srvu'};	$actiontext = $lt{'srvu'};
	$fixeddom = 1;
}	}
$r->print("<h3>$actiontext</h3>");	$r->print("<h3>$actiontext</h3>");
if ($env{'form.origform'} ne 'crtusername') {	if ($env{'form.origform'} ne 'crtusername') {
Line 768 sub print_username_entry_form {	Line 786 sub print_username_entry_form {
'<br clear="all" />');	'<br clear="all" />');
}	}
}	}
$r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,1));	$r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,$fixeddom));
}	}
}	}

Line 827 sub entry_form {	Line 845 sub entry_form {
$inexact = 1;	$inexact = 1;
}	}
}	}
my $cancreate =	my ($cancreate,$noinstd);
&Apache::lonuserutils::can_create_user($dom,$context,$usertype);	if ($env{'form.action'} eq 'accesslogs') {
	$noinstd = 1;
	} else {
	$cancreate =
	&Apache::lonuserutils::can_create_user($dom,$context,$usertype);
	}
my ($userpicker,$cansearch) =	my ($userpicker,$cansearch) =
&Apache::loncommon::user_picker($dom,$srch,$forcenewuser,	&Apache::loncommon::user_picker($dom,$srch,$forcenewuser,
'document.crtuser',$cancreate,$usertype,$context,$fixeddom);	'document.crtuser',$cancreate,$usertype,$context,$fixeddom,$noinstd);
my $srchbutton = &mt('Search');	my $srchbutton = &mt('Search');
if ($env{'form.action'} eq 'singlestudent') {	if ($env{'form.action'} eq 'singlestudent') {
$srchbutton = &mt('Search and Enroll');	$srchbutton = &mt('Search and Enroll');
Line 993 ENDSCRIPT	Line 1016 ENDSCRIPT
$helpitem = 'Course_Change_Privileges';	$helpitem = 'Course_Change_Privileges';
} elsif ($env{'form.action'} eq 'singlestudent') {	} elsif ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';	$helpitem = 'Course_Add_Student';
	} elsif ($context eq 'author') {
	$helpitem = 'Author_Change_Privileges';
	} elsif ($context eq 'domain') {
	$helpitem = 'Domain_Change_Privileges';
}	}
push (@{$brcrum},	push (@{$brcrum},
{href => "javascript:backPage(document.usersrchform,'','')",	{href => "javascript:backPage(document.usersrchform,'','')",
Line 1038 ENDSCRIPT	Line 1065 ENDSCRIPT
$r->print('</h3>');	$r->print('</h3>');
} elsif ($env{'form.action'} eq 'accesslogs') {	} elsif ($env{'form.action'} eq 'accesslogs') {
$r->print("<b>$lt{'srcva'}</b><br />");	$r->print("<b>$lt{'srcva'}</b><br />");
$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,'accesslogs',undef,undef,1));	$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,undef,1));
$r->print('<h3>'.$lt{'vacsel'}.'</h3>');	$r->print('<h3>'.$lt{'vacsel'}.'</h3>');
}	}
}	}
Line 1119 sub print_user_modification_page {	Line 1146 sub print_user_modification_page {
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,'','',$crstype,$brcrum);	&print_username_entry_form($r,$context,$usermsg,'','',$crstype,$brcrum,
	$permission);
return;	return;
}	}
my ($form,$formname);	my ($form,$formname);
Line 1168 sub print_user_modification_page {	Line 1196 sub print_user_modification_page {
}	}
$response .= '</p><br />';	$response .= '</p><br />';
$env{'form.phase'} = '';	$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response,undef,undef,$crstype,$brcrum);	&print_username_entry_form($r,$context,$response,undef,undef,$crstype,$brcrum,
	$permission);
return;	return;
}	}
$newuser = 1;	$newuser = 1;
Line 1192 sub print_user_modification_page {	Line 1221 sub print_user_modification_page {
'username');	'username');
}	}
$env{'form.phase'} = '';	$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype,$brcrum);	&print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype,$brcrum,
	$permission);
return;	return;
}	}
}	}
Line 1217 sub print_user_modification_page {	Line 1247 sub print_user_modification_page {
my $helpitem = 'Course_Change_Privileges';	my $helpitem = 'Course_Change_Privileges';
if ($env{'form.action'} eq 'singlestudent') {	if ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';	$helpitem = 'Course_Add_Student';
	} elsif ($context eq 'author') {
	$helpitem = 'Author_Change_Privileges';
	} elsif ($context eq 'domain') {
	$helpitem = 'Domain_Change_Privileges';
}	}
push (@{$brcrum},	push (@{$brcrum},
{href => "javascript:backPage($form)",	{href => "javascript:backPage($form)",
Line 1452 ENDAUTH	Line 1486 ENDAUTH
($env{'request.role.domain'} eq $ccdomain)) {	($env{'request.role.domain'} eq $ccdomain)) {
$user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain);	$user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain);
}	}
$user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname);	$user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname,$crstype,$permission);
if ((&Apache::lonnet::allowed('mpq',$ccdomain)) \|\|	if ((&Apache::lonnet::allowed('mpq',$ccdomain)) \|\|
(&Apache::lonnet::allowed('mut',$ccdomain)) \|\|	(&Apache::lonnet::allowed('mut',$ccdomain)) \|\|
(&Apache::lonnet::allowed('udp',$ccdomain))) {	(&Apache::lonnet::allowed('udp',$ccdomain))) {
Line 2130 sub new_domain_roles {	Line 2164 sub new_domain_roles {
}	}

sub user_authentication {	sub user_authentication {
my ($ccuname,$ccdomain,$formname) = @_;	my ($ccuname,$ccdomain,$formname,$crstype,$permission) = @_;
my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);	my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
my $outcome;	my $outcome;
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
Line 2202 ENDBADAUTH	Line 2236 ENDBADAUTH
}	}
$outcome .= &Apache::loncommon::end_data_table();	$outcome .= &Apache::loncommon::end_data_table();
} else {	} else {
	if (($currentauth =~ /^internal:/) &&
	(&Apache::lonuserutils::can_change_internalpass($ccuname,$ccdomain,$crstype,$permission))) {
	$outcome = <<"ENDJS";
	<script type="text/javascript">
	// <![CDATA[
	function togglePwd(form) {
	if (form.newintpwd.length) {
	if (document.getElementById('LC_ownersetpwd')) {
	for (var i=0; i<form.newintpwd.length; i++) {
	if (form.newintpwd[i].checked) {
	if (form.newintpwd[i].value == 1) {
	document.getElementById('LC_ownersetpwd').style.display = 'inline-block';
	} else {
	document.getElementById('LC_ownersetpwd').style.display = 'none';
	}
	}
	}
	}
	}
	}
	// ]]>
	</script>
	ENDJS

	$outcome .= '<h3>'.$lt{'ld'}.'</h3>'.
	&Apache::loncommon::start_data_table().
	&Apache::loncommon::start_data_table_row().
	'<td>'.&mt('Internally authenticated').'<br />'.&mt("Change user's password?").
	'<label><input type="radio" name="newintpwd" value="0" checked="checked" onclick="togglePwd(this.form);" />'.
	&mt('No').'</label>'.(' 'x2).
	'<label><input type="radio" name="newintpwd" value="1" onclick="togglePwd(this.form);" />'.&mt('Yes').'</label>'.
	'<div id="LC_ownersetpwd" style="display:none">'.
	'  '.&mt('Password').' <input type="password" size="15" name="intarg" value="" />'.
	'<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.intarg.type='."'text'".' } else { this.form.intarg.type='."'password'".' }" />'.&mt('Visible input').'</label></div></td>'.
	&Apache::loncommon::end_data_table_row().
	&Apache::loncommon::end_data_table();
	}
if (&Apache::lonnet::allowed('udp',$ccdomain)) {	if (&Apache::lonnet::allowed('udp',$ccdomain)) {
# Current user has rights to view domain preferences for user's domain	# Current user has rights to view domain preferences for user's domain
my $result;	my $result;
Line 2311 sub modify_login_block {	Line 2382 sub modify_login_block {

sub personal_data_display {	sub personal_data_display {
my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,	my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,
$now,$captchaform,$emailusername,$usertype) = @_;	$now,$captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded) = @_;
my ($output,%userenv,%canmodify,%canmodify_status);	my ($output,%userenv,%canmodify,%canmodify_status);
my @userinfo = ('firstname','middlename','lastname','generation',	my @userinfo = ('firstname','middlename','lastname','generation',
'permanentemail','id');	'permanentemail','id');
Line 2338 sub personal_data_display {	Line 2409 sub personal_data_display {
'inststatus' => "Affiliation",	'inststatus' => "Affiliation",
'email' => 'E-mail address',	'email' => 'E-mail address',
'valid' => 'Validation',	'valid' => 'Validation',
	'username' => 'Username',
);	);

%canmodify_status =	%canmodify_status =
Line 2356 sub personal_data_display {	Line 2428 sub personal_data_display {
if (ref($emailusername) eq 'HASH') {	if (ref($emailusername) eq 'HASH') {
if (ref($emailusername->{$usertype}) eq 'HASH') {	if (ref($emailusername->{$usertype}) eq 'HASH') {
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();	my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
@userinfo = ();	@userinfo = ();
if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {	if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
foreach my $field (@{$infofields}) {	foreach my $field (@{$infofields}) {
if ($emailusername->{$usertype}->{$field}) {	if ($emailusername->{$usertype}->{$field}) {
Line 2386 sub personal_data_display {	Line 2458 sub personal_data_display {
$output = '<h3>'.$lt{'pd'}.'</h3>'.	$output = '<h3>'.$lt{'pd'}.'</h3>'.
&Apache::lonhtmlcommon::start_pick_box();	&Apache::lonhtmlcommon::start_pick_box();
if (($context eq 'selfcreate') && ($newuser eq 'email')) {	if (($context eq 'selfcreate') && ($newuser eq 'email')) {
	my $size = 25;
	if ($condition) {
	if ($condition =~ /^\@[^\@]+$/) {
	$size = 10;
	} else {
	undef($condition);
	}
	}
	if ($excluded) {
	unless ($excluded =~ /^\@[^\@]+$/) {
	undef($condition);
	}
	}
$output .= &Apache::lonhtmlcommon::row_title($lt{'email'}.'<b>*</b>',undef,	$output .= &Apache::lonhtmlcommon::row_title($lt{'email'}.'<b>*</b>',undef,
'LC_oddrow_value')."\n".	'LC_oddrow_value')."\n".
'<input type="text" name="uname" size="25" value="" autocomplete="off" />';	'<input type="text" name="uname" size="'.$size.'" value="" autocomplete="off" />';
	if ($condition) {
	$output .= $condition;
	} elsif ($excluded) {
	$output .= '<br /><span style="font-size: smaller">'.&mt('You must use an e-mail address that does not end with [_1]',
	$excluded).'</span>';
	}
	if ($usernameset eq 'first') {
	$output .= '<br /><span style="font-size: smaller">';
	if ($condition) {
	$output .= &mt('Your username in LON-CAPA will be the part of your e-mail address before [_1]',
	$condition);
	} else {
	$output .= &mt('Your username in LON-CAPA will be the part of your e-mail address before the @');
	}
	$output .= '</span>';
	}
$rowcount ++;	$rowcount ++;
$output .= &Apache::lonhtmlcommon::row_closure(1);	$output .= &Apache::lonhtmlcommon::row_closure(1);
my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="off" />';	my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="off" />';
Line 2403 sub personal_data_display {	Line 2504 sub personal_data_display {
'LC_oddrow_value')."\n".	'LC_oddrow_value')."\n".
$upasstwo.	$upasstwo.
&Apache::lonhtmlcommon::row_closure()."\n";	&Apache::lonhtmlcommon::row_closure()."\n";
	if ($usernameset eq 'free') {
	my $onclick = "toggleUsernameDisp(this,'selfcreateusername');";
	$output .= &Apache::lonhtmlcommon::row_title($lt{'username'},undef,'LC_oddrow_value')."\n".
	&mt('Use e-mail address: ').
	'<label><input type="radio" name="emailused" value="1" checked="checked" onclick="'.$onclick.'" />'.&mt('Yes').'</label>'."\n".
	(' 'x2).
	'<label><input type="radio" name="emailused" value="0" onclick="'.$onclick.'" />'.&mt('No').'</label>'."\n".
	'<div id="selfcreateusername" style="display: none; font-size: smaller">'.
	'<br /><span class="LC_nobreak">'.&mt('Preferred username').
	' <input type="text" name="username" value="" size="20" autocomplete="off"/>'.
	'</span></div>'."\n".&Apache::lonhtmlcommon::row_closure(1);
	$rowcount ++;
	}
}	}
foreach my $item (@userinfo) {	foreach my $item (@userinfo) {
my $rowtitle = $lt{$item};	my $rowtitle = $lt{$item};
Line 2593 sub get_inststatuses {	Line 2707 sub get_inststatuses {

# ================================================================= Phase Three	# ================================================================= Phase Three
sub update_user_data {	sub update_user_data {
my ($r,$context,$crstype,$brcrum,$showcredits) = @_;	my ($r,$context,$crstype,$brcrum,$showcredits,$permission) = @_;
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 2634 sub update_user_data {	Line 2748 sub update_user_data {
my $helpitem = 'Course_Change_Privileges';	my $helpitem = 'Course_Change_Privileges';
if ($env{'form.action'} eq 'singlestudent') {	if ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';	$helpitem = 'Course_Add_Student';
	} elsif ($context eq 'author') {
	$helpitem = 'Author_Change_Privileges';
	} elsif ($context eq 'domain') {
	$helpitem = 'Domain_Change_Privileges';
}	}
push(@{$brcrum},	push(@{$brcrum},
{href => "javascript:backPage(document.userupdate,'$env{'form.prevphase'}','modify')",	{href => "javascript:backPage(document.userupdate,'$env{'form.prevphase'}','modify')",
Line 2874 sub update_user_data {	Line 2992 sub update_user_data {
($env{'form.ccuname'},$env{'form.ccdomain'}));	($env{'form.ccuname'},$env{'form.ccdomain'}));
} else {	} else {
# Okay, this is a non-fatal error.	# Okay, this is a non-fatal error.
$r->print($error.&mt('You do not have the authority to modify this users authentication information.').$end);	$r->print($error.&mt('You do not have privileges to modify the authentication configuration for this user.').$end);
}	}
	} elsif (($env{'form.intarg'} ne '') &&
	(&Apache::lonnet::queryauthenticate($env{'form.ccuname'},$env{'form.ccdomain'}) =~ /^internal:/) &&
	(&Apache::lonuserutils::can_change_internalpass($env{'form.ccuname'},$env{'form.ccdomain'},$crstype,$permission))) {
	$r->print('Modifying authentication: '.
	&Apache::lonnet::modifyuserauth(
	$env{'form.ccdomain'},$env{'form.ccuname'},
	'internal',$env{'form.intarg'}));
}	}
$r->rflush(); # Finish display of header before time consuming actions start	$r->rflush(); # Finish display of header before time consuming actions start
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state);	&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state);
Line 4296 sub build_roles {	Line 4421 sub build_roles {
# ========================================================== Custom Role Editor	# ========================================================== Custom Role Editor

sub custom_role_editor {	sub custom_role_editor {
my ($r,$brcrum,$prefix) = @_;	my ($r,$context,$brcrum,$prefix,$permission) = @_;
my $action = $env{'form.customroleaction'};	my $action = $env{'form.customroleaction'};
my $rolename;	my ($rolename,$helpitem);
if ($action eq 'new') {	if ($action eq 'new') {
$rolename=$env{'form.newrolename'};	$rolename=$env{'form.newrolename'};
} else {	} else {
Line 4309 sub custom_role_editor {	Line 4434 sub custom_role_editor {
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
$crstype = &Apache::loncommon::course_type();	$crstype = &Apache::loncommon::course_type();
$context = 'course';	$context = 'course';
	$helpitem = 'Course_Editing_Custom_Roles';
} else {	} else {
$context = 'domain';	$context = 'domain';
$crstype = 'course';	$crstype = 'course';
	$helpitem = 'Domain_Editing_Custom_Roles';
}	}

$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,undef,undef,undef,undef,$crstype,$brcrum);	&print_username_entry_form($r,$context,undef,undef,undef,$crstype,$brcrum,
	$permission);
return;	return;
}	}

Line 4371 sub custom_role_editor {	Line 4499 sub custom_role_editor {
text => "Edit custom role",	text => "Edit custom role",
faq => 282,	faq => 282,
bug => 'Instructor Interface',	bug => 'Instructor Interface',
help => 'Course_Editing_Custom_Roles'}	help => $helpitem}
);	);
my $args = { bread_crumbs => $brcrum,	my $args = { bread_crumbs => $brcrum,
bread_crumbs_component => 'User Management'};	bread_crumbs_component => 'User Management'};
Line 4398 ENDCCF	Line 4526 ENDCCF

# ---------------------------------------------------------- Call to definerole	# ---------------------------------------------------------- Call to definerole
sub set_custom_role {	sub set_custom_role {
my ($r,$context,$brcrum,$prefix) = @_;	my ($r,$context,$brcrum,$prefix,$permission) = @_;
my $rolename=$env{'form.rolename'};	my $rolename=$env{'form.rolename'};
$rolename=~s/[^A-Za-z0-9]//gs;	$rolename=~s/[^A-Za-z0-9]//gs;
if (!$rolename) {	if (!$rolename) {
&custom_role_editor($r,$brcrum,$prefix);	&custom_role_editor($r,$context,$brcrum,$prefix,$permission);
return;	return;
}	}
my ($jsback,$elements) = &crumb_utilities();	my ($jsback,$elements) = &crumb_utilities();
Line 4411 sub set_custom_role {	Line 4539 sub set_custom_role {
.$jsback."\n"	.$jsback."\n"
.'// ]]>'."\n"	.'// ]]>'."\n"
.'</script>'."\n";	.'</script>'."\n";
	my $helpitem = 'Course_Editing_Custom_Roles';
	if ($context eq 'domain') {
	$helpitem = 'Domain_Editing_Custom_Roles';
	}
push(@{$brcrum},	push(@{$brcrum},
{href => "javascript:backPage(document.customresult,'pickrole','')",	{href => "javascript:backPage(document.customresult,'pickrole','')",
text => "Pick custom role",	text => "Pick custom role",
Line 4424 sub set_custom_role {	Line 4556 sub set_custom_role {
text => "Result",	text => "Result",
faq => 282,	faq => 282,
bug => 'Instructor Interface',	bug => 'Instructor Interface',
help => 'Course_Editing_Custom_Roles'},	help => $helpitem,}
);	);
my $args = { bread_crumbs => $brcrum,	my $args = { bread_crumbs => $brcrum,
bread_crumbs_component => 'User Management'};	bread_crumbs_component => 'User Management'};
Line 4495 sub handler {	Line 4627 sub handler {
$r->send_http_header;	$r->send_http_header;
return OK;	return OK;
}	}
my ($context,$crstype);	my ($context,$crstype,$cid,$cnum,$cdom,$allhelpitems);

if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
$context = 'course';	$context = 'course';
$crstype = &Apache::loncommon::course_type();	$crstype = &Apache::loncommon::course_type();
Line 4505 sub handler {	Line 4638 sub handler {
$context = 'domain';	$context = 'domain';
}	}

	my ($permission,$allowed) =
	&Apache::lonuserutils::get_permission($context,$crstype);

	if ($allowed) {
	my @allhelp;
	if ($context eq 'course') {
	$cid = $env{'request.course.id'};
	$cdom = $env{'course.'.$cid.'.domain'};
	$cnum = $env{'course.'.$cid.'.num'};

	if ($permission->{'cusr'}) {
	push(@allhelp,'Course_Create_Class_List');
	}
	if ($permission->{'view'} \|\| $permission->{'cusr'}) {
	push(@allhelp,('Course_Change_Privileges','Course_View_Class_List'));
	}
	if ($permission->{'custom'}) {
	push(@allhelp,'Course_Editing_Custom_Roles');
	}
	if ($permission->{'cusr'}) {
	push(@allhelp,('Course_Add_Student','Course_Drop_Student'));
	}
	unless ($permission->{'cusr_section'}) {
	if (&Apache::lonnet::auto_run($cnum,$cdom) && (($permission->{'cusr'}) \|\| ($permission->{'view'}))) {
	push(@allhelp,'Course_Automated_Enrollment');
	}
	if ($permission->{'selfenrolladmin'}) {
	push(@allhelp,'Course_Approve_Selfenroll');
	}
	}
	if ($permission->{'grp_manage'}) {
	push(@allhelp,'Course_Manage_Group');
	}
	if ($permission->{'view'} \|\| $permission->{'cusr'}) {
	push(@allhelp,'Course_User_Logs');
	}
	} elsif ($context eq 'author') {
	push(@allhelp,('Author_Change_Privileges','Author_Create_Coauthor_List',
	'Author_View_Coauthor_List','Author_User_Logs'));
	} else {
	if ($permission->{'cusr'}) {
	push(@allhelp,'Domain_Change_Privileges');
	if ($permission->{'activity'}) {
	push(@allhelp,'Domain_User_Access_Logs');
	}
	push(@allhelp,('Domain_Create_Users','Domain_View_Users_List'));
	if ($permission->{'custom'}) {
	push(@allhelp,'Domain_Editing_Custom_Roles');
	}
	push(@allhelp,('Domain_Role_Approvals','Domain_Username_Approvals','Domain_Change_Logs'));
	} elsif ($permission->{'view'}) {
	push(@allhelp,'Domain_View_Privileges');
	if ($permission->{'activity'}) {
	push(@allhelp,'Domain_User_Access_Logs');
	}
	push(@allhelp,('Domain_View_Users_List','Domain_Change_Logs'));
	}
	}
	if (@allhelp) {
	$allhelpitems = join(',',@allhelp);
	}
	}

&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','queue']);	'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue']);
Line 4515 sub handler {	Line 4711 sub handler {
if (($env{'form.action'} ne 'dateselect') && ($env{'form.action'} ne 'displayuserreq')) {	if (($env{'form.action'} ne 'dateselect') && ($env{'form.action'} ne 'displayuserreq')) {
$brcrum = [{href=>"/adm/createuser",	$brcrum = [{href=>"/adm/createuser",
text=>"User Management",	text=>"User Management",
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=>$allhelpitems}
];	];
}	}
#SD Following files not added to help, because the corresponding .tex-files seem to
#be missing: Course_Approve_Selfenroll,Course_User_Logs,
my ($permission,$allowed) =
&Apache::lonuserutils::get_permission($context,$crstype);
if (!$allowed) {	if (!$allowed) {
if ($context eq 'course') {	if ($context eq 'course') {
$r->internal_redirect('/adm/viewclasslist');	$r->internal_redirect('/adm/viewclasslist');
Line 4553 sub handler {	Line 4745 sub handler {
$r->print(&header(undef,$args));	$r->print(&header(undef,$args));
$r->print(&print_main_menu($permission,$context,$crstype));	$r->print(&print_main_menu($permission,$context,$crstype));
} elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) {	} elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) {
	my $helpitem = 'Course_Create_Class_List';
	if ($context eq 'author') {
	$helpitem = 'Author_Create_Coauthor_List';
	} elsif ($context eq 'domain') {
	$helpitem = 'Domain_Create_Users';
	}
push(@{$brcrum},	push(@{$brcrum},
{ href => '/adm/createuser?action=upload&state=',	{ href => '/adm/createuser?action=upload&state=',
text => 'Upload Users List',	text => 'Upload Users List',
help => 'Course_Create_Class_List',	help => $helpitem,
});	});
$bread_crumbs_component = 'Upload Users List';	$bread_crumbs_component = 'Upload Users List';
$args = {bread_crumbs => $brcrum,	$args = {bread_crumbs => $brcrum,
Line 4568 sub handler {	Line 4766 sub handler {
if (! exists($env{'form.state'})) {	if (! exists($env{'form.state'})) {
&Apache::lonuserutils::print_first_users_upload_form($r,$context);	&Apache::lonuserutils::print_first_users_upload_form($r,$context);
} elsif ($env{'form.state'} eq 'got_file') {	} elsif ($env{'form.state'} eq 'got_file') {
&Apache::lonuserutils::print_upload_manager_form($r,$context,$permission,	my $result =
$crstype,$showcredits);	&Apache::lonuserutils::print_upload_manager_form($r,$context,
	$permission,
	$crstype,$showcredits);
	if ($result eq 'missingdata') {
	delete($env{'form.state'});
	&Apache::lonuserutils::print_first_users_upload_form($r,$context);
	}
} 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,	my $result = &Apache::lonuserutils::upfile_drop_add($r,$context,
$showcredits);	$permission,
	$showcredits);
	if ($result eq 'missingdata') {
	delete($env{'form.state'});
	&Apache::lonuserutils::print_first_users_upload_form($r,$context);
	} elsif ($result eq 'invalidhome') {
	$env{'form.state'} = 'got_file';
	delete($env{'form.lcserver'});
	my $result =
	&Apache::lonuserutils::print_upload_manager_form($r,$context,$permission,
	$crstype,$showcredits);
	if ($result eq 'missingdata') {
	delete($env{'form.state'});
	&Apache::lonuserutils::print_first_users_upload_form($r,$context);
	}
	}
	} else {
	delete($env{'form.state'});
	&Apache::lonuserutils::print_first_users_upload_form($r,$context);
}	}
} else {	} else {
&Apache::lonuserutils::print_first_users_upload_form($r,$context);	&Apache::lonuserutils::print_first_users_upload_form($r,$context);
}	}
	$r->print('</form>');
} elsif (((($env{'form.action'} eq 'singleuser') \|\| ($env{'form.action'}	} elsif (((($env{'form.action'} eq 'singleuser') \|\| ($env{'form.action'}
eq 'singlestudent')) && ($permission->{'cusr'})) \|\|	eq 'singlestudent')) && ($permission->{'cusr'})) \|\|
(($env{'form.action'} eq 'singleuser') && ($permission->{'view'})) \|\|	(($env{'form.action'} eq 'singleuser') && ($permission->{'view'})) \|\|
Line 4601 sub handler {	Line 4824 sub handler {
.'</span>';	.'</span>';
$env{'form.phase'} = '';	$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response,$srch,undef,	&print_username_entry_form($r,$context,$response,$srch,undef,
$crstype,$brcrum,$showcredits);	$crstype,$brcrum,$permission);
} 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'});
Line 4646 sub handler {	Line 4869 sub handler {
# }	# }
#}	#}
&print_username_entry_form($r,$context,$response,$srch,	&print_username_entry_form($r,$context,$response,$srch,
$forcenewuser,$crstype,$brcrum);	$forcenewuser,$crstype,$brcrum,
	$permission);
} else {	} else {
&print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);	&print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);
}	}
Line 4663 sub handler {	Line 4887 sub handler {
} 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,$crstype,$brcrum);	$forcenewuser,$crstype,$brcrum,
	$permission);
}	}
} 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'});
Line 4681 sub handler {	Line 4906 sub handler {
&print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);	&print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);
}	}
} elsif ($env{'form.phase'} eq 'update_user_data') {	} elsif ($env{'form.phase'} eq 'update_user_data') {
&update_user_data($r,$context,$crstype,$brcrum,$showcredits);	&update_user_data($r,$context,$crstype,$brcrum,$showcredits,$permission);
} else {	} else {
&print_username_entry_form($r,$context,undef,$srch,undef,$crstype,	&print_username_entry_form($r,$context,undef,$srch,undef,$crstype,
$brcrum);	$brcrum,$permission);
}	}
} elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {	} elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
my $prefix;	my $prefix;
if ($env{'form.phase'} eq 'set_custom_roles') {	if ($env{'form.phase'} eq 'set_custom_roles') {
&set_custom_role($r,$context,$brcrum,$prefix);	&set_custom_role($r,$context,$brcrum,$prefix,$permission);
} else {	} else {
&custom_role_editor($r,$brcrum,$prefix);	&custom_role_editor($r,$context,$brcrum,$prefix,$permission);
}	}
} elsif (($env{'form.action'} eq 'processauthorreq') &&	} elsif (($env{'form.action'} eq 'processauthorreq') &&
($permission->{'cusr'}) &&	($permission->{'cusr'}) &&
Line 4797 sub handler {	Line 5022 sub handler {
unless ($usertype) {	unless ($usertype) {
$usertype = 'default';	$usertype = 'default';
}	}
	my ($showstatus,$showemail,$pickstart);
	my $numextras = 0;
	my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
	if ((ref($types) eq 'ARRAY') && (@{$types} > 0)) {
	if (ref($usertypes) eq 'HASH') {
	if ($usertypes->{$usertype}) {
	$showstatus = $usertypes->{$usertype};
	} else {
	$showstatus = $othertitle;
	}
	if ($showstatus) {
	$numextras ++;
	}
	}
	}
	if (($info{$uname}{'email'} ne '') && ($info{$uname}{'email'} ne $uname)) {
	$showemail = $info{$uname}{'email'};
	$numextras ++;
	}
if (ref($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}) eq 'HASH') {	if (ref($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}) eq 'HASH') {
if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {	if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
	$pickstart = 1;
$r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box());	$r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box());
my ($num,$count,$showstatus);	my ($num,$count);
$count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}}));	$count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}}));
unless ($usertype eq 'default') {	$count += $numextras;
my ($othertitle,$usertypes,$types) =
&Apache::loncommon::sorted_inst_types($dom);
if (ref($usertypes) eq 'HASH') {
if ($usertypes->{$usertype}) {
$showstatus = $usertypes->{$usertype};
$count ++;
}
}
}
foreach my $field (@{$infofields}) {	foreach my $field (@{$infofields}) {
next unless ($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}{$field});	next unless ($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}{$field});
next unless ($infotitles->{$field});	next unless ($infotitles->{$field});
$r->print(&Apache::lonhtmlcommon::row_title($infotitles->{$field}).	$r->print(&Apache::lonhtmlcommon::row_title($infotitles->{$field}).
$info{$uname}{$field});	$info{$uname}{$field});
$num ++;	$num ++;
if ($count == $num) {	unless ($count == $num) {
$r->print(&Apache::lonhtmlcommon::row_closure(1));
} else {
$r->print(&Apache::lonhtmlcommon::row_closure());	$r->print(&Apache::lonhtmlcommon::row_closure());
}	}
}	}
if ($showstatus) {	}
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type (self-reported)')).	}
$showstatus.	if ($numextras) {
&Apache::lonhtmlcommon::row_closure(1));	unless ($pickstart) {
	$r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box());
	$pickstart = 1;
	}
	if ($showemail) {
	my $closure = '';
	unless ($showstatus) {
	$closure = 1;
}	}
$r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>');	$r->print(&Apache::lonhtmlcommon::row_title(&mt('E-mail address')).
	$showemail.
	&Apache::lonhtmlcommon::row_closure($closure));
	}
	if ($showstatus) {
	$r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type[_1](self-reported)','<br />')).
	$showstatus.
	&Apache::lonhtmlcommon::row_closure(1));
}	}
}	}
	if ($pickstart) {
	$r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>');
	} else {
	$r->print('<div>'.&mt('No information to display for this account request.').'</div>');
	}
	} else {
	$r->print('<div>'.&mt('No information available for this account request.').'</div>');
}	}
}	}
}	}
}	}
$r->print(&close_popup_form());
}	}
	$r->print(&close_popup_form());
} elsif (($env{'form.action'} eq 'listusers') &&	} elsif (($env{'form.action'} eq 'listusers') &&
($permission->{'view'} \|\| $permission->{'cusr'})) {	($permission->{'view'} \|\| $permission->{'cusr'})) {
	my $helpitem = 'Course_View_Class_List';
	if ($context eq 'author') {
	$helpitem = 'Author_View_Coauthor_List';
	} elsif ($context eq 'domain') {
	$helpitem = 'Domain_View_Users_List';
	}
if ($env{'form.phase'} eq 'bulkchange') {	if ($env{'form.phase'} eq 'bulkchange') {
push(@{$brcrum},	push(@{$brcrum},
{href => '/adm/createuser?action=listusers',	{href => '/adm/createuser?action=listusers',
text => "List Users"},	text => "List Users"},
{href => "/adm/createuser",	{href => "/adm/createuser",
text => "Result",	text => "Result",
help => 'Course_View_Class_List'});	help => $helpitem});
$bread_crumbs_component = 'Update Users';	$bread_crumbs_component = 'Update Users';
$args = {bread_crumbs => $brcrum,	$args = {bread_crumbs => $brcrum,
bread_crumbs_component => $bread_crumbs_component};	bread_crumbs_component => $bread_crumbs_component};
Line 4863 sub handler {	Line 5124 sub handler {
push(@{$brcrum},	push(@{$brcrum},
{href => '/adm/createuser?action=listusers',	{href => '/adm/createuser?action=listusers',
text => "List Users",	text => "List Users",
help => 'Course_View_Class_List'});	help => $helpitem});
$bread_crumbs_component = 'List Users';	$bread_crumbs_component = 'List Users';
$args = {bread_crumbs => $brcrum,	$args = {bread_crumbs => $brcrum,
bread_crumbs_component => $bread_crumbs_component};	bread_crumbs_component => $bread_crumbs_component};
Line 4944 sub handler {	Line 5205 sub handler {
}	}
} elsif ($env{'form.action'} eq 'selfenroll') {	} elsif ($env{'form.action'} eq 'selfenroll') {
if ($permission->{selfenrolladmin}) {	if ($permission->{selfenrolladmin}) {
my $cid = $env{'request.course.id'};
my $cdom = $env{'course.'.$cid.'.domain'};
my $cnum = $env{'course.'.$cid.'.num'};
my %currsettings = (	my %currsettings = (
selfenroll_types => $env{'course.'.$cid.'.internal.selfenroll_types'},	selfenroll_types => $env{'course.'.$cid.'.internal.selfenroll_types'},
selfenroll_registered => $env{'course.'.$cid.'.internal.selfenroll_registered'},	selfenroll_registered => $env{'course.'.$cid.'.internal.selfenroll_registered'},
Line 4992 sub handler {	Line 5250 sub handler {
push(@{$brcrum},	push(@{$brcrum},
{href => '/adm/createuser?action=selfenrollqueue',	{href => '/adm/createuser?action=selfenrollqueue',
text => 'Enrollment requests',	text => 'Enrollment requests',
help => 'Course_Self_Enrollment'});	help => 'Course_Approve_Selfenroll'});
$bread_crumbs_component = 'Enrollment requests';	$bread_crumbs_component = 'Enrollment requests';
if ($env{'form.state'} eq 'done') {	if ($env{'form.state'} eq 'done') {
push(@{$brcrum},	push(@{$brcrum},
{href => '/adm/createuser?action=selfenrollqueue',	{href => '/adm/createuser?action=selfenrollqueue',
text => 'Result',	text => 'Result',
help => 'Course_Self_Enrollment'});	help => 'Course_Approve_Selfenroll'});
$bread_crumbs_component = 'Enrollment result';	$bread_crumbs_component = 'Enrollment result';
}	}
$args = { bread_crumbs => $brcrum,	$args = { bread_crumbs => $brcrum,
bread_crumbs_component => $bread_crumbs_component};	bread_crumbs_component => $bread_crumbs_component};
$r->print(&header(undef,$args));	$r->print(&header(undef,$args));
my $cid = $env{'request.course.id'};
my $cdom = $env{'course.'.$cid.'.domain'};
my $cnum = $env{'course.'.$cid.'.num'};
my $coursedesc = $env{'course.'.$cid.'.description'};	my $coursedesc = $env{'course.'.$cid.'.description'};
if (!exists($env{'form.state'})) {	if (!exists($env{'form.state'})) {
$r->print('<h3>'.&mt('Pending enrollment requests').'</h3>'."\n");	$r->print('<h3>'.&mt('Pending enrollment requests').'</h3>'."\n");
Line 5704 function validate_types(form) {	Line 5959 function validate_types(form) {
}	}

function check_types(num,countfail,needaction) {	function check_types(num,countfail,needaction) {
var typeidx = getIndexByName('selfenroll_types_'+num);	var boxname = 'selfenroll_types_'+num;
	var typeidx = getIndexByName(boxname);
var count = 0;	var count = 0;
if (typeidx != -1) {	if (typeidx != -1) {
if (document.$formname.elements[typeidx].length) {	if (document.$formname.elements[boxname].length) {
for (var k=0; k<document.$formname.elements[typeidx].length; k++) {	for (var k=0; k<document.$formname.elements[boxname].length; k++) {
if (document.$formname.elements[typeidx][k].checked) {	if (document.$formname.elements[boxname][k].checked) {
count ++;	count ++;
}	}
}	}
Line 6472 sub print_userchangelogs_display {	Line 6728 sub print_userchangelogs_display {
my $helpitem;	my $helpitem;
if ($context eq 'course') {	if ($context eq 'course') {
$helpitem = 'Course_User_Logs';	$helpitem = 'Course_User_Logs';
	} elsif ($context eq 'domain') {
	$helpitem = 'Domain_Role_Logs';
	} elsif ($context eq 'author') {
	$helpitem = 'Author_User_Logs';
}	}
push (@{$brcrum},	push (@{$brcrum},
{href => '/adm/createuser?action=changelogs',	{href => '/adm/createuser?action=changelogs',
Line 6672 sub print_useraccesslogs_display {	Line 6932 sub print_useraccesslogs_display {

# set breadcrumbs	# set breadcrumbs
my %breadcrumb_text = &singleuser_breadcrumb('','domain',$udom);	my %breadcrumb_text = &singleuser_breadcrumb('','domain',$udom);
push (@{$brcrum},	my $prevphasestr;
{href => "javascript:backPage($form)",	if ($env{'form.popup'}) {
text => $breadcrumb_text{'search'}});	$brcrum = [];
my (@prevphases,$prevphasestr);	} else {
if ($env{'form.prevphases'}) {	push (@{$brcrum},
@prevphases = split(/,/,$env{'form.prevphases'});	{href => "javascript:backPage($form)",
$prevphasestr = $env{'form.prevphases'};	text => $breadcrumb_text{'search'}});
}	my @prevphases;
if (($env{'form.phase'} eq 'userpicked') \|\| (grep(/^userpicked$/,@prevphases))) {	if ($env{'form.prevphases'}) {
push(@{$brcrum},	@prevphases = split(/,/,$env{'form.prevphases'});
{href => "javascript:backPage($form,'get_user_info','select')",	$prevphasestr = $env{'form.prevphases'};
text => $breadcrumb_text{'userpicked'}});	}
if ($env{'form.phase'} eq 'userpicked') {	if (($env{'form.phase'} eq 'userpicked') \|\| (grep(/^userpicked$/,@prevphases))) {
$prevphasestr = 'userpicked';	push(@{$brcrum},
	{href => "javascript:backPage($form,'get_user_info','select')",
	text => $breadcrumb_text{'userpicked'}});
	if ($env{'form.phase'} eq 'userpicked') {
	$prevphasestr = 'userpicked';
	}
}	}
}	}
push(@{$brcrum},	push(@{$brcrum},
Line 6697 sub print_useraccesslogs_display {	Line 6962 sub print_useraccesslogs_display {
bread_crumbs_component => 'User Management'};	bread_crumbs_component => 'User Management'};
if ($env{'form.popup'}) {	if ($env{'form.popup'}) {
$args->{'no_nav_bar'} = 1;	$args->{'no_nav_bar'} = 1;
	$args->{'bread_crumbs_nomenu'} = 1;
}	}

# set javascript	# set javascript
Line 6722 ENDSCRIPT	Line 6988 ENDSCRIPT
unless ($permission->{'activity'}) {	unless ($permission->{'activity'}) {
$r->print('<p class="LC_warning">'	$r->print('<p class="LC_warning">'
.&mt('You do not have rights to display user access logs.')	.&mt('You do not have rights to display user access logs.')
.'</p>'	.'</p>');
.&earlyout_accesslog_form($formname,$prevphasestr,$udom));	if ($env{'form.popup'}) {
	$r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>');
	} else {
	$r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom));
	}
return;	return;
}	}

Line 6743 ENDSCRIPT	Line 7013 ENDSCRIPT
return;	return;
}	}

	if (&Apache::lonnet::privileged($uname,$udom,
	[$env{'request.role.domain'}],['dc','su'])) {
	unless (&Apache::lonnet::privileged($env{'user.name'},$env{'user.domain'},
	[$env{'request.role.domain'}],['dc','su'])) {
	$r->print('<p class="LC_warning">'
	.&mt('You need to be a privileged user to display user access logs for [_1]',
	&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),
	$uname,$udom))
	.'</p>');
	if ($env{'form.popup'}) {
	$r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>');
	} else {
	$r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom));
	}
	return;
	}
	}

# set defaults	# set defaults
my $now = time();	my $now = time();
my $defstart = $now - (7243600);	my $defstart = $now - (7243600);
Line 6789 ENDSCRIPT	Line 7077 ENDSCRIPT
my ($nav_script,$nav_links);	my ($nav_script,$nav_links);

# table header	# table header
my $tableheader =	my $tableheader = '<h3>'.
&Apache::loncommon::start_data_table_header_row()	&mt('User access logs for: [_1]',
	&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)).'</h3>'
	.&Apache::loncommon::start_data_table_header_row()
.'<th> </th>'	.'<th> </th>'
.'<th>'.&mt('When').'</th>'	.'<th>'.&mt('When').'</th>'
.'<th>'.&mt('HostID').'</th>'	.'<th>'.&mt('HostID').'</th>'
Line 6827 ENDSCRIPT	Line 7117 ENDSCRIPT
$showntableheader = 1;	$showntableheader = 1;
}	}
my ($shown,$extra);	my ($shown,$extra);
my ($event,$data) = split(/\s+/,&unescape($event));	my ($event,$data) = split(/\s+/,&unescape($event),2);
if ($event eq 'Role') {	if ($event eq 'Role') {
my ($rolecode,$extent) = split(/\./,$data,2);	my ($rolecode,$extent) = split(/\./,$data,2);
next if ($extent eq '');	next if ($extent eq '');
Line 6879 ENDSCRIPT	Line 7169 ENDSCRIPT
$shown = &mt('Role selection: [_1]',$rolename);	$shown = &mt('Role selection: [_1]',$rolename);
} else {	} else {
$shown = &mt($event);	$shown = &mt($event);
if ($data ne '') {	if ($data =~ /^webdav/) {
$extra = &mt('Client IP address: [_1]',$data);	my ($path,$clientip) = split(/\s+/,$data,2);
	$path =~ s/^webdav//;
	if ($clientip ne '') {
	$extra = &mt('Client IP address: [_1]',$clientip);
	}
	if ($path ne '') {
	$shown .= ' '.&mt('(WebDAV access to [_1])',$path);
	}
	} elsif ($data ne '') {
	$extra = &mt('Client IP address: [_1]',$data);
}	}
}	}
$r->print(	$r->print(
Line 6989 sub activity_display_filter {	Line 7288 sub activity_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 />';
return $output;	return $output;
}	}

Line 7183 sub print_helpdeskaccess_display {	Line 7482 sub print_helpdeskaccess_display {
my $confname = $cdom.'-domainconfig';	my $confname = $cdom.'-domainconfig';
my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();

my @accesstypes = ('all','none');	my @accesstypes = ('all','dh','da','none');
my ($numstatustypes,@jsarray);	my ($numstatustypes,@jsarray);
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($cdom);	my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($cdom);
if (ref($types) eq 'ARRAY') {	if (ref($types) eq 'ARRAY') {
Line 7194 sub print_helpdeskaccess_display {	Line 7493 sub print_helpdeskaccess_display {
}	}
}	}
my %customroles = &get_domain_customroles($cdom,$confname);	my %customroles = &get_domain_customroles($cdom,$confname);
my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh']);	my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']);
if (keys(%domhelpdesk)) {	if (keys(%domhelpdesk)) {
push(@accesstypes,('inc','exc'));	push(@accesstypes,('inc','exc'));
push(@jsarray,('notinc','notexc'));	push(@jsarray,('notinc','notexc'));
Line 7392 ENDJS	Line 7691 ENDJS
'rou' => 'Role usage',	'rou' => 'Role usage',
'whi' => 'Which helpdesk personnel may use this role?',	'whi' => 'Which helpdesk personnel may use this role?',
'udd' => 'Use domain default',	'udd' => 'Use domain default',
'all' => 'All',	'all' => 'All with domain helpdesk or helpdesk assistant role',
	'dh' => 'All with domain helpdesk role',
	'da' => 'All with domain helpdesk assistant role',
'none' => 'None',	'none' => 'None',
'status' => 'Determined based on institutional status',	'status' => 'Determined based on institutional status',
'inc' => 'Include all, but exclude specific personnel',	'inc' => 'Include all, but exclude specific personnel',
Line 7579 sub domain_adhoc_access {	Line 7880 sub domain_adhoc_access {
my $access = $domcurrent->{$role}{'access'};	my $access = $domcurrent->{$role}{'access'};
if (($access eq '') \|\| (!grep(/^\Q$access\E$/,@{$accesstypes}))) {	if (($access eq '') \|\| (!grep(/^\Q$access\E$/,@{$accesstypes}))) {
$access = 'all';	$access = 'all';
$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));	$domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',&Apache::lonnet::plaintext('dh'),
	&Apache::lonnet::plaintext('da'));
} elsif ($access eq 'status') {	} elsif ($access eq 'status') {
if (ref($domcurrent->{$role}{$access}) eq 'ARRAY') {	if (ref($domcurrent->{$role}{$access}) eq 'ARRAY') {
my @shown;	my @shown;
Line 7595 sub domain_adhoc_access {	Line 7897 sub domain_adhoc_access {
}	}
if (@shown) {	if (@shown) {
my $shownstatus = join(' '.&mt('or').' ',@shown);	my $shownstatus = join(' '.&mt('or').' ',@shown);
$domusage{$role} = &mt('Any user in domain with active [_1] role, and institutional status: [_2]',	$domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role, and institutional status: [_3]',
&Apache::lonnet::plaintext('dh'),$shownstatus);	&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownstatus);
} else {	} else {
$domusage{$role} = &mt('No one in the domain');	$domusage{$role} = &mt('No one in the domain');
}	}
Line 7610 sub domain_adhoc_access {	Line 7912 sub domain_adhoc_access {
}	}
my $showninc = join(', ',@dominc);	my $showninc = join(', ',@dominc);
if ($showninc ne '') {	if ($showninc ne '') {
$domusage{$role} = &mt('Include any user in domain with active [_1] role, except: [_2]',	$domusage{$role} = &mt('Include any user in domain with active [_1] or [_2] role, except: [_3]',
&Apache::lonnet::plaintext('dh'),$showninc);	&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$showninc);
} else {	} else {
$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));	$domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',
	&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'));
}	}
}	}
} elsif ($access eq 'exc') {	} elsif ($access eq 'exc') {
Line 7626 sub domain_adhoc_access {	Line 7929 sub domain_adhoc_access {
}	}
my $shownexc = join(', ',@domexc);	my $shownexc = join(', ',@domexc);
if ($shownexc ne '') {	if ($shownexc ne '') {
$domusage{$role} = &mt('Only the following in the domain with active [_1] role: [_2]',	$domusage{$role} = &mt('Only the following in the domain with active [_1] or [_2] role: [_3]',
&Apache::lonnet::plaintext('dh'),$shownexc);	&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownexc);
} else {	} else {
$domusage{$role} = &mt('No one in the domain');	$domusage{$role} = &mt('No one in the domain');
}	}
} elsif ($access eq 'none') {	} elsif ($access eq 'none') {
$domusage{$role} = &mt('No one in the domain');	$domusage{$role} = &mt('No one in the domain');
} elsif ($access eq 'all') {	} elsif ($access eq 'dh') {
$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));	$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));
	} elsif ($access eq 'da') {
	$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('da'));
	} elsif ($access eq 'all') {
	$domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',
	&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'));
}	}
} else {	} else {
$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));	$domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',
	&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'));
}	}
}	}
return %domusage;	return %domusage;
Line 7818 sub update_helpdeskaccess {	Line 8127 sub update_helpdeskaccess {
$r->print('<p class="LC_error">'.&mt('You do not have permission to change helpdesk access.').'</p>');	$r->print('<p class="LC_error">'.&mt('You do not have permission to change helpdesk access.').'</p>');
return;	return;
}	}
my @accesstypes = ('all','none','status','inc','exc');	my @accesstypes = ('all','dh','da','none','status','inc','exc');
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 $confname = $cdom.'-domainconfig';	my $confname = $cdom.'-domainconfig';
Line 7828 sub update_helpdeskaccess {	Line 8137 sub update_helpdeskaccess {
my (%settings,%overridden);	my (%settings,%overridden);
&get_adhocrole_settings($env{'request.course.id'},\@accesstypes,	&get_adhocrole_settings($env{'request.course.id'},\@accesstypes,
$types,\%customroles,\%settings,\%overridden);	$types,\%customroles,\%settings,\%overridden);
my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh']);	my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']);
my (%changed,%storehash,@todelete);	my (%changed,%storehash,@todelete);

if (keys(%customroles)) {	if (keys(%customroles)) {
Line 8069 sub update_helpdeskaccess {	Line 8378 sub update_helpdeskaccess {
if ($env{'form.'.$role.'_incrs'}) {	if ($env{'form.'.$role.'_incrs'}) {
if ($newsettings{$role}{'access'} eq 'all') {	if ($newsettings{$role}{'access'} eq 'all') {
$r->print(&mt('All helpdesk staff can access '.lc($crstype).' with this role.'));	$r->print(&mt('All helpdesk staff can access '.lc($crstype).' with this role.'));
	} elsif ($newsettings{$role}{'access'} eq 'dh') {
	$r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role',
	&Apache::lonnet::plaintext('dh')));
	} elsif ($newsettings{$role}{'access'} eq 'da') {
	$r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role',
	&Apache::lonnet::plaintext('da')));
} elsif ($newsettings{$role}{'access'} eq 'none') {	} elsif ($newsettings{$role}{'access'} eq 'none') {
$r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.'));	$r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.'));
} elsif ($newsettings{$role}{'access'} eq 'status') {	} elsif ($newsettings{$role}{'access'} eq 'status') {
Line 8191 sub user_search_result {	Line 8506 sub user_search_result {
} else {	} else {
unless (($context eq 'requestcrs') && ($srch->{'srchtype'} eq 'exact')) {	unless (($context eq 'requestcrs') && ($srch->{'srchtype'} eq 'exact')) {
my $domd_chk = &domdirectorysrch_check($srch);	my $domd_chk = &domdirectorysrch_check($srch);
if ($domd_chk ne 'ok') {	if (($domd_chk ne 'ok') && ($env{'form.action'} ne 'accesslogs')) {
my $instd_chk = &instdirectorysrch_check($srch);	my $instd_chk = &instdirectorysrch_check($srch);
$response .= '<span class="LC_warning">'.$domd_chk.'</span><br />';	$response .= '<span class="LC_warning">'.$domd_chk.'</span><br />';
if ($instd_chk eq 'ok') {	if ($instd_chk eq 'ok') {
Line 8542 sub build_search_response {	Line 8857 sub build_search_response {
if ($srch->{'srchin'} ne 'alc') {	if ($srch->{'srchin'} ne 'alc') {
$forcenewuser = 1;	$forcenewuser = 1;
my $cansrchinst = 0;	my $cansrchinst = 0;
if ($srch->{'srchdomain'}) {	if (($srch->{'srchdomain'}) && ($env{'form.action'} ne 'accesslogs')) {
my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$srch->{'srchdomain'});	my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$srch->{'srchdomain'});
if (ref($domconfig{'directorysrch'}) eq 'HASH') {	if (ref($domconfig{'directorysrch'}) eq 'HASH') {
if ($domconfig{'directorysrch'}{'available'}) {	if ($domconfig{'directorysrch'}{'available'}) {

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

Removed from v.1.406.2.11
changed lines
	Added in v.1.406.2.17