--- loncom/interface/loncreateuser.pm 2008/12/18 17:28:24 1.268.2.3
+++ loncom/interface/loncreateuser.pm 2009/01/05 17:13:11 1.268.2.5
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.268.2.3 2008/12/18 17:28:24 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.268.2.5 2009/01/05 17:13:11 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -213,7 +213,6 @@ END_SCRIPT
$tool_on = '';
}
}
- $curr_access = &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item);
$output .= '
'."\n".
' '.$lt{$item}.' | '."\n".
'
'."\n".
@@ -770,8 +769,9 @@ $lt{'hs'}: $home_server_pick
my $authtype = $rules->{$matchedrule}{'authtype'};
if ($authtype !~ /^(krb4|krb5|int|fsys|loc)$/) {
$r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc));
- } else {
+ } else {
my $authparm = $rules->{$matchedrule}{'authparm'};
+ $authmsg = $rules->{$matchedrule}{'authmsg'};
if ($authtype =~ /^krb(4|5)$/) {
my $ver = $1;
if ($authparm ne '') {
@@ -780,7 +780,6 @@ $lt{'hs'}: $home_server_pick
KERB
- $authmsg = $rules->{$matchedrule}{'authmsg'};
}
} else {
$fixedauth =
@@ -789,8 +788,16 @@ KERB
$fixedauth .=
''."\n";
} else {
- $varauth =
+ if ($authtype eq 'int') {
+ $varauth = '
'.
+&mt('[_1] Internally authenticated (with initial password [_2])','','')."';
+ } elsif ($authtype eq 'loc') {
+ $varauth = '
'.
+&mt('[_1] Local Authentication with argument [_2]','','')."\n";
+ } else {
+ $varauth =
''."\n";
+ }
}
}
}
@@ -2071,7 +2078,6 @@ sub update_user_data {
}
} else {
$changed{$tool} = &tool_admin($tool,'',\%changeHash);
- print STDERR "for $tool - changed is $changed{$tool}\n";
if ($changed{$tool}) {
$newaccess{$tool} = &mt('default');
} else {