--- loncom/interface/loncreateuser.pm	2002/08/21 17:18:08	1.40
+++ loncom/interface/loncreateuser.pm	2002/08/23 19:43:11	1.42
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.40 2002/08/21 17:18:08 www Exp $
+# $Id: loncreateuser.pm,v 1.42 2002/08/23 19:43: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.40 2002/08/21 17:18:08 www Exp $
+# $Id: loncreateuser.pm,v 1.42 2002/08/23 19:43:11 matthew 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');
     my $bodytag =&Apache::loncommon::bodytag(
@@ -95,13 +95,13 @@ sub phase_one {
 <title>The LearningOnline Network with CAPA</title>
 </head>
 $bodytag
-<form action=/adm/createuser method=post>
-<input type=hidden name=phase value=two>
+<form action="/adm/createuser" method="post">
+<input type="hidden" name="phase" value="get_user_info">
 <p>
-Username: <input type=text size=15 name=ccuname><br>
+Username: <input type="text" size="15" name="ccuname"><br>
 Domain: $domform 
 </p>
-<input type=submit value="Continue">
+<input type="submit" value="Continue">
 </form>
 </body>
 </html>
@@ -109,7 +109,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'};
@@ -122,7 +122,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;
@@ -160,7 +160,7 @@ ENDDOCHEAD
                                      'Create Users, Change User Privileges'));
     my $forminfo =<<"ENDFORMINFO";
 <form action="/adm/createuser" method="post" name="cu">
-<input type="hidden" name="phase"       value="three">
+<input type="hidden" name="phase"       value="update_user_data">
 <input type="hidden" name="ccuname"     value="$ccuname">
 <input type="hidden" name="ccdomain"    value="$ccdomain">
 <input type="hidden" name="pres_value"  value="" >
@@ -303,7 +303,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;
                        }
                    }
@@ -329,8 +329,8 @@ END
 	   $r->print('</table>');
         }  # End of unless
 	my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
-	if ($currentauth=~/^krb4:/) {
-	    $currentauth=~/^krb4:(.*)/;
+	if ($currentauth=~/^krb(4|5):/) {
+	    $currentauth=~/^krb(4|5):(.*)/;
 	    my $krbdefdom2=$1;
             my %param = ( formname => 'document.cu',
                           kerb_def_dom => $krbdefdom 
@@ -338,12 +338,12 @@ END
             $loginscript  = &Apache::loncommon::authform_header(%param);
 	}
 	# Check for a bad authentication type
-        unless ($currentauth=~/^krb4:/ or
+        unless ($currentauth=~/^krb(4|5):/ or
 		$currentauth=~/^unix:/ or
 		$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(<<ENDBADAUTH);
 <hr />
 <script type="text/javascript" language="Javascript">
@@ -376,7 +376,7 @@ ENDBADAUTH
         } else { # Authentication type is valid
 	    my $authformcurrent='';
 	    my $authform_other='';
-	    if ($currentauth=~/^krb4:/) {
+	    if ($currentauth=~/^krb(4|5):/) {
 		$authformcurrent=$authformkrb;
 		$authform_other="<p>$authformint</p>\n".
                     "<p>$authformfsys</p><p>$authformloc</p>";
@@ -406,7 +406,7 @@ ENDBADAUTH
 <td bgcolor='#cbbcbb'>Changing this value will overwrite existing authentication for the user; you should notify the user of this change.</td></tr>
 </table>
 ENDCURRENTAUTH
-            if (&Apache::lonnet::allowed('mau',$ENV{'user.domain'})) {
+            if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) {
 		# Current user has login modification privileges
 		$r->print(<<ENDOTHERAUTHS);
 <hr />
@@ -427,10 +427,9 @@ ENDOTHERAUTHS
 #
 # Co-Author
 # 
-
-    if (&Apache::lonnet::allowed('cca',$ENV{'user.domain'})) {
+    if (&Apache::lonnet::allowed('cca',$ENV{'request.role.domain'})) {
 	my $cuname=$ENV{'user.name'};
-        my $cudom=$ENV{'user.domain'};
+        my $cudom=$ENV{'request.role.domain'};
        $r->print(<<ENDCOAUTH);
 <h4>Construction Space</h4>
 <table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>
@@ -486,7 +485,7 @@ ENDDROW
 }
 
 # ================================================================= Phase Three
-sub phase_three {
+sub update_user_data {
     my $r=shift;
     my $uhome=&Apache::lonnet::homeserver($ENV{'form.ccuname'},
                                           $ENV{'form.ccdomain'});
@@ -541,7 +540,8 @@ ENDTHREEHEAD
     my $amode='';
     my $genpwd='';
     if ($ENV{'form.login'} eq 'krb') {
-	$amode='krb4';
+	$amode='krb';
+	$amode.=$ENV{'form.krbver'};
 	$genpwd=$ENV{'form.krbarg'};
     } elsif ($ENV{'form.login'} eq 'int') {
 	$amode='internal';
@@ -782,17 +782,17 @@ sub handler {
         (&Apache::lonnet::allowed('cin',$ENV{'request.course.id'})) || 
         (&Apache::lonnet::allowed('ccr',$ENV{'request.course.id'})) || 
         (&Apache::lonnet::allowed('cep',$ENV{'request.course.id'})) ||
-        (&Apache::lonnet::allowed('cca',$ENV{'user.domain'})) ||
-        (&Apache::lonnet::allowed('mau',$ENV{'user.domain'}))) {
+        (&Apache::lonnet::allowed('cca',$ENV{'request.role.domain'})) ||
+        (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'}))) {
        $r->content_type('text/html');
        $r->send_http_header;
        unless ($ENV{'form.phase'}) {
-	   &phase_one($r);
+	   &print_username_entry_form($r);
        }
-       if ($ENV{'form.phase'} eq 'two') {
-           &phase_two($r);
-       } elsif ($ENV{'form.phase'} eq 'three') {
-           &phase_three($r);
+       if ($ENV{'form.phase'} eq 'get_user_info') {
+           &print_user_modification_page($r);
+       } elsif ($ENV{'form.phase'} eq 'update_user_data') {
+           &update_user_data($r);
        }
    } else {
       $ENV{'user.error.msg'}=