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.293 and 1.301

version 1.293, 2009/05/11 13:07:24	version 1.301, 2009/08/04 18:02:30
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 225 sub build_tools_display {	Line 227 sub build_tools_display {
'usde' => "Use default",	'usde' => "Use default",
'uscu' => "Use custom",	'uscu' => "Use custom",
'official' => 'Can request creation of official courses',	'official' => 'Can request creation of official courses',
'unofficial' => 'Can request creation of unofficial courses',	'unofficial' => 'Can request creation of unofficial courses',
	'community' => 'Can request creation of communities',
);	);
if ($context eq 'requestcourses') {	if ($context eq 'requestcourses') {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,	%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'requestcourses.official','requestcourses.unofficial');	'requestcourses.official','requestcourses.unofficial',
@usertools = ('official','unofficial');	'requestcourses.community');
	@usertools = ('official','unofficial','community');
} 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');
Line 282 sub build_tools_display {	Line 286 sub build_tools_display {
return $output;	return $output;
}	}

	sub coursereq_externaluser {
	my ($ccuname,$ccdomain,$cdom) = @_;
	my (@usertools,%userenv,$output);
	my %lt = &Apache::lonlocal::texthash (
	'official' => 'Can request creation of official courses',
	'unofficial' => 'Can request creation of unofficial courses',
	'community' => 'Can request creation of communities',
	);

	%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
	'reqcrsotherdom.official','reqcrsotherdom.unofficial',
	'reqcrsotherdom.community');
	@usertools = ('official','unofficial','community');
	foreach my $item (@usertools) {
	my ($tool_on,$tool_off);
	$tool_off = 'checked="checked" ';
	if ($userenv{'reqcrsotherdom.'.$item} ne '') {
	my @curr = split(',',$userenv{'reqcrsotherdom.'.$item});
	if (grep(/^\Q$cdom\E$/,@curr)) {
	$tool_on = 'checked="checked" ';
	$tool_off = '';
	}
	}
	$output .= &Apache::loncommon::start_data_table_row()."\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";
	}
	return $output;
	}

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

