version 1.352, 2006/04/23 18:31:44
|
version 1.354, 2006/04/25 20:48:38
|
Line 1948 sub plainname {
|
Line 1948 sub plainname {
|
$name=~s/^\s+//; |
$name=~s/^\s+//; |
$name=~s/\s+$//; |
$name=~s/\s+$//; |
$name=~s/\s+/ /g; |
$name=~s/\s+/ /g; |
if ($name !~ /\S/) { $name=$uname.'@'.$udom; } |
if ($name !~ /\S/) { $name=$uname.':'.$udom; } |
return $name; |
return $name; |
} |
} |
|
|
Line 2616 sub findallcourses {
|
Line 2616 sub findallcourses {
|
if ( $key=~m{^user\.role\.(\w+)\./(\w+)/(\w+)} ) { |
if ( $key=~m{^user\.role\.(\w+)\./(\w+)/(\w+)} ) { |
my ($role,$domain,$id) = ($1,$2,$3); |
my ($role,$domain,$id) = ($1,$2,$3); |
next if ($role eq 'ca' || $role eq 'aa'); |
next if ($role eq 'ca' || $role eq 'aa'); |
my ($starttime,$endtime)=$env{$key}; |
my ($starttime,$endtime)=split(/\./,$env{$key}); |
my $active=1; |
my $active=1; |
if ($starttime) { |
if ($starttime) { |
if ($now<$starttime) { $active=0; } |
if ($now<$starttime) { $active=0; } |