--- loncom/interface/Attic/londropadd.pm 2003/08/25 14:31:20 1.83
+++ loncom/interface/Attic/londropadd.pm 2003/09/29 16:09:20 1.86
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.83 2003/08/25 14:31:20 www Exp $
+# $Id: londropadd.pm,v 1.86 2003/09/29 16:09:20 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,6 +42,7 @@ use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::Constants qw(:common :http REDIRECT);
use Spreadsheet::WriteExcel;
+use Apache::lonlocal;
###############################################################
###############################################################
@@ -521,7 +522,7 @@ sub print_upload_manager_form {
my $distotal=$total+1;
my $today=time;
my $halfyear=$today+15552000;
- my $defdom=$ENV{'request.role.domain'};
+ 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);
@@ -723,7 +724,7 @@ sub make_dates_default {
sub get_student_username_domain_form {
my $r = shift;
my $domform = &Apache::loncommon::select_dom_form
- ($ENV{'request.role.domain'},'cudomain',0);
+ ($ENV{'course.'.$ENV{'request.course.id'}.'.domain'},'cudomain',0);
$r->print(<
@@ -759,7 +760,7 @@ sub print_enroll_single_student_form {
my $user_data_html = '';
my $javascript_validations = '';
if ($new_user) {
- my $defdom=$ENV{'request.role.domain'};
+ my $defdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
# Set up authentication forms
my ($krbdef,$krbdefdom) =
&Apache::loncommon::get_kerberos_defaults($domain);
@@ -1681,7 +1682,7 @@ sub upfile_drop_add {
\$lname,\$gen,\$sec) {
$$_ =~ s/(\s+$|^\s+)//g;
}
- if ($password) {
+ if ($password || $ENV{'form.login'} eq 'loc') {
&modifystudent($domain,$username,$cid,$sec,
$desiredhost);
my $reply=&Apache::lonnet::modifystudent
@@ -1801,7 +1802,7 @@ The response to the request is governed
sub handler {
my $r=shift;
if ($r->header_only) {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK;
}
@@ -1822,7 +1823,7 @@ sub handler {
$r->content_type('text/csv');
} else {
# Start page
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
$r->print(&header());
}