[LON-CAPA-cvs] cvs: loncom /interface londropadd.pm

[matthew]

matthew		Mon Sep  8 10:30:47 2003 EDT

  Modified files:              
    /loncom/interface	londropadd.pm 
  Log:
  Attempt at bug 2142 - domains should default to course domain.
  
  
Index: loncom/interface/londropadd.pm
diff -u loncom/interface/londropadd.pm:1.84 loncom/interface/londropadd.pm:1.85
--- loncom/interface/londropadd.pm:1.84	Tue Aug 26 00:56:29 2003
+++ loncom/interface/londropadd.pm	Mon Sep  8 10:30:47 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.84 2003/08/26 04:56:29 albertel Exp $
+# $Id: londropadd.pm,v 1.85 2003/09/08 14:30:47 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -521,7 +521,7 @@
     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 +723,7 @@
 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(<<END);
 <input type="hidden" name="action" value="enrollstudent" />
 <input type="hidden" name="state"  value="gotusername" />
@@ -759,7 +759,7 @@
     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);