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.14.2.1 and 1.428

version 1.406.2.14.2.1, 2017/08/15 23:42:33	version 1.428, 2017/01/02 19:44:06
Line 252 sub build_tools_display {	Line 252 sub build_tools_display {
'unofficial' => 'Can request creation of unofficial courses',	'unofficial' => 'Can request creation of unofficial courses',
'community' => 'Can request creation of communities',	'community' => 'Can request creation of communities',
'textbook' => 'Can request creation of textbook courses',	'textbook' => 'Can request creation of textbook courses',
	'placement' => 'Can request creation of placement tests',
'requestauthor' => 'Can request author space',	'requestauthor' => 'Can request author space',
);	);
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',
'requestcourses.community','requestcourses.textbook');	'requestcourses.community','requestcourses.textbook',
@usertools = ('official','unofficial','community','textbook');	'requestcourses.placement');
	@usertools = ('official','unofficial','community','textbook','placement');
@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 333 sub build_tools_display {	Line 335 sub build_tools_display {
' <td'.$colspan.'>'.$lt{$item}.'</td>'."\n".	' <td'.$colspan.'>'.$lt{$item}.'</td>'."\n".
' </tr>'."\n".	' </tr>'."\n".
&Apache::loncommon::start_data_table_row()."\n";	&Apache::loncommon::start_data_table_row()."\n";

if (($context eq 'requestcourses') \|\| ($context eq 'requestauthor')) {	if (($context eq 'requestcourses') \|\| ($context eq 'requestauthor')) {
my ($curroption,$currlimit);	my ($curroption,$currlimit);
my $envkey = $context.'.'.$item;	my $envkey = $context.'.'.$item;
Line 451 sub coursereq_externaluser {	Line 454 sub coursereq_externaluser {
'unofficial' => 'Can request creation of unofficial courses',	'unofficial' => 'Can request creation of unofficial courses',
'community' => 'Can request creation of communities',	'community' => 'Can request creation of communities',
'textbook' => 'Can request creation of textbook courses',	'textbook' => 'Can request creation of textbook courses',
	'placement' => 'Can request creation of placement tests',
);	);

%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,	%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'reqcrsotherdom.official','reqcrsotherdom.unofficial',	'reqcrsotherdom.official','reqcrsotherdom.unofficial',
'reqcrsotherdom.community','reqcrsotherdom.textbook');	'reqcrsotherdom.community','reqcrsotherdom.textbook',
@usertools = ('official','unofficial','community','textbook');	'reqcrsotherdom.placement');
	@usertools = ('official','unofficial','community','textbook','placement');
@options = ('approval','validate','autolimit');	@options = ('approval','validate','autolimit');
%validations = &Apache::lonnet::auto_courserequest_checks($cdom);	%validations = &Apache::lonnet::auto_courserequest_checks($cdom);
my $optregex = join('\|',@options);	my $optregex = join('\|',@options);
Line 537 sub courserequest_titles {	Line 542 sub courserequest_titles {
unofficial => 'Unofficial',	unofficial => 'Unofficial',
community => 'Communities',	community => 'Communities',
textbook => 'Textbook',	textbook => 'Textbook',
	placement => 'Placement Tests',
norequest => 'Not allowed',	norequest => 'Not allowed',
approval => 'Approval by Dom. Coord.',	approval => 'Approval by Dom. Coord.',
validate => 'With validation',	validate => 'With validation',
Line 641 sub curr_requestauthor {	Line 647 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 668 sub print_username_entry_form {	Line 673 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') {
if ($context eq 'course') {	$helpitem = 'Course_Editing_Custom_Roles';
$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 764 sub print_username_entry_form {	Line 755 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 773 sub print_username_entry_form {	Line 763 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 786 sub print_username_entry_form {	Line 774 sub print_username_entry_form {
'<br clear="all" />');	'<br clear="all" />');
}	}
}	}
$r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,$fixeddom));	$r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,1));
}	}
}	}

