Changeset 250

Timestamp:

Sep 28, 2009, 2:11:05 PM (15 years ago)

Author:

george

Message:

• Opraveno: Podpora CIDR pro generování netwatch.

File:

• trunk/system/generators/netwatch.php (modified) (1 diff)

trunk/system/generators/netwatch.php

@@ -23 +23 @@
     $I = explode('.', $Subnet['AddressRange']);
     $I = $I[2];
-    $DbResult2 = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE (NetworkInterface.LocalIP LIKE "192.168.'.$I.'.%") AND (NetworkDevice.Used = 1) ORDER BY NetworkInterface.LocalIP');
+    $DbResult2 = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE CompareNetworkPrefix(INET_ATON(LocalIP), INET_ATON("'.$Subnet['AddressRange'].'"), '.$Subnet['Mask'].') AND (NetworkDevice.Used = 1) ORDER BY NetworkInterface.LocalIP');
     while($Interface = $DbResult2->fetch_assoc())
     {