Changeset 849

Timestamp:

Sep 5, 2017, 10:52:31 PM (7 years ago)

Author:

chronos

Message:

• Added: Show list of matching interfaces by LocalIP for viewed subnet.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/IS/IS.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 844; // Subversion revision
+$Revision = 849; // Subversion revision
 $DatabaseRevision = 844; // SQL structure revision
-$ReleaseTime = strtotime('2017-01-01');
+$ReleaseTime = strtotime('2017-09-05');

trunk/Modules/IS/IS.php

@@ -448 +448 @@
       if (($TabIndex == $I) or ($TabIndex == (count($Tabs) - 1)))
       {
-        $TabContent .= $this->ShowList($TypeItem['Table'], '`'.
+        if ($TypeItem['Ref'] == null)
+        {
+          $Filter = $TypeItem['Filter'];
+          $Filter = str_replace('#Id', $Id, $Filter);
+          $TabContent .= $this->ShowList($TypeItem['Table'],
+            $Filter, $Item['Caption']).'<br/>';
+        } else $TabContent .= $this->ShowList($TypeItem['Table'], '`'.
           $TypeItem['Ref'].'`='.$Id, $Item['Caption'],
-          $TypeItem['Ref'], $Id).'<br/>';
+          $TypeItem['Ref'], $Id).'<br/>';        
       }
       $I++;

trunk/Modules/Network/Network.php

@@ -247 +247 @@
         'AddressRangeIPv6' => array('Type' => 'String', 'Caption' => 'Rozsah adres IPv6', 'Default' => ''),
         'Configure' => array('Type' => 'Boolean', 'Caption' => 'Nastavovat', 'Default' => ''),
-      ),
+        'Interfaces' => array('Type' => 'TNetworkSubnetInterfaceList', 'Caption' => 'Rozhraní', 'Default' => ''),
+      ),
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkSubnetInterfaceList', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'NetworkInterface',
+      'Id' => 'Id',
+      'Ref' => null,
+      'Filter' => '(`TX`.`LocalIP` != "") AND CompareNetworkPrefix(INET_ATON(`TX`.`LocalIP`), INET_ATON((SELECT `NetworkSubnet`.`AddressRange` FROM `NetworkSubnet` WHERE `NetworkSubnet`.`Id`=#Id)), '.
+        '(SELECT `NetworkSubnet`.`Mask` FROM `NetworkSubnet` WHERE `NetworkSubnet`.`Id`=#Id))',
     ));
     $this->System->FormManager->RegisterClass('NetworkPort', array(