Changeset 973 for trunk

Timestamp:

Jun 30, 2025, 11:22:35 AM (3 weeks ago)

Author:

chronos

Message:

• Fixed: RouterOS doesn't always have wireless package to get wireless clients signal levels.

Location:

trunk

Files:

• Application/Core.php (modified) (1 diff)
• Application/Version.php (modified) (1 diff)
• Modules/Customer/Customer.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/DHCP.php (modified) (2 diffs)
• Modules/NetworkConfigRouterOS/Generators/FirewallFilter.php (modified) (2 diffs)
• Modules/NetworkConfigRouterOS/Generators/Signal.php (modified) (3 diffs)

trunk/Application/Core.php

@@ -149 +149 @@
     if (isset($this->Config['Web']['RootFolder']))
       $this->RootURLFolder = $this->Config['Web']['RootFolder'];
-    $this->FormManager->Root = $this->RootURLFolder;
+    $this->FormManager->RootURL = $this->RootURLFolder;
 
     $this->RegisterPageBar('Top');

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 970; // Subversion revision
+$Revision = 973; // Subversion revision
 $DatabaseRevision = 970; // SQL structure revision
-$ReleaseTime = strtotime('2024-07-17');
+$ReleaseTime = strtotime('2025-06-30');

trunk/Modules/Customer/Customer.php

@@ -85 +85 @@
         'InternetSpeedMin' => array('Type' => 'Integer', 'Caption' => 'Min. rychlost internetu', 'Default' => '0', 'Suffix' => 'bit/s'),
         'InternetSpeedMax' => array('Type' => 'Integer', 'Caption' => 'Max. rychlost internetu', 'Default' => '0', 'Suffix' => 'bit/s'),
-        'InternetSpeedBonus' => array('Type' => 'Integer', 'Caption' => 'Bonusová rychlost internetu', 'Default' => '0', 'Suffix' => 'bit/s'),
+        'InternetSpeedBonus' => array('Type' => 'Integer', 'Caption' => 'Bonusová rychlost internetu', 'Null' => true, 'Suffix' => 'bit/s'),
         'UploadAsymmetry' => array('Type' => 'Integer', 'Caption' => 'Asymetrie odesílání', 'Default' => '1'),
         'Memory' => array('Type' => 'Integer', 'Caption' => 'Paměť', 'Default' => '0', 'Suffix' => 'GB'),

trunk/Modules/NetworkConfigRouterOS/Generators/DHCP.php

@@ -1 +1 @@
 <?php
-
 
 class ConfigRouterOSDHCP extends NetworkConfigItem
@@ -36 +35 @@
   }
 }
-

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallFilter.php

@@ -7 +7 @@
     $Path = array('ip', 'firewall', 'filter');
 
-    $Routerboard = new Routerboard($this->SystemConfig['MainRouter']['HostName']);
-    $Routerboard->UserName = $this->SystemConfig['MainRouter']['UserName'];
-    $Routerboard->Timeout = $this->SystemConfig['MainRouter']['ConnectTimeout'];
+    $Routerboard = new Routerboard($this->System->Config['MainRouter']['HostName']);
+    $Routerboard->UserName = $this->System->Config['MainRouter']['UserName'];
+    $Routerboard->Timeout = $this->System->Config['MainRouter']['ConnectTimeout'];
     $Routerboard->Debug = true;
 
-    $InetInterface = $this->SystemConfig['MainRouter']['InetInterface'];
-    $LocalInterface = $this->SystemConfig['MainRouter']['LocalInterface'];
+    $InetInterface = $this->System->Config['MainRouter']['InetInterface'];
+    $LocalInterface = $this->System->Config['MainRouter']['LocalInterface'];
 
     $Items = array();
-
 
     // Total inet traffic measuring
@@ -38 +37 @@
     $Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'protocol' => 'tcp', 'dst-port' => 25, 'dst-address' => '82.119.226.113', 'action' => 'accept', 'comment' => 'smtp.svarko.cz');
     $Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'protocol' => 'tcp', 'dst-port' => 25, 'action' => 'drop', 'comment' => 'drop-rest-smtp');
-
 
     // Insert blocked addresses

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -39 +39 @@
     $Read = $Routerboard->Read(false);
     $Array = $Routerboard->ParseResponse($Read);
+    if (array_key_exists('!trap', $Array))
+    {
+      return array();
+    }
     $NetworkMac = new NetworkMac($this->System);
     foreach ($Array as $Properties)
@@ -79 +83 @@
       $Queries[] = 'INSERT INTO `NetworkSignal` (`MAC`, `Value`, `Remote`, `RateRx`, `RateTx`, `Time`, `Interface`, `Device`) VALUES '.
         '('.$MacRef.', '.$Strength.', '.$RemoteSignal.', '.$RateRx.', '.$RateTx.', "'.
-        TimeToMysqlDateTime($this->Time).'", '.$Interface.', '.$Device['Id'].')';              
+        TimeToMysqlDateTime($this->Time).'", '.$Interface.', '.$Device['Id'].')';
     }
     return $Queries;
@@ -98 +102 @@
     {
       return array();
-    }    
+    }
     $NetworkMac = new NetworkMac($this->System);
     foreach ($Array as $Properties)