--- loncom/interface/loncreateuser.pm	2001/02/21 20:38:35	1.3
+++ loncom/interface/loncreateuser.pm	2001/03/03 00:50:11	1.6
@@ -16,7 +16,7 @@
 #
 # 2/14 Gerd Kortemeyer)
 #
-# 2/14,2/17,2/19,2/20,2/21 Gerd Kortemeyer
+# 2/14,2/17,2/19,2/20,2/21,2/22,2/23,3/2 Gerd Kortemeyer
 #
 package Apache::loncreateuser;
 
@@ -53,6 +53,13 @@ sub phase_two {
     my $r=shift;
     my $ccuname=$ENV{'form.ccuname'};
     my $ccdomain=$ENV{'form.ccdomain'};
+
+    $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
+    my $krbdefdom=$1;
+    $krbdefdom=~tr/a-z/A-Z/;
+
+    my $defdom=$ENV{'user.domain'};
+
     $ccuname=~s/\W//g;
     $ccdomain=~s/\W//g;
     $r->print(<<ENDENHEAD);
@@ -94,6 +101,8 @@ sub phase_two {
 <input type="hidden" value='' name="pres_value">
 <input type="hidden" value='' name="pres_type">
 <input type="hidden" value='' name="pres_marker">
+<input type=hidden name=cuname value="$ccuname">
+<input type=hidden name=cdomain value="$ccdomain">
 
 ENDENHEAD
     my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
@@ -106,9 +115,53 @@ ENDENHEAD
         }
     } %ENV;
     if ($uhome eq 'no_host') {
-	$r->print('<h3>New user '.$ccuname.' at '.$ccdomain.'</h3>');
+	$r->print(<<ENDNUSER);
+<h2>New user $ccuname at $ccdomain</h2>
+<script>
+function setkrb(vf) {
+    if (vf.krbdom.value!='') {
+       vf.login[0].checked=true;
+       vf.krbdom.value=vf.krbdom.value.toUpperCase();
+       vf.intpwd.value='';
+   }
+}
+
+function setint(vf) {
+    if (vf.intpwd.value!='') {
+       vf.login[1].checked=true;
+       vf.krbdom.value='';
+   }
+}
+
+function clickkrb(vf) {
+    vf.krbdom.value='$krbdefdom';
+    vf.intpwd.value='';
+}
+
+function clickint(vf) {
+    vf.krbdom.value='';
+}
+</script>
+<input type=hidden name=makeuser value=1>
+<h3>Personal Data</h3>
+First Name: <input type=text name=cfirst size=15><br>
+Middle Name: <input type=text name=cmiddle size=15><br>
+Last Name: <input type=text name=clast size=15><br>
+Generation: <input type=text name=cgen size=5><p>
+
+ID/Student Number: <input type=text name=cstid size=10><p>
+
+<h3>Login Data</h3>
+<input type=radio name=login value=krb onClick="clickkrb(this.form);">
+Kerberos authenticated with domain
+<input type=text size=10 name=krbdom onChange="setkrb(this.form);"><p>
+<input type=radio name=login value=int onClick="clickint(this.form);"> 
+Internally authenticated (with initial password 
+<input type=text size=10 name=intpwd onChange="setint(this.form);">)
+ENDNUSER
     } else {
-	$r->print('<h3>Existing user '.$ccuname.' at '.$ccdomain.'</h3>');
+	$r->print('<h2>Existing user '.$ccuname.' at '.$ccdomain.'</h2>');
+
         my $rolesdump=&Apache::lonnet::reply(
                                   "dump:$ccdomain:$ccuname:roles",$uhome);
         unless ($rolesdump eq 'con_lost') { 
@@ -125,10 +178,9 @@ ENDENHEAD
               my ($trole,$tend,$tstart)=split(/_/,$role);
               my $bgcol='ffffff';
               my $allows=0;
-              if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) {
+              if ($area=~/^\/(\w+)\/(\d\w+)/) {
                  my %coursedata=&Apache::lonnet::coursedescription($1.'_'.$2);
-                 $area='Course: '.
-                          $coursedata{'description'}.'<br>Section/Group: '.$3;
+                 my $carea='Course: '.$coursedata{'description'};
                  $inccourses{$1.'_'.$2}=1;
                  if (&Apache::lonnet::allowed('c'.$trole,$1.'_'.$2)) {
 		     $allows=1;
@@ -136,6 +188,10 @@ ENDENHEAD
                  $bgcol=$1.'_'.$2;
                  $bgcol=~s/[^8-9b-e]//g;
                  $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',0,6);
+                 if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) {
+                     $carea.='<br>Section/Group: '.$3;
+		 }
+                 $area=$carea;
 	      } else {
                  if ($1) {
 		     $incdomains{$1}=1;
@@ -168,8 +224,8 @@ ENDENHEAD
 	   $r->print('</table>');
          }   
     }
-    $r->print('<hr><h4>Add Roles</h4><h5>System Level</h5>');
-    $r->print('<h5>Domain Level</h5>');
+    $r->print('<hr><h3>Add Roles</h3><h4>System Level</h4>');
+    $r->print('<h4>Domain Level</h4>');
     map {
 	my $thisdomain=$_;
         map {
@@ -178,7 +234,7 @@ ENDENHEAD
             }
         } ('dc','cc','li','dg','au');
     } sort keys %incdomains;
-    $r->print('<h5>Course Level</h5>'.
+    $r->print('<h4>Course Level</h4>'.
     '<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>'.
     '<th>Group/Section</th><th>Start</th><th>End</th></tr>');
     map {
@@ -210,9 +266,84 @@ ENDROW
         } ('st','ta','ep','ad','in');
     } sort keys %inccourses;
     $r->print('</table>');
+    $r->print('<input type=submit value="Modify User">');
     $r->print('</form></body></html>');
 }
 
