--- loncom/enrollment/Autoupdate.pl	2007/06/04 14:13:08	1.9
+++ loncom/enrollment/Autoupdate.pl	2010/03/26 13:19:04	1.19
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 # Automated Userinfo update script
-# $Id: Autoupdate.pl,v 1.9 2007/06/04 14:13:08 raeburn Exp $
+# $Id: Autoupdate.pl,v 1.19 2010/03/26 13:19:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,23 +31,23 @@
     use Apache::lonnet;
     use Apache::loncommon;
     use Apache::lonlocal;
+    use Apache::lonuserutils();
     use LONCAPA::Configuration;
     use LONCAPA;
 
     my $perlvarref = LONCAPA::Configuration::read_conf('loncapa.conf');
-    my $logfile = $$perlvarref{'lonDaemons'}.'/logs/autoupdate.log';
-    my $hostid = $perlvarref->{'lonHostID'}; 
+    exit if (ref($perlvarref) ne 'HASH');
+    my $logfile = $perlvarref->{'lonDaemons'}.'/logs/autoupdate.log';
+    exit if ($perlvarref->{'lonRole'} ne 'library');
+    my $hostid = $perlvarref->{'lonHostID'};
+
     my @info = ('inststatus','lockedname','internalname','lastname',
-                'firstname','id','permanentemail');
+                'firstname','middlename','generation','id','permanentemail');
     # Initialize language handler
     &Apache::lonlocal::get_language_handle();
     # find out which users we need to examine
     my @domains = sort(&Apache::lonnet::current_machine_domains());
     foreach my $dom (@domains) {
-        my $primaryhost_id = &Apache::lonnet::domain($dom,'primary');
-        if ($primaryhost_id ne $hostid) {
-            next;
-        } 
         my %domconfig = &Apache::lonnet::get_dom('configuration',['autoupdate'],
                                                  $dom);
         #only run if configured to
@@ -61,9 +61,9 @@
         }
         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,'.','.','',undef,undef,'.');
+        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');
@@ -73,7 +73,7 @@
         my @cdoms = ($dom);
         my $dir = $Apache::lonnet::perlvar{lonUsersDir}.'/'.$dom;
         &descend_tree($dir,0,\%users);
-        foreach my $uname (keys(%users)) {
+        foreach my $uname (sort(keys(%users))) {
             next if ($courses{$dom.'_'.$uname});
             my %userhash = &Apache::lonnet::userenvironment($dom,$uname,@info);
             my (@inststatuses);
@@ -82,7 +82,7 @@
                     (my $insttypechg,@inststatuses) = 
                        &affiliations_check(\%userhash,$instusers{$uname});
                     if ($insttypechg) {
-                        my $inststatusstr = join(':',&escape(@inststatuses));
+                        my $inststatusstr = join(':',map { &escape($_) } (@inststatuses));
                         my %statushash = ( inststatus => $inststatusstr );
                         my $statusres = &Apache::lonnet::put('environment',\%statushash,$dom,$uname);
                     }
@@ -112,7 +112,7 @@
                             if ($settings->{'classlists'} == 1) { 
                                 if ($field eq 'id') {
                                     $changes{'id'} = 1;
-                                } elsif ($field eq 'lastname' || $field eq 'firstname' || $field eq 'middlename' || $field eq 'gen') {
+                                } elsif ($field eq 'lastname' || $field eq 'firstname' || $field eq 'middlename' || $field eq 'generation') {
                                     $changes{'fullname'} = 1;
                                 }
                             }
@@ -121,10 +121,14 @@
                     # Make the change
                     if ($changed) {
                         my %userupdate;
+                        foreach my $item ('lastname','firstname','middlename','generation','id',
+                                          'permanentemail') {
+                            $userupdate{$item} = $userhash{$item};
+                        }
                         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) {
@@ -132,11 +136,12 @@
                                     my %roleshash = 
                                         &Apache::lonnet::get_my_roles($uname,
                                                   $dom,'userroles',\@types,\@roles,\@cdoms);
-                                    foreach my $item (%roleshash) {
+                                    foreach my $item (keys(%roleshash)) {
                                         my ($cnum,$cdom,$role) = split(/:/,$item);
                                         my ($start,$end) = split(/:/,$roleshash{$item});
                                         if (&Apache::lonnet::is_course($cdom,$cnum)) {
-                                            my $result = &update_classlist($cdom,$cnum,$dom,$uname,\%userupdate);
+                                            my $result = 
+                                                &Apache::lonuserutils::update_classlist($cdom,$cnum,$dom,$uname,\%userupdate);
                                             if ($result eq 'ok') {
                                                 print $fh "Classlist change: $uname:$dom - class -> $cnum:$cdom\n";
                                             } else {
@@ -189,48 +194,13 @@ sub descend_tree {
         foreach my $item (@contents) {
             if ($depth < 4) {
                 &descend_tree($dir.'/'.$item,$depth,$alldomusers);
-            } else {
+            } elsif (-e $dir.'/'.$item.'/passwd') {
                 $$alldomusers{$item} = '';
             }
         }
     }
 }
 
-sub update_classlist {
-    my ($cdom,$cnum,$udom,$uname,$user) = @_;
-    my ($uid,$fullname,$classlistentry);
-    my $fullname = 
-        &Apache::lonnet::format_name($user->{'first'},$user->{'middle'},
-                                     $user->{'last'},$user->{'gene'},'lastname');
-    my %classhash = &Apache::lonnet::get('classlist',[$uname.':'.$udom],
-                                         $cdom,$cnum);
-    my @classinfo = split(/:/,$classhash{$uname.':'.$udom});
-    my $ididx=&Apache::loncoursedata::CL_ID() - 2;
-    my $nameidx=&Apache::loncoursedata::CL_FULLNAME() - 2;
-    for (my $i=0; $i<@classinfo; $i++) {
-        if ($i == $ididx) {
-            if (defined($user->{'id'})) {
-                $classlistentry .= $user->{'id'}.':';
-            } else {
-                $classlistentry .= $classinfo[$i].':';
-            }
-        } elsif ($i == $nameidx) {
-            $classlistentry .= $fullname.':';
-        } else {
-            $classlistentry .= $classinfo[$i].':';
-        }
-    }
-    $classlistentry =~ s/:$//;
-    my $reply=&Apache::lonnet::cput('classlist',
-                                    {"$uname:$udom" => $classlistentry},
-                                    $cdom,$cnum);
-    if (($reply eq 'ok') || ($reply eq 'delayed')) {
-        return 'ok';
-    } else { 
-        return 'error: '.$reply;
-    }
-}
-
 sub affiliations_check {
     my ($userhash,$insthashref) = @_;
     my (@inststatuses,$insttypechg);;
@@ -239,7 +209,7 @@ sub affiliations_check {
             @inststatuses = @{$insthashref->{'inststatus'}};
         }
     }
-    my @currstatuses = &unescape(split(/:/,$userhash->{'inststatus'}));
+    my @currstatuses = map { &unescape($_); } (split(/:/,$userhash->{'inststatus'}));
     foreach my $status (@inststatuses) {
         if (!grep/^\Q$status\E/,@currstatuses) {
             $insttypechg = 1;