loncom/interface/loncreateuser.pm - diff

Return to loncreateuser.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncreateuser.pm between versions 1.295 and 1.295.2.4

version 1.295, 2009/05/18 16:08:07	version 1.295.2.4, 2009/08/14 14:21: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 282 sub build_tools_display {	Line 284 sub build_tools_display {
return $output;	return $output;
}	}

	sub coursereq_externaluser {
	my ($ccuname,$ccdomain,$cdom) = @_;
	my (@usertools,@options,%validations,%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');
	@options = ('approve','validate','autolimit');
	%validations = &Apache::lonnet::auto_courserequest_checks($cdom);
	my $optregex = join('\|',@options);
	my %reqtitles = &courserequest_titles();
	foreach my $item (@usertools) {
	my ($curroption,$currlimit,$tooloff);
	if ($userenv{'reqcrsotherdom.'.$item} ne '') {
	my @curr = split(',',$userenv{'reqcrsotherdom.'.$item});
	if (grep(/^\Q$cdom\E:($optregex)=?(\d*)$/,@curr)) {
	$curroption = $1;
	$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 .= '</span></td>'."\n".
	&Apache::loncommon::end_data_table_row()."\n";
	}
	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 299 sub print_username_entry_form {	Line 389 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 558 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",
Line 483 sub user_modification_js {	Line 576 sub user_modification_js {
}	}

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

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

Line 758 $crumbs	Line 853 $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 912 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 874 ENDCHANGEUSER	Line 971 ENDCHANGEUSER
}	}
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?').'</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 1054 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 1067 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 1082 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 1150 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 1507 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 1538 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 1871 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 1998 sub update_user_data {	Line 2111 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 2242 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 2251 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 2336 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,
\%userenv, \%changeHash,\%changed,\%newaccess,\%newaccesstext);	if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) {
	&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 2333 END	Line 2456 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 2492 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 2528 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 2463 END	Line 2601 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 2697 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 @options = ('approve','validate','autolimit');
	my $optregex = join('\|',@options);
	my %reqdisplay = &courserequest_display();
	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;
	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');
	my $oldop = $1;
	if ($oldop ne $newop) {
	$changedoms = 1;
	foreach my $dom (@curr) {
	unless ($dom eq $cdom) {
	push(@new,$dom);
	}
	}
	if ($newop) {
	push(@new,$cdom.':'.$newop);
	}
	@new = sort(@new);
	}
	} elsif ($env{'form.'.$context.'_'.$tool}) {
	$changedoms = 1;
	$changedoms = 1;
	@new = sort(@curr,$cdom.':'.$newop);
	}
	$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}) {
	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 {
	$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 2992 sub tool_admin {	Line 3213 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 3336 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 3475 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 3488 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>';

$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 3864 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".
	"\n".$js."\n".
	'// ]]>'."\n"
	'</script>'."\n";
}	}

sub verify_user_display {	sub verify_user_display {
Line 3666 sub print_main_menu {	Line 3902 sub print_main_menu {
listusers => 'Display Co-authors and Manage Multiple Users',	listusers => 'Display Co-authors and Manage Multiple Users',
},	},
course => {	course => {
upload => 'File of Course Users',	upload => 'Upload a File of Course Users',
singleuser => 'Single Course User',	singleuser => 'Add/Modify a Single Course User',
listusers => 'Course User Lists',	listusers => 'Display Class Lists and Manage Multiple Users',
},	},
);	);
my @menu = ( {categorytitle => 'Add Users',
items =>	my @menu =
[{	(
linktext => $links{$context}{'upload'},	{ text => $links{$context}{'upload'},
icon => 'sctr.png',	help => 'Course_Create_Class_List',
#help => 'Course_Create_Class_List',	action => 'upload',
url => '/adm/createuser?action=upload',	permission => $permission->{'cusr'},
permission => $permission->{'cusr'},	},
linktitle => 'Upload a CSV or a text file containing users.',	{ text => $links{$context}{'singleuser'},
},	help => 'Course_Change_Privileges',
{	action => 'singleuser',
linktext => $links{$context}{'singleuser'},	permission => $permission->{'cusr'},
icon => 'edit-redo.png',	},
#help => 'Course_Change_Privileges',	{ text => $links{$context}{'listusers'},
url => '/adm/createuser?action=singleuser',	help => 'Course_View_Class_List',
permission => $permission->{'cusr'},	action => 'listusers',
linktitle => 'Add a user with a certain role to this course.',	permission => ($permission->{'view'} \|\| $permission->{'cusr'}),
}]},	},
{categorytitle => 'Administration',	);
items =>	if ($context eq 'domain' \|\| $context eq 'course') {
[{	my $customlink = { text => 'Edit Custom Roles',
linktext => $links{$context}{'listusers'},	help => 'Course_Editing_Custom_Roles',
icon => 'edit-find.png',	action => 'custom',
#help => 'Course_View_Class_List',	permission => $permission->{'custom'},
url => '/adm/createuser?action=listusers',	};
permission => ($permission->{'view'} \|\| $permission->{'cusr'}),	push(@menu,$customlink);
linktitle => 'Show and manage users of this course.',	}
}]},	if ($context eq 'course') {
{categorytitle => 'Configuration',	my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
items =>	my @courselinks =
[	(
]},	{ text => 'Enroll a Single Student',
);	help => 'Course_Add_Student',
	action => 'singlestudent',
if ($context eq 'domain'){	permission => $permission->{'cusr'},
	},
push(@{ $menu[1]->{items} },	{ text => 'Drop Students',
{ linktext => 'Custom Roles',	help => 'Course_Drop_Student',
icon => 'emblem-photos.png',	action => 'drop',
#help => 'Course_Editing_Custom_Roles',	permission => $permission->{'cusr'},
url => '/adm/createuser?action=custom',	});
permission => $permission->{'custom'},	if (!exists($permission->{'cusr_section'})) {
linktitle => 'Configure a custom role.',	push(@courselinks,
});	{ text => 'Automated Enrollment Manager',
	help => 'Course_Automated_Enrollment',
}elsif ($context eq 'course'){	permission => (&Apache::lonnet::auto_run($cnum,$cdom)
my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();	&& $permission->{'cusr'}),
	url => '/adm/populate',
push(@{ $menu[0]->{items} },	},
{ linktext => 'Single Student',	{ text => 'Configure User Self-enrollment',
#help => 'Course_Add_Student',	help => 'Course_Self_Enrollment',
icon => 'list-add.png',	action => 'selfenroll',
url => '/adm/createuser?action=singlestudent',	permission => $permission->{'cusr'},
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',
#help => 'Course_Drop_Student',
url => '/adm/createuser?action=drop',
permission => $permission->{'cusr'},
linktitle =>'Remove a student from this course.',
},
{ 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.',
});
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(@courselinks,
{ linktext => 'Enrollment Requests',	{ text => 'Enrollment Requests',
icon => 'selfenrl-queue.png',	help => 'Course_Approve_Selfenroll',
#help => 'Course_Approve_Selfenroll',	action => 'selfenrollqueue',
url => '/adm/createuser?action=selfenrollqueue',
permission => $permission->{'cusr'},	permission => $permission->{'cusr'},
linktitle =>'Approve or reject enrollment requests.',	});
});
}	}
	push(@courselinks,
if (!exists($permission->{'cusr_section'})){	{ text => 'Manage Course Groups',
	help => 'Course_Manage_Group',
push(@{ $menu[2]->{items} },	permission => $permission->{'grp_manage'},
{ linktext => 'Automated Enrollment',	url => '/adm/coursegroups?refpage=cusr',
icon => 'roles.png',	},
#help => 'Course_Automated_Enrollment',	{ text => 'View Change Logs',
permission => (&Apache::lonnet::auto_run($cnum,$cdom)	help => 'Course_User_Logs',
&& $permission->{'cusr'}),	action => 'changelogs',
url => '/adm/populate',	permission => $permission->{'cusr'},
linktitle => 'Automated enrollment manager.',	},);
},
{ linktext => 'User Self-Enrollment',
icon => 'cstr.png',
#help => 'Course_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);
# { text => 'View Log-in History',	# { text => 'View Log-in History',
# help => 'Course_User_Logins',	# help => 'Course_User_Logins',
# action => 'logins',	# action => 'logins',
# permission => $permission->{'cusr'},	# permission => $permission->{'cusr'},
# });	# });
	push(@menu,@courselinks);
	}
	my $menu_html = '';
	foreach my $menu_item (@menu) {
	next if (! $menu_item->{'permission'});
	$menu_html.='<p>';
	if (exists($menu_item->{'help'})) {
	$menu_html.=
	&Apache::loncommon::help_open_topic($menu_item->{'help'});
	}
	$menu_html.='<font size="+1">';
	if (exists($menu_item->{'url'})) {
	$menu_html.=qq{<a href="$menu_item->{'url'}">};
	} else {
	$menu_html.=
	qq{<a href="/adm/createuser?action=$menu_item->{'action'}">}; }
	$menu_html.= &mt($menu_item->{'text'}).'</a></font>';
	$menu_html.='</p>';
	}
	return $menu_html;
}	}

sub restore_prev_selections {	sub restore_prev_selections {
Line 3993 ENDSCRIPT	Line 4202 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 4885 sub print_userchangelogs_display {	Line 5096 sub print_userchangelogs_display {
$r->print('</tr></table>');	$r->print('</tr></table>');
$r->print(<<"ENDSCRIPT");	$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 5107 function chgPage(caller) {
document.$formname.submit();	document.$formname.submit();
return;	return;
}	}
	// ]]>
</script>	</script>
ENDSCRIPT	ENDSCRIPT
}	}
} else {	} else {
$r->print(&mt('There are no records to display'));	$r->print('<p class="LC_info">'.
	&mt('There are no records to display').
	'</p>');
}	}
$r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.	$r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.
'<input type="hidden" name="action" value="changelogs" /></form>');	'<input type="hidden" name="action" value="changelogs" /></form>');
Line 4911 sub role_display_filter {	Line 5126 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 4952 sub role_display_filter {	Line 5167 sub role_display_filter {
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));
Line 4965 sub role_display_filter {	Line 5180 sub role_display_filter {
&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 5809 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.295
changed lines
	Added in v.1.295.2.4