--- loncom/interface/loncreateuser.pm 2009/08/14 16:43:32 1.295.2.7
+++ loncom/interface/loncreateuser.pm 2010/01/19 20:52:24 1.295.2.22
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.295.2.7 2009/08/14 16:43:32 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.295.2.22 2010/01/19 20:52:24 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -110,6 +110,7 @@ sub initialize_authen_forms {
sub auth_abbrev {
my %abv_auth = (
+ krb5 => 'krb',
krb4 => 'krb',
internal => 'int',
localuth => 'loc',
@@ -228,13 +229,13 @@ sub build_tools_display {
'usde' => "Use default",
'uscu' => "Use custom",
'official' => 'Can request creation of official courses',
- 'unofficial' => 'Can request creation of unofficial courses',
+ 'unofficial' => 'Can request creation of unofficial courses',
);
if ($context eq 'requestcourses') {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'requestcourses.official','requestcourses.unofficial');
@usertools = ('official','unofficial');
- @options =('norequest','approve','autolimit','validate');
+ @options =('norequest','approval','autolimit','validate');
%validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);
%reqtitles = &courserequest_titles();
%reqdisplay = &courserequest_display();
@@ -291,7 +292,11 @@ sub build_tools_display {
}
if ($curroption =~ /^autolimit=(\d*)$/) {
$currlimit = $1;
- $currdisp = &mt('Yes, up to [quant,_1,request]/user',$currlimit);
+ if ($currlimit eq '') {
+ $currdisp = &mt('Yes, automatic creation');
+ } else {
+ $currdisp = &mt('Yes, up to [quant,_1,request]/user',$currlimit);
+ }
} else {
$currdisp = $reqdisplay{$curroption};
}
@@ -325,9 +330,12 @@ sub build_tools_display {
if ($option eq 'autolimit') {
$custdisp .= '';
+ 'value="'.$currlimit.'" />
'.
+ $reqtitles{'unlimited'};
+ } else {
+ $custdisp .= '';
}
- $custdisp .= '';
+ $custdisp .= '';
}
$custdisp .= '';
$custradio = '
'."\n". ' '; + '" value=""'.$tooloff.' />'.$reqtitles{'norequest'}. + ' | '; foreach my $option (@options) { if ($option eq 'validate') { my $canvalidate = 0; @@ -407,18 +420,21 @@ sub coursereq_externaluser { if ($option eq $curroption) { $checked = ' checked="checked"'; } - $output .= ''."\n". + $output .= '