--- loncom/interface/loncreateuser.pm 2008/12/18 16:58:26 1.270 +++ loncom/interface/loncreateuser.pm 2009/01/16 10:59:48 1.274 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.270 2008/12/18 16:58:26 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.274 2009/01/16 10:59:48 bisitz 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 { @@ -2136,7 +2142,9 @@ sub update_user_data { $changeHash{'tools.'.$key}; } } - &Apache::lonnet::appenv(\%newenvhash); + if (keys(%newenvhash)) { + &Apache::lonnet::appenv(\%newenvhash); + } } } } @@ -2603,12 +2611,18 @@ sub update_roles { $r->print('

'.&mt('ERROR').': '.&mt('Unknown command').' '.$key.'


'); } foreach my $key (sort(keys(%disallowed))) { + $r->print('

'); if (($key eq 'none') || ($key eq 'all')) { - $r->print('

'.&mt('[_1] may not be used as the name for a section, as it is a reserved word.',$key)); + $r->print(&mt('[_1] may not be used as the name for a section, as it is a reserved word.',''.$key.'')); } else { - $r->print('

'.&mt('[_1] may not be used as the name for a section, as it is the name of a course group.',$key)); + $r->print(&mt('[_1] may not be used as the name for a section, as it is the name of a course group.',''.$key.'')); } - $r->print(' '.&mt('Please go back and choose a different section name.').'


'); + $r->print('

' + .&mt('Please [_1]go back[_2] and choose a different section name.' + ,'