Changeset 887 for trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php

Timestamp:

Nov 20, 2020, 12:08:12 AM (3 years ago)

Author:

chronos

Message:

• Added: Static types added to almost all classes, methods and function. Supported by PHP 7.4.
• Fixed: Various found code issues.

File:

• trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php (modified) (4 diffs)

trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php

@@ -18 +18 @@
 class ModuleNetworkConfigRouterOS extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -29 +29 @@
   }
 
-  function DoInstall()
+  function DoInstall(): void
   {
   }
 
-  function DoUnInstall()
+  function DoUnInstall(): void
   {
   }
 
-  function DoStart()
+  function DoStart(): void
   {
     $this->System->Pages['zdarma'] = 'PageFreeAccess';
-    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-dns', 'ConfigRouterOSDNS');
-    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-dhcp', 'ConfigRouterOSDHCP');
-    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-signal', 'ConfigRouterOSSignal');
-    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-netwatch', 'ConfigRouterOSNetwatch');
-    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-netwatch-import', 'ConfigRouterOSNetwatchImport');
-    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-firewall-filter', 'ConfigRouterOSFirewallFilter');
-    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-firewall-nat', 'ConfigRouterOSFirewallNAT');
-    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-firewall-mangle', 'ConfigRouterOSFirewallMangle');
-    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-queue', 'ConfigRouterOSQueue');
+    ModuleNetworkConfig::Cast($this->System->GetModule('NetworkConfig'))->RegisterConfigItem('routeros-dns', 'ConfigRouterOSDNS');
+    ModuleNetworkConfig::Cast($this->System->GetModule('NetworkConfig'))->RegisterConfigItem('routeros-dhcp', 'ConfigRouterOSDHCP');
+    ModuleNetworkConfig::Cast($this->System->GetModule('NetworkConfig'))->RegisterConfigItem('routeros-signal', 'ConfigRouterOSSignal');
+    ModuleNetworkConfig::Cast($this->System->GetModule('NetworkConfig'))->RegisterConfigItem('routeros-netwatch', 'ConfigRouterOSNetwatch');
+    ModuleNetworkConfig::Cast($this->System->GetModule('NetworkConfig'))->RegisterConfigItem('routeros-netwatch-import', 'ConfigRouterOSNetwatchImport');
+    ModuleNetworkConfig::Cast($this->System->GetModule('NetworkConfig'))->RegisterConfigItem('routeros-firewall-filter', 'ConfigRouterOSFirewallFilter');
+    ModuleNetworkConfig::Cast($this->System->GetModule('NetworkConfig'))->RegisterConfigItem('routeros-firewall-nat', 'ConfigRouterOSFirewallNAT');
+    ModuleNetworkConfig::Cast($this->System->GetModule('NetworkConfig'))->RegisterConfigItem('routeros-firewall-mangle', 'ConfigRouterOSFirewallMangle');
+    ModuleNetworkConfig::Cast($this->System->GetModule('NetworkConfig'))->RegisterConfigItem('routeros-queue', 'ConfigRouterOSQueue');
   }
 }
@@ -54 +54 @@
 class PageFreeAccess extends Page
 {
-  var $FullTitle = 'Přístup zdarma k Internetu';
-  var $ShortTitle = 'Internet zdarma';
-  var $ParentClass = 'PagePortal';
-  var $AddressList = 'free-access';
-  var $Timeout;
+  public string $AddressList = 'free-access';
+  public int $Timeout;
 
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
+    $this->FullTitle = 'Přístup zdarma k Internetu';
+    $this->ShortTitle = 'Internet zdarma';
+    $this->ParentClass = 'PagePortal';
+
     $this->Timeout = 24 * 60 * 60;
   }
 
-  function Show()
+  function Show(): string
   {
     $IPAddress = GetRemoteAddress();
     $Output = 'Vaše IP adresa je: '.$IPAddress.'<br/>';
-    if (IsInternetAddr($IPAddress)) {
+    if (IsInternetAddr($IPAddress))
+    {
       $Output .= '<p>Internet zdarma je dostupný pouze z vnitřní sítě.</p>';
       return $Output;
@@ -117 +119 @@
 class ScheduleConfigureFreeAccess extends SchedulerTask
 {
-  function Execute()
+  function Execute(): string
   {
     $Output = '';