vcl-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jftho...@apache.org
Subject svn commit: r1646810 - /vcl/trunk/web/.ht-inc/computer.php
Date Fri, 19 Dec 2014 17:59:32 GMT
Author: jfthomps
Date: Fri Dec 19 17:59:32 2014
New Revision: 1646810

URL: http://svn.apache.org/r1646810
Log:
VCL-174 - NAT - support for sites that have small IP address ranges

computer.php: modified validateResourceData and AJcompNATchange: updated queries checking
for computers having reservations using a nat host to also ignore laststateid's 1,5,11,12
in addition to ignoring the same values for stateid

Modified:
    vcl/trunk/web/.ht-inc/computer.php

Modified: vcl/trunk/web/.ht-inc/computer.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/computer.php?rev=1646810&r1=1646809&r2=1646810&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/computer.php (original)
+++ vcl/trunk/web/.ht-inc/computer.php Fri Dec 19 17:59:32 2014
@@ -2008,6 +2008,7 @@ class Computer extends Resource {
 				       .       "rq.start <= NOW() AND "
 				       .       "rq.end > NOW() AND "
 				       .       "rq.stateid NOT IN (1,5,11,12) AND "
+				       .       "rq.laststateid NOT IN (1,5,11,12) AND "
 				       .       "rq.userid != $vclreloadid";
 				$qh = doQuery($query);
 				if(mysql_num_rows($qh)) {
@@ -2057,6 +2058,7 @@ class Computer extends Resource {
 				       .       "rq.start <= NOW() AND "
 				       .       "rq.end > NOW() AND "
 				       .       "rq.stateid NOT IN (1,5,11,12) AND "
+				       .       "rq.laststateid NOT IN (1,5,11,12) AND "
 				       .       "rq.userid != $vclreloadid";
 				$qh = doQuery($query);
 				if(mysql_num_rows($qh)) {
@@ -4436,6 +4438,7 @@ class Computer extends Resource {
 		       .       "rq.start <= NOW() AND "
 		       .       "rq.end > NOW() AND "
 		       .       "rq.stateid NOT IN (1,5,11,12) AND "
+		       .       "rq.laststateid NOT IN (1,5,11,12) AND "
 		       .       "rq.userid != $vclreloadid";
 		$qh = doQuery($query);
 		while($row = mysql_fetch_assoc($qh))



Mime
View raw message