--- loncom/interface/Attic/londropadd.pm 2003/07/15 19:23:14 1.75 +++ 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.75 2003/07/15 19:23:14 matthew Exp $ +# $Id: londropadd.pm,v 1.81 2003/08/14 14:16:42 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -154,7 +154,7 @@ sub print_main_menu {
- View Classlist + View Class List
@@ -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,6 +559,8 @@ sub print_upload_manager_form {
# ======================================================= Enroll single student
sub enroll_single_student {
my $r=shift;
+ # 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
@@ -620,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'}.'. 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'}.'.
-Current Classlist
+Current Class List
END
if ($ENV{'form.action'} ne 'modifystudent') {
@@ -1028,7 +1040,7 @@ END
$excel_workbook->set_tempdir('/home/httpd/perl/tmp');
$excel_sheet = $excel_workbook->addworksheet('classlist');
#
- my $description = 'Classlist for '.
+ my $description = 'Class List for '.
$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
$excel_sheet->write($row++,0,$description);
#
@@ -1195,6 +1207,9 @@ END
sub modify_single_student {
my $r = shift;
#
+ # 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();
if ($ENV{'form.makedatesdefault'}) {
@@ -1519,6 +1534,7 @@ $upfile_select
+ Ignore First Line
$create_csv_help
@@ -1580,6 +1596,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.