version 1.20, 2011/10/14 17:13:25
|
version 1.21, 2011/10/14 18:14:31
|
Line 67
|
Line 67
|
# get user information |
# get user information |
my (%users,%instusers,%instids); |
my (%users,%instusers,%instids); |
my $dir = $Apache::lonnet::perlvar{lonUsersDir}.'/'.$dom; |
my $dir = $Apache::lonnet::perlvar{lonUsersDir}.'/'.$dom; |
&descend_tree($dir,0,\%users,\%courses); |
&descend_tree($dom,$dir,0,\%users,\%courses); |
next if (&localenroll::allusers_info($dom,\%instusers,\%instids,\%users) ne 'ok'); |
next if (&localenroll::allusers_info($dom,\%instusers,\%instids,\%users) ne 'ok'); |
my (%unamechg,%possnames); |
my (%unamechg,%possnames); |
my @types = ('active','future'); |
my @types = ('active','future'); |
Line 184
|
Line 184
|
} |
} |
|
|
sub descend_tree { |
sub descend_tree { |
my ($dir,$depth,$alldomusers,$coursesref) = @_; |
my ($dom,$dir,$depth,$alldomusers,$coursesref) = @_; |
if (-d $dir) { |
if (-d $dir) { |
opendir(DIR,$dir); |
opendir(DIR,$dir); |
my @contents = grep(!/^\./,readdir(DIR)); |
my @contents = grep(!/^\./,readdir(DIR)); |
Line 192 sub descend_tree {
|
Line 192 sub descend_tree {
|
$depth ++; |
$depth ++; |
foreach my $item (@contents) { |
foreach my $item (@contents) { |
if ($depth < 4) { |
if ($depth < 4) { |
&descend_tree($dir.'/'.$item,$depth,$alldomusers,$coursesref); |
&descend_tree($dom,$dir.'/'.$item,$depth,$alldomusers,$coursesref); |
} elsif (-e $dir.'/'.$item.'/passwd') { |
} elsif (-e $dir.'/'.$item.'/passwd') { |
if (ref($coursesref) eq 'HASH') { |
if (ref($coursesref) eq 'HASH') { |
next if (exists($coursesref->{$item})); |
next if (exists($coursesref->{$dom.'_'.$item})); |
} |
} |
$$alldomusers{$item} = ''; |
$$alldomusers{$item} = ''; |
} |
} |