--- loncom/enrollment/Autoenroll.pl	2003/12/09 20:06:37	1.3
+++ loncom/enrollment/Autoenroll.pl	2004/06/08 22:09:44	1.9
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
-#Automated enroll script
-# $Id: Autoenroll.pl,v 1.3 2003/12/09 20:06:37 albertel Exp $
+#Automated Enrollment script
+# $Id: Autoenroll.pl,v 1.9 2004/06/08 22:09:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,20 +36,23 @@
     use Apache::lonmsg;
     use HTML::Entities;
 
-# Determine the library server's domain
+#only run if configured to
+    if (! &localenroll::run()) { exit; }
+
+# Determine the library server's domain and hostID
     my $perlvarref = LONCAPA::Configuration::read_conf('loncapa.conf');
     my $dom = $$perlvarref{'lonDefDomain'};
-    my $tmpdir = $$perlvarref{'lonDaemons'}.'/tmp';
+    my $logfile = $$perlvarref{'lonDaemons'}.'/logs/autoenroll.log';
     $ENV{'user.domain'} = $dom;
+    my $hostid = $$perlvarref{'lonHostID'};
 
 # Determine the present time;
     my $timenow = time();
 
 # Determine the courses
-    my %courses = &Apache::lonnet::courseiddump($dom,'.',1); 
+    my %courses = &Apache::lonnet::courseiddump($dom,'.',1,$hostid); 
     my %affiliates = ();
     my %enrollvar = ();
-    my %logmsg = ();
     my %reply = ();
     my %LC_code = ();
     foreach my $key (sort keys %courses) {
@@ -70,7 +73,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;
@@ -110,20 +113,21 @@
             }
         }
     }
-    &localenroll::fetch_enrollment($dom,\%affiliates,\%reply);
+    my $outcome = &Apache::lonnet::fetch_enrollment_query($hostid,$dom,\%affiliates,\%reply);
 
 # Now go through classes and perform required enrollment changes.
+    open (my $fh,">>$logfile");
+    print $fh "********************\n".localtime(time)." Enrollment messages start --\n";
     foreach my $crs (sort keys %enrollvar) {
+        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{$crs},'automated');
-                    my $logfile = $crs."_enrollment_log.txt";
-                    open (FILE,">>$tmpdir/$logfile");
-                    print FILE "********************\n".localtime(time)." Enrollment messages start --\n";
-                    print FILE "$logmsg{$crs}\n";
-                    print FILE "-- ".localtime(time)." Enrollment messages end\n********************\n\n"; 
-                    close (FILE);
+                    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";
+                    print $fh "$logmsg\n";
+                    print $fh "Messages end for $crs\n";
                     if ($changecount > 0) {
                         unless ($enrollvar{$crs}{notifylist}  eq '') {
 # Send message about enrollment changes to notifylist.
@@ -134,6 +138,10 @@
 
                                 my $subject = "Student enrollment changes in $enrollvar{$crs}{coursecode}";
                                 my $message = "The following $changecount change(s) occurred in $enrollvar{$crs}{description} - $enrollvar{$crs}{coursecode} as a result of the automated classlist update:\n\n".$response;
+                                unless ($newusermsg eq '') 
+                                {
+                                   $message .= "\n".$newusermsg;
+                                }
                                 my @to_notify = ();
                                 if ($enrollvar{$crs}{notifylist} =~ m/,/) {
                                     @to_notify = split/,/,$enrollvar{$crs}{notifylist};
@@ -144,6 +152,10 @@
                                     my ($ccname,$ccdom) = split/@/,$cc;
                                     my $status =  &Apache::lonmsg::user_normal_msg($ccname,$ccdom,$subject,$message);
                                 }
+                                if ( ($enrollvar{$crs}{notifylist} eq '') && ($newusermsg ne '') ) {
+                                     my $subject = "New user accounts in  $enrollvar{$crs}{'coursecode'}";
+                                     my $status =  &Apache::lonmsg::user_normal_msg($ENV{'user.name'},$dom,$subject,$newusermsg);
+                                }
                                 delete($ENV{'user.name'});
                                 delete($ENV{'user.home'});
                             }
@@ -152,9 +164,19 @@
                 }
             }
         } else {
-            print STDERR "No institutional classlist data could be retrieved for $crs\n";
+            if ( ($enrollvar{$crs}{autoadds} == 1) || ($enrollvar{$crs}{autodrops} == 1) ) {
+                if ( ($enrollvar{$crs}{autostart} < $timenow) && ( ($enrollvar{$crs}{autoend} > $timenow) || ($enrollvar{$crs}{autoend} == 0) ) ) {
+                    print $fh "No institutional classlist data could be retrieved for $crs\n";
+                } else {
+                    print $fh "Not within time window for auto-enrollment in $crs\n";
+                }
+            } else {
+                print $fh "Auto-enrollment not currently enabled for $crs\n";
+            }
         }
     }
+    print $fh "-- ".localtime(time)." Enrollment messages end\n*******************\n\n";
+    close($fh);
     delete($ENV{'user.domain'});
 
 # Check for photos