--- loncom/interface/loncreateuser.pm 2002/08/08 19:27:35 1.39 +++ loncom/interface/loncreateuser.pm 2002/09/03 20:46:04 1.39.4.2 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.39 2002/08/08 19:27:35 matthew Exp $ +# $Id: loncreateuser.pm,v 1.39.4.2 2002/09/03 20:46:04 albertel 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.39 2002/08/08 19:27:35 matthew Exp $ +# $Id: loncreateuser.pm,v 1.39.4.2 2002/09/03 20:46:04 albertel Exp $ ### package Apache::loncreateuser; @@ -82,9 +82,9 @@ BEGIN { # =================================================================== Phase one -sub phase_one { +sub print_username_entry_form { my $r=shift; - my $defdom=$ENV{'user.domain'}; + my $defdom=$ENV{'request.role.domain'}; my @domains = &Apache::loncommon::get_domains(); my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain'); $r->print(<<"ENDDOCUMENT"); @@ -94,13 +94,13 @@ sub phase_one {

Create User, Change User Privileges

-
- + +

-Username:
+Username:
Domain: $domform

- +
@@ -108,7 +108,7 @@ ENDDOCUMENT } # =================================================================== Phase two -sub phase_two { +sub print_user_modification_page { my $r=shift; my $ccuname=$ENV{'form.ccuname'}; my $ccdomain=$ENV{'form.ccdomain'}; @@ -121,7 +121,7 @@ sub phase_two { ); $loginscript = &Apache::loncommon::authform_header(%param); - my $defdom=$ENV{'user.domain'}; + my $defdom=$ENV{'request.role.domain'}; $ccuname=~s/\W//g; $ccdomain=~s/\W//g; @@ -159,7 +159,7 @@ sub phase_two { ENDDOCHEAD my $forminfo =<<"ENDFORMINFO";
- + @@ -302,7 +302,7 @@ END if (($role_code eq 'ca') && ($ENV{'request.role'} !~ /^dc/)) { if ($area !~ - /^\/$ENV{'user.domain'}\/$ENV{'user.name'}/) { + /^\/$ENV{'request.role.domain'}\/$ENV{'user.name'}/) { $allowed = 0; } } @@ -342,7 +342,7 @@ END $currentauth=~/^internal:/ or $currentauth=~/^localauth:/ ) { # bad authentication scheme - if (&Apache::lonnet::allowed('mau',$ENV{'user.domain'})) { + if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) { $r->print(<