--- loncom/interface/lonpopulate.pm 2004/01/15 05:56:34 1.10 +++ 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.10 2004/01/15 05:56:34 raeburn Exp $ +# $Id: lonpopulate.pm,v 1.13 2004/06/09 17:01:56 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -641,7 +641,8 @@ ENDTWO "); } elsif ($action eq "sections") { - my @sections = &localenroll::get_sections($enrollvar{coursecode}); + my @sections = (); + @sections = &Apache::lonnet::auto_get_sections($crs,$dom,$enrollvar{coursecode}); my @storedsections = (); my @currsections = (); my %sec_id = (); @@ -1289,14 +1290,16 @@ sub print_crosslistings_response () { my $xl = "newcross_".$i; my $gp = "newgroupid_".$i; if ( exists($ENV{"form.$xl"}) ) { - my $coursecheck = &localenroll::validate_courseID($ENV{"form.$xl"}); + my $coursecheck = ''; + $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$ENV{"form.$xl"}); if ($coursecheck eq 'ok') { - my $addcheck = &localenroll::new_course($ENV{"form.$xl"},$owner); + my $addcheck = ''; + $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 { push @badowner,$ENV{"form.$xl"}.":".$ENV{"form.$gp"}; - } + } } else { push @badxlists, $ENV{"form.$xl"}.":".$ENV{"form.$gp"}.":".$coursecheck; } @@ -1410,9 +1413,9 @@ sub print_sections_menu () { $seccount ++; } else { my $newsec = $coursecode.$ENV{"form.$secnum"}; - my $coursecheck = &localenroll::validate_courseID($newsec); + my $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$newsec); if ($coursecheck eq 'ok') { - my $addcheck = &localenroll::new_course($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 ++; @@ -1587,9 +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 = &localenroll::validate_courseID($newsec); + my $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$newsec); if ($coursecheck eq 'ok') { - my $addcheck = &localenroll::new_course($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 { @@ -1763,7 +1766,7 @@ sub print_update_result () { if (@allcourses > 0) { @{$affiliates{$crs}} = @allcourses; - &localenroll::fetch_enrollment($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 { @@ -1848,9 +1851,6 @@ sub print_reply () { sub setup_date_selectors { my ($starttime,$endtime) = @_; - if ($endtime == 0) { - $endtime = 1999915200; - } if (! defined($starttime)) { $starttime = time; if (exists($ENV{'course.'.$ENV{'request.course.id'}. @@ -2007,7 +2007,7 @@ sub handler { } } } - + my $reply = 0; unless ($state eq "choose") { $reply = 1; }