--- loncom/interface/Attic/londropadd.pm	2002/04/30 15:24:16	1.35
+++ loncom/interface/Attic/londropadd.pm	2002/05/03 16:30:48	1.38
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.35 2002/04/30 15:24:16 matthew Exp $
+# $Id: londropadd.pm,v 1.38 2002/05/03 16:30:48 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -106,8 +106,8 @@ sub modifystudent {
     }
     if ($result eq '') {
         $result eq 'Unable to find section for this student';
-    } elsif ($result =~ /^(ok:)+$/) {
-        $result eq 'ok';
+    } else {
+        $result =~ s/(ok:)+/ok/g;
     }
     return $result;
 }
@@ -175,7 +175,8 @@ sub phase_two_header {
 Total number of records found in file: $distotal <hr />
 Enter as many fields as you can. The system will inform you and bring you back
 to this page if the data selected is insufficient to run your class.<hr />
-<input type="submit" name="associate"  value="Reverse Association" />
+<input type="button" value="Reverse Association" onClick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
+<input type="hidden" name="associate"  value="" />
 <input type="hidden" name="phase"      value="three" />
 <input type="hidden" name="datatoken"  value="$datatoken" />
 <input type="hidden" name="fileupload" value="$ENV{'form.fileupload'}" />
@@ -457,7 +458,7 @@ LON-CAPA domain: $domform <p>
 <input type=checkbox name=forceid value=yes> 
 Disable ID/Student Number Safeguard and Force Change of Conflicting IDs
 (only do if you know what you are doing)<p>
-<input type="button" onClick="verify(this.form)" value="Update Courselist"><br>
+<input type="button" onClick="javascript:verify(this.form)" value="Update Courselist" /><br />
 Note: for large courses, this operation might be time consuming.
 ENDPICK
 }
@@ -686,6 +687,7 @@ sub get_current_classlist {
         }
         return (undef,%currentlist);
     } else {
+        $tmp =~ s/^error://;
         return ($tmp,undef);
     }
 }
@@ -694,12 +696,11 @@ sub get_current_classlist {
 sub menu_phase_two_drop {
     my $r=shift;
     my $cid=$ENV{'request.course.id'};
-    my ($error,%currentlist)=&get_current_classlist($ENV{'course.'.$cid.'.domain'},
-                                           $ENV{'course.'.$cid.'.num'});
+    my ($error,%currentlist)=&get_current_classlist
+        ($ENV{'course.'.$cid.'.domain'},$ENV{'course.'.$cid.'.num'});
     if (defined($error)) {
-        $r->print('<pre>ERROR:$error</pre>');
-    }
-    if (!defined(%currentlist)) { 
+        $r->print("<pre>ERROR:$error</pre>");
+    } elsif (!defined(%currentlist)) { 
         $r->print("There are no students currently enrolled.\n");
     } else {
         # Print out the available choices
@@ -955,7 +956,7 @@ sub drop_student_list {
     foreach (@droplist) {
         my ($uname,$udom)=split(/\:/,$_);
         my $result = &modifystudent($udom,$uname,$ENV{'request.course.id'});
-        if ($result eq 'ok') {
+        if ($result eq 'ok' || $result eq 'ok:') {
             $r->print('Dropped '.$uname.' at '.$udom.'<br>');
         } else {
             $r->print('Error dropping '.$uname.' at '.$udom.': '.$result.