--- loncom/interface/Attic/londropadd.pm 2003/07/25 18:05:06 1.77 +++ loncom/interface/Attic/londropadd.pm 2003/08/14 14:16:42 1.81 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to drop and add students in courses # -# $Id: londropadd.pm,v 1.77 2003/07/25 18:05:06 matthew Exp $ +# $Id: londropadd.pm,v 1.81 2003/08/14 14:16:42 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -198,6 +198,7 @@ to this page if the data selected is ins + @@ -524,6 +525,7 @@ sub print_upload_manager_form { &print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom); my $i; my $keyfields; + my $dummy; if ($total>=0) { my @d=(['username','Username'], ['names','Last Name, First Names'], @@ -535,6 +537,10 @@ sub print_upload_manager_form { ['sec','Group/Section'], ['ipwd','Initial Password'], ['email','EMail Address']); + if($ENV{'form.noFirstLine'}){ + ($dummy,@records)=@records; + } + if ($ENV{'form.upfile_associate'} eq 'reverse') { &Apache::loncommon::csv_print_samples($r,\@records); $i=&Apache::loncommon::csv_print_select_table($r,\@records,\@d); @@ -553,8 +559,8 @@ sub print_upload_manager_form { # ======================================================= Enroll single student sub enroll_single_student { my $r=shift; - # Remove whitespace from section - $ENV{'form.csec'}=~s/\s//g; + # Remove non alphanumeric values from section + $ENV{'form.csec'}=~s/\W//g; # # We do the dates first because the action of making them the defaul # in the course is entirely seperate from the action of enrolling the @@ -622,10 +628,14 @@ sub enroll_single_student { $r->print("unable to enroll: ".$login_result); } } else { - $r->print('
ERROR '. - 'Invalid login mode or password. '. - 'Unable to enroll '.$ENV{'form.cuname'}.'.
'); - } + $r->print('ERROR '); + if ($amode =~ /^krb/) { + $r->print('Missing Kerberos domain information. '); + } else { + $r->print('Invalid login mode or password. '); + } + $r->print('Unable to enroll '.$ENV{'form.cuname'}.'.
'); + } } else { $r->print('Invalid username or domain'); } @@ -1197,8 +1207,8 @@ END sub modify_single_student { my $r = shift; # - # Remove whitespace from the section - $ENV{'form.section'} =~ s/\s//g; + # Remove non alphanumeric values from the section + $ENV{'form.section'} =~ s/\W//g; # # Do the date defaults first my ($starttime,$endtime) = &get_dates_from_form(); @@ -1524,6 +1534,7 @@ $upfile_select + Ignore First Line