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.300 and 1.306

version 1.300, 2009/07/27 14:09:14	version 1.306, 2009/08/08 00:36:00
Line 143 sub portfolio_quota {	Line 143 sub portfolio_quota {
$custom_off = ' checked="checked" ';	$custom_off = ' checked="checked" ';
my $quota_javascript = <<"END_SCRIPT";	my $quota_javascript = <<"END_SCRIPT";
<script type="text/javascript">	<script type="text/javascript">
	// <![CDATA[
function quota_changes(caller) {	function quota_changes(caller) {
if (caller == "custom") {	if (caller == "custom") {
if (document.cu.customquota[0].checked) {	if (document.cu.customquota[0].checked) {
Line 153 function quota_changes(caller) {	Line 154 function quota_changes(caller) {
document.cu.customquota[1].checked = true;	document.cu.customquota[1].checked = true;
}	}
}	}
	// ]]>
</script>	</script>
END_SCRIPT	END_SCRIPT
if ($quotatype eq 'custom') {	if ($quotatype eq 'custom') {
Line 214 END_SCRIPT	Line 216 END_SCRIPT

sub build_tools_display {	sub build_tools_display {
my ($ccuname,$ccdomain,$context) = @_;	my ($ccuname,$ccdomain,$context) = @_;
my (@usertools,%userenv,$output);	my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay,
	$colspan);
my %lt = &Apache::lonlocal::texthash (	my %lt = &Apache::lonlocal::texthash (
'blog' => "Personal User Blog",	'blog' => "Personal User Blog",
'aboutme' => "Personal Information Page",	'aboutme' => "Personal Information Page",
Line 233 sub build_tools_display {	Line 236 sub build_tools_display {
'requestcourses.official','requestcourses.unofficial',	'requestcourses.official','requestcourses.unofficial',
'requestcourses.community');	'requestcourses.community');
@usertools = ('official','unofficial','community');	@usertools = ('official','unofficial','community');
	@options =('norequest','approve','autolimit','validate');
	%validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);
	%reqtitles = &courserequest_titles();
	%reqdisplay = &courserequest_display();
	$colspan = ' colspan="2"';
} else {	} else {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,	%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'tools.aboutme','tools.portfolio','tools.blog');	'tools.aboutme','tools.portfolio','tools.blog');
@usertools = ('aboutme','blog','portfolio');	@usertools = ('aboutme','blog','portfolio');
}	}
foreach my $item (@usertools) {	foreach my $item (@usertools) {
my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off);	my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off,
	$currdisp,$custdisp,$custradio);
$cust_off = 'checked="checked" ';	$cust_off = 'checked="checked" ';
$tool_on = 'checked="checked" ';	$tool_on = 'checked="checked" ';
$curr_access =	$curr_access =
&Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,	&Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
$context);	$context);
if ($userenv{$context.'.'.$item} eq '') {	if ($userenv{$context.'.'.$item} ne '') {
$custom_access = 'default';
if (!$curr_access) {
$tool_off = 'checked="checked" ';
$tool_on = '';
}
} else {
$custom_access = 'custom';
$cust_on = ' checked="checked" ';	$cust_on = ' checked="checked" ';
$cust_off = '';	$cust_off = '';
if ($userenv{$context.'.'.$item} == 0) {	}
$tool_off = 'checked="checked" ';	if ($context eq 'requestcourses') {
$tool_on = '';	if ($userenv{$context.'.'.$item} eq '') {
	$custom_access = &mt('Currently from default setting.');
	} else {
	$custom_access = &mt('Currently from custom setting.');
	}
	} else {
	if ($userenv{$context.'.'.$item} eq '') {
	$custom_access =
	&mt('Availability determined currently from default setting.');
	if (!$curr_access) {
	$tool_off = 'checked="checked" ';
	$tool_on = '';
	}
	} else {
	$custom_access =
	&mt('Availability determined currently from custom setting.');
	if ($userenv{$context.'.'.$item} == 0) {
	$tool_off = 'checked="checked" ';
	$tool_on = '';
	}
}	}
}	}
$output .= ' <tr class="LC_info_row">'."\n".	$output .= ' <tr class="LC_info_row">'."\n".
' <td>'.$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";
' <td>'.&mt('Availability determined currently from [_1] setting.',$custom_access).	if ($context eq 'requestcourses') {
'     '.$lt{'avai'}.': '.	my ($curroption,$currlimit);
($curr_access?&mt('Yes'):&mt('No')).'</td>'."\n".	$curroption = $userenv{$context.'.'.$item};
	if (!$curroption) {
	$curroption = 'norequest';
	}
	if ($curroption =~ /^autolimit=(\d*)$/) {
	$currlimit = $1;
	$currdisp = &mt('Yes, up to [quant,_1,request]/user',$currlimit);
	} else {
	$currdisp = $reqdisplay{$curroption};
	}
	$custdisp = '<table>';
	foreach my $option (@options) {
	my $val = $option;
	if ($option eq 'norequest') {
	$val = 0;
	}
	if ($option eq 'validate') {
	my $canvalidate = 0;
	if (ref($validations{$item}) eq 'HASH') {
	if ($validations{$item}{'_custom_'}) {
	$canvalidate = 1;
	}
	}
	next if (!$canvalidate);
	}
	my $checked = '';
	if ($option eq $curroption) {
	$checked = ' checked="checked"';
	} elsif ($option eq 'autolimit') {
	if ($curroption =~ /^autolimit/) {
	$checked = ' checked="checked"';
	}
	}
	$custdisp .= '<tr><td><span class="LC_nobreak"><label>'.
	'<input type="radio" name="crsreq_'.$item.
	'" value="'.$val.'"'.$checked.' />'.
	$reqtitles{$option}.'</label> ';
	if ($option eq 'autolimit') {
	$custdisp .= '<input type="text" name="crsreq_'.
	$item.'_limit" size="1" '.
	'value="'.$currlimit.'" />';
	}
	$custdisp .= '</span></td></tr>';
	}
	$custdisp .= '</table>';
	$custradio = '</span></td><td>'.&mt('Custom setting').'<br />'.$custdisp;
	} else {
	$currdisp = ($curr_access?&mt('Yes'):&mt('No'));
	$custdisp = '<span class="LC_nobreak"><label>'.
	'<input type="radio" name="'.$context.'_'.$item.'"'.
	' value="1"'. $tool_on.'/>'.&mt('On').'</label> <label>'.
	'<input type="radio" name="'.$context.'_'.$item.'" value="0" '.
	$tool_off.'/>'.&mt('Off').'</label></span>';
	$custradio = (' 'x2).'--'.$lt{'cusa'}.': '.$custdisp.
	'</span>';
	}
	$output .= ' <td'.$colspan.'>'.$custom_access.(' 'x4).
	$lt{'avai'}.': '.$currdisp.'</td>'."\n".
&Apache::loncommon::end_data_table_row()."\n".	&Apache::loncommon::end_data_table_row()."\n".
&Apache::loncommon::start_data_table_row()."\n".	&Apache::loncommon::start_data_table_row()."\n".
' <td><span class="LC_nobreak">'.$lt{'chse'}.': <label>'.	' <td style="vertical-align:top;"><span class="LC_nobreak">'.
	$lt{'chse'}.': <label>'.
'<input type="radio" name="custom'.$item.'" value="0" '.	'<input type="radio" name="custom'.$item.'" value="0" '.
$cust_off.'/>'.$lt{'usde'}.'</label>   '.	$cust_off.'/>'.$lt{'usde'}.'</label>'.(' ' x3).
'<label><input type="radio" name="custom'.$item.'" value="1" '.	'<label><input type="radio" name="custom'.$item.'" value="1" '.
$cust_on.'/>'.$lt{'uscu'}.'</label>  --  '.	$cust_on.'/>'.$lt{'uscu'}.'</label>'.$custradio.'</td>'.
$lt{'cusa'}.': <label>'.
'<input type="radio" name="'.$context.'_'.$item.'" value="1" '.
$tool_on.'/>'.&mt('On').'</label> <label>'.
'<input type="radio" name="'.$context.'_'.$item.'" value="0" '.
$tool_off.'/>'.&mt('Off').'</label></span></td>'."\n".
&Apache::loncommon::end_data_table_row()."\n";	&Apache::loncommon::end_data_table_row()."\n";
}	}
return $output;	return $output;
Line 286 sub build_tools_display {	Line 360 sub build_tools_display {

sub coursereq_externaluser {	sub coursereq_externaluser {
my ($ccuname,$ccdomain,$cdom) = @_;	my ($ccuname,$ccdomain,$cdom) = @_;
my (@usertools,%userenv,$output);	my (@usertools,@options,%validations,%userenv,$output);
my %lt = &Apache::lonlocal::texthash (	my %lt = &Apache::lonlocal::texthash (
'official' => 'Can request creation of official courses',	'official' => 'Can request creation of official courses',
'unofficial' => 'Can request creation of unofficial courses',	'unofficial' => 'Can request creation of unofficial courses',
Line 297 sub coursereq_externaluser {	Line 371 sub coursereq_externaluser {
'reqcrsotherdom.official','reqcrsotherdom.unofficial',	'reqcrsotherdom.official','reqcrsotherdom.unofficial',
'reqcrsotherdom.community');	'reqcrsotherdom.community');
@usertools = ('official','unofficial','community');	@usertools = ('official','unofficial','community');
	@options = ('approve','validate','autolimit');
	%validations = &Apache::lonnet::auto_courserequest_checks($cdom);
	my $optregex = join('\|',@options);
	my %reqtitles = &courserequest_titles();
foreach my $item (@usertools) {	foreach my $item (@usertools) {
my ($tool_on,$tool_off);	my ($curroption,$currlimit,$tooloff);
$tool_off = 'checked="checked" ';
if ($userenv{'reqcrsotherdom.'.$item} ne '') {	if ($userenv{'reqcrsotherdom.'.$item} ne '') {
my @curr = split(',',$userenv{'reqcrsotherdom.'.$item});	my @curr = split(',',$userenv{'reqcrsotherdom.'.$item});
if (grep(/^\Q$cdom\E$/,@curr)) {	if (grep(/^\Q$cdom\E:($optregex)=?(\d*)$/,@curr)) {
$tool_on = 'checked="checked" ';	$curroption = $1;
$tool_off = '';	$currlimit = $2;
	if (!$curroption) {
	$curroption = 'norequest';
	}
}	}
	} else {
	$curroption = 'norequest';
	$tooloff = ' checked="checked"';
	}
	$output.= &Apache::loncommon::start_data_table_row()."\n".
	' <td><span class="LC_nobreak">'.$lt{$item}.': '.
	'<label><input type="radio" name="reqcrsotherdom_'.$item.
	'" value="0"'.$tooloff.' />'.$reqtitles{'norequest'}.
	'</label> ';
	foreach my $option (@options) {
	if ($option eq 'validate') {
	my $canvalidate = 0;
	if (ref($validations{$item}) eq 'HASH') {
	if ($validations{$item}{'_external_'}) {
	$canvalidate = 1;
	}
	}
	next if (!$canvalidate);
	}
	my $checked = '';
	if ($option eq $curroption) {
	$checked = ' checked="checked"';
	}
	$output .= '<span class="LC_nobreak"><label>'.
	'<input type="radio" name="reqcrsotherdom_'.$item.
	'" value="'.$option.'"'.$checked.' />'.
	$reqtitles{$option}.'</label> ';
	if ($option eq 'autolimit') {
	$output .= '<input type="text" name="reqcrsotherdom_'.
	$item.'_limit" size="1" '.
	'value="'.$currlimit.'" />';
	}
	$output .= ' '
}	}
$output .= &Apache::loncommon::start_data_table_row()."\n".	$output .= '</span></td>'."\n".
' <td><span class="LC_nobreak">'.$lt{$item}.': <label>'.
'<input type="radio" name="reqcrsotherdom_'.$item.'" value="1" '.
$tool_on.'/>'.&mt('Yes').'</label> <label>'.
'<input type="radio" name="reqcrsotherdom_'.$item.'" value="0" '.
$tool_off.'/>'.&mt('No').'</label></span></td>'."\n".
&Apache::loncommon::end_data_table_row()."\n";	&Apache::loncommon::end_data_table_row()."\n";
}	}
return $output;	return $output;
}	}

	sub courserequest_titles {
	my %titles = &Apache::lonlocal::texthash (
	official => 'Official',
	unofficial => 'Unofficial',
	community => 'Communities',
	norequest => 'Not allowed',
	approve => 'Approval by Dom. Coord.',
	validate => 'With validation',
	autolimit => 'Numerical limit',
	);
	return %titles;
	}

	sub courserequest_display {
	my %titles = &Apache::lonlocal::texthash (
	approve => 'Yes, need approval',
	validate => 'Yes, with validation',
	norequest => 'No',
	);
	return %titles;
	}

# =================================================================== Phase one	# =================================================================== Phase one

sub print_username_entry_form {	sub print_username_entry_form {
Line 335 sub print_username_entry_form {	Line 465 sub print_username_entry_form {

my $jscript = &Apache::loncommon::studentbrowser_javascript()."\n".	my $jscript = &Apache::loncommon::studentbrowser_javascript()."\n".
'<script type="text/javascript">'."\n".	'<script type="text/javascript">'."\n".
&Apache::lonhtmlcommon::set_form_elements($elements->{$formtoset}).	'// <![CDATA['."\n".
	&Apache::lonhtmlcommon::set_form_elements($elements->{$formtoset})."\n".
	'// ]]>'."\n".
'</script>'."\n";	'</script>'."\n";

my %loaditems = (	my %loaditems = (
Line 502 sub user_modification_js {	Line 634 sub user_modification_js {

return <<END;	return <<END;
<script type="text/javascript" language="Javascript">	<script type="text/javascript" language="Javascript">
	// <![CDATA[
function pclose() {	function pclose() {
parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",	parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
"height=350,width=350,scrollbars=no,menubar=no");	"height=350,width=350,scrollbars=no,menubar=no");
Line 519 sub user_modification_js {	Line 651 sub user_modification_js {
}	}

$nondc_setsection_code	$nondc_setsection_code
	// ]]>
</script>	</script>
END	END
}	}

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

Line 538 sub print_user_selection_page {	Line 670 sub print_user_selection_page {

my $jscript = (<<ENDSCRIPT);	my $jscript = (<<ENDSCRIPT);
<script type="text/javascript">	<script type="text/javascript">
	// <![CDATA[
function pickuser(uname,udom) {	function pickuser(uname,udom) {
document.usersrchform.seluname.value=uname;	document.usersrchform.seluname.value=uname;
document.usersrchform.seludom.value=udom;	document.usersrchform.seludom.value=udom;
Line 546 function pickuser(uname,udom) {	Line 679 function pickuser(uname,udom) {
}	}

$jsback	$jsback
	// ]]>
</script>	</script>
ENDSCRIPT	ENDSCRIPT

Line 560 ENDSCRIPT	Line 694 ENDSCRIPT
'firstname' => "first name",	'firstname' => "first name",
'permanentemail' => "permanent e-mail",	'permanentemail' => "permanent e-mail",
);	);
$r->print(&Apache::loncommon::start_page('User Management',$jscript));	if ($context eq 'requestcrs') {
	$r->print('<div>');
	} else {
	$r->print(&Apache::loncommon::start_page('User Management',$jscript));

my %breadcrumb_text = &singleuser_breadcrumb();	my %breadcrumb_text = &singleuser_breadcrumb();
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage(document.usersrchform,'','')",	({href=>"javascript:backPage(document.usersrchform,'','')",
text=>$breadcrumb_text{'search'},	text=>$breadcrumb_text{'search'},
faq=>282,bug=>'Instructor Interface',},	faq=>282,bug=>'Instructor Interface',},
{href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",	{href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",
text=>$breadcrumb_text{'userpicked'},	text=>$breadcrumb_text{'userpicked'},
faq=>282,bug=>'Instructor Interface',});	faq=>282,bug=>'Instructor Interface',});
if ($env{'form.action'} eq 'singleuser') {	if ($env{'form.action'} eq 'singleuser') {
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',	$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
'Course_Change_Privileges'));	'Course_Change_Privileges'));
$r->print("<b>$lt{'usrch'}</b><br />");	$r->print("<b>$lt{'usrch'}</b><br />");
$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));	$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
$r->print('<h3>'.$lt{'usel'}.'</h3>');	$r->print('<h3>'.$lt{'usel'}.'</h3>');
} elsif ($env{'form.action'} eq 'singlestudent') {	} elsif ($env{'form.action'} eq 'singlestudent') {
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',	$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
'Course_Add_Student'));	'Course_Add_Student'));
$r->print($jscript."<b>$lt{'stusrch'}</b><br />");	$r->print($jscript."<b>$lt{'stusrch'}</b><br />");
$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));	$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
$r->print('</form><h3>'.$lt{'stusel'}.'</h3>');	$r->print('</form><h3>'.$lt{'stusel'}.'</h3>');
	}
}	}
$r->print('<form name="usersrchform" method="post">'.	$r->print('<form name="usersrchform" method="post">'.
&Apache::loncommon::start_data_table()."\n".	&Apache::loncommon::start_data_table()."\n".
Line 606 ENDSCRIPT	Line 744 ENDSCRIPT

foreach my $user (@sorted_users) {	foreach my $user (@sorted_users) {
my ($uname,$udom) = split(/:/,$user);	my ($uname,$udom) = split(/:/,$user);
	my $onclick;
	if ($context eq 'requestcrs') {
	$onclick =
	'onclick="javascript:gochoose('."'$uname','$udom',".
	"'$srch_results->{$user}->{firstname}',".
	"'$srch_results->{$user}->{lastname}',".
	"'$srch_results->{$user}->{permanentemail}'".');"';
	} else {
	$onclick =
	' onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".');"';
	}
$r->print(&Apache::loncommon::start_data_table_row().	$r->print(&Apache::loncommon::start_data_table_row().
'<td><input type="button" name="seluser" value="'.&mt('Select').'" onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".')" /></td>'.	'<td><input type="button" name="seluser" value="'.&mt('Select').'" '.
	$onclick.' /></td>'.
'<td><tt>'.$uname.'</tt></td>'.	'<td><tt>'.$uname.'</tt></td>'.
'<td><tt>'.$udom.'</tt></td>');	'<td><tt>'.$udom.'</tt></td>');
foreach my $field ('lastname','firstname','permanentemail') {	foreach my $field ('lastname','firstname','permanentemail') {
Line 627 ENDSCRIPT	Line 777 ENDSCRIPT
' <input type="hidden" name="currstate" value="select" />'."\n".	' <input type="hidden" name="currstate" value="select" />'."\n".
' <input type="hidden" name="phase" value="get_user_info" />'."\n".	' <input type="hidden" name="phase" value="get_user_info" />'."\n".
' <input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n");	' <input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n");
$r->print($response.'</form>'.&Apache::loncommon::end_page());	if ($context eq 'requestcrs') {
	$r->print($opener_elements.'</form></div>');
	} else {
	$r->print($response.'</form>'.&Apache::loncommon::end_page());
	}
}	}

sub print_user_query_page {	sub print_user_query_page {
Line 794 $crumbs	Line 948 $crumbs
$response	$response
$forminfo	$forminfo
<script type="text/javascript" language="Javascript">	<script type="text/javascript" language="Javascript">
	// <![CDATA[
$loginscript	$loginscript
	// ]]>
</script>	</script>
<input type='hidden' name='makeuser' value='1' />	<input type='hidden' name='makeuser' value='1' />
<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain	<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain
Line 807 ENDTITLE	Line 963 ENDTITLE
&personal_data_display($ccuname,$ccdomain,$newuser,$context,	&personal_data_display($ccuname,$ccdomain,$newuser,$context,
$inst_results{$ccuname.':'.$ccdomain});	$inst_results{$ccuname.':'.$ccdomain});
$r->print($personal_table);	$r->print($personal_table);
	#FIXME
my ($home_server_pick,$numlib) =	my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($ccdomain,'hserver',	&Apache::loncommon::home_server_form_item($ccdomain,'hserver',
'default','hide');	'default','hide');
Line 818 $lt{'hs'}: $home_server_pick	Line 975 $lt{'hs'}: $home_server_pick
} else {	} else {
$r->print($home_server_pick);	$r->print($home_server_pick);
}	}
	if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
	$r->print('<br /><h3>'.&mt('User Can Request Creation of Courses in this Domain?').'</h3>'.
	&Apache::loncommon::start_data_table().
	&build_tools_display($ccuname,$ccdomain,
	'requestcourses').
	&Apache::loncommon::end_data_table());
	}
$r->print('</div>'."\n".'<div class="LC_left_float"><h3>'.	$r->print('</div>'."\n".'<div class="LC_left_float"><h3>'.
$lt{'lg'}.'</h3>');	$lt{'lg'}.'</h3>');
my ($fixedauth,$varauth,$authmsg);	my ($fixedauth,$varauth,$authmsg);
Line 851 KERB	Line 1015 KERB
} else {	} else {
if ($authtype eq 'int') {	if ($authtype eq 'int') {
$varauth = '<br />'.	$varauth = '<br />'.
&mt('[_1] Internally authenticated (with initial password [_2])','','<input type="password" size="10" 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>';	&mt('[_1] Internally authenticated (with initial password [_2])','','<input type="password" size="10" 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>';
} elsif ($authtype eq 'loc') {	} elsif ($authtype eq 'loc') {
$varauth = '<br />'.	$varauth = '<br />'.
&mt('[_1] Local Authentication with argument [_2]','','<input type="text" name="'.$authtype.'arg" value="" />')."\n";	&mt('[_1] Local Authentication with argument [_2]','','<input type="text" name="'.$authtype.'arg" value="" />')."\n";
Line 993 ENDNOTOOLSPRIV	Line 1157 ENDNOTOOLSPRIV
} ## End of new user/old user logic	} ## End of new user/old user logic

if ($env{'form.action'} eq 'singlestudent') {	if ($env{'form.action'} eq 'singlestudent') {
$r->print('<br /><input type="button" value="'.&mt('Enroll Student').'" onClick="setSections(this.form)" />'."\n");	$r->print('<br /><input type="button" value="'.&mt('Enroll Student').'" onclick="setSections(this.form)" />'."\n");
} else {	} else {
$r->print('<h3>'.&mt('Add Roles').'</h3>');	$r->print('<h3>'.&mt('Add Roles').'</h3>');
my $addrolesdisplay = 0;	my $addrolesdisplay = 0;
Line 1006 ENDNOTOOLSPRIV	Line 1170 ENDNOTOOLSPRIV
$addrolesdisplay = $add_domainroles;	$addrolesdisplay = $add_domainroles;
}	}
$r->print(&course_level_dc($env{'request.role.domain'},'Course'));	$r->print(&course_level_dc($env{'request.role.domain'},'Course'));
$r->print('<br /><input type="button" value="'.&mt('Save').'" onClick="setCourse()" />'."\n");	$r->print('<br /><input type="button" value="'.&mt('Save').'" onclick="setCourse()" />'."\n");
} elsif ($context eq 'author') {	} elsif ($context eq 'author') {
if ($addrolesdisplay) {	if ($addrolesdisplay) {
$r->print('<br /><input type="button" value="'.&mt('Save').'"');	$r->print('<br /><input type="button" value="'.&mt('Save').'"');
if ($newuser) {	if ($newuser) {
$r->print(' onClick="auth_check()" \>'."\n");	$r->print(' onclick="auth_check()" \>'."\n");
} else {	} else {
$r->print('onClick="this.form.submit()" \>'."\n");	$r->print('onclick="this.form.submit()" \>'."\n");
}	}
} else {	} else {
$r->print('<br /><a href="javascript:backPage(document.cu)">'.	$r->print('<br /><a href="javascript:backPage(document.cu)">'.
Line 1021 ENDNOTOOLSPRIV	Line 1185 ENDNOTOOLSPRIV
}	}
} else {	} else {
$r->print(&course_level_table(%inccourses));	$r->print(&course_level_table(%inccourses));
$r->print('<br /><input type="button" value="'.&mt('Save').'" onClick="setSections(this.form)" />'."\n");	$r->print('<br /><input type="button" value="'.&mt('Save').'" onclick="setSections(this.form)" />'."\n");
}	}
}	}
$r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));	$r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
Line 1089 sub validation_javascript {	Line 1253 sub validation_javascript {
$nondc_setsection_code,$groupslist);	$nondc_setsection_code,$groupslist);
my ($jsback,$elements) = &crumb_utilities();	my ($jsback,$elements) = &crumb_utilities();
$js .= "\n".	$js .= "\n".
'<script type="text/javascript">'."\n".$jsback."\n".'</script>';	'<script type="text/javascript">'."\n".
	'// <![CDATA['."\n".
	$jsback."\n".
	'// ]]>'."\n".
	'</script>'."\n";
