--- loncom/interface/Attic/londropadd.pm	2002/04/17 13:55:35	1.27
+++ loncom/interface/Attic/londropadd.pm	2002/04/23 21:03:59	1.29
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.27 2002/04/17 13:55:35 matthew Exp $
+# $Id: londropadd.pm,v 1.29 2002/04/23 21:03:59 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -146,7 +146,7 @@ to this page if the data selected is ins
 <input type="hidden" name="upfile_associate" 
                                        value="$ENV{'form.upfile_associate'}" />
 <hr />
-<script>
+<script type="text/javascript" language="Javascript">
 $javascript
 $javascript_validations
 </script>
@@ -155,36 +155,45 @@ ENDPICK
 
 sub javascript_validations {
     my ($krbdefdom)=@_;
+    my %param = ( formname => 'studentform',
+                  kerb_def_dom => $krbdefdom );
+    my $authheader = &Apache::loncommon::authform_header(%param);
     return (<<ENDPICK);
 function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec) {
     var foundatype=0;
     var message='';
     if (founduname==0) {
-	alert('You need to specify at least the username field');
+	alert('You need to specify the username field');
         return;
     }
-    if (vf.login[0].checked) {
-	foundatype=1;
-        if (vf.krbdom.value=='') {
-	    alert('You need to specify the Kerberos domain');
-            return;
-        }
+    if (current.radiovalue == null || current.radiovalue == 'nochange') {
+        // They did not check any of the login radiobuttons.
+        alert('You must choose an authentication type');
+        return;
     }
-    if (vf.login[1].checked) {
-	foundatype=1;
-        if ((vf.intpwd.value=='') && (foundpwd==0)) {
-	    alert('You need to specify the initial password');
+    foundatype=1;
+    if (current.argfield == null || current.argfield == '') {
+        var alertmsg = '';
+        switch (current.value) {
+            case 'krb': 
+                alertmsg = 'You need to specify the Kerberos domain';
+                break;
+            case 'loc':
+            case 'fsys':
+                alertmsg = 'You need to specify the initial password';
+                break;
+            case 'fsys':
+                alertmsg = '';
+                break;
+            default: 
+                alertmsg = '';
+        }
+        if (alertmsg != '') {
+            alert(alertmsg);
             return;
         }
     }
-    if (vf.login[2].checked) {
-	foundatype=1;
-	//An argument is not required
-    }
-    if (foundatype==0) {
-	alert('You need to set the login type');
-        return;
-    }
+
     if (foundname==0) { message='No name fields specified. '; }
     if (foundid==0) { message+='No ID or student number field specified. '; }
     if (foundsec==0) { message+='No section or group field specified. '; }
@@ -212,49 +221,6 @@ function verify_message (vf,founduname,f
     }
 }
 
-function setkrb(vf) {
-    if (vf.krbdom.value!='') {
-       clearpwd(vf);
-       vf.login[0].checked=true;
-       vf.krbdom.value=vf.krbdom.value.toUpperCase();
-       vf.intpwd.value='';
-       vf.locarg.value='';
-   }
-}
-
-function setint(vf) {
-    if (vf.intpwd.value!='') {
-       clearpwd(vf);
-       vf.login[1].checked=true;
-       vf.krbdom.value='';
-       vf.locarg.value='';
-   }
-}
-
-function setloc(vf) {
-    if (vf.locarg.value!='') {
-       vf.login[2].checked=true;
-       vf.krbdom.value='';
-       vf.intpwd.value='';
-   }
-}
-
-function clickkrb(vf) {
-    vf.krbdom.value='$krbdefdom';
-    clearpwd(vf);
-    vf.intpwd.value='';
-    vf.locarg.value='';
-}
-
-function clickint(vf) {
-    vf.krbdom.value='';
-    vf.locarg.value='';
-}
-
-function clickloc(vf) {
-    vf.krbdom.value='';
-    vf.intpwd.value='';
-}
 
     function pclose() {
         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
@@ -283,7 +249,9 @@ function clickloc(vf) {
         pclose();
     }
 
+$authheader
 ENDPICK
+
 }
 
 sub phase_two_javascript_forward_associate {
@@ -335,9 +303,10 @@ function flip(vf,tf) {
       }
    }
    if (nw==9) {
-       vf.login[1].checked=true;
-       vf.intpwd.value='';
-       vf.krbdom.value='';
+       changed_radio('int',document.studentform);
+       set_auth_radio_buttons('int',document.studentform);
+       vf.intarg.value='';
+       vf.krbarg.value='';
        vf.locarg.value='';
    }
 }
@@ -390,9 +359,10 @@ function flip(vf,tf) {
    }
    // intial password specified, pick internal authentication
    if (tf==8 && nw!=0) {
-       vf.login[1].checked=true;
-       vf.intpwd.value='';
-       vf.krbdom.value='';
+       changed_radio('int',document.studentform);
+       set_auth_radio_buttons('int',document.studentform);
+       vf.krbarg.value='';
+       vf.intarg.value='';
        vf.locarg.value='';
    }
 }
@@ -408,6 +378,12 @@ ENDPICK
 
 sub phase_two_end {
     my ($r,$i,$keyfields,$defdom,$today,$halfyear)=@_;
+    my %param = ( formname => 'document.studentform');
+    my $krbform = &Apache::loncommon::authform_kerberos(%param);
+    my $intform = &Apache::loncommon::authform_internal(%param);
+    my $locform = &Apache::loncommon::authform_local(%param);
+    # Set up domain selection form
+    my $domform = &Apache::loncommon::select_dom_form($defdom,'lcdomain');    
     $r->print(<<ENDPICK);
 </table>
 <input type=hidden name=nfields value=$i>
@@ -415,22 +391,16 @@ sub phase_two_end {
 <h3>Login Type</h3>
 <p>Note: this will not take effect if the user already exists</p>
 <p>
-<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);" />
+$krbform
 </p>
 <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);" />)
+$intform
 </p>
 <p>
-<input type="radio" name="login" value="loc" onClick="clickloc(this.form);" />
-Local Authentication with argument
-<input type="text" size="10" name="locarg" onChange="setloc(this.form);" />
+$locform
 </p>
 <h3>LON-CAPA Domain for Students</h3>
-LON-CAPA domain: <input type=text size=10 value=$defdom name=lcdomain><p>
+LON-CAPA domain: $domform <p>
 <h3>Starting and Ending Dates</h3>
 <input type="hidden" value=''          name="pres_value"  >
 <input type="hidden" value=''          name="pres_type"   >
@@ -504,16 +474,17 @@ sub menu_phase_two_upload {
 sub enroll_single_student {
     my $r=shift;
     $r->print('<h3>Enrolling Student</h3>');
+    $r->print($ENV{'form.cuname'}." in domain ".$ENV{'form.cdomain'}.": ");
     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'};
+           $genpwd=$ENV{'form.krbarg'};
         } elsif ($ENV{'form.login'} eq 'int') {
            $amode='internal';
-           $genpwd=$ENV{'form.intpwd'};
+           $genpwd=$ENV{'form.intarg'};
         }  elsif ($ENV{'form.login'} eq 'loc') {
 	    $amode='localauth';
 	    $genpwd=$ENV{'form.locarg'};
@@ -546,8 +517,16 @@ sub menu_phase_two_enroll {
     my $halfyear = $today+15552000;
     my $defdom=$r->dir_config('lonDefDomain');
     my $javascript_validations=&javascript_validations($krbdefdom);
+    # Set up authentication forms
+    my %param = ( formname => 'document.studentform');
+    my $krbform = &Apache::loncommon::authform_kerberos(%param);
+    my $intform = &Apache::loncommon::authform_internal(%param);
+    my $locform = &Apache::loncommon::authform_local(%param);
+    # Set up domain selection form
+    my $domform = &Apache::loncommon::select_dom_form($defdom,'cdomain');    
+    # Print it all out
     $r->print(<<ENDSENROLL);
-<script>
+<script type="text/javascript" language="Javascript">
 function verify(vf) {
     var founduname=0;
     var foundpwd=0;
@@ -595,20 +574,14 @@ Generation:  <input type="text" name="cg
 
 <h3>Login Data</h3>
 <p>Username: <input type="text" name="cuname"  size="15"></p>
-<p>Domain:   <input type="text" name="cdomain" size="10" value="$defdom"></p>
+<p>Domain:   $domform</p>
 <p>Note: login settings below  will not take effect if the user already exists
 </p><p>
-<input type="radio" name="login" value="krb" onClick="clickkrb(this.form);">
-Kerberos authenticated with domain 
-<input type="text" name="krbdom" size="10"  onChange="setkrb(this.form);">
+$krbform
 </p><p>
-<input type="radio" name="login"  value="int" onClick="clickint(this.form);"> 
-Internally authenticated (with initial password 
-<input type="text"  name="intpwd" size="10" onChange="setint(this.form);">)
+$intform
 </p><p>
-<input type="radio" name="login" value="loc" onClick="clickloc(this.form);" />
-Local Authentication with argument
-<input type="text" name="locarg" size="10"  onChange="setloc(this.form);" />
+$locform
 </p><p>
 <h3>Starting and Ending Dates</h3>
 <input type="hidden" value='' name="pres_value">
@@ -747,11 +720,11 @@ sub upfile_drop_add {
     my $genpwd = '';
     if ($ENV{'form.login'} eq 'krb') {
         $amode='krb4';
-        $genpwd=$ENV{'form.krbdom'};
+        $genpwd=$ENV{'form.krbarg'};
     } elsif ($ENV{'form.login'} eq 'int') {
         $amode='internal';
-        if ((defined($ENV{'form.intpwd'})) && ($ENV{'form.intpwd'})) {
-            $genpwd=$ENV{'form.intpwd'};
+        if ((defined($ENV{'form.intarg'})) && ($ENV{'form.intarg'})) {
+            $genpwd=$ENV{'form.intarg'};
         }
     } elsif ($ENV{'form.login'} eq 'loc') {
         $amode='localauth';