--- loncom/enrollment/Autoenroll.pl	2008/01/02 03:39:50	1.29
+++ loncom/enrollment/Autoenroll.pl	2010/08/19 22:36:59	1.32
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 #Automated Enrollment script
-# $Id: Autoenroll.pl,v 1.29 2008/01/02 03:39:50 raeburn Exp $
+# $Id: Autoenroll.pl,v 1.32 2010/08/19 22:36:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,12 +52,12 @@
     foreach my $dom (@domains) {
         #only run if configured to
         my $run_enroll = 0;
-        my $settings;
+        my $domsettings;
         my %domconfig =
             &Apache::lonnet::get_dom('configuration',['autoenroll'],$dom);
         if (ref($domconfig{'autoenroll'}) eq 'HASH') {
-            $settings = $domconfig{'autoenroll'};
-            if ($settings->{'run'} eq '1') {
+            $domsettings = $domconfig{'autoenroll'};
+            if ($domsettings->{'run'} eq '1') {
                 $run_enroll = 1;
             }
         } else {
@@ -78,11 +78,10 @@
             my %args = (
                          one_time => 1,
                        );
-            my %coursehash = &Apache::lonnet::coursedescription($key,\%args);
-            my $crs = $coursehash{'num'};
-            next if ($coursehash{'domain'} ne $dom);
 # Get course settings
-            my %settings = &Apache::lonnet::dump('environment',$dom,$crs);
+            my %settings = &Apache::lonnet::coursedescription($key,\%args);
+            my $crs = $settings{'num'};
+            next if ($settings{'domain'} ne $dom);
             %{$enrollvar{$crs}} = ();
             @{$affiliates{$crs}} = ();
             %{$LC_code{$crs}} = ();
@@ -118,7 +117,7 @@
                         if ($sec =~ m/^(\w+):(\w*)$/ ) {
                             my $course_id = $enrollvar{$crs}{coursecode}.$1;
                             my $gp = $2;
-                            if (!grep/^$course_id$/,@{$affiliates{$crs}}) {
+                            if (!grep/^\Q$course_id\E$/,@{$affiliates{$crs}}) {
                                 push @{$affiliates{$crs}}, $course_id;
                                 $LC_code{$crs}{$course_id} = $gp; 
                             }
@@ -128,7 +127,7 @@
                         if ($xlist =~ m/^([^:]+):(\w*)$/) {
                             my $course_id = $1;
                             my $gp = $2;
-                            if (!grep/^$course_id$/,@{$affiliates{$crs}}) {
+                            if (!grep/^\Q$course_id\E$/,@{$affiliates{$crs}}) {
                                 push @{$affiliates{$crs}}, $course_id;
                                 $LC_code{$crs}{$course_id} = $gp;
                             }
@@ -149,7 +148,7 @@
             if ($reply{$crs} > 0) {
                 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');
+                        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 &mt('Messages start for [_1]',$crs)."\n";
                         print $fh "$logmsg\n";
                         print $fh &mt('Messages end for [_1]',$crs)."\n";
@@ -167,13 +166,14 @@
                                     $ownerdom = $dom;
                                 }
                             }
-                            if (($settings->{'sender_uname'} ne '') && 
-                                ($settings->{'sender_domain'} ne '')) {
-                                $env{'user.name'} = $settings->{'sender_uname'};
-                                $env{'user.domain'} = $settings->{'sender_domain'};
-                            } else {
-                                $env{'user.name'} = $ownername;
-                                $env{'user.domain'} = $ownerdom;
+                            $env{'user.name'} = $ownername;
+                            $env{'user.domain'} = $ownerdom;
+                            if (ref($domsettings) eq 'HASH') {
+                                if (($domsettings->{'sender_uname'} ne '') && 
+                                    ($domsettings->{'sender_domain'} ne '')) {
+                                    $env{'user.name'} = $domsettings->{'sender_uname'};
+                                    $env{'user.domain'} = $domsettings->{'sender_domain'};
+                                }
                             }
                             if ($enrollvar{$crs}{notifylist}  eq '') {
                                 if ($newusermsg ne '') {
@@ -184,6 +184,7 @@
                                     }
                                 }
                             } else {
+                                $env{'form.can_reply'} = 'N';
                                 my $msgcc;
 # Send message about enrollment changes to notifylist.
                                 $env{'user.home'} = &Apache::lonnet::homeserver($env{'user.name'},$env{'user.domain'});
@@ -223,6 +224,7 @@
                                     my $status =  
                                         &Apache::lonmsg::user_normal_msg($ccname,$ccdom,$subject,$message,undef,undef,undef,undef,\%sentmessage,undef,undef,undef,1,$recipid);
                                 }
+                                delete($env{'form.can_reply'});
                             }
                             delete($env{'user.name'});
                             delete($env{'user.home'});