Changeset 820

Timestamp:

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

Author:

chronos

Message:

• Added: Remove NetworkInterface related child items upon Delete.

Location:

trunk

Files:

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

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 819; // Subversion revision
+$Revision = 820; // Subversion revision
 $DatabaseRevision = 818; // SQL structure revision
-$ReleaseTime = strtotime('2016-03-16');
+$ReleaseTime = strtotime('2016-03-20');

trunk/Modules/IS/IS.php

@@ -233 +233 @@
         $Form->LoadValuesFromDatabase($Id);
         $this->ShortTitle .= ' - '.$Form->Definition['Title'].' odstranění';
+        if(array_key_exists('BeforeDelete', $Form->Definition))
+        {
+          call_user_func($Form->Definition['BeforeDelete'], $Form, $Id);
+        }
         $this->LogChange($Form, 'Delete', 0, $Id);
         $this->Database->delete($Table, '`Id`='.$Id);

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) 

trunk/Modules/NetworkConfig/NetworkConfig.php

@@ -32 +32 @@
       'Items' => array(
         'Caption' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
-        'Execute' => array('Type' => 'String', 'Caption' => 'Povely', 'Default' => ''),
+        'SysName' => array('Type' => 'String', 'Caption' => 'Systémové jméno', 'Default' => ''),
         'Changed' => array('Type' => 'TNetworkConfigurationState', 'Caption' => 'Stav', 'Default' => 0),
         'LastTime' => array('Type' => 'DateTime', 'Caption' => 'Naposledy spuštěno', 'ReadOnly' => true),