--- loncom/enrollment/Autoupdate.pl	2010/03/21 20:39:30	1.15
+++ 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.15 2010/03/21 20:39:30 raeburn Exp $
+# $Id: Autoupdate.pl,v 1.20 2011/10/14 17:13:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,11 +36,11 @@
     use LONCAPA;
 
     my $perlvarref = LONCAPA::Configuration::read_conf('loncapa.conf');
-    my $logfile = $$perlvarref{'lonDaemons'}.'/logs/autoupdate.log';
+    exit if (ref($perlvarref) ne 'HASH');
+    my $logfile = $perlvarref->{'lonDaemons'}.'/logs/autoupdate.log';
+    exit if ($perlvarref->{'lonRole'} ne 'library');
     my $hostid = $perlvarref->{'lonHostID'};
-    if (!&Apache::lonnet::is_library($hostid)) {
-        exit;
-    }
+
     my @info = ('inststatus','lockedname','internalname','lastname',
                 'firstname','middlename','generation','id','permanentemail');
     # Initialize language handler
@@ -61,20 +61,19 @@
         }
         next if (!$run_update);
         open(my $fh,">>$logfile");
-        print $fh ("********************\n".localtime(time).' '.&mt('Autoupdate messages start for domain: [_1]',$dom).' --'."\n");
+        print $fh ("********************\n".&Apache::lonlocal::locallocaltime(time).' '.&mt('Autoupdate messages start for domain: [_1]',$dom).' --'."\n");
         # 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 (keys(%users)) {
-            next if ($courses{$dom.'_'.$uname});
+        foreach my $uname (sort(keys(%users))) {
             my %userhash = &Apache::lonnet::userenvironment($dom,$uname,@info);
             my (@inststatuses);
             if (!$userhash{'internalname'}) {
@@ -128,7 +127,7 @@
                         foreach my $field (@fields) {
                             $userupdate{$field} = $instusers{$uname}{$field};
                         }
-                        my $modresult = &Apache::lonnet::modifyuser($dom,$uname,$userupdate{'id'},undef,undef,$userupdate{'firstname'},$userupdate{'middlename'},$userupdate{'lastname'},$userupdate{'generation'},1,$hostid,$userupdate{'permanentemail'});
+                        my $modresult = &Apache::lonnet::modifyuser($dom,$uname,$userupdate{'id'},undef,undef,$userupdate{'firstname'},$userupdate{'middlename'},$userupdate{'lastname'},$userupdate{'generation'},1,$hostid,$userupdate{'permanentemail'},undef,\@fields);
                         if ($modresult eq 'ok') {
                             print $fh "User change: $uname:$dom; New values: 1.Name: $userupdate{'firstname'} $userupdate{'middlename'} $userupdate{'lastname'} $userupdate{'generation'}; 2. StuID: $userupdate{'id'}; 3. Email: $userupdate{'permanentemail'}.\n";
                             if ($settings->{'classlists'} == 1) {
@@ -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);
-            } else {
+                &descend_tree($dir.'/'.$item,$depth,$alldomusers,$coursesref);
+            } elsif (-e $dir.'/'.$item.'/passwd') {
+                if (ref($coursesref) eq 'HASH') {
+                    next if (exists($coursesref->{$item}));
+                }
                 $$alldomusers{$item} = '';
             }
         }