--- loncom/interface/loncreateuser.pm 2002/09/05 16:44:22 1.39.6.1 +++ loncom/interface/loncreateuser.pm 2002/08/21 17:18:08 1.40 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.39.6.1 2002/09/05 16:44:22 albertel Exp $ +# $Id: loncreateuser.pm,v 1.40 2002/08/21 17:18:08 www 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.6.1 2002/09/05 16:44:22 albertel Exp $ +# $Id: loncreateuser.pm,v 1.40 2002/08/21 17:18:08 www Exp $ ### package Apache::loncreateuser; @@ -82,25 +82,26 @@ BEGIN { # =================================================================== Phase one -sub print_username_entry_form { +sub phase_one { my $r=shift; - my $defdom=$ENV{'request.role.domain'}; + my $defdom=$ENV{'user.domain'}; my @domains = &Apache::loncommon::get_domains(); my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain'); + my $bodytag =&Apache::loncommon::bodytag( + 'Create Users, Change User Privileges'); $r->print(<<"ENDDOCUMENT"); The LearningOnline Network with CAPA - -

Create User, Change User Privileges

-
- +$bodytag + +

-Username:
+Username:
Domain: $domform

- +
@@ -108,7 +109,7 @@ ENDDOCUMENT } # =================================================================== Phase two -sub print_user_modification_page { +sub phase_two { my $r=shift; my $ccuname=$ENV{'form.ccuname'}; my $ccdomain=$ENV{'form.ccdomain'}; @@ -121,7 +122,7 @@ sub print_user_modification_page { ); $loginscript = &Apache::loncommon::authform_header(%param); - my $defdom=$ENV{'request.role.domain'}; + my $defdom=$ENV{'user.domain'}; $ccuname=~s/\W//g; $ccdomain=~s/\W//g; @@ -154,12 +155,12 @@ sub print_user_modification_page { - - ENDDOCHEAD + $r->print(&Apache::loncommon::bodytag( + 'Create Users, Change User Privileges')); my $forminfo =<<"ENDFORMINFO";
- + @@ -302,7 +303,7 @@ END if (($role_code eq 'ca') && ($ENV{'request.role'} !~ /^dc/)) { if ($area !~ - /^\/$ENV{'request.role.domain'}\/$ENV{'user.name'}/) { + /^\/$ENV{'user.domain'}\/$ENV{'user.name'}/) { $allowed = 0; } } @@ -328,8 +329,8 @@ END $r->print(''); } # End of unless my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); - if ($currentauth=~/^krb(4|5):/) { - $currentauth=~/^krb(4|5):(.*)/; + if ($currentauth=~/^krb4:/) { + $currentauth=~/^krb4:(.*)/; my $krbdefdom2=$1; my %param = ( formname => 'document.cu', kerb_def_dom => $krbdefdom @@ -337,12 +338,12 @@ END $loginscript = &Apache::loncommon::authform_header(%param); } # Check for a bad authentication type - unless ($currentauth=~/^krb(4|5):/ or + unless ($currentauth=~/^krb4:/ or $currentauth=~/^unix:/ or $currentauth=~/^internal:/ or $currentauth=~/^localauth:/ ) { # bad authentication scheme - if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) { + if (&Apache::lonnet::allowed('mau',$ENV{'user.domain'})) { $r->print(<