Author: jfthomps
Date: Thu Jan 19 17:26:36 2012
New Revision: 1233490
URL: http://svn.apache.org/viewvc?rev=1233490&view=rev
Log:
VCL-548
server reservations not owned by a user count toward that user's overlapping
reservation count
modified checkOverlap - added constraint that user must be owner of reservation
for it to count toward max overlap
Modified:
incubator/vcl/trunk/web/.ht-inc/utils.php
Modified: incubator/vcl/trunk/web/.ht-inc/utils.php
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/utils.php?rev=1233490&r1=1233489&r2=1233490&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/utils.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/utils.php Thu Jan 19 17:26:36 2012
@@ -4280,7 +4280,8 @@ function checkOverlap($start, $end, $max
$requests[$id]["currstateid"] != 5 &&
$requests[$id]["id"] != $requestid &&
($start < datetimeToUnix($requests[$id]["end"]) &&
- $end > datetimeToUnix($requests[$id]["start"]))) {
+ $end > datetimeToUnix($requests[$id]["start"])) &&
+ $requests[$id]['serverowner'] == 1) {
$count++;
if($count > $max)
return 1;
