Changeset 973 for trunk


Ignore:
Timestamp:
Jun 30, 2025, 11:22:35 AM (41 hours ago)
Author:
chronos
Message:
  • Fixed: RouterOS doesn't always have wireless package to get wireless clients signal levels.
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Application/Core.php

    r951 r973  
    149149    if (isset($this->Config['Web']['RootFolder']))
    150150      $this->RootURLFolder = $this->Config['Web']['RootFolder'];
    151     $this->FormManager->Root = $this->RootURLFolder;
     151    $this->FormManager->RootURL = $this->RootURLFolder;
    152152
    153153    $this->RegisterPageBar('Top');
  • trunk/Application/Version.php

    r970 r973  
    11<?php
    22
    3 $Revision = 970; // Subversion revision
     3$Revision = 973; // Subversion revision
    44$DatabaseRevision = 970; // SQL structure revision
    5 $ReleaseTime = strtotime('2024-07-17');
     5$ReleaseTime = strtotime('2025-06-30');
  • trunk/Modules/Customer/Customer.php

    r970 r973  
    8585        'InternetSpeedMin' => array('Type' => 'Integer', 'Caption' => 'Min. rychlost internetu', 'Default' => '0', 'Suffix' => 'bit/s'),
    8686        'InternetSpeedMax' => array('Type' => 'Integer', 'Caption' => 'Max. rychlost internetu', 'Default' => '0', 'Suffix' => 'bit/s'),
    87         'InternetSpeedBonus' => array('Type' => 'Integer', 'Caption' => 'Bonusová rychlost internetu', 'Default' => '0', 'Suffix' => 'bit/s'),
     87        'InternetSpeedBonus' => array('Type' => 'Integer', 'Caption' => 'Bonusová rychlost internetu', 'Null' => true, 'Suffix' => 'bit/s'),
    8888        'UploadAsymmetry' => array('Type' => 'Integer', 'Caption' => 'Asymetrie odesílání', 'Default' => '1'),
    8989        'Memory' => array('Type' => 'Integer', 'Caption' => 'Paměť', 'Default' => '0', 'Suffix' => 'GB'),
  • trunk/Modules/NetworkConfigRouterOS/Generators/DHCP.php

    r936 r973  
    11<?php
    2 
    32
    43class ConfigRouterOSDHCP extends NetworkConfigItem
     
    3635  }
    3736}
    38 
  • trunk/Modules/NetworkConfigRouterOS/Generators/FirewallFilter.php

    r929 r973  
    77    $Path = array('ip', 'firewall', 'filter');
    88
    9     $Routerboard = new Routerboard($this->SystemConfig['MainRouter']['HostName']);
    10     $Routerboard->UserName = $this->SystemConfig['MainRouter']['UserName'];
    11     $Routerboard->Timeout = $this->SystemConfig['MainRouter']['ConnectTimeout'];
     9    $Routerboard = new Routerboard($this->System->Config['MainRouter']['HostName']);
     10    $Routerboard->UserName = $this->System->Config['MainRouter']['UserName'];
     11    $Routerboard->Timeout = $this->System->Config['MainRouter']['ConnectTimeout'];
    1212    $Routerboard->Debug = true;
    1313
    14     $InetInterface = $this->SystemConfig['MainRouter']['InetInterface'];
    15     $LocalInterface = $this->SystemConfig['MainRouter']['LocalInterface'];
     14    $InetInterface = $this->System->Config['MainRouter']['InetInterface'];
     15    $LocalInterface = $this->System->Config['MainRouter']['LocalInterface'];
    1616
    1717    $Items = array();
    18 
    1918
    2019    // Total inet traffic measuring
     
    3837    $Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'protocol' => 'tcp', 'dst-port' => 25, 'dst-address' => '82.119.226.113', 'action' => 'accept', 'comment' => 'smtp.svarko.cz');
    3938    $Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'protocol' => 'tcp', 'dst-port' => 25, 'action' => 'drop', 'comment' => 'drop-rest-smtp');
    40 
    4139
    4240    // Insert blocked addresses
  • trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

    r929 r973  
    3939    $Read = $Routerboard->Read(false);
    4040    $Array = $Routerboard->ParseResponse($Read);
     41    if (array_key_exists('!trap', $Array))
     42    {
     43      return array();
     44    }
    4145    $NetworkMac = new NetworkMac($this->System);
    4246    foreach ($Array as $Properties)
     
    7983      $Queries[] = 'INSERT INTO `NetworkSignal` (`MAC`, `Value`, `Remote`, `RateRx`, `RateTx`, `Time`, `Interface`, `Device`) VALUES '.
    8084        '('.$MacRef.', '.$Strength.', '.$RemoteSignal.', '.$RateRx.', '.$RateTx.', "'.
    81         TimeToMysqlDateTime($this->Time).'", '.$Interface.', '.$Device['Id'].')';             
     85        TimeToMysqlDateTime($this->Time).'", '.$Interface.', '.$Device['Id'].')';
    8286    }
    8387    return $Queries;
     
    98102    {
    99103      return array();
    100     }   
     104    }
    101105    $NetworkMac = new NetworkMac($this->System);
    102106    foreach ($Array as $Properties)
Note: See TracChangeset for help on using the changeset viewer.