version 1.419, 2006/07/04 21:31:02
|
version 1.420, 2006/07/04 22:02:14
|
Line 4113 sub get_course_users {
|
Line 4113 sub get_course_users {
|
$section = 'none'; |
$section = 'none'; |
} |
} |
if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) { |
if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) { |
if (grep/^all$/,@{$sections}) { |
if (grep(/^all$/,@{$sections})) { |
$secmatch = 1; |
$secmatch = 1; |
} elsif ($$classlist{$student}[$idx{section}] eq '') { |
} elsif ($$classlist{$student}[$idx{section}] eq '') { |
if (grep/^none$/,@{$sections}) { |
if (grep(/^none$/,@{$sections})) { |
$secmatch = 1; |
$secmatch = 1; |
} |
} |
} else { |
} else { |
Line 4128 sub get_course_users {
|
Line 4128 sub get_course_users {
|
next; |
next; |
} |
} |
} |
} |
push (@{$seclists{$student}},$section); |
push(@{$seclists{$student}},$section); |
if (defined($$types{'active'})) { |
if (defined($$types{'active'})) { |
if ($$classlist{$student}[$idx{status}] eq 'Active') { |
if ($$classlist{$student}[$idx{status}] eq 'Active') { |
push(@{$$users{st}{$student}},'active'); |
push(@{$$users{st}{$student}},'active'); |
Line 4162 sub get_course_users {
|
Line 4162 sub get_course_users {
|
if (($role) && (grep(/^\Q$role\E$/,@{$roles}))) { |
if (($role) && (grep(/^\Q$role\E$/,@{$roles}))) { |
my ($uname,$udom) = split(/:/,$user); |
my ($uname,$udom) = split(/:/,$user); |
if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) { |
if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) { |
if (grep/^all$/,@{$sections}) { |
if (grep(/^all$/,@{$sections})) { |
$secmatch = 1; |
$secmatch = 1; |
} elsif ($usec eq '') { |
} elsif ($usec eq '') { |
if (grep/^none$/,@{$sections}) { |
if (grep(/^none$/,@{$sections})) { |
$secmatch = 1; |
$secmatch = 1; |
} |
} |
} else { |
} else { |
Line 4185 sub get_course_users {
|
Line 4185 sub get_course_users {
|
$usec); |
$usec); |
foreach my $type (keys(%{$types})) { |
foreach my $type (keys(%{$types})) { |
if ($status eq $type) { |
if ($status eq $type) { |
if (!grep/^\Q$type\E$/,@{$$users{$role}{$user}}) { |
if (!grep(/^\Q$type\E$/,@{$$users{$role}{$user}})) { |
push(@{$$users{$role}{$user}},$type); |
push(@{$$users{$role}{$user}},$type); |
} |
} |
$match = 1; |
$match = 1; |
Line 4195 sub get_course_users {
|
Line 4195 sub get_course_users {
|
if (!exists($$userdata{$uname.':'.$udom})) { |
if (!exists($$userdata{$uname.':'.$udom})) { |
&get_user_info($udom,$uname,\%idx,$userdata); |
&get_user_info($udom,$uname,\%idx,$userdata); |
} |
} |
if (!grep/^\Q$usec\E$/,@{$seclists{$uname.':'.$udom}}) { |
if (!grep(/^\Q$usec\E$/,@{$seclists{$uname.':'.$udom}})) { |
push(@{$seclists{$uname.':'.$udom}},$usec); |
push(@{$seclists{$uname.':'.$udom}},$usec); |
} |
} |
} |
} |
Line 4211 sub get_course_users {
|
Line 4211 sub get_course_users {
|
if (defined($userdata) && |
if (defined($userdata) && |
!exists($$userdata{$owner.':'.$cdom})) { |
!exists($$userdata{$owner.':'.$cdom})) { |
&get_user_info($cdom,$owner,\%idx,$userdata); |
&get_user_info($cdom,$owner,\%idx,$userdata); |
if (!grep/^none$/,@{$seclists{$owner.':'.$cdom}}) { |
if (!grep(/^none$/,@{$seclists{$owner.':'.$cdom}})) { |
push(@{$seclists{$owner.':'.$cdom}},'none'); |
push(@{$seclists{$owner.':'.$cdom}},'none'); |
} |
} |
} |
} |