version 1.102, 2004/11/09 15:52:29
|
version 1.103, 2004/11/09 16:18:51
|
Line 376 ENDHEADER
|
Line 376 ENDHEADER
|
$tpend=' '; |
$tpend=' '; |
$tfont='#000000'; |
$tfont='#000000'; |
if ($tstart) { |
if ($tstart) { |
if ($tstart>$then) { |
|
$tstatus='future'; |
|
if ($tstart<$now) { $tstatus='will'; } |
|
} |
|
$tpstart=&Apache::lonlocal::locallocaltime($tstart); |
$tpstart=&Apache::lonlocal::locallocaltime($tstart); |
} |
} |
if ($tend) { |
if ($tend) { |
if ($tend<$then) { |
|
$tstatus='expired'; |
|
} elsif ($tend<$now) { |
|
$tstatus='will_not'; |
|
} |
|
$tpend=&Apache::lonlocal::locallocaltime($tend); |
$tpend=&Apache::lonlocal::locallocaltime($tend); |
} |
} |
if ($ENV{'request.role'} eq $trolecode) { |
if ($ENV{'request.role'} eq $trolecode) { |
Line 717 sub role_status {
|
Line 708 sub role_status {
|
($$tstart,$$tend)=split(/\./,$ENV{$rolekey}); |
($$tstart,$$tend)=split(/\./,$ENV{$rolekey}); |
$$tstatus='is'; |
$$tstatus='is'; |
if ($$tstart) { |
if ($$tstart) { |
|
if ($tstart>$then) { |
|
$tstatus='future'; |
|
if ($tstart<$now) { $tstatus='will'; } |
|
} |
if ($$tstart>$then) { |
if ($$tstart>$then) { |
$$tstatus='future'; |
$$tstatus='future'; |
if ($$tstart<$now) { $$tstatus='will'; } |
if ($$tstart<$now) { $$tstatus='will'; } |
Line 725 sub role_status {
|
Line 720 sub role_status {
|
if ($$tend) { |
if ($$tend) { |
if ($$tend<$then) { |
if ($$tend<$then) { |
$$tstatus='expired'; |
$$tstatus='expired'; |
if ($$tend<$now) { $$tstatus='will_not'; } |
} elsif ($$tend<$now) { |
|
$$tstatus='will_not'; |
} |
} |
} |
} |
} |
} |