version 1.470, 2011/11/29 11:58:53
|
version 1.472, 2011/12/18 17:15:03
|
Line 1013 sub render_resource {
|
Line 1013 sub render_resource {
|
# Is this the current resource? |
# Is this the current resource? |
if (!$params->{'displayedHereMarker'} && |
if (!$params->{'displayedHereMarker'} && |
$resource->symb() eq $params->{'here'} ) { |
$resource->symb() eq $params->{'here'} ) { |
$curMarkerBegin = '<em>'; |
$curMarkerBegin = '<span class="LC_current_nav_location">'; |
$curMarkerEnd = '</em>'; |
$curMarkerEnd = '</span>'; |
$params->{'displayedHereMarker'} = 1; |
$params->{'displayedHereMarker'} = 1; |
} |
} |
|
|
Line 5118 sub check_for_slot {
|
Line 5118 sub check_for_slot {
|
my $ip = $slots{$slot_name}->{'ip'}; |
my $ip = $slots{$slot_name}->{'ip'}; |
if ($self->simpleStatus() == OPEN) { |
if ($self->simpleStatus() == OPEN) { |
my $startreserve = $slots{$slot_name}->{'startreserve'}; |
my $startreserve = $slots{$slot_name}->{'startreserve'}; |
|
my $endreserve = $slots{$slot_name}->{'endreserve'}; |
my @proctors; |
my @proctors; |
if ($slots{$slot_name}->{'proctor'} ne '') { |
if ($slots{$slot_name}->{'proctor'} ne '') { |
@proctors = split(',',$slots{$slot_name}->{'proctor'}); |
@proctors = split(',',$slots{$slot_name}->{'proctor'}); |
Line 5143 sub check_for_slot {
|
Line 5144 sub check_for_slot {
|
} |
} |
} else { |
} else { |
if ($start > $now) { |
if ($start > $now) { |
return (RESERVABLE,$startreserve,$slot_name); |
if (!$endreserve || $endreserve > $now) { |
|
return (RESERVABLE,$startreserve,$slot_name); |
|
} |
} |
} |
} |
} |
} |
} |