--- loncom/enrollment/Autoupdate.pl 2007/05/29 21:09:47 1.8 +++ 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.8 2007/05/29 21:09:47 raeburn Exp $ +# $Id: Autoupdate.pl,v 1.20 2011/10/14 17:13:25 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'); + '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,17 +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)) { + foreach my $uname (sort(keys(%users))) { my %userhash = &Apache::lonnet::userenvironment($dom,$uname,@info); my (@inststatuses); if (!$userhash{'internalname'}) { @@ -79,7 +81,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); } @@ -106,37 +108,50 @@ foreach my $field (@fields) { if ($userhash{$field} ne $instusers{$uname}{$field}) { $changed = 1; - if ($settings->{'classlists'} eq 'yes') { + 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; } } - } + } } # 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); + 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') { - if ($settings->{'classlists'} eq 'yes') { + 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) { if ($changes{'id'} || $changes{'fullname'}) { 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::loncommon::is_course($cdom,$cnum)) { - my $result = &update_classlist($cdom,$cnum,$dom,$uname,\%userupdate); + if (&Apache::lonnet::is_course($cdom,$cnum)) { + 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 { + print $fh "Error - $result -during classlist update for $uname:$dom in $cnum:$cdom\n"; + } } } } } + } else { + print $fh "User change detected for $uname:$dom. Error during update: $modresult\n"; } } } else { @@ -164,12 +179,12 @@ print $fh (&mt('Possible username change to [_1] detected for [_2] in domain [_3].',$altnames,$uname,$dom)."\n"); } } - print $fh ("-- ".&Apache::lonlocal::locallocaltime(time).' '.&mt('Autoupdate messages end')."\n*******************\n\n"); + print $fh ("-- \n".&Apache::lonlocal::locallocaltime(time).' '.&mt('Autoupdate messages end')."\n*******************\n\n"); close($fh); } sub descend_tree { - my ($dir,$depth,$alldomusers) = @_; + my ($dir,$depth,$alldomusers,$coursesref) = @_; if (-d $dir) { opendir(DIR,$dir); my @contents = grep(!/^\./,readdir(DIR)); @@ -177,52 +192,17 @@ sub descend_tree { $depth ++; foreach my $item (@contents) { if ($depth < 4) { - &descend_tree($dir.'/'.$item,$depth,$alldomusers); - } else { - if (-e $dir.'/'.$item.'/environment.db') { - - $$alldomusers{$item} = ''; + &descend_tree($dir.'/'.$item,$depth,$alldomusers,$coursesref); + } elsif (-e $dir.'/'.$item.'/passwd') { + if (ref($coursesref) eq 'HASH') { + next if (exists($coursesref->{$item})); } + $$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);; @@ -231,7 +211,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;