Changeset 820 for trunk/Modules/Network/Network.php

Timestamp:

Mar 20, 2016, 10:33:00 PM (9 years ago)

Author:

chronos

Message:

• Added: Remove NetworkInterface related child items upon Delete.

File:

• trunk/Modules/Network/Network.php (modified) (3 diffs)

trunk/Modules/Network/Network.php

@@ -206 +206 @@
       'AfterInsert' => array($this, 'AfterInsertNetworkInterface'),
       'AfterModify' => array($this, 'AfterModifyNetworkInterface'),
+      'BeforeDelete' => array($this, 'BeforeDeleteNetworkInterface'),
       'AfterDelete' => array($this, 'AfterModifyNetworkInterface'),
     ));
@@ -676 +677 @@
   }
   
+  function BeforeDeleteNetworkInterface($Form, $Id)
+  {
+    $this->Database->query('DELETE FROM `NetworkInterfaceUpDown` WHERE `Interface`='.$Id);
+    $this->Database->query('DELETE FROM `NetworkLink` WHERE `Interface1`='.$Id.' OR `Interface2`='.$Id);
+    $this->Database->query('DELETE FROM `NetworkPort` WHERE `Interface`='.$Id);
+    $this->Database->query('DELETE FROM `NetworkSignal` WHERE `Interface`='.$Id);
+    $this->Database->query('DELETE FROM `NetworkInterfaceWireless` WHERE `Interface`='.$Id);
+  }
+
   function ShowDashboardItem()
   {
@@ -712 +722 @@
       'LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` '.
       $Condition.' AND (`NetworkDevice`.`PermanentOnline`=1) AND (`NetworkDevice`.`Used`=1) AND '.
-      '(`NetworkInterface`.`LocalIP` != "") AND (`NetworkInterface`.`Enabled` == 1)'.
+      '(`NetworkInterface`.`LocalIP` != "") AND (`NetworkInterface`.`Enabled`=1)'.
       'ORDER BY `Name` ASC');
     if($DbResult3->num_rows > 0)