--- loncom/enrollment/Autoenroll.pl	2007/03/02 21:38:18	1.25
+++ loncom/enrollment/Autoenroll.pl	2007/05/14 17:35:01	1.26
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 #Automated Enrollment script
-# $Id: Autoenroll.pl,v 1.25 2007/03/02 21:38:18 raeburn Exp $
+# $Id: Autoenroll.pl,v 1.26 2007/05/14 17:35:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -49,8 +49,21 @@
 
 # For each domain ......
     foreach my $dom (@domains) {
-    #only run if configured to
-        if (! &localenroll::run($dom)) { next; }
+        #only run if configured to
+        my $run_enroll = 0;
+        my $settings;
+        my %domconfig =
+            &Apache::lonnet::get_dom('configuration',['autoenroll'],$dom);
+        if (ref($domconfig{'autoenroll'}) eq 'HASH') {
+            $settings = $domconfig{'autoenroll'};
+            if ($settings->{'run'} eq '1') {
+                $run_enroll = 1;
+            }
+        } else {
+            $run_enroll = &localenroll::run($dom);
+        }
+        next if ($run_enroll != 1);
+
         $env{'user.domain'} = $dom;
         # Initialize language handler
         &Apache::lonlocal::get_language_handle();