--- loncom/interface/Attic/londropadd.pm 2003/07/25 18:05:06 1.77
+++ loncom/interface/Attic/londropadd.pm 2003/11/05 20:55:59 1.87
@@ -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.87 2003/11/05 20:55:59 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -32,7 +32,7 @@
# (TeX Content Handler
#
###############################################################
-###############################################################
+##############################################################
package Apache::londropadd;
@@ -42,6 +42,7 @@ use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::Constants qw(:common :http REDIRECT);
use Spreadsheet::WriteExcel;
+use Apache::lonlocal;
###############################################################
###############################################################
@@ -79,7 +80,7 @@ sub modifystudent {
# We are in this course
my $section=$1;
$section='' if ($course eq $courseid.'_st');
- if ($section eq $csec) {
+ if (defined($csec) && $section eq $csec) {
$result .= 'ok:';
} elsif ( ((!$section) && (!$csec)) || ($section ne $csec) ) {
my (undef,$end,$start)=split(/\_/,$roles{$course});
@@ -185,6 +186,7 @@ sub print_upload_manager_header {
$javascript=&upload_manager_javascript_forward_associate();
}
my $javascript_validations=&javascript_validations($krbdefdom);
+ my $checked=(($ENV{'form.noFirstLine'})?' checked="1"':'');
$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'}.'. '.$starttime.'
@@ -198,6 +200,7 @@ to this page if the data selected is ins
+Ignore First Line
@@ -505,7 +508,7 @@ ENDPICK
# ======================================================= Menu Phase Two Upload
sub print_upload_manager_form {
my $r=shift;
-
+ my $firstLine;
my $datatoken;
if (!$ENV{'form.datatoken'}) {
$datatoken=&Apache::loncommon::upfile_store($r);
@@ -514,11 +517,12 @@ sub print_upload_manager_form {
&Apache::loncommon::load_tmp_file($r);
}
my @records=&Apache::loncommon::upfile_record_sep();
+ if($ENV{'form.noFirstLine'}){$firstLine=shift(@records);}
my $total=$#records;
my $distotal=$total+1;
my $today=time;
my $halfyear=$today+15552000;
- my $defdom=$r->dir_config('lonDefDomain');
+ my $defdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
my ($krbdef,$krbdefdom) =
&Apache::loncommon::get_kerberos_defaults($defdom);
&print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom);
@@ -553,8 +557,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 +626,14 @@ sub enroll_single_student {
$r->print("unable to enroll: ".$login_result);
}
} else {
- $r->print('Error
');
+ $r->print('