--- loncom/enrollment/Autoenroll.pl	2007/12/05 02:04:02	1.28
+++ loncom/enrollment/Autoenroll.pl	2009/01/08 16:58:04	1.31
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 #Automated Enrollment script
-# $Id: Autoenroll.pl,v 1.28 2007/12/05 02:04:02 raeburn Exp $
+# $Id: Autoenroll.pl,v 1.31 2009/01/08 16:58:04 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 {
@@ -167,13 +167,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 +185,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 +225,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'});
@@ -236,7 +239,7 @@
                     if ( ($enrollvar{$crs}{autostart} < $timenow) && ( ($enrollvar{$crs}{autoend} > $timenow) || ($enrollvar{$crs}{autoend} == 0) ) ) {
                         print $fh &mt('No institutional classlist data could be retrieved for [_1]',$crs)."\n";
                     } else {
-                        print $fh ('Not within time window for auto-enrollment in [_1]',$crs)."\n";
+                        print $fh &mt('Not within time window for auto-enrollment in [_1]',$crs)."\n";
                     }
                 } else {
                     print $fh &mt('Auto-enrollment not currently enabled for [_1]',$crs)."\n";