--- loncom/enrollment/Autoenroll.pl	2003/12/11 15:39:37	1.5
+++ loncom/enrollment/Autoenroll.pl	2004/02/08 15:47:45	1.7
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 #Automated Enrollment script
-# $Id: Autoenroll.pl,v 1.5 2003/12/11 15:39:37 albertel Exp $
+# $Id: Autoenroll.pl,v 1.7 2004/02/08 15:47:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,9 @@
     use Apache::lonmsg;
     use HTML::Entities;
 
+#only run if configured to
+    if (! &localenroll::run()) { exit; }
+
 # Determine the library server's domain
     my $perlvarref = LONCAPA::Configuration::read_conf('loncapa.conf');
     my $dom = $$perlvarref{'lonDefDomain'};
@@ -69,7 +72,7 @@
                 $enrollvar{$crs}{$item} = &HTML::Entities::decode($settings{$item});  
             }
         }
-        if (($enrollvar{$crs}{autostart} <= $timenow) && ($enrollvar{$crs}{autoend} > $timenow)) {
+        if (($enrollvar{$crs}{autostart} <= $timenow) && ( ($enrollvar{$crs}{autoend} > $timenow) || ($enrollvar{$crs}{autoend} == 0) ) ) {
             if ( ($enrollvar{$crs}{autoadds} == 1) || ($enrollvar{$crs}{autodrops} == 1) ) {
 # Add to list of classes for retrieval
                 $enrollvar{$crs}{sectionnums} =~ s/ //g;
@@ -118,7 +121,7 @@
         my $logmsg = '';
         my $newusermsg = '';
         if ($reply{$crs} > 0) {
-            if (($enrollvar{$crs}{autostart} < $timenow) && ($enrollvar{$crs}{autoend} > $timenow)) {
+            if ( ($enrollvar{$crs}{autostart} < $timenow) && ( ($enrollvar{$crs}{autoend} > $timenow) || ($enrollvar{$crs}{autoend} == 0) ) ) {
                 if (($enrollvar{$crs}{autoadds} == 1) || ($enrollvar{$crs}{autodrops} == 1)) {
                     my ($changecount,$response) = &LONCAPA::Enrollment::update_LC($dom,$crs,$enrollvar{$crs}{autoadds},$enrollvar{$crs}{autodrops},$enrollvar{$crs}{startdate},$enrollvar{$crs}{enddate},$enrollvar{$crs}{authtype},$enrollvar{$crs}{autharg},\@{$affiliates{$crs}},\%{$LC_code{$crs}},\$logmsg,\$newusermsg,'automated');
                     print $fh "Messages start for $crs\n";