Line 845 sub entry_form {	Line 833 sub entry_form {
$inexact = 1;	$inexact = 1;
}	}
}	}
my ($cancreate,$noinstd);	my $cancreate =
if ($env{'form.action'} eq 'accesslogs') {	&Apache::lonuserutils::can_create_user($dom,$context,$usertype);
$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,$noinstd);	'document.crtuser',$cancreate,$usertype,$context,$fixeddom);
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 877 ENDBLOCK	Line 860 ENDBLOCK
$output = '<p>'.$userpicker.'</p>';	$output = '<p>'.$userpicker.'</p>';
}	}
if (($env{'form.phase'} eq '') && ($env{'form.action'} ne 'accesslogs') &&	if (($env{'form.phase'} eq '') && ($env{'form.action'} ne 'accesslogs') &&
(!(($env{'form.action'} eq 'singleuser') && ($context eq 'domain') &&	(!(($env{'form.action'} eq 'singleuser') && ($context eq 'domain') &&
(!&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))))) {	(!&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))))) {
my $defdom=$env{'request.role.domain'};	my $defdom=$env{'request.role.domain'};
my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');	my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');
Line 1016 ENDSCRIPT	Line 999 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 1065 ENDSCRIPT	Line 1044 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,$context,undef,undef,1));	$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,'accesslogs',undef,undef,1));
$r->print('<h3>'.$lt{'vacsel'}.'</h3>');	$r->print('<h3>'.$lt{'vacsel'}.'</h3>');
}	}
}	}
Line 1146 sub print_user_modification_page {	Line 1125 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 1196 sub print_user_modification_page {	Line 1174 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 1221 sub print_user_modification_page {	Line 1198 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 1247 sub print_user_modification_page {	Line 1223 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 1463 ENDAUTH	Line 1435 ENDAUTH
$r->print('<div class="LC_left_float">');	$r->print('<div class="LC_left_float">');
$r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context,	$r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context,
$inst_results{$ccuname.':'.$ccdomain}));	$inst_results{$ccuname.':'.$ccdomain}));
if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) \|\|	if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) \|\|
(&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) {	(&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) {
$r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities 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());
Line 1483 ENDAUTH	Line 1455 ENDAUTH
if ((!$isauthor) &&	if ((!$isauthor) &&
((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) \|\|	((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) \|\|
(&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) &&	(&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) &&
($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);
Line 1554 ENDNOTOOLSPRIV	Line 1526 ENDNOTOOLSPRIV
} elsif (($context eq 'course') && ((&Apache::lonnet::allowed('vcl',$env{'request.course.id'})) \|\|	} elsif (($context eq 'course') && ((&Apache::lonnet::allowed('vcl',$env{'request.course.id'})) \|\|
($env{'request.course.sec'} &&	($env{'request.course.sec'} &&
&Apache::lonnet::allowed('vcl',$env{'request.course.id'}.'/'.$env{'request.course.sec'})))) {	&Apache::lonnet::allowed('vcl',$env{'request.course.id'}.'/'.$env{'request.course.sec'})))) {
$statuses = ['active'];	$statuses = ['active'];
}	}
if ($env{'form.action'} ne 'singlestudent') {	if ($env{'form.action'} ne 'singlestudent') {
&display_existing_roles($r,$ccuname,$ccdomain,\%inccourses,$context,	&display_existing_roles($r,$ccuname,$ccdomain,\%inccourses,$context,
Line 1788 sub display_existing_roles {	Line 1760 sub display_existing_roles {
if ($active) {	if ($active) {
next unless($showall \|\| $showactive);	next unless($showall \|\| $showactive);
} else {	} else {
next unless($showall \|\| $showexpired);	next unless($showall \|\| $showexpired);
}	}
# Is this a custom role? Get role owner and title.	# Is this a custom role? Get role owner and title.
my ($croleudom,$croleuname,$croletitle)=	my ($croleudom,$croleuname,$croletitle)=
Line 1933 sub display_existing_roles {	Line 1905 sub display_existing_roles {
} else {	} else {
$row.=' ';	$row.=' ';
}	}
$row.= '</td>';	$row.= '</td>';
}	}
my $plaintext='';	my $plaintext='';
if (!$croletitle) {	if (!$croletitle) {
Line 2202 $lt{'uuas'} ($currentauth). $lt{'adcs'}.	Line 2174 $lt{'uuas'} ($currentauth). $lt{'adcs'}.
ENDBADAUTH	ENDBADAUTH
}	}
} else { # Authentication type is valid	} else { # Authentication type is valid

&initialize_authen_forms($ccdomain,$formname,$currentauth,'modifyuser');	&initialize_authen_forms($ccdomain,$formname,$currentauth,'modifyuser');
my ($authformcurrent,$can_modify,@authform_others) =	my ($authformcurrent,$can_modify,@authform_others) =
&modify_login_block($ccdomain,$currentauth);	&modify_login_block($ccdomain,$currentauth);
Line 2345 sub modify_login_block {	Line 2318 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,$usernameset,$condition,$excluded) = @_;	$now,$captchaform,$emailusername,$usertype) = @_;
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 2372 sub personal_data_display {	Line 2345 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 2391 sub personal_data_display {	Line 2363 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 2421 sub personal_data_display {	Line 2393 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="'.$size.'" value="" autocomplete="off" />';	'<input type="text" name="uname" size="25" 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 2467 sub personal_data_display {	Line 2410 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 2711 sub update_user_data {	Line 2641 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 2807 sub update_user_data {	Line 2733 sub update_user_data {
my (%alerts,%rulematch,%inst_results,%curr_rules);	my (%alerts,%rulematch,%inst_results,%curr_rules);
my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');	my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
my @usertools = ('aboutme','blog','webdav','portfolio');	my @usertools = ('aboutme','blog','webdav','portfolio');
my @requestcourses = ('official','unofficial','community','textbook');	my @requestcourses = ('official','unofficial','community','textbook','placement');
my @requestauthor = ('requestauthor');	my @requestauthor = ('requestauthor');
my ($othertitle,$usertypes,$types) =	my ($othertitle,$usertypes,$types) =
&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});	&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
Line 2980 sub update_user_data {	Line 2906 sub update_user_data {
'requestcourses.community','requestcourses.textbook',	'requestcourses.community','requestcourses.textbook',
'reqcrsotherdom.official','reqcrsotherdom.unofficial',	'reqcrsotherdom.official','reqcrsotherdom.unofficial',
'reqcrsotherdom.community','reqcrsotherdom.textbook',	'reqcrsotherdom.community','reqcrsotherdom.textbook',
'requestauthor'],	'reqcrsotherdom.placement','requestauthor'],
$env{'form.ccdomain'},$env{'form.ccuname'});	$env{'form.ccdomain'},$env{'form.ccuname'});
my ($tmp) = keys(%userenv);	my ($tmp) = keys(%userenv);
if ($tmp =~ /^(con_lost\|error)/i) {	if ($tmp =~ /^(con_lost\|error)/i) {
Line 3271 sub update_user_data {	Line 3197 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') \|\| ($key eq 'textbook')) {	($key eq 'community') \|\| ($key eq 'textbook') \|\|
	($key eq 'placement')) {
$newenvhash{'environment.requestcourses.'.$key} =	$newenvhash{'environment.requestcourses.'.$key} =
$changeHash{'requestcourses.'.$key};	$changeHash{'requestcourses.'.$key};
if ($changeHash{'requestcourses.'.$key}) {	if ($changeHash{'requestcourses.'.$key}) {
Line 3338 sub update_user_data {	Line 3265 sub update_user_data {
\%newsettingstext);	\%newsettingstext);
if ($env{'form.cid'} ne $userenv{'id'}) {	if ($env{'form.cid'} ne $userenv{'id'}) {
&Apache::lonnet::idput($env{'form.ccdomain'},	&Apache::lonnet::idput($env{'form.ccdomain'},
{$env{'form.ccuname'} => $env{'form.cid'}});	{$env{'form.ccuname'} => $env{'form.cid'}},$uhome,'ids');
if (($recurseid) &&	if (($recurseid) &&
(&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) {	(&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) {
my $idresult =	my $idresult =
Line 3481 sub display_userinfo {	Line 3408 sub display_userinfo {
'unofficial' => 'Can Request Unofficial Courses',	'unofficial' => 'Can Request Unofficial Courses',
'community' => 'Can Request Communities',	'community' => 'Can Request Communities',
'textbook' => 'Can Request Textbook Courses',	'textbook' => 'Can Request Textbook Courses',
	'placement' => 'Can Request Placement Tests',
'requestauthor' => 'Can Request Author Role',	'requestauthor' => 'Can Request Author Role',
'inststatus' => "Affiliation",	'inststatus' => "Affiliation",
'prvs' => 'Previous Value:',	'prvs' => 'Previous Value:',
Line 4377 sub build_roles {	Line 4305 sub build_roles {
# ========================================================== Custom Role Editor	# ========================================================== Custom Role Editor

sub custom_role_editor {	sub custom_role_editor {
my ($r,$context,$brcrum,$prefix,$permission) = @_;	my ($r,$brcrum,$prefix) = @_;
my $action = $env{'form.customroleaction'};	my $action = $env{'form.customroleaction'};
my ($rolename,$helpitem);	my $rolename;
if ($action eq 'new') {	if ($action eq 'new') {
$rolename=$env{'form.newrolename'};	$rolename=$env{'form.newrolename'};
} else {	} else {
Line 4390 sub custom_role_editor {	Line 4318 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,$context,undef,undef,undef,$crstype,$brcrum,	&print_username_entry_form($r,undef,undef,undef,undef,$crstype,$brcrum);
$permission);
return;	return;
}	}

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

$r->print(&Apache::loncommon::start_page('Custom Role Editor',	$r->print(&Apache::loncommon::start_page('Custom Role Editor',
$head_script,$args).	$head_script,$args).
$body_top);	$body_top);
Line 4482 ENDCCF	Line 4408 ENDCCF

# ---------------------------------------------------------- Call to definerole	# ---------------------------------------------------------- Call to definerole
sub set_custom_role {	sub set_custom_role {
my ($r,$context,$brcrum,$prefix,$permission) = @_;	my ($r,$context,$brcrum,$prefix) = @_;
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,$context,$brcrum,$prefix,$permission);	&custom_role_editor($r,$brcrum,$prefix);
return;	return;
}	}
my ($jsback,$elements) = &crumb_utilities();	my ($jsback,$elements) = &crumb_utilities();
Line 4495 sub set_custom_role {	Line 4421 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 4512 sub set_custom_role {	Line 4434 sub set_custom_role {
text => "Result",	text => "Result",
faq => 282,	faq => 282,
bug => 'Instructor Interface',	bug => 'Instructor Interface',
help => $helpitem,}	help => 'Course_Editing_Custom_Roles'},
);	);
my $args = { bread_crumbs => $brcrum,	my $args = { bread_crumbs => $brcrum,
bread_crumbs_component => 'User Management'};	bread_crumbs_component => 'User Management'};
Line 4583 sub handler {	Line 4505 sub handler {
$r->send_http_header;	$r->send_http_header;
return OK;	return OK;
}	}
my ($context,$crstype,$cid,$cnum,$cdom,$allhelpitems);	my ($context,$crstype);

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 4594 sub handler {	Line 4515 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 4667 sub handler {	Line 4525 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=>$allhelpitems}	help=>'Course_Create_Class_List,Course_Change_Privileges,Course_View_Class_List,Course_Editing_Custom_Roles,Course_Add_Student,Course_Drop_Student,Course_Automated_Enrollment,Course_Self_Enrollment,Course_Manage_Group'}
];	];
}	}
	#SD Following files not added to help, because the corresponding .tex-files seem to
	#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 4701 sub handler {	Line 4563 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 => $helpitem,	help => 'Course_Create_Class_List',
});	});
$bread_crumbs_component = 'Upload Users List';	$bread_crumbs_component = 'Upload Users List';
$args = {bread_crumbs => $brcrum,	$args = {bread_crumbs => $brcrum,
Line 4755 sub handler {	Line 4611 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,$permission);	$crstype,$brcrum,$showcredits);
} 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 4800 sub handler {	Line 4656 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 4818 sub handler {	Line 4673 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 4840 sub handler {	Line 4694 sub handler {
&update_user_data($r,$context,$crstype,$brcrum,$showcredits);	&update_user_data($r,$context,$crstype,$brcrum,$showcredits);
} else {	} else {
&print_username_entry_form($r,$context,undef,$srch,undef,$crstype,	&print_username_entry_form($r,$context,undef,$srch,undef,$crstype,
$brcrum,$permission);	$brcrum);
}	}
} 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,$permission);	&set_custom_role($r,$context,$brcrum,$prefix);
} else {	} else {
&custom_role_editor($r,$context,$brcrum,$prefix,$permission);	&custom_role_editor($r,$brcrum,$prefix);
}	}
} elsif (($env{'form.action'} eq 'processauthorreq') &&	} elsif (($env{'form.action'} eq 'processauthorreq') &&
($permission->{'cusr'}) &&	($permission->{'cusr'}) &&
Line 4953 sub handler {	Line 4807 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);	my ($num,$count,$showstatus);
$count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}}));	$count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}}));
$count += $numextras;	unless ($usertype eq 'default') {
	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 ++;
unless ($count == $num) {	if ($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)')).
if ($numextras) {	$showstatus.
unless ($pickstart) {	&Apache::lonhtmlcommon::row_closure(1));
$r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box());
$pickstart = 1;
}
if ($showemail) {
my $closure = '';
unless ($showstatus) {
$closure = 1;
}	}
$r->print(&Apache::lonhtmlcommon::row_title(&mt('E-mail address')).	$r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>');
$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 => $helpitem});	help => 'Course_View_Class_List'});
$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 5055 sub handler {	Line 4873 sub handler {
push(@{$brcrum},	push(@{$brcrum},
{href => '/adm/createuser?action=listusers',	{href => '/adm/createuser?action=listusers',
text => "List Users",	text => "List Users",
help => $helpitem});	help => 'Course_View_Class_List'});
$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 5136 sub handler {	Line 4954 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 5181 sub handler {	Line 5002 sub handler {
push(@{$brcrum},	push(@{$brcrum},
{href => '/adm/createuser?action=selfenrollqueue',	{href => '/adm/createuser?action=selfenrollqueue',
text => 'Enrollment requests',	text => 'Enrollment requests',
help => 'Course_Approve_Selfenroll'});	help => 'Course_Self_Enrollment'});
$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_Approve_Selfenroll'});	help => 'Course_Self_Enrollment'});
$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 5201 sub handler {	Line 5025 sub handler {
} elsif ($env{'form.state'} eq 'done') {	} elsif ($env{'form.state'} eq 'done') {
$r->print('<h3>'.&mt('Enrollment request processing').'</h3>'."\n");	$r->print('<h3>'.&mt('Enrollment request processing').'</h3>'."\n");
$r->print(&Apache::loncoursequeueadmin::update_request_queue($context,	$r->print(&Apache::loncoursequeueadmin::update_request_queue($context,
$cdom,$cnum,$coursedesc));	$cdom,$cnum,$coursedesc));
}	}
} else {	} else {
$r->print(&header(undef,{'no_nav_bar' => 1}).	$r->print(&header(undef,{'no_nav_bar' => 1}).
Line 5221 sub handler {	Line 5045 sub handler {
&update_helpdeskaccess($r,$permission,$brcrum);	&update_helpdeskaccess($r,$permission,$brcrum);
} else {	} else {
&print_helpdeskaccess_display($r,$permission,$brcrum);	&print_helpdeskaccess_display($r,$permission,$brcrum);
}	}
} else {	} else {
&print_helpdeskaccess_display($r,$permission,$brcrum);	&print_helpdeskaccess_display($r,$permission,$brcrum);
}	}
Line 5482 sub print_main_menu {	Line 5306 sub print_main_menu {
);	);
if ($linkcontext eq 'domain') {	if ($linkcontext eq 'domain') {
unless ($permission->{'cusr'}) {	unless ($permission->{'cusr'}) {
$links{'domain'}{'singleuser'} = 'View a User';	$links{'domain'}{'singleuser'} = 'View a User';
$linktitles{'domain'}{'singleuser'} = 'View information about a user in the domain';	$linktitles{'domain'}{'singleuser'} = 'View information about a user in the domain';

}	}
} elsif ($linkcontext eq 'course') {	} elsif ($linkcontext eq 'course') {
unless ($permission->{'cusr'}) {	unless ($permission->{'cusr'}) {
Line 5601 sub print_main_menu {	Line 5426 sub print_main_menu {
groups => 'Community Groups',	groups => 'Community Groups',
},	},
);	);
	$linktext{'Placement'} = $linktext{'Course'};

my %linktitle = (	my %linktitle = (
'Course' => {	'Course' => {
Line 5615 sub print_main_menu {	Line 5441 sub print_main_menu {
},	},
);	);

	$linktitle{'Placement'} = $linktitle{'Course'};

push(@{ $menu[0]->{items} }, #Category: Single Users	push(@{ $menu[0]->{items} }, #Category: Single Users
{	{
linktext => $linktext{$crstype}{'single'},	linktext => $linktext{$crstype}{'single'},
Line 5890 function validate_types(form) {	Line 5718 function validate_types(form) {
}	}

function check_types(num,countfail,needaction) {	function check_types(num,countfail,needaction) {
var boxname = 'selfenroll_types_'+num;	var typeidx = getIndexByName('selfenroll_types_'+num);
var typeidx = getIndexByName(boxname);
var count = 0;	var count = 0;
if (typeidx != -1) {	if (typeidx != -1) {
if (document.$formname.elements[boxname].length) {	if (document.$formname.elements[typeidx].length) {
for (var k=0; k<document.$formname.elements[boxname].length; k++) {	for (var k=0; k<document.$formname.elements[typeidx].length; k++) {
if (document.$formname.elements[boxname][k].checked) {	if (document.$formname.elements[typeidx][k].checked) {
count ++;	count ++;
}	}
}	}
Line 6235 ENDSCRIPT	Line 6062 ENDSCRIPT
} elsif ($item eq 'approval') {	} elsif ($item eq 'approval') {
my ($currnotified,$currapproval,%appchecked);	my ($currnotified,$currapproval,%appchecked);
my %selfdescs = &Apache::lonuserutils::selfenroll_default_descs();	my %selfdescs = &Apache::lonuserutils::selfenroll_default_descs();
if (ref($currsettings) eq 'HASH') {	if (ref($currsettings) eq 'HASH') {
$currnotified = $currsettings->{'selfenroll_notifylist'};	$currnotified = $currsettings->{'selfenroll_notifylist'};
$currapproval = $currsettings->{'selfenroll_approval'};	$currapproval = $currsettings->{'selfenroll_approval'};
}	}
Line 6659 sub print_userchangelogs_display {	Line 6486 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 6773 ENDSCRIPT	Line 6596 ENDSCRIPT
}	}
}	}
if (($context eq 'course') && ($viewablesec ne '')) {	if (($context eq 'course') && ($viewablesec ne '')) {
next if ($roleslog{$id}{'logentry'}{'section'} ne $viewablesec);	next if ($roleslog{$id}{'logentry'}{'section'} ne $viewablesec);
}	}
$count ++;	$count ++;
next if ($count < $minshown);	next if ($count < $minshown);
Line 6863 sub print_useraccesslogs_display {	Line 6686 sub print_useraccesslogs_display {

# set breadcrumbs	# set breadcrumbs
my %breadcrumb_text = &singleuser_breadcrumb('','domain',$udom);	my %breadcrumb_text = &singleuser_breadcrumb('','domain',$udom);
my $prevphasestr;	push (@{$brcrum},
if ($env{'form.popup'}) {	{href => "javascript:backPage($form)",
$brcrum = [];	text => $breadcrumb_text{'search'}});
} else {	my (@prevphases,$prevphasestr);
push (@{$brcrum},	if ($env{'form.prevphases'}) {
{href => "javascript:backPage($form)",	@prevphases = split(/,/,$env{'form.prevphases'});
text => $breadcrumb_text{'search'}});	$prevphasestr = $env{'form.prevphases'};
my @prevphases;	}
if ($env{'form.prevphases'}) {	if (($env{'form.phase'} eq 'userpicked') \|\| (grep(/^userpicked$/,@prevphases))) {
@prevphases = split(/,/,$env{'form.prevphases'});	push(@{$brcrum},
$prevphasestr = $env{'form.prevphases'};	{href => "javascript:backPage($form,'get_user_info','select')",
}	text => $breadcrumb_text{'userpicked'}});
if (($env{'form.phase'} eq 'userpicked') \|\| (grep(/^userpicked$/,@prevphases))) {	if ($env{'form.phase'} eq 'userpicked') {
push(@{$brcrum},	$prevphasestr = 'userpicked';
{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 6893 sub print_useraccesslogs_display {	Line 6711 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 6919 ENDSCRIPT	Line 6736 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>'
if ($env{'form.popup'}) {	.&earlyout_accesslog_form($formname,$prevphasestr,$udom));
$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 6944 ENDSCRIPT	Line 6757 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 7008 ENDSCRIPT	Line 6803 ENDSCRIPT
my ($nav_script,$nav_links);	my ($nav_script,$nav_links);

# table header	# table header
my $tableheader = '<h3>'.	my $tableheader =
&mt('User access logs for: [_1]',	&Apache::loncommon::start_data_table_header_row()
&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 7048 ENDSCRIPT	Line 6841 ENDSCRIPT
$showntableheader = 1;	$showntableheader = 1;
}	}
my ($shown,$extra);	my ($shown,$extra);
my ($event,$data) = split(/\s+/,&unescape($event),2);	my ($event,$data) = split(/\s+/,&unescape($event));
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 7100 ENDSCRIPT	Line 6893 ENDSCRIPT
$shown = &mt('Role selection: [_1]',$rolename);	$shown = &mt('Role selection: [_1]',$rolename);
} else {	} else {
$shown = &mt($event);	$shown = &mt($event);
if ($data =~ /^webdav/) {	if ($data ne '') {
my ($path,$clientip) = split(/\s+/,$data,2);	$extra = &mt('Client IP address: [_1]',$data);
$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 7219 sub activity_display_filter {	Line 7003 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><hr />';	.'</p>';
return $output;	return $output;
}	}

Line 7413 sub print_helpdeskaccess_display {	Line 7197 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','dh','da','none');	my @accesstypes = ('all','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') {
if (@{$types} > 0) {	if (@{$types} > 0) {
$numstatustypes = scalar(@{$types});	$numstatustypes = scalar(@{$types});
push(@accesstypes,'status');	push(@accesstypes,'status');
@jsarray = ('bystatus');	@jsarray = ('bystatus');
}	}
}	}
my %customroles = &get_domain_customroles($cdom,$confname);	my %customroles = &get_domain_customroles($cdom,$confname);
my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']);	my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh']);
if (keys(%domhelpdesk)) {	if (keys(%domhelpdesk)) {
push(@accesstypes,('inc','exc'));	push(@accesstypes,('inc','exc'));
push(@jsarray,('notinc','notexc'));	push(@jsarray,('notinc','notexc'));
Line 7467 sub print_helpdeskaccess_display {	Line 7251 sub print_helpdeskaccess_display {
$elements{$role.'_staff_inc'} = 'checkbox';	$elements{$role.'_staff_inc'} = 'checkbox';
$elements{$role.'_staff_exc'} = 'checkbox';	$elements{$role.'_staff_exc'} = 'checkbox';
}	}
$elements{$role.'_override'} = 'checkbox';	$elements{$role.'_override'} = 'checkbox';
if (ref($settings{$role}) eq 'HASH') {	if (ref($settings{$role}) eq 'HASH') {
if ($settings{$role}{'access'} ne '') {	if ($settings{$role}{'access'} ne '') {
my $curraccess = $settings{$role}{'access'};	my $curraccess = $settings{$role}{'access'};
Line 7531 function switchRoleTab(caller,role) {	Line 7315 function switchRoleTab(caller,role) {
}	}
}	}
return false;	return false;
}	}

function helpdeskAccess(role) {	function helpdeskAccess(role) {
var curraccess = null;	var curraccess = null;
Line 7545 function helpdeskAccess(role) {	Line 7329 function helpdeskAccess(role) {
var shown = Array();	var shown = Array();
var hidden = Array();	var hidden = Array();
if (curraccess == 'none') {	if (curraccess == 'none') {
hidden = Array ('$hiddenstr');	hidden = Array ('$hiddenstr');
} else {	} else {
if (curraccess == 'status') {	if (curraccess == 'status') {
shown = Array ('bystatus','privs');	shown = Array ('bystatus','privs');
hidden = Array ('notinc','notexc');	hidden = Array ('notinc','notexc');
} else {	} else {
if (curraccess == 'exc') {	if (curraccess == 'exc') {
shown = Array ('notexc','privs');	shown = Array ('notexc','privs');
Line 7568 function helpdeskAccess(role) {	Line 7352 function helpdeskAccess(role) {
if (hidden.length > 0) {	if (hidden.length > 0) {
for (var i=0; i<hidden.length; i++) {	for (var i=0; i<hidden.length; i++) {
if (document.getElementById(role+'_'+hidden[i])) {	if (document.getElementById(role+'_'+hidden[i])) {
document.getElementById(role+'_'+hidden[i]).style.display = 'none';	document.getElementById(role+'_'+hidden[i]).style.display = 'none';
}	}
}	}
}	}
Line 7593 function toggleAccess(role) {	Line 7377 function toggleAccess(role) {
if (document.$formname.elements[role+'_incrs'][i].checked) {	if (document.$formname.elements[role+'_incrs'][i].checked) {
if (document.$formname.elements[role+'_incrs'][i].value == 1) {	if (document.$formname.elements[role+'_incrs'][i].value == 1) {
document.getElementById(role+'_setindom').style.display = 'none';	document.getElementById(role+'_setindom').style.display = 'none';
document.getElementById(role+'_setincrs').style.display = 'block';	document.getElementById(role+'_setincrs').style.display = 'block';
} else {	} else {
document.getElementById(role+'_setincrs').style.display = 'none';	document.getElementById(role+'_setincrs').style.display = 'none';
document.getElementById(role+'_setindom').style.display = 'block';	document.getElementById(role+'_setindom').style.display = 'block';
Line 7622 ENDJS	Line 7406 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 with domain helpdesk or helpdesk assistant role',	'all' => 'All',
'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',
'exc' => 'Exclude all, but include specific personnel',	'exc' => 'Exclude all, but include specific personnel',
'hel' => 'Helpdesk',	'hel' => 'Helpdesk',
'rpr' => 'Role privileges',	'rpr' => 'Role privileges',
Line 7663 ENDJS	Line 7445 ENDJS
my @roles_by_num = ();	my @roles_by_num = ();
foreach my $item (sort {$a <=> $b } (keys(%ordered))) {	foreach my $item (sort {$a <=> $b } (keys(%ordered))) {
push(@roles_by_num,$ordered{$item});	push(@roles_by_num,$ordered{$item});
}	}
$r->print('<p>'.$lt{'tfh'}.': <i>'.join('</i>, <i>',map { $description{$_}; } @roles_by_num).'</i>.');	$r->print('<p>'.$lt{'tfh'}.': <b>'.join('</b>, <b>',map { $description{$_}; } @roles_by_num).'</b>.');
if ($permission->{'owner'}) {	if ($permission->{'owner'}) {
$r->print('<br />'.$lt{'aco'}.'</p><p>');	$r->print('<br />'.$lt{'aco'}.'</p><p>');
$r->print('<input type="hidden" name="state" value="process" />'.	$r->print('<input type="hidden" name="state" value="process" />'.
Line 7686 ENDJS	Line 7468 ENDJS
my $id;	my $id;
if ($count == 0) {	if ($count == 0) {
$id=' id="LC_current_minitab"';	$id=' id="LC_current_minitab"';
$visibility{$role} = ' style="display:block"';	$visibility{$role} = ' style="display:block"';
} else {	} else {
$visibility{$role} = ' style="display:none"';	$visibility{$role} = ' style="display:none"';
}	}
Line 7706 ENDJS	Line 7488 ENDJS
priv => 'block',	priv => 'block',
);	);
my (%selected,$overridden,$incrscheck,$indomcheck,$indomvis,$incrsvis);	my (%selected,$overridden,$incrscheck,$indomcheck,$indomvis,$incrsvis);
if (ref($settings{$role}) eq 'HASH') {	if (ref($settings{$role}) eq 'HASH') {
if ($settings{$role}{'access'} ne '') {	if ($settings{$role}{'access'} ne '') {
$indomvis = ' style="display:none"';	$indomvis = ' style="display:none"';
$incrsvis = ' style="display:block"';	$incrsvis = ' style="display:block"';
$incrscheck = ' checked="checked"';	$incrscheck = ' checked="checked"';
if ($settings{$role}{'access'} ne 'all') {	if ($settings{$role}{'access'} ne 'all') {
$usecheck{$settings{$role}{'access'}} = $usecheck{'all'};	$usecheck{$settings{$role}{'access'}} = $usecheck{'all'};
delete($usecheck{'all'});	delete($usecheck{'all'});
Line 7737 ENDJS	Line 7519 ENDJS
}	}
} else {	} else {
$indomcheck = ' checked="checked"';	$indomcheck = ' checked="checked"';
$indomvis = ' style="display:block"';	$indomvis = ' style="display:block"';
$incrsvis = ' style="display:none"';	$incrsvis = ' style="display:none"';
}	}
$r->print('<div class="LC_left_float" id="'.$role.'_maindiv"'.$visibility{$role}.'>'.	$r->print('<div class="LC_left_float" id="'.$role.'_maindiv"'.$visibility{$role}.'>'.
Line 7790 ENDJS	Line 7572 ENDJS
&role_priv_table($role,$permission,$crstype,\%full,\%levels,\%levelscurrent,$overridden{$role}).	&role_priv_table($role,$permission,$crstype,\%full,\%levels,\%levelscurrent,$overridden{$role}).
'</fieldset></div><div style="padding:0;clear:both;margin:0;border:0"></div>');	'</fieldset></div><div style="padding:0;clear:both;margin:0;border:0"></div>');
}	}
if ($permission->{'owner'}) {
$r->print('<p><input type="submit" value="'.&mt('Save changes').'" /></p>');
}
} else {	} else {
$r->print(&mt('Helpdesk roles have not yet been created in this domain.'));	$r->print(&mt('Helpdesk roles have not yet been created in this domain.'));
}	}
Line 7811 sub domain_adhoc_access {	Line 7590 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] or [_2] role',&Apache::lonnet::plaintext('dh'),	$domusage{$role} = &mt('Any user in domain with active [_1] 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 7828 sub domain_adhoc_access {	Line 7606 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] or [_2] role, and institutional status: [_3]',	$domusage{$role} = &mt('Any user in domain with active [_1] role, and institutional status: [_2]',
&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownstatus);	&Apache::lonnet::plaintext('dh'),$shownstatus);
} else {	} else {
$domusage{$role} = &mt('No one in the domain');	$domusage{$role} = &mt('No one in the domain');
}	}
Line 7843 sub domain_adhoc_access {	Line 7621 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] or [_2] role, except: [_3]',	$domusage{$role} = &mt('Include any user in domain with active [_1] role, except: [_2]',
&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$showninc);	&Apache::lonnet::plaintext('dh'),$showninc);
} else {	} else {
$domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',	$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));
&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'));
}	}
}	}
} elsif ($access eq 'exc') {	} elsif ($access eq 'exc') {
Line 7860 sub domain_adhoc_access {	Line 7637 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] or [_2] role: [_3]',	$domusage{$role} = &mt('Only the following in the domain with active [_1] role: [_2]',
&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownexc);	&Apache::lonnet::plaintext('dh'),$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 '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') {	} elsif ($access eq 'all') {
$domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',	$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));
&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'));
}	}
} else {	} else {
$domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',	$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));
&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'));
}	}
}	}
return %domusage;	return %domusage;
Line 7945 sub role_priv_table {	Line 7716 sub role_priv_table {
$checked = ' checked="checked"';	$checked = ' checked="checked"';
}	}
$customstatus = '<img src="/adm/lonIcons/navmap.wrong.gif" alt="'.$lt{'dis'}.'" />';	$customstatus = '<img src="/adm/lonIcons/navmap.wrong.gif" alt="'.$lt{'dis'}.'" />';
$ineffect = $customstatus;	$ineffect = $customstatus;
} elsif ((!$levelscurrent->{'course'}{$priv}) && ($on{$priv})) {	} elsif ((!$levelscurrent->{'course'}{$priv}) && ($on{$priv})) {
if ($permission->{'owner'}) {	if ($permission->{'owner'}) {
$checked = ' checked="checked"';	$checked = ' checked="checked"';
}	}
$customstatus = '<img src="/adm/lonIcons/navmap.correct.gif" alt="'.$lt{'ena'}.'" />';	$customstatus = '<img src="/adm/lonIcons/navmap.correct.gif" alt="'.$lt{'ena'}.'" />';
$ineffect = $customstatus;	$ineffect = $customstatus;
}	}
if ($permission->{'owner'}) {	if ($permission->{'owner'}) {
$output .= '<input type="checkbox" name="'.$role.'_override" value="'.$priv.'"'.$checked.' />';	$output .= '<input type="checkbox" name="'.$role.'_override" value="'.$priv.'"'.$checked.' />';
Line 7966 sub role_priv_table {	Line 7737 sub role_priv_table {
}	}

sub get_adhocrole_settings {	sub get_adhocrole_settings {
my ($cid,$accesstypes,$types,$customroles,$settings,$overridden) = @_;	my ($cid,$accesstypes,$types,$customroles,$settings,$overridden) = @_;
return unless ((ref($accesstypes) eq 'ARRAY') && (ref($customroles) eq 'HASH') &&	return unless ((ref($accesstypes) eq 'ARRAY') && (ref($customroles) eq 'HASH') &&
(ref($settings) eq 'HASH') && (ref($overridden) eq 'HASH'));	(ref($settings) eq 'HASH') && (ref($overridden) eq 'HASH'));
foreach my $role (split(/,/,$env{'course.'.$cid.'.internal.adhocaccess'})) {	foreach my $role (split(/,/,$env{'course.'.$cid.'.internal.adhocaccess'})) {
Line 8058 sub update_helpdeskaccess {	Line 7829 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','dh','da','none','status','inc','exc');	my @accesstypes = ('all','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 8068 sub update_helpdeskaccess {	Line 7839 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','da']);	my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh']);
my (%changed,%storehash,@todelete);	my (%changed,%storehash,@todelete);

if (keys(%customroles)) {	if (keys(%customroles)) {
Line 8095 sub update_helpdeskaccess {	Line 7866 sub update_helpdeskaccess {
push(@incrs,$role);	push(@incrs,$role);
unless ($current{'access'} eq $access) {	unless ($current{'access'} eq $access) {
$changed{$role}{'access'} = 1;	$changed{$role}{'access'} = 1;
$storehash{'internal.adhoc.'.$role} = $access;	$storehash{'internal.adhoc.'.$role} = $access;
}	}
if ($access eq 'status') {	if ($access eq 'status') {
my @statuses = &Apache::loncommon::get_env_multiple('form.'.$role.'_status');	my @statuses = &Apache::loncommon::get_env_multiple('form.'.$role.'_status');
Line 8131 sub update_helpdeskaccess {	Line 7902 sub update_helpdeskaccess {
my @currstaff;	my @currstaff;
foreach my $person (sort(@personnel)) {	foreach my $person (sort(@personnel)) {
if ($domhelpdesk{$person}) {	if ($domhelpdesk{$person}) {
push(@stored,$person);	push(@stored,$person);
}	}
}	}
if (ref($current{$access}) eq 'ARRAY') {	if (ref($current{$access}) eq 'ARRAY') {
Line 8177 sub update_helpdeskaccess {	Line 7948 sub update_helpdeskaccess {
&Apache::lonuserutils::custom_role_privs($customroles{$role},\%full,\%levels,\%levelscurrent);	&Apache::lonuserutils::custom_role_privs($customroles{$role},\%full,\%levels,\%levelscurrent);
my (@updatedon,@updatedoff,@override);	my (@updatedon,@updatedoff,@override);
@override = &Apache::loncommon::get_env_multiple('form.'.$role.'_override');	@override = &Apache::loncommon::get_env_multiple('form.'.$role.'_override');
if (@override) {	if (@override) {
foreach my $priv (sort(keys(%full))) {	foreach my $priv (sort(keys(%full))) {
next unless ($levels{'course'}{$priv});	next unless ($levels{'course'}{$priv});
if (grep(/^\Q$priv\E$/,@override)) {	if (grep(/^\Q$priv\E$/,@override)) {
Line 8190 sub update_helpdeskaccess {	Line 7961 sub update_helpdeskaccess {
}	}
}	}
if (@updatedon) {	if (@updatedon) {
$newsettings{$role}{'on'} = join('</li><li>', map { &Apache::lonnet::plaintext($_,$crstype) } (@updatedon));	$newsettings{$role}{'on'} = join('</li><li>', map { &Apache::lonnet::plaintext($_,$crstype) } (@updatedon));
}	}
if (@updatedoff) {	if (@updatedoff) {
$newsettings{$role}{'off'} = join('</li><li>', map { &Apache::lonnet::plaintext($_,$crstype) } (@updatedoff));	$newsettings{$role}{'off'} = join('</li><li>', map { &Apache::lonnet::plaintext($_,$crstype) } (@updatedoff));
Line 8298 sub update_helpdeskaccess {	Line 8069 sub update_helpdeskaccess {
push(@roles_by_num,$ordered{$item});	push(@roles_by_num,$ordered{$item});
}	}
%domusage = &domain_adhoc_access(\%changed,\%domcurrent,\@accesstypes,$usertypes,$othertitle);	%domusage = &domain_adhoc_access(\%changed,\%domcurrent,\@accesstypes,$usertypes,$othertitle);
$r->print(&mt('Helpdesk access settings have been changed as follows').'<br />');	$r->print(&mt('Helpdesk access settings have been changed as follows').'<br />');
$r->print('<ul>');	$r->print('<ul>');
foreach my $role (@roles_by_num) {	foreach my $role (@roles_by_num) {
next unless (ref($changed{$role}) eq 'HASH');	next unless (ref($changed{$role}) eq 'HASH');
$r->print('<li>'.&mt('Ad hoc role').': <b>'.$description{$role}.'</b>'.	$r->print('<li>'.&mt('Ad hoc role').': <b>'.$description{$role}.'</b>'.
'<ul>');	'<ul>');
if ($changed{$role}{'access'} \|\| $changed{$role}{'status'} \|\| $changed{$role}{'inc'} \|\| $changed{$role}{'exc'}) {	if ($changed{$role}{'access'} \|\| $changed{$role}{'status'} \|\| $changed{$role}{'inc'} \|\| $changed{$role}{'exc'}) {
$r->print('<li>');	$r->print('<li>');
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') {
if ($newsettings{$role}{'status'}) {	if ($newsettings{$role}{'status'}) {
my ($access,$rest) = split(/=/,$storehash{'internal.adhoc.'.$role});	my ($access,$rest) = split(/=/,$storehash{'internal.adhoc.'.$role});
if (split(/,/,$rest) > 1) {	if (split(/,/,$rest) > 1) {
$r->print(&mt('Helpdesk staff can use this role if their institutional type is one of: [_1].',	$r->print(&mt('Helpdesk staff can use this role if their institutional type is one of: [_1].',
$newsettings{$role}{'status'}));	$newsettings{$role}{'status'}));
} else {	} else {
Line 8355 sub update_helpdeskaccess {	Line 8120 sub update_helpdeskaccess {
$r->print('<li>'.&mt('Privileges which are available by default for this ad hoc role, but are disabled for this specific '.lc($crstype).':').	$r->print('<li>'.&mt('Privileges which are available by default for this ad hoc role, but are disabled for this specific '.lc($crstype).':').
'<ul><li>'.$newsettings{$role}{'off'}.'</li></ul></li>');	'<ul><li>'.$newsettings{$role}{'off'}.'</li></ul></li>');
} else {	} else {
$r->print('<li>'.&mt('All privileges available by default for this ad hoc role are enabled.').'</li>');	$r->print('<li>'.&mt('All privileges available by default for this ad hoc role are enabled.').'</li>');
}	}
}	}
if ($changed{$role}{'on'}) {	if ($changed{$role}{'on'}) {
if ($newsettings{$role}{'on'}) {	if ($newsettings{$role}{'on'}) {
$r->print('<li>'.&mt('Privileges which are not available by default for this ad hoc role, but are enabled for this specific '.lc($crstype).':').	$r->print('<li>'.&mt('Privileges which are not available by default for this ad hoc role, but are enabled for this specific '.lc($crstype).':').
'<ul><li>'.$newsettings{$role}{'on'}.'</li></ul></li>');	'<ul><li>'.$newsettings{$role}{'on'}.'</li></ul></li>');
} else {	} else {
$r->print('<li>'.&mt('None of the privileges unavailable by default for this ad hoc role are enabled.').'</li>');	$r->print('<li>'.&mt('None of the privileges unavailable by default for this ad hoc role are enabled.').'</li>');
}	}
}	}
}	}
Line 8372 sub update_helpdeskaccess {	Line 8137 sub update_helpdeskaccess {
$r->print('</ul>');	$r->print('</ul>');
}	}
} else {	} else {
$r->print(&mt('No changes made to helpdesk access settings.'));	$r->print(&mt('No changes made to helpdesk access settings.'));
}	}
}	}
return;	return;
Line 8437 sub user_search_result {	Line 8202 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') && ($env{'form.action'} ne 'accesslogs')) {	if ($domd_chk ne 'ok') {
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 8788 sub build_search_response {	Line 8553 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'}) && ($env{'form.action'} ne 'accesslogs')) {	if ($srch->{'srchdomain'}) {
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'}) {
Line 8851 sub build_search_response {	Line 8616 sub build_search_response {
,' <a'.$helplink.'>'	,' <a'.$helplink.'>'
,'</a>')	,'</a>')
.'<br />';	.'<br />';

}	}
}	}
}	}

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

Removed from v.1.406.2.14.2.1
changed lines
	Added in v.1.428