--- loncom/enrollment/Autoupdate.pl	2010/03/26 13:19:04	1.19
+++ loncom/enrollment/Autoupdate.pl	2011/10/14 17:13:25	1.20
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 # Automated Userinfo update script
-# $Id: Autoupdate.pl,v 1.19 2010/03/26 13:19:04 raeburn Exp $
+# $Id: Autoupdate.pl,v 1.20 2011/10/14 17:13:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,16 +65,15 @@
         # get courseIDs for domain
         my %courses=&Apache::lonnet::courseiddump($dom,'.',1,'.','.','.',1,[$hostid],'.');
         # get user information
-        my (%instusers,%instids);
-        next if (&localenroll::allusers_info($dom,\%instusers,\%instids) ne 'ok');
-        my (%users,%unamechg,%possnames);
+        my (%users,%instusers,%instids);
+        my $dir = $Apache::lonnet::perlvar{lonUsersDir}.'/'.$dom;
+        &descend_tree($dir,0,\%users,\%courses);
+        next if (&localenroll::allusers_info($dom,\%instusers,\%instids,\%users) ne 'ok');
+        my (%unamechg,%possnames);
         my @types = ('active','future');
         my @roles = ('st');
         my @cdoms = ($dom);
-        my $dir = $Apache::lonnet::perlvar{lonUsersDir}.'/'.$dom;
-        &descend_tree($dir,0,\%users);
         foreach my $uname (sort(keys(%users))) {
-            next if ($courses{$dom.'_'.$uname});
             my %userhash = &Apache::lonnet::userenvironment($dom,$uname,@info);
             my (@inststatuses);
             if (!$userhash{'internalname'}) {
@@ -185,7 +184,7 @@
     }
 
 sub descend_tree {
-    my ($dir,$depth,$alldomusers) = @_;
+    my ($dir,$depth,$alldomusers,$coursesref) = @_;
     if (-d $dir) {
         opendir(DIR,$dir);
         my @contents = grep(!/^\./,readdir(DIR));
@@ -193,8 +192,11 @@ sub descend_tree {
         $depth ++;
         foreach my $item (@contents) {
             if ($depth < 4) {
-                &descend_tree($dir.'/'.$item,$depth,$alldomusers);
+                &descend_tree($dir.'/'.$item,$depth,$alldomusers,$coursesref);
             } elsif (-e $dir.'/'.$item.'/passwd') {
+                if (ref($coursesref) eq 'HASH') {
+                    next if (exists($coursesref->{$item}));
+                }
                 $$alldomusers{$item} = '';
             }
         }