Changeset 983

Timestamp:

Apr 22, 2026, 10:11:45 PM (4 hours ago)

Author:

chronos

Message:

• Fixed: IS form unknown items error handling.
• Modified: Ping redirection to Inext local network.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Form/Form.php (modified) (1 diff)
• Modules/IS/IS.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 981; // Subversion revision
+$Revision = 983; // Subversion revision
 $DatabaseRevision = 970; // SQL structure revision
-$ReleaseTime = strtotime('2026-12-01');
+$ReleaseTime = strtotime('2026-04-22');

trunk/Common/Form/Form.php

@@ -210 +210 @@
       else $SourceTable = '`'.$this->Definition['Table'].'` AS `TX`';
     $DbResult = $this->Database->query('SELECT '.$Columns.' FROM '.$SourceTable.' WHERE `TX`.`Id`='.$Id);
-    $DbRow = $DbResult->fetch_array();
-    foreach ($this->Definition['Items'] as $Index => $Item)
-    {
-      if (!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or
-      (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and
-      ($this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
-      {
-        $UseType = $this->GetItemType($Item);
-        $this->Values[$Index] = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'OnLoadDb',
-          array('Value' => $DbRow[$Index], 'Name' => $Index,
-          'Type' => $Item['Type'], 'Values' => $this->Values));
-        $this->ValuesFilter[$Index] = $DbRow[$Index.'_Filter'];
-      }
-    }
+    if ($DbResult->num_rows == 1)
+    {
+      $DbRow = $DbResult->fetch_array();
+     foreach ($this->Definition['Items'] as $Index => $Item)
+      {
+        if (!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or
+        (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and
+        ($this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
+        {
+          $UseType = $this->GetItemType($Item);
+          $this->Values[$Index] = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'OnLoadDb',
+            array('Value' => $DbRow[$Index], 'Name' => $Index,
+            'Type' => $Item['Type'], 'Values' => $this->Values));
+          $this->ValuesFilter[$Index] = $DbRow[$Index.'_Filter'];
+        }
+      }
+    } else throw new Exception('Item '.$Id.' not found');
   }
 

trunk/Modules/IS/IS.php

@@ -464 +464 @@
     $Form->SetClass($Table);
     $this->Title .= ' - '.$Form->Definition['Title'].' položka';
-    $Form->LoadValuesFromDatabase($Id);
+    try
+    {
+      $Form->LoadValuesFromDatabase($Id);
+    } catch (Exception $E)
+    {
+      return $this->SystemMessage('Chyba', 'Položka '.$Id.' nenalezena.');
+    }
     $Form->OnSubmit = '?a=view';
     $Output = $Form->ShowViewForm();

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php

@@ -35 +35 @@
     //$Items[] = array('chain' => 'inet-out', 'dst-address' => '172.16.1.1/30', 'action' => 'accept', 'comment' => 'Local_subnet');
     //$Items[] = array('chain' => 'inet-in', 'dst-address' => '172.16.1.1/30', 'action' => 'accept', 'comment' => 'Local_subnet');
+
+    // Redirect ping from warp to inext test network
+    $Items[] = array('chain' => 'inet-out', 'src-address' => '10.145.64.23', 'dst-address' => '172.20.195.192/29', 'protocol' => 'icmp', 
+      'action' => 'src-nat', 'to-addresses' => '172.20.195.197', 'comment' => 'warp_ping_inext');
 
     $DbResult = $this->Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` '.