--- loncom/interface/loncreateuser.pm 2002/04/22 15:26:46 1.31 +++ loncom/interface/loncreateuser.pm 2002/04/29 14:32:11 1.34 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.31 2002/04/22 15:26:46 matthew Exp $ +# $Id: loncreateuser.pm,v 1.34 2002/04/29 14:32:11 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -47,7 +47,7 @@ # 11/12,11/13,11/15 Scott Harrison # 02/11/02 Matthew Hall # -# $Id: loncreateuser.pm,v 1.31 2002/04/22 15:26:46 matthew Exp $ +# $Id: loncreateuser.pm,v 1.34 2002/04/29 14:32:11 matthew Exp $ ### package Apache::loncreateuser; @@ -85,7 +85,9 @@ BEGIN { sub phase_one { my $r=shift; my $defdom=$ENV{'user.domain'}; - $r->print(<print(<<"ENDDOCUMENT"); The LearningOnline Network with CAPA @@ -94,8 +96,10 @@ sub phase_one {

Create User, Change User Privileges

+

Username:
-Domain:

+Domain: $domform +

@@ -165,7 +169,6 @@ ENDFORMINFO my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain); my %incdomains; my %inccourses; - my %home_servers = &get_home_servers($ccdomain); foreach (%Apache::lonnet::hostdom) { $incdomains{$_}=1; } @@ -176,12 +179,9 @@ ENDFORMINFO } if ($uhome eq 'no_host') { my $home_server_list= - ''."\n"; - foreach (sort keys(%home_servers)) { - $home_server_list.= - '\n"; - } + ''."\n". + &Apache::loncommon::home_server_option_list($ccdomain); + $r->print(<Create New User @@ -532,6 +532,9 @@ ENDTHREEHEAD $amode='localauth'; $genpwd=$ENV{'form.locarg'}; $genpwd=" " if (!$genpwd); + } elsif (($ENV{'form.login'} eq 'nochange')) { + # There is no need to tell the user we did not change what they + # did not ask us to change. } else { $r->print($error.'Invalid login mode or password'.$end); return; @@ -552,7 +555,8 @@ ENDNEWUSERHEAD if (lc($desiredhost) eq 'default') { $desiredhost = undef; } else { - my %home_servers = &get_home_servers($ENV{'form.ccdomain'}); + my %home_servers = &Apache::loncommon::get_home_servers + ($ENV{'form.ccdomain'}); if (! exists($home_servers{$desiredhost})) { $r->print($error.'Invalid home server specified'); return; @@ -570,7 +574,7 @@ ENDNEWUSERHEAD $ENV{'form.ccdomain'}); $r->print('
Home server: '.$home.' '. $Apache::lonnet::libserv{$home}); - } elsif ($ENV{'form.login'} ne '') { + } elsif ($ENV{'form.login'} ne 'nochange') { # Modify user privileges $r->print(<Change User Privileges @@ -832,16 +836,6 @@ ENDTABLE #---------------------------------------------- end functions for &phase_two #--------------------------------- functions for &phase_two and &phase_three -sub get_home_servers { - my $domain = shift; - my %home_servers; - foreach (keys(%Apache::lonnet::libserv)) { - if ($Apache::lonnet::hostdom{$_} eq $domain) { - $home_servers{$_} = $Apache::lonnet::hostname{$_}; - } - } - return %home_servers; -} #--------------------------end of functions for &phase_two and &phase_three