--- loncom/interface/loncreateuser.pm	2002/04/18 20:16:43	1.30
+++ loncom/interface/loncreateuser.pm	2002/04/22 15:26:46	1.31
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.30 2002/04/18 20:16:43 matthew Exp $
+# $Id: loncreateuser.pm,v 1.31 2002/04/22 15:26:46 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.30 2002/04/18 20:16:43 matthew Exp $
+# $Id: loncreateuser.pm,v 1.31 2002/04/22 15:26:46 matthew Exp $
 ###
 
 package Apache::loncreateuser;
@@ -68,116 +68,16 @@ BEGIN {
     $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
     my $krbdefdom=$1;
     $krbdefdom=~tr/a-z/A-Z/;
-    $authformnop=(<<END);
-<p>
-<input type="radio" name="login" value="nochange" checked="checked"
-       onclick="changed_radio('nochange',document.cu);">
-Do not change login data
-</p>
-END
-    $authformkrb=(<<END);
-<p>
-<input type="radio" name="login" value="krb" 
-       onclick="changed_radio('krb',document.cu);">
-Kerberos authenticated with domain
-<input type="text" size="10" name="krbarg" 
-       onclick="changed_text('krb',document.cu);"
-       onchange="changed_text('krb',document.cu);">
-</p>
-END
-    $authformint=(<<END);
-<p>
-<input type="radio" name="login" value="int" 
-       onclick="changed_radio('int',document.cu);"> 
-Internally authenticated (with initial password 
-<input type="text" size="10" name="intarg" 
-       onclick="changed_text('int',document.cu);"
-       onchange="changed_text('int',document.cu);">
-</p>
-END
-    $authformfsys=(<<END);
-<p>
-<input type="radio" name="login" value="fsys" 
-       onclick="changed_radio('fsys',document.cu);"> 
-Filesystem authenticated (with initial password 
-<input type="text" size="10" name="fsysarg"
-       onclick="changed_text('fsys',document.cu);"
-       onchange="changed_text('fsys',document.cu);">
-</p>
-END
-    $authformloc=(<<END);
-<p>
-<input type="radio" name="login" value="loc"
-       onclick="changed_radio('loc',document.cu);"> 
-Local Authentication with argument
-<input type="text" size="10" name="locarg" 
-       onclick="changed_text('loc',document.cu);"
-       onchange="changed_text('loc',document.cu);">
-</p>
-END
-    $loginscript=(<<ENDLOGINSCRIPT);
-<script>
-
-var authvalues = new Object();
-authvalues.names = new Array('krbarg','intarg','fsysarg','locarg');
-authvalues.defaults = new Array('MSU.EDU','','','');
-
-function changed_radio(choice,currentform) {
-    var choicearg = choice + 'arg';
-    if (currentform.elements[choicearg].value == '') {
-        clear(currentform,authvalues.names);
-        for (var i=0; i<authvalues.names.length; i++) {
-            if (authvalues.names[i] == choicearg) {
-                currentform.elements[choicearg].value = authvalues.defaults[i];
-            }
-        }
-    }
-}
-
-function changed_text(choice,currentform) {
-    var choicearg = choice + 'arg';
-    if (currentform.elements[choicearg].value !='') {
-        // clear the other values
-        var keep = currentform.elements[choicearg].value;
-        clear(currentform,authvalues.names);
-        currentform.elements[choicearg].value = keep;
-        // validate our value
-        if (choice == 'krb') {
-            currentform.elements[choicearg].value = keep.toUpperCase();
-        }
-        // check the appropriate checkbox
-        set_checked('login',choice,currentform);
-    } 
-}
-
-function clear(currentform,names) {
-    for (var i=0; i< currentform.elements.length; i++) {
-        for (var j = 0; j< names.length; j++) {
-            if (currentform.elements[i].name == names[j]) {
-                currentform.elements[i].value = '';
-            }
-        }
-    }
-}
-
-function set_checked(name,choice,currentform) {
-    for (var i=0; i< currentform.elements.length; i++) {
-        if (currentform.elements[i].name == name) {
-            if (currentform.elements[i].value == choice) {
-                currentform.elements[i].checked =true;
-            }
-        }
-    }
-}
-
-</script>
-ENDLOGINSCRIPT
-    $generalrule=<<END;
-<p>
-<i>As a general rule, only authors or co-authors should be filesystem
-authenticated (which allows access to the server filesystem).</i>
-</p>
-END
+    my %param = ( formname => 'document.cu',
+                  kerb_def_dom => $krbdefdom 
+                  );
+    $loginscript  = &Apache::loncommon::authform_header(%param);
+    $generalrule  = &Apache::loncommon::authform_authorwarning(%param);
+    $authformnop  = &Apache::loncommon::authform_nochange(%param);
+    $authformkrb  = &Apache::loncommon::authform_kerberos(%param);
+    $authformint  = &Apache::loncommon::authform_internal(%param);
+    $authformfsys = &Apache::loncommon::authform_filesystem(%param);
+    $authformloc  = &Apache::loncommon::authform_local(%param);
 }
 
 # =================================================================== Phase one
@@ -212,6 +112,10 @@ sub phase_two {
     $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
     my $krbdefdom=$1;
     $krbdefdom=~tr/a-z/A-Z/;
+    my %param = ( formname => 'document.cu',
+                  kerb_def_dom => $krbdefdom 
+                  );
+    $loginscript  = &Apache::loncommon::authform_header(%param);
 
     my $defdom=$ENV{'user.domain'};
 
@@ -221,7 +125,7 @@ sub phase_two {
 <html>
 <head>
 <title>The LearningOnline Network with CAPA</title>
-<script>
+<script type="text/javascript" language="Javascript">
 
     function pclose() {
         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
@@ -283,7 +187,9 @@ $dochead
 <h1>Create New User</h1>
 $forminfo
 <h2>New user "$ccuname" in domain $ccdomain</h2>
+<script type="text/javascript" language="Javascript">
 $loginscript
+</script>
 <input type='hidden' name='makeuser' value='1' />
 <h3>Personal Data</h3>
 <p>
@@ -301,11 +207,11 @@ ID/Student Number <input type='text' nam
 Home Server: <select name="hserver" size="1"> $home_server_list </select>
 <hr />
 <h3>Login Data</h3>
-$generalrule
-$authformkrb
-$authformint
-$authformfsys
-$authformloc
+<p>$generalrule </p>
+<p>$authformkrb </p>
+<p>$authformint </p>
+<p>$authformfsys</p>
+<p>$authformloc </p>
 ENDNEWUSER
     } else { # user already exists
 	$r->print(<<ENDCHANGEUSER);
@@ -410,7 +316,10 @@ END
 	if ($currentauth=~/^krb4:/) {
 	    $currentauth=~/^krb4:(.*)/;
 	    my $krbdefdom2=$1;
-	    $loginscript=~s/vf\.krbdom\.value='.*?';/vf.krbdom.value='$krbdefdom2';/;
+            my %param = ( formname => 'document.cu',
+                          kerb_def_dom => $krbdefdom 
+                          );
+            $loginscript  = &Apache::loncommon::authform_header(%param);
 	}
 	# Check for a bad authentication type
         unless ($currentauth=~/^krb4:/ or
@@ -421,23 +330,27 @@ END
 	    if (&Apache::lonnet::allowed('mau',$ENV{'user.domain'})) {
 		$r->print(<<ENDBADAUTH);
 <hr />
+<script type="text/javascript" language="Javascript">
 $loginscript
+</script>
 <font color='#ff0000'>ERROR:</font>
 This user has an unrecognized authentication scheme ($currentauth).
 Please specify login data below.
 <h3>Login Data</h3>
-$generalrule
-$authformkrb
-$authformint
-$authformfsys
-$authformloc
+<p>$generalrule</p>
+<p>$authformkrb</p>
+<p>$authformint</p>
+<p>$authformfsys</p>
+<p>$authformloc</p>
 ENDBADAUTH
             } else { 
                 # This user is not allowed to modify the users 
                 # authentication scheme, so just notify them of the problem
 		$r->print(<<ENDBADAUTH);
 <hr />
+<script type="text/javascript" language="Javascript">
 $loginscript
+</script>
 <font color="#ff0000"> ERROR: </font>
 This user has an unrecognized authentication scheme ($currentauth).
 Please alert a domain coordinator of this situation.
@@ -449,40 +362,23 @@ ENDBADAUTH
 	    my $authform_other='';
 	    if ($currentauth=~/^krb4:/) {
 		$authformcurrent=$authformkrb;
-		$authform_other=$authformint.$authformfsys.$authformloc;
-		# embarrassing script hack here
-		$loginscript=~s/login\[3\]/login\[4\]/; # loc
-		$loginscript=~s/login\[2\]/login\[3\]/; # fsys
-		$loginscript=~s/login\[1\]/login\[2\]/; # int
-		$loginscript=~s/login\[0\]/login\[1\]/; # krb4
+		$authform_other="<p>$authformint</p>\n".
+                    "<p>$authformfsys</p><p>$authformloc</p>";
 	    }
 	    elsif ($currentauth=~/^internal:/) {
 		$authformcurrent=$authformint;
-		$authform_other=$authformkrb.$authformfsys.$authformloc;
-		# embarrassing script hack here
-		$loginscript=~s/login\[3\]/login\[4\]/; # loc
-		$loginscript=~s/login\[2\]/login\[3\]/; # fsys
-		$loginscript=~s/login\[1\]/login\[1\]/; # int
-		$loginscript=~s/login\[0\]/login\[2\]/; # krb4
+		$authform_other="<p>$authformkrb</p>".
+                    "<p>$authformfsys</p><p>$authformloc</p>";
 	    }
 	    elsif ($currentauth=~/^unix:/) {
 		$authformcurrent=$authformfsys;
-		$authform_other=$authformkrb.$authformint.$authformloc;
-		# embarrassing script hack here
-		$loginscript=~s/login\[3\]/login\[4\]/; # loc
-		$loginscript=~s/login\[1\]/login\[3\]/; # int
-		$loginscript=~s/login\[2\]/login\[1\]/; # fsys
-		$loginscript=~s/login\[0\]/login\[2\]/; # krb4
+		$authform_other="<p>$authformkrb</p>".
+                    "<p>$authformint</p><p>$authformloc;</p>";
 	    }
 	    elsif ($currentauth=~/^localauth:/) {
 		$authformcurrent=$authformloc;
-		$authform_other=$authformkrb.$authformint.$authformfsys;
-		# embarrassing script hack here
-		$loginscript=~s/login\[3\]/login\[loc\]/; # loc
-		$loginscript=~s/login\[2\]/login\[4\]/; # fsys
-		$loginscript=~s/login\[1\]/login\[3\]/; # int
-		$loginscript=~s/login\[0\]/login\[2\]/; # krb4
-		$loginscript=~s/login\[loc\]/login\[1\]/; # loc
+		$authform_other="<p>$authformkrb</p>".
+                    "<p>$authformint</p><p>$authformfsys</p>";
 	    }
 	    $authformcurrent=<<ENDCURRENTAUTH;
 <table border='1'>
@@ -498,11 +394,13 @@ ENDCURRENTAUTH
 		# Current user has login modification privileges
 		$r->print(<<ENDOTHERAUTHS);
 <hr />
+<script type="text/javascript" language="Javascript">
 $loginscript
+</script>
 <h3>Change Current Login Data</h3>
-$generalrule
-$authformnop
-$authformcurrent
+<p>$generalrule</p>
+<p>$authformnop</p>
+<p>$authformcurrent</p>
 <h3>Enter New Login Data</h3>
 $authform_other
 ENDOTHERAUTHS
@@ -685,7 +583,7 @@ ENDMODIFYUSERHEAD
 	# Only allow authentification modification if the person has authority
 	if (&Apache::lonnet::allowed('mau',$ENV{'user.domain'})) {
 	    $r->print('Modifying authentication: '.
-		  &Apache::lonnet::modifyuserauth(
+                      &Apache::lonnet::modifyuserauth(
 		       $ENV{'form.ccdomain'},$ENV{'form.ccuname'},
                        $amode,$genpwd));
             $r->print('<br>Home server: '.&Apache::lonnet::homeserver