+# ================================================================= Phase Three
+
+sub phase_three {
+    my $r=shift;
+    $r->print(<<ENDTHREEHEAD);
+<html>
+<head>
+<title>The LearningOnline Network with CAPA</title>
+</head>
+<body bgcolor="#FFFFFF">
+<img align=right src=/adm/lonIcons/lonlogos.gif>
+<h1>Create User, Change User Privileges</h1>
+ENDTHREEHEAD
+   $r->print('<h2>'.$ENV{'form.cuname'}.' at '.$ENV{'form.cdomain'}.'</h2>');
+   if ($ENV{'form.makeuser'}) {
+    $r->print('<h3>Creating User</h3>');
+    if (($ENV{'form.cuname'})&&($ENV{'form.cuname'}!~/\W/)&&
+        ($ENV{'form.cdomain'})&&($ENV{'form.cdomain'}!~/\W/)) {
+	my $amode='';
+        my $genpwd='';
+        if ($ENV{'form.login'} eq 'krb') {
+           $amode='krb4';
+           $genpwd=$ENV{'form.krbdom'};
+        } elsif ($ENV{'form.login'} eq 'int') {
+           $amode='internal';
+           $genpwd=$ENV{'form.intpwd'};
+        }
+        if (($amode) && ($genpwd)) {
+          $r->print('Generating user: '.&Apache::lonnet::modifyuser(
+                      $ENV{'form.cdomain'},$ENV{'form.cuname'},
+                      $ENV{'form.cstid'},$amode,$genpwd,
+ 	              $ENV{'form.cfirst'},$ENV{'form.cmiddle'},
+                      $ENV{'form.clast'},$ENV{'form.cgen'}));
+          $r->print('<br>Home server: '.&Apache::lonnet::homeserver
+                      ($ENV{'form.cuname'},$ENV{'form.cdomain'}));
+
+	} else {
+           $r->print('Invalid login mode or password');    
+        }          
+    } else {
+        $r->print('Invalid username or domain');
+    }
+   }
+    my $now=time;
+    $r->print('<h3>Modifying Roles</h3>');
+    map {
+	if (($_=~/^form\.rev\:([^\_]+)\_([^\_]+)$/) && ($ENV{$_})) {
+           $r->print('Revoking '.$2.' in '.$1.': '.
+          &Apache::lonnet::assignrole($ENV{'form.cdomain'},$ENV{'form.cuname'},
+                                      $1,$2,$now).'<br>');
+	}
+    } keys %ENV;
+    map {
+	if (($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_([^\_]+)$/) && ($ENV{$_})) {
+            my $url='/'.$1.'/'.$2;
+            if ($ENV{'form.sec_'.$1.'_'.$2.'_'.$3}) {
+		$url.='/'.$ENV{'form.sec_'.$1.'_'.$2.'_'.$3};
+            }
+            my $start=$now;
+            if ($ENV{'form.start_'.$1.'_'.$2.'_'.$3}) {
+		$start=$ENV{'form.start_'.$1.'_'.$2.'_'.$3};
+            }
+            my $end=0;
+            if ($ENV{'form.end_'.$1.'_'.$2.'_'.$3}) {
+		$end=$ENV{'form.end_'.$1.'_'.$2.'_'.$3};
+            }
+            $r->print('Assigning: '.$3.' in '.$url.': '.
+          &Apache::lonnet::assignrole($ENV{'form.cdomain'},$ENV{'form.cuname'},
+                                      $url,$3,$end,$start).'<br>');
+	}
+    } keys %ENV;
+    $r->print('</body></html>');
+}
+
 # ================================================================ Main Handler
 sub handler {
     my $r = shift;
@@ -235,6 +366,8 @@ sub handler {
        }
        if ($ENV{'form.phase'} eq 'two') {
            &phase_two($r);
+       } elsif ($ENV{'form.phase'} eq 'three') {
+           &phase_three($r);
        }
    } else {
       $ENV{'user.error.msg'}=