version 1.1, 2006/05/18 12:33:14
|
version 1.2, 2006/05/18 13:49:10
|
Line 295 sub group_changes {
|
Line 295 sub group_changes {
|
if ($chgtype eq 'drop') { |
if ($chgtype eq 'drop') { |
if ($grpstart == -1) { next; } # deleted |
if ($grpstart == -1) { next; } # deleted |
if ($grpend == 0 || $grpend > $now) { |
if ($grpend == 0 || $grpend > $now) { |
unless (defined($dropgroup{$group})) { |
if (!defined($dropgroup{$group})) { |
$dropstart{$group} = $grpstart; |
$dropstart{$group} = $grpstart; |
if ($grpstart > $now) { |
if ($grpstart > $now) { |
$dropstart{$group} = $now; |
$dropstart{$group} = $now; |
Line 310 sub group_changes {
|
Line 310 sub group_changes {
|
($grpend < $settings{$group}{'enddate'} || |
($grpend < $settings{$group}{'enddate'} || |
$settings{$group}{'enddate'} == 0)) || |
$settings{$group}{'enddate'} == 0)) || |
($grpstart > $settings{$group}{'startdate'})) { |
($grpstart > $settings{$group}{'startdate'})) { |
unless(defined($addgroup{$group})) { |
if (!defined($addgroup{$group})) { |
$addgroup{$group} = |
$addgroup{$group} = |
$settings{$group}{'enddate'}.':'. |
$settings{$group}{'enddate'}.':'. |
$settings{$group}{'startdate'}.':'. |
$settings{$group}{'startdate'}.':'. |
Line 356 sub group_changes {
|
Line 356 sub group_changes {
|
if ($usec eq 'all') { |
if ($usec eq 'all') { |
foreach my $ukey (keys(%roleshash)) { |
foreach my $ukey (keys(%roleshash)) { |
if ($ukey =~ /^\Q$cid\E(\/?\w*)_($urole)$/) { |
if ($ukey =~ /^\Q$cid\E(\/?\w*)_($urole)$/) { |
unless ($sec eq $1) { |
if ($sec ne $1) { |
if ($roleshash{$ukey} =~ /_?(\d*)_?([\-\d]*)$/) { |
if ($roleshash{$ukey} =~ /_?(\d*)_?([\-\d]*)$/) { |
my $roleend = $1; |
my $roleend = $1; |
if ((!$roleend) || |
if ((!$roleend) || |