return $js;	return $js;
}	}

Line 1442 sub user_authentication {	Line 1610 sub user_authentication {
my $choices = &Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc);	my $choices = &Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc);
$outcome = <<ENDBADAUTH;	$outcome = <<ENDBADAUTH;
<script type="text/javascript" language="Javascript">	<script type="text/javascript" language="Javascript">
	// <![CDATA[
$loginscript	$loginscript
	// ]]>
</script>	</script>
<span class="LC_error">$lt{'err'}:	<span class="LC_error">$lt{'err'}:
$lt{'uuas'} ($currentauth). $lt{'sldb'}.</span>	$lt{'uuas'} ($currentauth). $lt{'sldb'}.</span>
Line 1471 ENDBADAUTH	Line 1641 ENDBADAUTH
);	);
$outcome =	$outcome =
'<script type="text/javascript" language="Javascript">'."\n".	'<script type="text/javascript" language="Javascript">'."\n".
	'// <![CDATA['."\n".
$loginscript."\n".	$loginscript."\n".
	'// ]]>'."\n".
'</script>'."\n".	'</script>'."\n".
'<h3>'.$lt{'ld'}.'</h3>'.	'<h3>'.$lt{'ld'}.'</h3>'.
&Apache::loncommon::start_data_table().	&Apache::loncommon::start_data_table().
Line 1802 sub update_user_data {	Line 1974 sub update_user_data {
my $newuser = 0;	my $newuser = 0;
my ($jsback,$elements) = &crumb_utilities();	my ($jsback,$elements) = &crumb_utilities();
my $jscript = '<script type="text/javascript">'."\n".	my $jscript = '<script type="text/javascript">'."\n".
$jsback."\n".'</script>'."\n";	'// <![CDATA['."\n".
	$jsback."\n".
	'// ]]>'."\n".
	'</script>'."\n";
my %breadcrumb_text = &singleuser_breadcrumb();	my %breadcrumb_text = &singleuser_breadcrumb();
my $args;	my $args;
if ($env{'form.popup'}) {	if ($env{'form.popup'}) {
Line 1983 sub update_user_data {	Line 2158 sub update_user_data {
}	}
}	}
foreach my $item (@requestcourses) {	foreach my $item (@requestcourses) {
$newcustom{$item} = $env{'form.requestcourses_'.$item};	$newcustom{$item} = $env{'form.crsreq_'.$item};
	if ($env{'form.crsreq_'.$item} eq 'autolimit') {
	$newcustom{$item} .= '=';
	unless ($env{'form.crsreq_'.$item.'_limit'} =~ /\D/) {
	$newcustom{$item} .= $env{'form.crsreq_'.$item.'_limit'};
	}
	}
$changed{$item} = &tool_admin($item,$newcustom{$item},	$changed{$item} = &tool_admin($item,$newcustom{$item},
\%changeHash,'requestcourses');	\%changeHash,'requestcourses');
}	}
Line 2629 sub tool_changes {	Line 2810 sub tool_changes {
return;	return;
}	}
if ($context eq 'reqcrsotherdom') {	if ($context eq 'reqcrsotherdom') {
	my @options = ('approve','validate','autolimit');
	my $optregex = join('\|',@options);
	my %reqdisplay = &courserequest_display();
my $cdom = $env{'request.role.domain'};	my $cdom = $env{'request.role.domain'};
foreach my $tool (@{$usertools}) {	foreach my $tool (@{$usertools}) {
$oldaccesstext->{$tool} = &mt('no');	$oldaccesstext->{$tool} = &mt('no');
Line 2647 sub tool_changes {	Line 2831 sub tool_changes {
my @curr = split(',',$userenv->{$context.'.'.$tool});	my @curr = split(',',$userenv->{$context.'.'.$tool});
my @new;	my @new;
my $changedoms;	my $changedoms;
if (grep(/^\Q$cdom\E$/,@curr)) {	my $newop = $env{'form.'.$context.'_'.$tool};
	if ($newop eq 'autolimit') {
	$newop .= '=';
	unless ($env{'form.'.$context.'_'.$tool.'_limit'} =~ /\D/) {
	$newop .= $env{'form.'.$context.'_'.$tool.'_limit'};
	}
	}
	if (grep(/^\Q$cdom:($optregex\=?\d*)\E$/,@curr)) {
$oldaccesstext->{$tool} = &mt('yes');	$oldaccesstext->{$tool} = &mt('yes');
unless ($env{'form.'.$context.'_'.$tool}) {	my $oldop = $1;
	if ($oldop ne $newop) {
$changedoms = 1;	$changedoms = 1;
foreach my $dom (@curr) {	foreach my $dom (@curr) {
unless ($dom eq $cdom) {	unless ($dom eq $cdom) {
push(@new,$dom);	push(@new,$dom);
}	}
}	}
	if ($newop) {
	push(@new,$cdom.':'.$newop);
	}
	@new = sort(@new);
}	}
} elsif ($env{'form.'.$context.'_'.$tool}) {	} elsif ($env{'form.'.$context.'_'.$tool}) {
$changedoms = 1;	$changedoms = 1;
@new = sort(@curr,$cdom);	@new = sort(@curr,$cdom.':'.$newop);
}	}
$newaccesstext->{$tool} = $oldaccesstext->{$tool};	$newaccesstext->{$tool} = $oldaccesstext->{$tool};
if ($changedoms) {	if ($changedoms) {
Line 2671 sub tool_changes {	Line 2867 sub tool_changes {
$context);	$context);
if ($changed->{$tool}) {	if ($changed->{$tool}) {
if ($env{'form.'.$context.'_'.$tool}) {	if ($env{'form.'.$context.'_'.$tool}) {
$newaccesstext->{$tool} = &mt('yes');	if ($env{'form.'.$context.'_'.$tool} eq 'autolimit') {
	if ($env{'form.'.$context.'_'.$tool.'_limit'} =~ /\D/) {
	$newaccesstext->{$tool} = &mt('Yes, processed automatically');
	} else {
	$newaccesstext->{$tool} = &mt('Yes, up to limit of [quant,_1,request] per user).',$env{'form.'.$context.'_'.$tool.'_limit'});
	}
	} else {
	$newaccesstext->{$tool} = $reqdisplay{$env{'form.'.$context.'_'.$tool}};
	}
} else {	} else {
$newaccesstext->{$tool} = &mt('no');	$newaccesstext->{$tool} = &mt('No');
}	}
}	}
}	}
Line 2682 sub tool_changes {	Line 2886 sub tool_changes {
return;	return;
}	}
foreach my $tool (@{$usertools}) {	foreach my $tool (@{$usertools}) {
	my $newval;
	if ($context eq 'requestcourses') {
	$newval = $env{'form.crsreq_'.$tool};
	if ($newval eq 'autolimit') {
	$newval .= '='.$env{'form.crsreq_'.$tool.'_limit'};
	}
	} else {
	$newval = $env{'form.'.$context.'_'.$tool};
	}
if ($userenv->{$context.'.'.$tool} ne '') {	if ($userenv->{$context.'.'.$tool} ne '') {
$oldaccess->{$tool} = &mt('custom');	$oldaccess->{$tool} = &mt('custom');
if ($userenv->{$context.'.'.$tool}) {	if ($userenv->{$context.'.'.$tool}) {
Line 2691 sub tool_changes {	Line 2904 sub tool_changes {
}	}
$changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool};	$changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool};
if ($env{'form.custom'.$tool} == 1) {	if ($env{'form.custom'.$tool} == 1) {
if ($env{'form.'.$context.'_'.$tool} ne $userenv->{$context.'.'.$tool}) {	if ($newval ne $userenv->{$context.'.'.$tool}) {
$changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool},	$changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
$changeHash,$context);	$context);
if ($changed->{$tool}) {	if ($changed->{$tool}) {
$newaccess->{$tool} = &mt('custom');	$newaccess->{$tool} = &mt('custom');
if ($env{'form.'.$context.'_'.$tool}) {	if ($newval) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");	$newaccesstext->{$tool} = &mt("availability set to 'on'");
} else {	} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");	$newaccesstext->{$tool} = &mt("availability set to 'off'");
Line 2729 sub tool_changes {	Line 2942 sub tool_changes {
} else {	} else {
$oldaccess->{$tool} = &mt('default');	$oldaccess->{$tool} = &mt('default');
if ($env{'form.custom'.$tool} == 1) {	if ($env{'form.custom'.$tool} == 1) {
$changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool},	$changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
$changeHash,$context);	$context);
if ($changed->{$tool}) {	if ($changed->{$tool}) {
$newaccess->{$tool} = &mt('custom');	$newaccess->{$tool} = &mt('custom');
if ($env{'form.'.$context.'_'.$tool}) {	if ($newval) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");	$newaccesstext->{$tool} = &mt("availability set to 'on'");
} else {	} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");	$newaccesstext->{$tool} = &mt("availability set to 'off'");
Line 3242 sub custom_role_editor {	Line 3455 sub custom_role_editor {
my ($jsback,$elements) = &crumb_utilities();	my ($jsback,$elements) = &crumb_utilities();
my $button_code = "\n";	my $button_code = "\n";
my $head_script = "\n";	my $head_script = "\n";
$head_script .= '<script type="text/javascript">'."\n";	$head_script .= '<script type="text/javascript">'."\n"
	.'// <![CDATA['."\n";
my @template_roles = ("cc","in","ta","ep","st");	my @template_roles = ("cc","in","ta","ep","st");
foreach my $role (@template_roles) {	foreach my $role (@template_roles) {
$head_script .= &make_script_template($role);	$head_script .= &make_script_template($role);
$button_code .= &make_button_code($role).' ';	$button_code .= &make_button_code($role).' ';
}	}
$head_script .= "\n".$jsback."\n".'</script>'."\n";	$head_script .= "\n".$jsback."\n"
	.'// ]]>'."\n"
	.'</script>'."\n";
$r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));	$r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage(document.form1,'pickrole','')",	({href=>"javascript:backPage(document.form1,'pickrole','')",
Line 3378 sub make_script_template {	Line 3594 sub make_script_template {
sub make_button_code {	sub make_button_code {
my ($role) = @_;	my ($role) = @_;
my $label = &Apache::lonnet::plaintext($role);	my $label = &Apache::lonnet::plaintext($role);
my $button_code = '<input type="button" onClick="set_'.$role.'()" value="'.$label.'" />';	my $button_code = '<input type="button" onclick="set_'.$role.'()" value="'.$label.'" />';
return ($button_code);	return ($button_code);
}	}
# ---------------------------------------------------------- Call to definerole	# ---------------------------------------------------------- Call to definerole
Line 3391 sub set_custom_role {	Line 3607 sub set_custom_role {
return;	return;
}	}
my ($jsback,$elements) = &crumb_utilities();	my ($jsback,$elements) = &crumb_utilities();
my $jscript = '<script type="text/javascript">'.$jsback."\n".'</script>';	my $jscript = '<script type="text/javascript">'
	.'// <![CDATA['."\n"
	.$jsback."\n"
	.'// ]]>'."\n"
	.'</script>'."\n";

$r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript);	$r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript);
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
Line 3763 sub header {	Line 3983 sub header {

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

sub verify_user_display {	sub verify_user_display {
Line 4143 ENDSCRIPT	Line 4367 ENDSCRIPT
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};

my $output = '<script type="text/javascript">'."\n".	my $output = '<script type="text/javascript">'."\n".
	'// <![CDATA['."\n".
$setsec_js."\n".$selfenroll_js."\n".	$setsec_js."\n".$selfenroll_js."\n".
	'// ]]>'."\n".
'</script>'."\n".	'</script>'."\n".
'<h3>'.$lt->{'selfenroll'}.'</h3>'."\n";	'<h3>'.$lt->{'selfenroll'}.'</h3>'."\n";
my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum);	my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum);
Line 4939 sub print_userchangelogs_display {	Line 5165 sub print_userchangelogs_display {
my (%whodunit,%changed,$version);	my (%whodunit,%changed,$version);
($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/);	($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/);
$r->print(&role_display_filter($formname,$cdom,$cnum,\%curr,$version));	$r->print(&role_display_filter($formname,$cdom,$cnum,\%curr,$version));
my $showntablehdr = 0;
my $tablehdr = &Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().
'<th> </th><th>'.&mt('When').'</th><th>'.&mt('Who made the change').
'</th><th>'.&mt('Changed User').'</th><th>'.&mt('Role').'</th><th>'.&mt('Section').'</th><th>'.
&mt('Context').'</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'.
&Apache::loncommon::end_data_table_header_row();
my ($minshown,$maxshown);	my ($minshown,$maxshown);
$minshown = 1;	$minshown = 1;
my $count = 0;	my $count = 0;
Line 4955 sub print_userchangelogs_display {	Line 5174 sub print_userchangelogs_display {
$minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};	$minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
}	}
}	}

	# Collect user change log data
	my $content = '';
foreach my $id (sort { $roleslog{$b}{'exe_time'}<=>$roleslog{$a}{'exe_time'} } (keys(%roleslog))) {	foreach my $id (sort { $roleslog{$b}{'exe_time'}<=>$roleslog{$a}{'exe_time'} } (keys(%roleslog))) {
next if (($roleslog{$id}{'exe_time'} < $curr{'rolelog_start_date'}) \|\|	next if (($roleslog{$id}{'exe_time'} < $curr{'rolelog_start_date'}) \|\|
($roleslog{$id}{'exe_time'} > $curr{'rolelog_end_date'}));	($roleslog{$id}{'exe_time'} > $curr{'rolelog_end_date'}));
Line 4976 sub print_userchangelogs_display {	Line 5198 sub print_userchangelogs_display {
}	}
$count ++;	$count ++;
next if ($count < $minshown);	next if ($count < $minshown);
if (!$showntablehdr) {
$r->print($tablehdr);
$showntablehdr = 1;
}
if ($whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} eq '') {	if ($whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} eq '') {
$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} =	$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} =
&Apache::loncommon::plainname($roleslog{$id}{'exe_uname'},$roleslog{$id}{'exe_udom'});	&Apache::loncommon::plainname($roleslog{$id}{'exe_uname'},$roleslog{$id}{'exe_udom'});
Line 5018 sub print_userchangelogs_display {	Line 5237 sub print_userchangelogs_display {
if ($chgcontext ne '' && $lt{$chgcontext} ne '') {	if ($chgcontext ne '' && $lt{$chgcontext} ne '') {
$chgcontext = $lt{$chgcontext};	$chgcontext = $lt{$chgcontext};
}	}
$r->print(&Apache::loncommon::start_data_table_row().'<td>'.$count.'</td><td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td><td>'.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.'</td><td>'.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.'</td><td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'}).'</td><td>'.$sec.'</td><td>'.$chgcontext.'</td><td>'.$rolestart.'</td><td>'.$roleend.'</td>'.&Apache::loncommon::end_data_table_row()."\n");	$content .=
	&Apache::loncommon::start_data_table_row()
	.'<td>'.$count.'</td>'
	.'<td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td>'
	.'<td>'.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.'</td>'
	.'<td>'.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.'</td>'
	.'<td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'}).'</td>'
	.'<td>'.$sec.'</td>'
	.'<td>'.$chgcontext.'</td>'
	.'<td>'.$rolestart.'</td>'
	.'<td>'.$roleend.'</td>'
	.&Apache::loncommon::end_data_table_row();
	}

	# Form Footer
	my $form_footer =
	'<input type="hidden" name="page" value="'.$curr{'page'}.'" />'
	.'<input type="hidden" name="action" value="changelogs" />'
	.'</form>';

	# Only display table, if content is available (has been collected above)
	if (!$content) {
	$r->print('<p class="LC_info">'
	.&mt('There are no records to display.')
	.'</p>'
	);
	$r->print($form_footer);
	return;
}	}
if ($showntablehdr) {
$r->print(&Apache::loncommon::end_data_table().'<br />');	# Content to display, so create navigation and display table
if (($curr{'page'} > 1) \|\| ($more_records)) {
$r->print('<table><tr>');	# Create Navigation:
if ($curr{'page'} > 1) {	# Navigation Script
$r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>');	my $nav_script = <<"ENDSCRIPT";
}
if ($more_records) {
$r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>');
}
$r->print('</tr></table>');
$r->print(<<"ENDSCRIPT");
<script type="text/javascript">	<script type="text/javascript">
	// <![CDATA[
function chgPage(caller) {	function chgPage(caller) {
if (caller == 'previous') {	if (caller == 'previous') {
document.$formname.page.value --;	document.$formname.page.value --;
Line 5043 function chgPage(caller) {	Line 5284 function chgPage(caller) {
document.$formname.submit();	document.$formname.submit();
return;	return;
}	}
	// ]]>
</script>	</script>
ENDSCRIPT	ENDSCRIPT
}	# Navigation Buttons
} else {	my $nav_links;
$r->print(&mt('There are no records to display'));	$nav_links = '<p>';
}	if (($curr{'page'} > 1) \|\| ($more_records)) {
$r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.	if ($curr{'page'} > 1) {
'<input type="hidden" name="action" value="changelogs" /></form>');	$nav_links .= '<input type="button"'
	.' onclick="javascript:chgPage('."'previous'".');"'
	.' value="'.&mt('Previous [_1] changes',$curr{'show'})
	.'" /> ';
	}
	if ($more_records) {
	$nav_links .= '<input type="button"'
	.' onclick="javascript:chgPage('."'next'".');"'
	.' value="'.&mt('Next [_1] changes',$curr{'show'})
	.'" />';
	}
	}
	$nav_links .= '</p>';

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

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

Line 5059 sub role_display_filter {	Line 5339 sub role_display_filter {
my $context = 'course';	my $context = 'course';
my $nolink = 1;	my $nolink = 1;
my $output = '<table><tr><td valign="top">'.	my $output = '<table><tr><td valign="top">'.
'<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b><br />'.	'<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b></span><br />'.
&Apache::lonmeta::selectbox('show',$curr->{'show'},undef,	&Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
(&mt('all'),5,10,20,50,100,1000,10000)).	(&mt('all'),5,10,20,50,100,1000,10000)).
'</td><td>  </td>';	'</td><td>  </td>';
Line 5072 sub role_display_filter {	Line 5352 sub role_display_filter {
$curr->{'rolelog_end_date'},undef,	$curr->{'rolelog_end_date'},undef,
undef,undef,undef,undef,undef,undef,$nolink);	undef,undef,undef,undef,undef,undef,$nolink);
my %lt = &rolechg_contexts();	my %lt = &rolechg_contexts();
$output .= '<td valign="top"><b>'.&mt('Window during which changes occurred:').'</b><br /><table><tr><td>'.&mt('After:').	$output .= '<td valign="top"><b>'.&mt('Window during which changes occurred:').'</b><br />'.
'</td><td>'.$startform.'</td></tr><tr><td>'.&mt('Before:').'</td><td>'.	'<table><tr><td>'.&mt('After:').
$endform.'</td></tr></table></td><td>  </td>'.	'</td><td>'.$startform.'</td></tr>'.
	'<tr><td>'.&mt('Before:').'</td>'.
	'<td>'.$endform.'</td></tr></table>'.
	'</td>'.
	'<td>  </td>'.
'<td valign="top"><b>'.&mt('Role:').'</b><br />'.	'<td valign="top"><b>'.&mt('Role:').'</b><br />'.
'<select name="role"><option value="any"';	'<select name="role"><option value="any"';
if ($curr->{'role'} eq 'any') {	if ($curr->{'role'} eq 'any') {
Line 5095 sub role_display_filter {	Line 5379 sub role_display_filter {
}	}
$output .= ' <option value="'.$role.'"'.$selstr.'>'.$plrole.'</option>';	$output .= ' <option value="'.$role.'"'.$selstr.'>'.$plrole.'</option>';
}	}
$output .= '</select></td><td>  </td><td valign="top"><b>'.	$output .= '</select></td>'.
	'<td>  </td>'.
	'<td valign="top"><b>'.
&mt('Context:').'</b><br /><select name="chgcontext">';	&mt('Context:').'</b><br /><select name="chgcontext">';
foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll') {	foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll') {
my $selstr = '';	my $selstr = '';
if ($curr->{'chgcontext'} eq $chgtype) {	if ($curr->{'chgcontext'} eq $chgtype) {
$output .= $selstr = ' selected="selected"';	$selstr = ' selected="selected"';
}	}
if (($chgtype eq 'auto') \|\| ($chgtype eq 'updatenow')) {	if (($chgtype eq 'auto') \|\| ($chgtype eq 'updatenow')) {
next if (!&Apache::lonnet::auto_run($cnum,$cdom));	next if (!&Apache::lonnet::auto_run($cnum,$cdom));
}	}
$output .= '<option value="'.$chgtype.'"'.$selstr.'>'.$lt{$chgtype}.'</option>'."\n";	$output .= '<option value="'.$chgtype.'"'.$selstr.'>'.$lt{$chgtype}.'</option>'."\n";
}	}
$output .= '</select></td><td>  </td><td valign="middle"><input type="submit" value="'.	$output .= '</select></td>'
&mt('Update Display').'" /></tr></table>'.	.'</tr></table>';
'<span class="LC_roleslog_note">'.
&mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.6.99.0 or later are displayed.');	# Update Display button
	$output .= '<p>'
	.'<input type="submit" value="'.&mt('Update Display').'" />'
	.'</p>';

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

Line 5501 sub build_search_response {	Line 5796 sub build_search_response {
$response .= '<br />'.&mt('You may want to broaden your search to the selected LON-CAPA domain.');	$response .= '<br />'.&mt('You may want to broaden your search to the selected LON-CAPA domain.');
}	}
}	}
if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $env{'request.role.domain'})) {	my $createdom = $env{'request.role.domain'};
	if ($context eq 'requestcrs') {
	if ($env{'form.coursedom'} ne '') {
	$createdom = $env{'form.coursedom'};
	}
	}
	if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $createdom)) {
my $cancreate =	my $cancreate =
&Apache::lonuserutils::can_create_user($env{'request.role.domain'},$context);	&Apache::lonuserutils::can_create_user($createdom,$context);
	my $targetdom = '<span class="LC_cusr_emph">'.$createdom.'</span>';
if ($cancreate) {	if ($cancreate) {
my $showdom = &display_domain_info($env{'request.role.domain'});	my $showdom = &display_domain_info($createdom);
$response .= '<br /><br />'	$response .= '<br /><br />'
.'<b>'.&mt('To add a new user:').'</b>'	.'<b>'.&mt('To add a new user:').'</b>'
.'<br />'	.'<br />';
.&mt("(You can only create new users in your current role's domain - [_1])"	if ($context eq 'requestcrs') {
,'<span class="LC_cusr_emph">'.$env{'request.role.domain'}.'</span>')	$response .= &mt("(You can only define new users in the new course's domain - [_1])",$targetdom);
.'<ul><li>'	} else {
	$response .= &mt("(You can only create new users in your current role's domain - [_1])",$targetdom);
	}
	$response .='<ul><li>'
.&mt("Set 'Domain/institution to search' to: [_1]",'<span class="LC_cusr_emph">'.$showdom.'</span>')	.&mt("Set 'Domain/institution to search' to: [_1]",'<span class="LC_cusr_emph">'.$showdom.'</span>')
.'</li><li>'	.'</li><li>'
.&mt("Set 'Search criteria' to: [_1]username is ..... in selected LON-CAPA domain[_2]",'<span class="LC_cusr_emph">','</span>')	.&mt("Set 'Search criteria' to: [_1]username is ..... in selected LON-CAPA domain[_2]",'<span class="LC_cusr_emph">','</span>')
Line 5522 sub build_search_response {	Line 5827 sub build_search_response {
.'</li></ul><br />';	.'</li></ul><br />';
} else {	} else {
my $helplink = ' href="javascript:helpMenu('."'display'".')"';	my $helplink = ' href="javascript:helpMenu('."'display'".')"';
$response .= '<br /><br />'	$response .= '<br /><br />';
.&mt("You are not authorized to create new users in your current role's domain - [_1]."	if ($context eq 'requestcrs') {
,'<span class="LC_cusr_emph">'.$env{'request.role.domain'}.'</span>')	$response .= &mt("You are not authorized to defined new users in the new course's domain - [_1].",$targetdom);
.'<br />'	} else {
.&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.'	$response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom);
	}
	$response .= '<br />'
	.&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.'
,' <a'.$helplink.'>'	,' <a'.$helplink.'>'
,'</a>')	,'</a>')
.'<br /><br />';	.'<br /><br />';
}	}
}	}
}	}
Line 5742 sub course_level_dc {	Line 6050 sub course_level_dc {
'<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.	'<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
&Apache::loncommon::end_data_table_header_row();	&Apache::loncommon::end_data_table_header_row();
my $otheritems = &Apache::loncommon::start_data_table_row()."\n".	my $otheritems = &Apache::loncommon::start_data_table_row()."\n".
'<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".	'<td><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
'<td><select name="role">'."\n";	'<td><select name="role">'."\n";
foreach my $role (@roles) {	foreach my $role (@roles) {
my $plrole=&Apache::lonnet::plaintext($role);	my $plrole=&Apache::lonnet::plaintext($role);

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

Removed from v.1.300
changed lines
	Added in v.1.306