--- loncom/enrollment/Autoupdate.pl 2007/06/05 23:23:01 1.10 +++ loncom/enrollment/Autoupdate.pl 2011/12/18 01:23:21 1.22 @@ -1,7 +1,7 @@ #!/usr/bin/perl # # Automated Userinfo update script -# $Id: Autoupdate.pl,v 1.10 2007/06/05 23:23:01 raeburn Exp $ +# $Id: Autoupdate.pl,v 1.22 2011/12/18 01:23:21 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,17 +31,18 @@ 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'; + 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','id','permanentemail'); + 'firstname','middlename','generation','id','permanentemail'); # Initialize language handler &Apache::lonlocal::get_language_handle(); # find out which users we need to examine @@ -60,20 +61,26 @@ } 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($dom,$dir,0,\%users,\%courses); + my $resp = &localenroll::allusers_info($dom,\%instusers,\%instids,\%users); + if ($resp ne 'ok') { + print $fh &mt('Problem retrieving institutional data for users in domain: [_1].',$dom)."\n". + &mt('Error: [_1].',$resp)."\n". + "-- \n".&Apache::lonlocal::locallocaltime(time).' '. + &mt('Autoupdate messages end')."\n*******************\n\n"; + next; + } + 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'}) { @@ -81,7 +88,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); } @@ -111,7 +118,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; } } @@ -120,10 +127,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) { @@ -135,7 +146,8 @@ 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 { @@ -179,7 +191,7 @@ } sub descend_tree { - my ($dir,$depth,$alldomusers) = @_; + my ($dom,$dir,$depth,$alldomusers,$coursesref) = @_; if (-d $dir) { opendir(DIR,$dir); my @contents = grep(!/^\./,readdir(DIR)); @@ -187,50 +199,17 @@ sub descend_tree { $depth ++; foreach my $item (@contents) { if ($depth < 4) { - &descend_tree($dir.'/'.$item,$depth,$alldomusers); - } else { + &descend_tree($dom,$dir.'/'.$item,$depth,$alldomusers,$coursesref); + } elsif (-e $dir.'/'.$item.'/passwd') { + if (ref($coursesref) eq 'HASH') { + next if (exists($coursesref->{$dom.'_'.$item})); + } $$alldomusers{$item} = ''; } } } } -sub update_classlist { - my ($cdom,$cnum,$udom,$uname,$user) = @_; - my ($uid,$fullname,$classlistentry); - my $fullname = - &Apache::lonnet::format_name($user->{'firstname'},$user->{'middlename'}, - $user->{'lastname'},$user->{'generation'}, - '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 +218,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;