--- loncom/interface/Attic/londropadd.pm 2003/07/21 17:54:43 1.76 +++ loncom/interface/Attic/londropadd.pm 2003/07/28 17:10:12 1.79 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to drop and add students in courses # -# $Id: londropadd.pm,v 1.76 2003/07/21 17:54:43 albertel Exp $ +# $Id: londropadd.pm,v 1.79 2003/07/28 17:10:12 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -553,6 +553,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; # # 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 @@ -620,10 +622,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'); } @@ -1195,6 +1201,9 @@ END sub modify_single_student { my $r = shift; # + # Remove whitespace from the section + $ENV{'form.section'} =~ s/(\s|:)//g; + # # Do the date defaults first my ($starttime,$endtime) = &get_dates_from_form(); if ($ENV{'form.makedatesdefault'}) { @@ -1580,6 +1589,14 @@ sub upfile_drop_add { $genpwd=$ENV{'form.locarg'}; } } + if ($amode =~ /^krb/) { + if (! defined($genpwd) || $genpwd eq '') { + $r->print(''. + 'Unable to enroll students:'.' '. + 'No Kerberos domain was specified.

'); + $amode = ''; # This causes the loop below to be skipped + } + } unless (($domain=~/\W/) || ($amode eq '')) { ####################################### ## Enroll Students ## @@ -1625,6 +1642,8 @@ sub upfile_drop_add { $sec=$entries{$fields{'sec'}}; } } + # remove whitespace from section + $sec =~ s/(\s|:)//g; # determine student id number my $id=''; if (defined($fields{'id'})) {