Changeset 887 for trunk/Modules/Network/Network.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/Network/Network.php (modified) (14 diffs)

trunk/Modules/Network/Network.php

@@ -8 +8 @@
 class PageFrequencyPlan extends Page
 {
-  var $FullTitle = 'Výpis obsazení frekvenčních kanálů';
-  var $ShortTitle = 'Frekvenční plán';
-  var $ParentClass = 'PageNetwork';
-
-  function Show()
+  function __construct(System $System)
+  {
+    parent::__construct($System);
+    $this->FullTitle = 'Výpis obsazení frekvenčních kanálů';
+    $this->ShortTitle = 'Frekvenční plán';
+    $this->ParentClass = 'PageNetwork';
+  }
+
+  function Show(): string
   {
     // http://en.wikipedia.org/wiki/List_of_WLAN_channels
@@ -75 +79 @@
 class PageNetwork extends Page
 {
-  var $FullTitle = 'Technické informace o síti';
-  var $ShortTitle = 'Síť';
-  var $ParentClass = 'PagePortal';
-
-  function Show()
-  {
-    if (count($this->System->PathItems) > 1)
-    {
-      $Output = $this->PageNotFound();
-    } else $Output = $this->ShowInformation();
-    return $Output;
-  }
-
-  function ShowInformation()
-  {
-    if (!$this->System->User->CheckPermission('Network', 'ShowInfo'))
+  function __construct(System $System)
+  {
+    parent::__construct($System);
+    $this->FullTitle = 'Technické informace o síti';
+    $this->ShortTitle = 'Síť';
+    $this->ParentClass = 'PagePortal';
+  }
+
+  function Show(): string
+  {
+    if (!ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('Network', 'ShowInfo'))
       return 'Nemáte oprávnění';
 
@@ -102 +101 @@
 class ModuleNetwork extends AppModule
 {
-  var $MinNotifyTime;
-
-  function __construct($System)
+  public int $MinNotifyTime;
+
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -112 +111 @@
     $this->License = 'GNU/GPLv3';
     $this->Description = 'Networking related tools';
-    $this->Dependencies = array('Notify');
+    $this->Dependencies = array('Notify', 'IS');
 
     // TODO: Make notify time configurable
@@ -118 +117 @@
   }
 
-  function DoInstall()
-  {
-  }
-
-  function DoUninstall()
-  {
-  }
-
-  function DoStart()
-  {
-    $this->System->ModuleManager->Modules['Notify']->RegisterCheck('NetworkReachability',
+  function DoInstall(): void
+  {
+  }
+
+  function DoUninstall(): void
+  {
+  }
+
+  function DoStart(): void
+  {
+    ModuleNotify::Cast($this->System->GetModule('Notify'))->RegisterCheck('NetworkReachability',
       array($this, 'ReachabilityCheck'));
-    $this->System->ModuleManager->Modules['Notify']->RegisterCheck('NetworkPort',
+    ModuleNotify::Cast($this->System->GetModule('Notify'))->RegisterCheck('NetworkPort',
       array($this, 'PortCheck'));
 
-    $this->System->RegisterPage('network', 'PageNetwork');
-    $this->System->RegisterPage(array('network', 'administration'), 'PageNetworkAdministration');
-    $this->System->RegisterPage(array('network', 'subnet'), 'PageSubnet');
-    $this->System->RegisterPage(array('network', 'user-hosts'), 'PageNetworkHostList');
-    $this->System->RegisterPage(array('network', 'hosting'),'PageHosting');
-    $this->System->RegisterPage(array('network', 'hosts'), 'PageHostList');
-    $this->System->RegisterPage(array('network', 'frequency-plan'), 'PageFrequencyPlan');
-
-    $this->System->RegisterCommandLine('networklog_import', array($this, 'ImportNetworkLog'));
+    $this->System->RegisterPage(['network'], 'PageNetwork');
+    $this->System->RegisterPage(['network', 'administration'], 'PageNetworkAdministration');
+    $this->System->RegisterPage(['network', 'subnet'], 'PageSubnet');
+    $this->System->RegisterPage(['network', 'user-hosts'], 'PageNetworkHostList');
+    $this->System->RegisterPage(['network', 'hosting'],'PageHosting');
+    $this->System->RegisterPage(['network', 'hosts'], 'PageHostList');
+    $this->System->RegisterPage(['network', 'frequency-plan'], 'PageFrequencyPlan');
+
+    $this->System->RegisterCommandLine('networklog_import', 'Imports network logs from remote server', array($this, 'ImportNetworkLog'));
 
     $this->System->FormManager->RegisterClass('NetworkDomainAlias', array(
@@ -750 +749 @@
     ));
 
-    $this->System->ModuleManager->Modules['IS']->RegisterDashboardItem('Network',
-      array('ModuleNetwork', 'ShowDashboardItem'));
+    ModuleIS::Cast($this->System->GetModule('IS'))->RegisterDashboardItem('Network',
+      array($this, 'ShowDashboardItem'));
 
     $this->System->RegisterModel('NetworkDevice', array(
@@ -761 +760 @@
   }
 
-  function AfterInsertNetworkDevice($Form)
+  function AfterInsertNetworkDevice(Form $Form): void
   {
     $this->System->Models['NetworkDevice']->DoOnChange();
   }
 
-  function AfterModifyNetworkDevice($Form, $Id)
+  function AfterModifyNetworkDevice(Form $Form, string $Id): void
   {
     $this->System->Models['NetworkDevice']->DoOnChange();
   }
 
-  function AfterInsertNetworkInterface($Form)
+  function AfterInsertNetworkInterface(Form $Form): void
   {
     $this->System->Models['NetworkInterface']->DoOnChange();
   }
 
-  function AfterModifyNetworkInterface($Form, $Id)
+  function AfterModifyNetworkInterface(Form $Form, string $Id): void
   {
     $this->System->Models['NetworkInterface']->DoOnChange();
   }
 
-  function BeforeDeleteNetworkInterface($Form, $Id)
+  function BeforeDeleteNetworkInterface(Form $Form, string $Id): void
   {
     $this->Database->query('DELETE FROM `NetworkInterfaceUpDown` WHERE `Interface`='.$Id);
@@ -791 +790 @@
   }
 
-  function ImportNetworkLog($Parameters)
+  function ImportNetworkLog(array $Parameters): void
   {
     global $Config;
@@ -813 +812 @@
       {
         $DbRow2 = $DbResult2->fetch_assoc();
-        $DeviceID = $DbRow2['Device'];
+        $DeviceId = $DbRow2['Device'];
         $this->System->Database->insert('NetworkDeviceLog', array('Time' => $DbRow['ReceivedAt'],
           'Device' => $DeviceId, 'Message' => $DbRow['Message'], 'Tags' => $DbRow['SysLogTag']));
@@ -820 +819 @@
   }
 
-  function ShowDashboardItem()
+  function ShowDashboardItem(): string
   {
     $Output = '';
@@ -841 +840 @@
   }
 
-  function DoStop()
-  {
-  }
-
-  function OnlineList($Title, $OnlineNow, $OnlinePrevious, $MinDuration)
+  function DoStop(): void
+  {
+  }
+
+  function OnlineList(string $Title, string $OnlineNow, string $OnlinePrevious, int $MinDuration): array
   {
     $Time = time();
@@ -886 +885 @@
   }
 
-  function ReachabilityCheck()
+  function ReachabilityCheck(): array
   {
     $NewOnline = $this->OnlineList('Nově online', 1, 0, 0);
@@ -898 +897 @@
   }
 
-  function PortCheckList($Title, $OnlineNow, $OnlinePrevious, $MinDuration)
+  function PortCheckList(string $Title, string $OnlineNow, string $OnlinePrevious, int $MinDuration): array
   {
     $Time = time();
@@ -937 +936 @@
   }
 
-  function PortCheck()
+  function PortCheck(): array
   {
     $Output = '';