sub print_username_entry_form {	sub print_username_entry_form {
Line 299 sub print_username_entry_form {	Line 337 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 466 sub user_modification_js {	Line 506 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 483 sub user_modification_js {	Line 523 sub user_modification_js {
}	}

$nondc_setsection_code	$nondc_setsection_code
	// ]]>
</script>	</script>
END	END
}	}
Line 502 sub print_user_selection_page {	Line 542 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 510 function pickuser(uname,udom) {	Line 551 function pickuser(uname,udom) {
}	}

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

Line 758 $crumbs	Line 800 $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 815 KERB	Line 859 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 873 ENDCHANGEUSER	Line 917 ENDCHANGEUSER
$r->print(&Apache::lonuserutils::forceid_change($context));	$r->print(&Apache::lonuserutils::forceid_change($context));
}	}
if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {	if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
$r->print('<h3>'.&mt('User Can Request Creation of Courses?').'</h3>'.	$r->print('<h3>'.&mt('User Can Request Creation of Courses in this Domain?').'</h3>'.
&Apache::loncommon::start_data_table().	&Apache::loncommon::start_data_table());
&build_tools_display($ccuname,$ccdomain,'requestcourses').	if ($env{'request.role.domain'} eq $ccdomain) {
&Apache::loncommon::end_data_table());	$r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
	} else {
	$r->print(&coursereq_externaluser($ccuname,$ccdomain,
	$env{'request.role.domain'}));
	}
	$r->print(&Apache::loncommon::end_data_table());
}	}
$r->print('</div>');	$r->print('</div>');
my $user_auth_text = &user_authentication($ccuname,$ccdomain,$formname);	my $user_auth_text = &user_authentication($ccuname,$ccdomain,$formname);
Line 952 ENDNOTOOLSPRIV	Line 1001 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 965 ENDNOTOOLSPRIV	Line 1014 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 980 ENDNOTOOLSPRIV	Line 1029 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 1048 sub validation_javascript {	Line 1097 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 1401 sub user_authentication {	Line 1454 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 1430 ENDBADAUTH	Line 1485 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 1761 sub update_user_data {	Line 1818 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 1861 sub update_user_data {	Line 1921 sub update_user_data {
$env{'form.ccuname'}, $env{'form.ccdomain'}).'</h3>');	$env{'form.ccuname'}, $env{'form.ccdomain'}).'</h3>');
my (%alerts,%rulematch,%inst_results,%curr_rules);	my (%alerts,%rulematch,%inst_results,%curr_rules);
my @usertools = ('aboutme','blog','portfolio');	my @usertools = ('aboutme','blog','portfolio');
my @requestcourses = ('official','unofficial');	my @requestcourses = ('official','unofficial','community');
my ($othertitle,$usertypes,$types) =	my ($othertitle,$usertypes,$types) =
&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});	&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
if ($env{'form.makeuser'}) {	if ($env{'form.makeuser'}) {
Line 1998 sub update_user_data {	Line 2058 sub update_user_data {
('environment',['firstname','middlename','lastname','generation',	('environment',['firstname','middlename','lastname','generation',
'id','permanentemail','portfolioquota','inststatus','tools.aboutme',	'id','permanentemail','portfolioquota','inststatus','tools.aboutme',
'tools.blog','tools.portfolio','requestcourses.official',	'tools.blog','tools.portfolio','requestcourses.official',
'requestcourses.unofficial'],	'requestcourses.unofficial','requestcourses.community',
	'reqcrsotherdom.official','reqcrsotherdom.unofficial',
	'reqcrsotherdom.community'],
$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 2127 sub update_user_data {	Line 2189 sub update_user_data {
$oldinststatuses,$newinststatuses);	$oldinststatuses,$newinststatuses);
my ($defquota,$settingstatus) =	my ($defquota,$settingstatus) =
&Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus);	&Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus);
my ($showquota,$showtools,$showrequestcourses,$showinststatus);	my ($showquota,$showtools,$showrequestcourses,$showinststatus,$showreqotherdom);
if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {	if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
$showquota = 1;	$showquota = 1;
}	}
Line 2136 sub update_user_data {	Line 2198 sub update_user_data {
}	}
if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) {	if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) {
$showrequestcourses = 1;	$showrequestcourses = 1;
	} elsif (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
	$showreqotherdom = 1;
}	}
if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) {	if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) {
$showinststatus = 1;	$showinststatus = 1;
Line 2219 sub update_user_data {	Line 2283 sub update_user_data {
}	}
&tool_changes('tools',\@usertools,\%oldaccess,\%oldaccesstext,\%userenv,	&tool_changes('tools',\@usertools,\%oldaccess,\%oldaccesstext,\%userenv,
\%changeHash,\%changed,\%newaccess,\%newaccesstext);	\%changeHash,\%changed,\%newaccess,\%newaccesstext);
&tool_changes('requestcourses',\@requestcourses,\%oldaccess,\%oldaccesstext,	if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) {
\%userenv, \%changeHash,\%changed,\%newaccess,\%newaccesstext);	&tool_changes('requestcourses',\@requestcourses,\%oldaccess,\%oldaccesstext,
	\%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext);
	} else {
	&tool_changes('reqcrsotherdom',\@requestcourses,\%oldaccess,\%oldaccesstext,
	\%userenv,
	\%changeHash,\%changed,\%newaccess,\%newaccesstext);
	}
