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

[www]

www		Mon Aug 25 10:31:20 2003 EDT

  Modified files:              
    /loncom/interface	londropadd.pm 
  Log:
  Going by the domain of the server makes no sense, users should be default be
  enrolled into the domain of the course. Already caused some confusion, should
  probably go into 1.0.1.
  
  
Index: loncom/interface/londropadd.pm
diff -u loncom/interface/londropadd.pm:1.82 loncom/interface/londropadd.pm:1.83
--- loncom/interface/londropadd.pm:1.82	Thu Aug 14 12:08:46 2003
+++ loncom/interface/londropadd.pm	Mon Aug 25 10:31:20 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.82 2003/08/14 16:08:46 www Exp $
+# $Id: londropadd.pm,v 1.83 2003/08/25 14:31:20 www 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=$r->dir_config('lonDefDomain');
+    my $defdom=$ENV{'request.role.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
-        ($r->dir_config('lonDefDomain'),'cudomain',0);
+        ($ENV{'request.role.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=$r->dir_config('lonDefDomain');
+        my $defdom=$ENV{'request.role.domain'};
         # Set up authentication forms
         my ($krbdef,$krbdefdom) =
             &Apache::loncommon::get_kerberos_defaults($domain);