svn commit: r1670955 - in /vcl/trunk: mysql/update-vcl.sql mysql/vcl.sql web/.ht-inc/computer.php

[jfthomps]

Author: jfthomps
Date: Thu Apr  2 19:34:46 2015
New Revision: 1670955

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

update-vcl.sql and vcl.sql: removed nathost.deleted and nathost.datedeleted

computer.php: modified AJsubmitCompNATchange: changed order of id and 
$nathostid in INSERT INTO ... SELECT to match order of nathostid and computerid 
that is in vcl.sql file

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

Modified: vcl/trunk/mysql/update-vcl.sql
URL: 
http://svn.apache.org/viewvc/vcl/trunk/mysql/update-vcl.sql?rev=1670955&r1=1670954&r2=1670955&view=diff
==============================================================================
--- vcl/trunk/mysql/update-vcl.sql (original)
+++ vcl/trunk/mysql/update-vcl.sql Thu Apr  2 19:34:46 2015
@@ -1053,8 +1053,6 @@ CREATE TABLE IF NOT EXISTS `nathost` (
   `resourceid` mediumint(8) unsigned NOT NULL,
   `publicIPaddress` varchar(15) NOT NULL,
   `internalIPaddress` varchar(15) DEFAULT NULL,
-  `deleted` tinyint(1) unsigned NOT NULL default '0',
-  `datedeleted` DATETIME DEFAULT NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `resourceid` (`resourceid`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=latin1;

Modified: vcl/trunk/mysql/vcl.sql
URL: 
http://svn.apache.org/viewvc/vcl/trunk/mysql/vcl.sql?rev=1670955&r1=1670954&r2=1670955&view=diff
==============================================================================
--- vcl/trunk/mysql/vcl.sql (original)
+++ vcl/trunk/mysql/vcl.sql Thu Apr  2 19:34:46 2015
@@ -662,8 +662,6 @@ CREATE TABLE IF NOT EXISTS `nathost` (
   `resourceid` mediumint(8) unsigned NOT NULL,
   `publicIPaddress` varchar(15) NOT NULL,
   `internalIPaddress` varchar(15) DEFAULT NULL,
-  `deleted` tinyint(1) unsigned NOT NULL default '0',
-  `datedeleted` DATETIME DEFAULT NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `resourceid` (`resourceid`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=latin1;

Modified: vcl/trunk/web/.ht-inc/computer.php
URL: 
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/computer.php?rev=1670955&r1=1670954&r2=1670955&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/computer.php (original)
+++ vcl/trunk/web/.ht-inc/computer.php Thu Apr  2 19:34:46 2015
@@ -4519,8 +4519,8 @@ class Computer extends Resource {
                doQuery($query);
                if($natenabled) {
                        $query = "INSERT INTO nathostcomputermap "
-                              . "SELECT id, "
-                              .        "$nathostid "
+                              . "SELECT $nathostid, "
+                              .        "id "
                               . "FROM computer "
                               . "WHERE id IN ($allids)";
                        doQuery($query);