--- loncom/interface/Attic/londropadd.pm	2002/08/08 19:27:35	1.45
+++ loncom/interface/Attic/londropadd.pm	2002/09/13 18:59:53	1.45.6.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.45 2002/08/08 19:27:35 matthew Exp $
+# $Id: londropadd.pm,v 1.45.6.2 2002/09/13 18:59:53 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -327,19 +327,34 @@ function verify(vf) {
     verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec);
 }
 
+//
+// vf = this.form
+// tf = column number
+//
+// values of nw
+//
+// 0 = none
+// 1 = username
+// 2 = names (lastname, firstnames)
+// 3 = fname (firstname)
+// 4 = mname (middlename)
+// 5 = lname (lastname)
+// 6 = gen   (generation)
+// 7 = id
+// 8 = section
+// 9 = ipwd  (password)
+//
 function flip(vf,tf) {
    var nw=eval('vf.f'+tf+'.selectedIndex');
    var i;
+   // make sure no other columns are labeled the same as this one
    for (i=0;i<=vf.nfields.value;i++) {
       if ((i!=tf) && (eval('vf.f'+i+'.selectedIndex')==nw)) {
           eval('vf.f'+i+'.selectedIndex=0;')
       }
    }
-   if (tf==1 && nw!=0) {
-      for (i=2;i<=5;i++) {
-         eval('vf.f'+i+'.selectedIndex=0;')
-      }
-   }
+   // If we set this to 'lastname, firstnames', clear out all the ones
+   // set to 'fname','mname','lname','gen' (3,4,5,6) currently.
    if (nw==2) {
       for (i=0;i<=vf.nfields.value;i++) {
          if ((eval('vf.f'+i+'.selectedIndex')>=3) &&
@@ -348,6 +363,8 @@ function flip(vf,tf) {
          }
       }
    }
+   // If we set this to one of 'fname','mname','lname','gen' (3,4,5,6),
+   // clear out any that are set to 'lastname, firstnames' (2)
    if ((nw>=3) && (nw<=6)) {
       for (i=0;i<=vf.nfields.value;i++) {
          if (eval('vf.f'+i+'.selectedIndex')==2) {
@@ -355,6 +372,8 @@ function flip(vf,tf) {
          }
       }
    }
+   // If we set the password, make the password form below correspond to 
+   // the new value.
    if (nw==9) {
        changed_radio('int',document.studentform);
        set_auth_radio_buttons('int',document.studentform);
@@ -548,7 +567,8 @@ sub enroll_single_student {
 	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';
@@ -930,7 +950,8 @@ sub upfile_drop_add {
     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';