Changeset 317 for trunk/system/generators/firewall_nat.php

Timestamp:

Jul 15, 2011, 8:26:28 AM (13 years ago)

Author:

george

Message:

• Uvozovky v názvech v SQL dotazech.

File:

• trunk/system/generators/firewall_nat.php (modified) (2 diffs)

trunk/system/generators/firewall_nat.php

@@ -36 +36 @@
 //$Items[] = array('chain' => 'inet-in', 'dst-address' => '172.16.1.1/30', 'action' => 'accept', 'comment' => 'Local_subnet');
 
-$DbResult = $Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id');
+$DbResult = $Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` JOIN `Subject` ON `Member`.`Subject` = `Subject`.`Id`');
 while($Member = $DbResult->fetch_assoc())
 {
   echo($Member['Name'].': ');
   // Hosts
-  $DbResult2 = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName, NetworkDevice.InboundNATPriority FROM NetworkInterface LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE (NetworkInterface.ExternalIP <> "") AND (NetworkDevice.Member = '.$Member['Id'].') AND (NetworkInterface.LocalIP != NetworkInterface.ExternalIP) ORDER BY id DESC');
+  $DbResult2 = $Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName`, `NetworkDevice`.`InboundNATPriority` FROM `NetworkInterface`'.
+  ' LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` WHERE (`NetworkInterface`.`ExternalIP` <> "")'.
+  ' AND (`NetworkDevice`.`Member` = '.$Member['Id'].') AND (`NetworkInterface`.`LocalIP` != `NetworkInterface`.`ExternalIP`) ORDER BY `id` DESC');
   while($Interface = $DbResult2->fetch_assoc())
   {
@@ -60 +62 @@
 
   // Subnets
-  $DbResult2 = $Database->select('NetworkSubnet', '*', 'Member='.$Member['Id']);
+  $DbResult2 = $Database->select('NetworkSubnet', '*', '`Member`='.$Member['Id']);
   while($Subnet = $DbResult2->fetch_assoc())
   {