version 1.104, 2004/11/09 18:18:02
|
version 1.105, 2004/11/09 20:04:48
|
Line 539 ENDHEADER
|
Line 539 ENDHEADER
|
'</font>'; |
'</font>'; |
} |
} |
} else { |
} else { |
my %newhash=Apache::lonnet::coursedescription |
my %newhash=&Apache::lonnet::coursedescription($tcourseid); |
($tcourseid); |
|
if (%newhash) { |
if (%newhash) { |
$sortkey=$role."\0".$tdom."\0".$newhash{'description'}. |
$sortkey=$role."\0".$tdom."\0".$newhash{'description'}. |
"\0".$envkey; |
"\0".$envkey; |
Line 810 sub role_status {
|
Line 809 sub role_status {
|
$$trolecode=$$role.'.'.$$where; |
$$trolecode=$$role.'.'.$$where; |
($$tstart,$$tend)=split(/\./,$ENV{$rolekey}); |
($$tstart,$$tend)=split(/\./,$ENV{$rolekey}); |
$$tstatus='is'; |
$$tstatus='is'; |
if ($$tstart) { |
if ($$tstart && $$tstart>$then) { |
if ($$tstart>$then) { |
$$tstatus='future'; |
$$tstatus='future'; |
if ($$tstart<$now) { $$tstatus='will'; } |
if ($$tstart<$now) { $$tstatus='will'; } |
|
} |
|
} |
} |
if ($$tend) { |
if ($$tend) { |
if ($$tend<$then) { |
if ($$tend<$then) { |
Line 848 sub check_fordc {
|
Line 845 sub check_fordc {
|
my $dcdom = $1; |
my $dcdom = $1; |
my $livedc = 1; |
my $livedc = 1; |
my ($tstart,$tend)=split(/\./,$ENV{$envkey}); |
my ($tstart,$tend)=split(/\./,$ENV{$envkey}); |
if ($tstart) { |
if ($tstart && $tstart>$then) { $livedc = 0; } |
if ($tstart>$then) { |
if ($tend && $tend <$then) { $livedc = 0; } |
$livedc = 0; |
|
} |
|
} |
|
if ($tend) { |
|
if ($tend<$then) { |
|
$livedc = 0; |
|
} |
|
} |
|
if ($livedc) { |
if ($livedc) { |
$$dcroles{$dcdom} = $envkey; |
$$dcroles{$dcdom} = $envkey; |
$numdc ++; |
$numdc++; |
} |
} |
} |
} |
} |
} |