--- loncom/interface/lonpopulate.pm	2004/06/08 22:09:44	1.12
+++ loncom/interface/lonpopulate.pm	2004/06/09 17:01:56	1.13
@@ -1,5 +1,5 @@
 # automated enrollment configuration handler
-# $Id: lonpopulate.pm,v 1.12 2004/06/08 22:09:44 raeburn Exp $
+# $Id: lonpopulate.pm,v 1.13 2004/06/09 17:01:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -207,7 +207,7 @@ ENDONE
 ###############################################################
 
 sub print_main_frame {
-  my ($r,$realm,$dom,$crs,$tasktitleref,$homeserver,$server) = @_;
+  my ($r,$realm,$dom,$crs,$tasktitleref) = @_;
   my $action = "information";
   if (exists($ENV{'form.action'}) ) {
       $action = $ENV{'form.action'};
@@ -642,7 +642,7 @@ ENDTWO
       ");
   } elsif ($action eq "sections") {
       my @sections = ();
-      @sections = &Apache::lonnet::auto_get_sections($homeserver,$enrollvar{coursecode});
+      @sections = &Apache::lonnet::auto_get_sections($crs,$dom,$enrollvar{coursecode});
       my @storedsections = ();
       my @currsections = ();
       my %sec_id = ();
@@ -1157,7 +1157,7 @@ sub print_notify_response {
 }
 
 sub print_crosslistings_menu () {
-  my ($r,$realm,$dom,$crs,$action,$tasktitleref,$homeserver,$server) = @_;
+  my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_;
   my %settings = &Apache::lonnet::get('environment',['internal.crosslistings','internal.coursecode'],$dom,$crs);
   my @currxlists = ();
   my @xlists = ();
@@ -1260,7 +1260,7 @@ sub print_crosslistings_menu () {
 }
 
 sub print_crosslistings_response () {
-  my ($r,$realm,$dom,$crs,$action,$tasktitleref,$homeserver,$server) = @_;
+  my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_;
   my %settings = &Apache::lonnet::get('environment',['internal.crosslistings','internal.coursecode','internal.courseowner'],$dom,$crs);
   my @currxlists = ();
   my @xlists = ();
@@ -1291,18 +1291,10 @@ sub print_crosslistings_response () {
           my $gp = "newgroupid_".$i;
           if ( exists($ENV{"form.$xl"}) ) {
               my $coursecheck = '';
-#              if ($homeserver eq $server) {
-#                  $coursecheck = &localenroll::validate_courseID($ENV{"form.$xl"});
-#              } else {
-                  $coursecheck = &Apache::lonnet::auto_validate_courseID($homeserver,$ENV{"form.$xl"});
-#              }
+              $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$ENV{"form.$xl"});
               if ($coursecheck eq 'ok') {
                   my $addcheck = '';
-#                  if ($homeserver eq $server) {
-#                      $addcheck = &localenroll::new_course($ENV{"form.$xl"},$owner);
-#                  } else {
-                      $addcheck = &Apache::lonnet::auto_new_course($homeserver,$ENV{"form.$xl"},$owner);
-#                  }
+                  $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$ENV{"form.$xl"},$owner);
                   if ($addcheck eq 'ok') {
                      push @xlists,$ENV{"form.$xl"}.":".$ENV{"form.$gp"};
                   } else {
@@ -1382,7 +1374,7 @@ sub print_crosslistings_response () {
 }
 
 sub print_sections_menu () {
-  my ($r,$realm,$dom,$crs,$action,$tasktitleref,$homeserver,$server) = @_;
+  my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_;
   my %settings = &Apache::lonnet::get('environment',['internal.sectionnums','internal.coursecode','internal.courseowner'],$dom,$crs);
   my @currsections = ();
   my @sections = ();
@@ -1421,19 +1413,9 @@ sub print_sections_menu () {
                   $seccount ++;
               } else {
                   my $newsec = $coursecode.$ENV{"form.$secnum"};
-                  my $coursecheck = '';
-#                  if ($homeserver eq $server) {
-#                      $coursecheck = &localenroll::validate_courseID($newsec);
-#                  } else  {
-                      $coursecheck = &Apache::lonnet::auto_validate_courseID($homeserver,$newsec);
-#                  }
+                  my $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$newsec);
                   if ($coursecheck eq 'ok') {
-                      my $addcheck = '';
-#                      if ($homeserver eq $server) {
-#                          $addcheck = &localenroll::new_course($newsec,$owner);
-#                      } else {
-                          $addcheck = &Apache::lonnet::auto_new_course($homeserver,$newsec,$owner);
-#                      }
+                      my $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$newsec,$owner);
                       if ($addcheck eq 'ok') {
                           push @sections,$ENV{"form.$secnum"}.":".$ENV{"form.$gp"};
                           $seccount ++;
@@ -1576,7 +1558,7 @@ sections which contribute to enrollment
 }
 
 sub print_sections_response () {
-  my ($r,$realm,$dom,$crs,$action,$tasktitleref,$homeserver,$server) = @_;
+  my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_;
   my %settings = &Apache::lonnet::get('environment',['internal.sectionnums','internal.coursecode','internal.courseowner'],$dom,$crs);
   my @currsections = ();
   my @sections = ();
@@ -1608,19 +1590,9 @@ sub print_sections_response () {
           if ( exists($ENV{"form.$sec"}) ) {
               unless ( (grep/^$ENV{"form.$sec"}:/,@allsections) || (grep/^$ENV{"form.$sec"}:/,@sections) ) {
                   my $newsec = $coursecode.$ENV{"form.$sec"};
-                  my $coursecheck = '';
-#                  if ($homeserver eq $server) {
-#                      $coursecheck = &localenroll::validate_courseID($newsec);
-#                  } else {
-                      $coursecheck = &Apache::lonnet::auto_validate_courseID($homeserver,$newsec);
-#                  }
+                  my $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$newsec);
                   if ($coursecheck eq 'ok') {
-                      my $addcheck = '';
-#                      if ($homeserver eq $server) {
-#                          $addcheck = &localenroll::new_course($newsec,$owner);
-#                      } else {
-                          $addcheck = &Apache::lonnet::auto_new_course($homeserver,$newsec,$owner);
-#                      }
+                      my $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$newsec,$owner);
                       if ($addcheck eq 'ok') {
                           push @sections,$ENV{"form.$sec"}.":".$ENV{"form.$gp"};
                       } else {
@@ -1722,7 +1694,7 @@ sub print_photos_response () {
 }
 
 sub print_update_result () {
-  my ($r,$realm,$dom,$crs,$action,$tasktitleref,$homeserver,$server) = @_;
+  my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_;
   my $response = '';
   my $updateadds = 0;
   my $updatedrops = 0;
@@ -1794,11 +1766,7 @@ sub print_update_result () {
 
       if (@allcourses > 0) {
           @{$affiliates{$crs}} = @allcourses;
-#          if ($homeserver eq $server) {
-#              &localenroll::fetch_enrollment($dom,\%affiliates,\%reply);
-#          } else {
-              &Apache::lonnet::fetch_enrollment_query($homeserver,$dom,\%affiliates,\%reply);
-#          }
+          my $outcome = &Apache::lonnet::fetch_enrollment_query('updatenow',\%affiliates,\%reply,$crs,$dom);
           if ($reply{$crs} > 0) {
               ($changecount,$response) = &LONCAPA::Enrollment::update_LC($dom,$crs,$updateadds,$updatedrops,$autostart,$autoend,$authtype,$autharg,\@allcourses,\%LC_code,\$logmsg,\$newusermsg,"updatenow");
           } else {
@@ -2040,10 +2008,6 @@ sub handler {
         }
     }
 
-# Determine course home server and current server
-    my $homeserver = &Apache::lonnet::homeserver($crs,$dom);
-    my $server = $Apache::lonnet::perlvar{'lonHostID'};
-  
     my $reply = 0;
     unless ($state eq "choose") { $reply = 1; }
 
@@ -2051,7 +2015,7 @@ sub handler {
     &print_navmenu($r,\@tasks,\%tasklong);
     
     if (($state eq "choose") || ($action eq "information")) {
-        &print_main_frame($r,$realm,$dom,$crs,\%tasktitle,$homeserver,$server);
+        &print_main_frame($r,$realm,$dom,$crs,\%tasktitle);
     } elsif ($action eq "chgsettings") {
         &print_chgsettings_response($r,$realm,$dom,$crs,$action,\%tasktitle);
     } elsif ($action eq "setdates") {
@@ -2059,17 +2023,17 @@ sub handler {
     } elsif ($action eq "notify") {
         &print_notify_response($r,$realm,$dom,$crs,$action,\%tasktitle);
     } elsif ($action eq "sections") {
-        &print_sections_menu($r,$realm,$dom,$crs,$action,\%tasktitle,$homeserver,$server);
+        &print_sections_menu($r,$realm,$dom,$crs,$action,\%tasktitle);
     } elsif ($action eq "crosslist") {
-        &print_crosslistings_menu($r,$realm,$dom,$crs,$action,\%tasktitle,$homeserver,$server);
+        &print_crosslistings_menu($r,$realm,$dom,$crs,$action,\%tasktitle);
     } elsif ($action eq "updatenow") {
-        &print_update_result($r,$realm,$dom,$crs,$action,\%tasktitle,$homeserver,$server);
+        &print_update_result($r,$realm,$dom,$crs,$action,\%tasktitle);
     } elsif ($action eq "photos") {
         &print_photos_response($r,$realm,$dom,$crs,$action,\%tasktitle);
     } elsif ($action eq "newcross") {
-        &print_crosslistings_response($r,$realm,$dom,$crs,$action,\%tasktitle,$homeserver,$server);    
+        &print_crosslistings_response($r,$realm,$dom,$crs,$action,\%tasktitle);    
     } elsif ($action eq "newsections") {
-        &print_sections_response($r,$realm,$dom,$crs,$action,\%tasktitle,$homeserver,$server);
+        &print_sections_response($r,$realm,$dom,$crs,$action,\%tasktitle);
     }
     &print_doc_base($r);  
     return OK;