if ($env{'form.cfirstname'} ne $userenv{'firstname'} \|\|	if ($env{'form.cfirstname'} ne $userenv{'firstname'} \|\|
$env{'form.cmiddlename'} ne $userenv{'middlename'} \|\|	$env{'form.cmiddlename'} ne $userenv{'middlename'} \|\|
$env{'form.clastname'} ne $userenv{'lastname'} \|\|	$env{'form.clastname'} ne $userenv{'lastname'} \|\|
Line 2246 sub update_user_data {	Line 2316 sub update_user_data {
($env{'user.domain'} eq $env{'form.ccdomain'})) {	($env{'user.domain'} eq $env{'form.ccdomain'})) {
my %newenvhash;	my %newenvhash;
foreach my $key (keys(%changed)) {	foreach my $key (keys(%changed)) {
if (($key eq 'official') \|\| ($key eq 'unofficial')) {	if (($key eq 'official') \|\| ($key eq 'unofficial')
	\|\| ($key eq 'community')) {
$newenvhash{'environment.requestcourses.'.$key} =	$newenvhash{'environment.requestcourses.'.$key} =
$changeHash{'requestcourses.'.$key};	$changeHash{'requestcourses.'.$key};
if ($changeHash{'requestcourses.'.$key} ne '') {	if ($changeHash{'requestcourses.'.$key} ne '') {
Line 2308 sub update_user_data {	Line 2379 sub update_user_data {
'portfolio' => 'Portfolio Availability',	'portfolio' => 'Portfolio Availability',
'official' => 'Can Request Official Courses',	'official' => 'Can Request Official Courses',
'unofficial' => 'Can Request Unofficial Courses',	'unofficial' => 'Can Request Unofficial Courses',
	'community' => 'Can Request Communities',
'inststatus' => "Affiliation",	'inststatus' => "Affiliation",
'prvs' => 'Previous Value:',	'prvs' => 'Previous Value:',
'chto' => 'Changed To:'	'chto' => 'Changed To:'
Line 2333 END	Line 2405 END
$r->print("	$r->print("
<th>$lt{$item}</th>\n");	<th>$lt{$item}</th>\n");
}	}
	} elsif ($showreqotherdom) {
	foreach my $item (@requestcourses) {
	$r->print("
	<th>$lt{$item}</th>\n");
	}
}	}
if ($showquota) {	if ($showquota) {
$r->print("	$r->print("
Line 2364 END	Line 2441 END
$r->print("	$r->print("
<td>$oldaccess{$item} $oldaccesstext{$item}</td>\n");	<td>$oldaccess{$item} $oldaccesstext{$item}</td>\n");
}	}
	} elsif ($showreqotherdom) {
	foreach my $item (@requestcourses) {
	$r->print("
	<td>$oldaccess{$item} $oldaccesstext{$item}</td>\n");
	}
}	}
if ($showquota) {	if ($showquota) {
$r->print("	$r->print("
Line 2395 END	Line 2477 END
$r->print("	$r->print("
<td>$newaccess{$item} $newaccesstext{$item} </td>\n");	<td>$newaccess{$item} $newaccesstext{$item} </td>\n");
}	}
	} elsif ($showreqotherdom) {
	foreach my $item (@requestcourses) {
	$r->print("
	<td>$newaccess{$item} $newaccesstext{$item} </td>\n");
	}
}	}
if ($showquota) {	if ($showquota) {
$r->print("	$r->print("
Line 2445 END	Line 2532 END
'aboutme' => "Personal Information Page Availability",	'aboutme' => "Personal Information Page Availability",
'portfolio' => "Portfolio Availability",	'portfolio' => "Portfolio Availability",
'official' => "Can Request Official Courses",	'official' => "Can Request Official Courses",
'unofficial' => "Can Request Unofficial Course",	'unofficial' => "Can Request Unofficial Courses",
	'community' => "Can Request Communities",
'inststatus' => "Affiliation",	'inststatus' => "Affiliation",
);	);
$r->print(<<"END");	$r->print(<<"END");
Line 2463 END	Line 2551 END
$r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '.	$r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '.
$newaccesstext{$item}.']'."\n");	$newaccesstext{$item}.']'."\n");
}	}
	} elsif ($showreqotherdom) {
	foreach my $item (@requestcourses) {
	$r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '.
	$newaccesstext{$item}.']'."\n");
	}
}	}
if ($showtools) {	if ($showtools) {
foreach my $item (@usertools) {	foreach my $item (@usertools) {
Line 2554 sub tool_changes {	Line 2647 sub tool_changes {
(ref($newaccess) eq 'HASH') && (ref($newaccesstext) eq 'HASH'))) {	(ref($newaccess) eq 'HASH') && (ref($newaccesstext) eq 'HASH'))) {
return;	return;
}	}
	if ($context eq 'reqcrsotherdom') {
	my $cdom = $env{'request.role.domain'};
	foreach my $tool (@{$usertools}) {
	$oldaccesstext->{$tool} = &mt('no');
	$changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool};
	if ($userenv->{$context.'.'.$tool} eq '') {
	if ($env{'form.'.$context.'_'.$tool}) {
	$changed->{$tool}=&tool_admin($tool,$cdom,
	$changeHash,$context);
	if ($changed->{$tool}) {
	$newaccesstext->{$tool} = &mt('yes');
	} else {
	$newaccesstext->{$tool} = $oldaccesstext->{$tool};
	}
	}
	} else {
	my @curr = split(',',$userenv->{$context.'.'.$tool});
	my @new;
	my $changedoms;
	if (grep(/^\Q$cdom\E$/,@curr)) {
	$oldaccesstext->{$tool} = &mt('yes');
	unless ($env{'form.'.$context.'_'.$tool}) {
	$changedoms = 1;
	foreach my $dom (@curr) {
	unless ($dom eq $cdom) {
	push(@new,$dom);
	}
	}
	}
	} elsif ($env{'form.'.$context.'_'.$tool}) {
	$changedoms = 1;
	@new = sort(@curr,$cdom);
	}
	$newaccesstext->{$tool} = $oldaccesstext->{$tool};
	if ($changedoms) {
	my $newdomstr;
	if (@new) {
	$newdomstr = join(',',@new);
	}
	$changed->{$tool}=&tool_admin($tool,$newdomstr,$changeHash,
	$context);
	if ($changed->{$tool}) {
	if ($env{'form.'.$context.'_'.$tool}) {
	$newaccesstext->{$tool} = &mt('yes');
	} else {
	$newaccesstext->{$tool} = &mt('no');
	}
	}
	}
	}
	}
	return;
	}
foreach my $tool (@{$usertools}) {	foreach my $tool (@{$usertools}) {
if ($userenv->{$context.'.'.$tool} ne '') {	if ($userenv->{$context.'.'.$tool} ne '') {
$oldaccess->{$tool} = &mt('custom');	$oldaccess->{$tool} = &mt('custom');
Line 2593 sub tool_changes {	Line 2739 sub tool_changes {
} else {	} else {
$newaccess->{$tool} = $oldaccess->{$tool};	$newaccess->{$tool} = $oldaccess->{$tool};
if ($userenv->{$context.'.'.$tool}) {	if ($userenv->{$context.'.'.$tool}) {
$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 2689 sub update_roles {	Line 2835 sub update_roles {
if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {	if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);	my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
# Delete custom role	# Delete custom role
$r->print(&mt('Deleting custom role [_1] by [_2]:[_3] in [_4]',	$r->print(&mt('Deleting custom role [_1] by [_2] in [_3]',
$rolename,$rnam,$rdom,$url).': <b>'.	$rolename,$rnam.':'.$rdom,$url).': <b>'.
&Apache::lonnet::assigncustomrole($env{'form.ccdomain'},	&Apache::lonnet::assigncustomrole($env{'form.ccdomain'},
$env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,	$env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
0,1,$context).'</b><br />');	0,1,$context).'</b><br />');
Line 2741 sub update_roles {	Line 2887 sub update_roles {
my $result = &Apache::lonnet::assigncustomrole(	my $result = &Apache::lonnet::assigncustomrole(
$env{'form.ccdomain'}, $env{'form.ccuname'},	$env{'form.ccdomain'}, $env{'form.ccuname'},
$url,$rdom,$rnam,$rolename,0,$now,undef,$context);	$url,$rdom,$rnam,$rolename,0,$now,undef,$context);
$r->print(&mt('Re-enabling custom role [_1] by [_2]:[_3] in [_4] : [_5]',	$r->print(&mt('Re-enabling custom role [_1] by [_2] in [_3]: [_4]',
$rolename,$rnam,$rdom,$url,'<b>'.$result.'</b>').'<br />');	$rolename,$rnam.':'.$rdom,$url,'<b>'.$result.'</b>').'<br />');
if (!grep(/^cr$/,@rolechanges)) {	if (!grep(/^cr$/,@rolechanges)) {
push(@rolechanges,'cr');	push(@rolechanges,'cr');
}	}
Line 2992 sub tool_admin {	Line 3138 sub tool_admin {
if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) {	if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) {
$canchange = 1;	$canchange = 1;
}	}
	} elsif ($context eq 'reqcrsotherdom') {
	if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
	$canchange = 1;
	}
} elsif (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) {	} elsif (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) {
# Current user has quota modification privileges	# Current user has quota modification privileges
$canchange = 1;	$canchange = 1;
Line 3111 sub custom_role_editor {	Line 3261 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 3247 sub make_script_template {	Line 3400 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 3260 sub set_custom_role {	Line 3413 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 3632 sub header {	Line 3789 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 3655 END	Line 3816 END
sub print_main_menu {	sub print_main_menu {
my ($permission,$context) = @_;	my ($permission,$context) = @_;
my %links = (	my %links = (
domain => {	domain => {
upload => 'Upload a File of Users',	upload => 'Upload a File of Users',
singleuser => 'Add/Modify a Single User',	singleuser => 'Add/Modify a User',
listusers => 'Manage Multiple Users',	listusers => 'Manage Users',
},	},
author => {	author => {
upload => 'Upload a File of Co-authors',	upload => 'Upload a File of Co-authors',
singleuser => 'Add/Modify a Single Co-author',	singleuser => 'Add/Modify a Co-author',
listusers => 'Display Co-authors and Manage Multiple Users',	listusers => 'Manage Co-authors',
},	},
course => {	course => {
upload => 'File of Course Users',	upload => 'Upload a File of Course Users',
singleuser => 'Single Course User',	singleuser => 'Add/Modify a Course User',
listusers => 'Course User Lists',	listusers => 'Manage Course Users',
},	},
);	);
my @menu = ( {categorytitle => 'Add Users',	my @menu = ( {categorytitle => 'Single Users',
items =>	items =>
[{	[
linktext => $links{$context}{'upload'},	{
icon => 'sctr.png',	linktext => $links{$context}{'singleuser'},
#help => 'Course_Create_Class_List',	icon => 'edit-redo.png',
url => '/adm/createuser?action=upload',	#help => 'Course_Change_Privileges',
permission => $permission->{'cusr'},	url => '/adm/createuser?action=singleuser',
linktitle => 'Upload a CSV or a text file containing users.',	permission => $permission->{'cusr'},
},	linktitle => 'Add a user with a certain role to this course.',
{	},
linktext => $links{$context}{'singleuser'},	]},
icon => 'edit-redo.png',
#help => 'Course_Change_Privileges',	{categorytitle => 'Multiple Users',
url => '/adm/createuser?action=singleuser',	items =>
permission => $permission->{'cusr'},	[
linktitle => 'Add a user with a certain role to this course.',	{
}]},	linktext => $links{$context}{'upload'},
{categorytitle => 'Administration',	icon => 'sctr.png',
items =>	#help => 'Course_Create_Class_List',
[{	url => '/adm/createuser?action=upload',
linktext => $links{$context}{'listusers'},	permission => $permission->{'cusr'},
icon => 'edit-find.png',	linktitle => 'Upload a CSV or a text file containing users.',
#help => 'Course_View_Class_List',	},
url => '/adm/createuser?action=listusers',	{
permission => ($permission->{'view'} \|\| $permission->{'cusr'}),	linktext => $links{$context}{'listusers'},
linktitle => 'Show and manage users of this course.',	icon => 'edit-find.png',
}]},	#help => 'Course_View_Class_List',
{categorytitle => 'Configuration',	url => '/adm/createuser?action=listusers',
items =>	permission => ($permission->{'view'} \|\| $permission->{'cusr'}),
[	linktitle => 'Show and manage users of this course.',
]},	},
);
	]},

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

if ($context eq 'domain'){	if ($context eq 'domain'){

push(@{ $menu[1]->{items} },	push(@{ $menu[2]->{items} }, #Category: Administration
{ linktext => 'Custom Roles',	{
icon => 'emblem-photos.png',	linktext => 'Custom Roles',
#help => 'Course_Editing_Custom_Roles',	icon => 'emblem-photos.png',
url => '/adm/createuser?action=custom',	#help => 'Course_Editing_Custom_Roles',
permission => $permission->{'custom'},	url => '/adm/createuser?action=custom',
linktitle => 'Configure a custom role.',	permission => $permission->{'custom'},
});	linktitle => 'Configure a custom role.',
	},
	);

}elsif ($context eq 'course'){	}elsif ($context eq 'course'){
my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();	my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();

push(@{ $menu[0]->{items} },	push(@{ $menu[0]->{items} }, #Category: Single Users
{ linktext => 'Single Student',	{
#help => 'Course_Add_Student',	linktext => 'Add/Modify a Student',
icon => 'list-add.png',	#help => 'Course_Add_Student',
url => '/adm/createuser?action=singlestudent',	icon => 'list-add.png',
permission => $permission->{'cusr'},	url => '/adm/createuser?action=singlestudent',
linktitle => 'Add a user with the role student to this course.',	permission => $permission->{'cusr'},
});	linktitle => 'Add a user with the role student to this course.',
	},
push(@{ $menu[1]->{items} },	);
{ linktext => 'Drop Students',
icon => 'edit-undo.png',	push(@{ $menu[1]->{items} }, #Category: Multiple Users
#help => 'Course_Drop_Student',	{
url => '/adm/createuser?action=drop',	linktext => 'Drop Students',
permission => $permission->{'cusr'},	icon => 'edit-undo.png',
linktitle =>'Remove a student from this course.',	#help => 'Course_Drop_Student',
},	url => '/adm/createuser?action=drop',
{ linktext => 'Custom Roles',	permission => $permission->{'cusr'},
icon => 'emblem-photos.png',	linktitle =>'Remove a student from this course.',
#help => 'Course_Editing_Custom_Roles',	},
url => '/adm/createuser?action=custom',	);
permission => $permission->{'custom'},	push(@{ $menu[2]->{items} }, #Category: Administration
linktitle => 'Configure a custom role.',	{
});	linktext => 'Custom Roles',
	icon => 'emblem-photos.png',
	#help => 'Course_Editing_Custom_Roles',
	url => '/adm/createuser?action=custom',
	permission => $permission->{'custom'},
	linktitle => 'Configure a custom role.',
	},
	{
	linktext => 'Course Groups',
	icon => 'conf.png',
	#help => 'Course_Manage_Group',
	url => '/adm/coursegroups?refpage=cusr',
	permission => $permission->{'grp_manage'},
	linktitle => 'Manage course groups.',
	},
	{
	linktext => 'Change Logs',
	icon => 'document-properties.png',
	#help => 'Course_User_Logs',
	url => '/adm/createuser?action=changelogs',
	permission => $permission->{'cusr'},
	linktitle => 'View change log.',
	},
	);
if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {	if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {
push(@{ $menu[1]->{items} },	push(@{ $menu[2]->{items} },
{ linktext => 'Enrollment Requests',	{
icon => 'selfenrl-queue.png',	linktext => 'Enrollment Requests',
#help => 'Course_Approve_Selfenroll',	icon => 'selfenrl-queue.png',
url => '/adm/createuser?action=selfenrollqueue',	#help => 'Course_Approve_Selfenroll',
permission => $permission->{'cusr'},	url => '/adm/createuser?action=selfenrollqueue',
linktitle =>'Approve or reject enrollment requests.',	permission => $permission->{'cusr'},
});	linktitle =>'Approve or reject enrollment requests.',
	},
	);
}	}

if (!exists($permission->{'cusr_section'})){	if (!exists($permission->{'cusr_section'})){

push(@{ $menu[2]->{items} },	push(@{ $menu[2]->{items} },
{ linktext => 'Automated Enrollment',	{
icon => 'roles.png',	linktext => 'Automated Enrollment',
#help => 'Course_Automated_Enrollment',	icon => 'roles.png',
permission => (&Apache::lonnet::auto_run($cnum,$cdom)	#help => 'Course_Automated_Enrollment',
&& $permission->{'cusr'}),	permission => (&Apache::lonnet::auto_run($cnum,$cdom)
url => '/adm/populate',	&& $permission->{'cusr'}),
linktitle => 'Automated enrollment manager.',	url => '/adm/populate',
},	linktitle => 'Automated enrollment manager.',
{ linktext => 'User Self-Enrollment',	},
icon => 'cstr.png',	{
#help => 'Course_Self_Enrollment',	linktext => 'User Self-Enrollment',
url => '/adm/createuser?action=selfenroll',	icon => 'cstr.png',
permission => $permission->{'cusr'},	#help => 'Course_Self_Enrollment',
linktitle => 'Configure user self enrollment.',	url => '/adm/createuser?action=selfenroll',
});	permission => $permission->{'cusr'},
	linktitle => 'Configure user self enrollment.',
}	},
	);
push(@{ $menu[2]->{items} },
{ linktext => 'Course Groups',	}
icon => 'conf.png',
#help => 'Course_Manage_Group',
url => '/adm/coursegroups?refpage=cusr',
permission => $permission->{'grp_manage'},
linktitle => 'Manage course groups.',
},
{ linktext => 'Change Logs',
icon => 'document-properties.png',
#help => 'Course_User_Logs',
url => '/adm/createuser?action=changelogs',
permission => $permission->{'cusr'},
linktitle => 'View change log.',
});
};	};
return Apache::lonhtmlcommon::generate_menu(@menu);	return Apache::lonhtmlcommon::generate_menu(@menu);
# { text => 'View Log-in History',	# { text => 'View Log-in History',
Line 3993 ENDSCRIPT	Line 4173 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 4022 ENDSCRIPT	Line 4204 ENDSCRIPT
if (ref($lt) eq 'HASH') {	if (ref($lt) eq 'HASH') {
$title = $lt->{$item};	$title = $lt->{$item};
}	}
$output .=	$output .= &Apache::lonhtmlcommon::row_title($title);
&Apache::lonhtmlcommon::row_title($title,
'LC_selfenroll_pick_box_title','LC_oddrow_value')."\n";
if ($item eq 'types') {	if ($item eq 'types') {
my $curr_types = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_types'};	my $curr_types = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_types'};
my $showdomdesc = 1;	my $showdomdesc = 1;
Line 4791 sub print_userchangelogs_display {	Line 4971 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 4807 sub print_userchangelogs_display {	Line 4980 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 4828 sub print_userchangelogs_display {	Line 5004 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 4870 sub print_userchangelogs_display {	Line 5043 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 4895 function chgPage(caller) {	Line 5090 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()
	.&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 4911 sub role_display_filter {	Line 5146 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 4924 sub role_display_filter {	Line 5159 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 4947 sub role_display_filter {	Line 5186 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>'.	'<td>  </td>'.
	'<td valign="middle"><input type="submit" value="'.
	&mt('Update Display').'" /></td></tr></table>'.
'<span class="LC_roleslog_note">'.	'<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.');	&mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.6.99.0 or later are displayed.');
if ($version) {	if ($version) {
$output .= ' '.&mt('This server is version [_3].','<b>','</b>',$version); }	$output .= ' '.&mt('This server is version [_3].','<b>','</b>',$version); }
$output .= '</span><hr noshade><br />';	$output .= '</span><hr /><br />';
return $output;	return $output;
}	}

Line 5594 sub course_level_dc {	Line 5837 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);
Line 5773 sub update_selfenroll_config {	Line 6016 sub update_selfenroll_config {
}	}
} else {	} else {
my @differences =	my @differences =
&compare_arrays(\@currnotified,\@newnotified);	&Apache::loncommon::compare_arrays(\@currnotified,\@newnotified);
if (@differences > 0) {	if (@differences > 0) {
if (@newnotified > 0) {	if (@newnotified > 0) {
$changes{'internal.selfenroll_notifylist'} = join(',',@newnotified);	$changes{'internal.selfenroll_notifylist'} = join(',',@newnotified);
Line 5783 sub update_selfenroll_config {	Line 6026 sub update_selfenroll_config {
}	}
}	}
} else {	} else {
my @differences = &compare_arrays(\@currnotified,\@newnotified);	my @differences = &Apache::loncommon::compare_arrays(\@currnotified,\@newnotified);
if (@differences > 0) {	if (@differences > 0) {
if (@newnotified > 0) {	if (@newnotified > 0) {
$changes{'internal.selfenroll_notifylist'} = join(',',@newnotified);	$changes{'internal.selfenroll_notifylist'} = join(',',@newnotified);
Line 5973 sub update_selfenroll_config {	Line 6216 sub update_selfenroll_config {
return;	return;
}	}

sub compare_arrays {
my ($arrayref1,$arrayref2) = @_;
my (@difference,%count);
@difference = ();
%count = ();
if ((ref($arrayref1) eq 'ARRAY') && (ref($arrayref2) eq 'ARRAY')) {
foreach my $element (@{$arrayref1}, @{$arrayref2}) { $count{$element}++; }
foreach my $element (keys(%count)) {
if ($count{$element} == 1) {
push(@difference,$element);
}
}
}
return @difference;
}

sub get_selfenroll_titles {	sub get_selfenroll_titles {
my @row = ('types','registered','enroll_dates','access_dates','section',	my @row = ('types','registered','enroll_dates','access_dates','section',
'approval','limit');	'approval','limit');

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

Removed from v.1.293
changed lines
	Added in v.1.301