--- loncom/interface/Attic/londropadd.pm	2002/05/06 17:48:57	1.41
+++ 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.41 2002/05/06 17:48:57 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
 #
@@ -129,7 +129,7 @@ sub domain_form {
         $select_menus{$dom}->{'default'}= 'default';
         $select_menus{$dom}->{'select2'}->{'default'} = 'default';
         # Now build up the other items in the second menu
-        my %servers = &Apache::loncommon::get_home_servers($dom);
+        my %servers = &Apache::loncommon::get_library_servers($dom);
         foreach my $server (keys(%servers)) {
             $select_menus{$dom}->{'select2'}->{$server} 
                                             = "$server $servers{$server}";
@@ -145,12 +145,22 @@ sub domain_form {
 sub menu_phase_one {
     my $r=shift;
     my $upfile_select=&Apache::loncommon::upfile_select_html();
+    my $create_classlist_help = 
+	&Apache::loncommon::help_open_topic("Course_Create_Class_List",
+           "How do I create a class list from a spreadsheet");
+    my $create_csv_help =
+	&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
+           "How do I create a CSV file from a spreadsheet");
     $r->print(<<ENDUPFORM);
 <input type=hidden name=phase value=two>
 <hr>
 <h3>Upload a courselist</h3>
 $upfile_select
 <p><input type=submit name="fileupload" value="Upload Courselist">
+<br />
+$create_classlist_help <br />
+$create_csv_help
+
 <hr />
 <h3>Enroll a single student</h3>
 <p><input type=submit name="enroll" value="Enroll Student"></p>
@@ -317,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) &&
@@ -338,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) {
@@ -345,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);
@@ -526,7 +555,7 @@ sub enroll_single_student {
         if (lc($desiredhost) eq 'default') {
             $desiredhost = undef;
         } else {
-            my %home_servers = &Apache::loncommon::get_home_servers($domain);
+            my %home_servers =&Apache::loncommon::get_library_servers($domain);
             if (! exists($home_servers{$desiredhost})) {
                 $r->print('<font color="#ff0000">Error:</font>'.
                           'Invalid home server specified');
@@ -538,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';
@@ -763,6 +793,7 @@ sub menu_phase_two_viewcsv {
 sub show_class_list {
     my ($r,$mode,%currentlist)=@_;
     my $cid=$ENV{'request.course.id'};
+    # Print out header 
     if ($mode eq 'view') {
         $r->print(<<END);
 <p>
@@ -803,14 +834,16 @@ END
 </tr>
 END
             } elsif ($mode eq 'csv') {
-                $r->print($sname.','.
-                          $sdom.','.
-                          $reply{$sname}.','.
-                          $info{'lastname'}.','.
-                          $info{'firstname'}.','.
-                          $info{'middlename'}.','.
-                          $info{'generation'}.','.
-                          $ssec."\n");
+                my @line = ();
+                foreach ($sname,$sdom,$reply{$sname},
+                         $info{'lastname'},$info{'firstname'},
+                         $info{'middlename'},$info{'generation'},$ssec) {
+                    push @line,&Apache::loncommon::csv_translate($_);
+                }
+                my $tmp = $";
+                $" = '","';
+                $r->print("\"@line\"\n");
+                $" = $tmp;
             }
         }
     }
@@ -906,7 +939,7 @@ sub upfile_drop_add {
     if (lc($desiredhost) eq 'default') {
         $desiredhost = undef;
     } else {
-        my %home_servers = &Apache::loncommon::get_home_servers($domain);
+        my %home_servers = &Apache::loncommon::get_library_servers($domain);
         if (! exists($home_servers{$desiredhost})) {
             $r->print('<font color="#ff0000">Error:</font>'.
                       'Invalid home server specified');
@@ -917,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';