Changeset 915 for trunk

Timestamp:

Dec 7, 2021, 9:56:09 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Various PHP 8.0 related fixes.

Location:

trunk

Files:

• Application/BaseView.php (modified) (3 diffs)
• Application/Core.php (modified) (3 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/IS/IS.php (modified) (1 diff)
• Modules/NetworkConfigLinux/Generators/DNS.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Routerboard.php (modified) (3 diffs)
• Modules/NetworkConfigRouterOS/RouterboardAPI.php (modified) (2 diffs)
• Modules/NetworkConfigRouterOS/SSH.php (modified) (1 diff)
• Packages/Common/Error.php (modified) (5 diffs)

trunk/Application/BaseView.php

@@ -5 +5 @@
 class BaseView extends View
 {
-  var $TimeStart;
   public bool $FormatHTML = false;
   public bool $ShowRuntimeInfo = false;
@@ -24 +23 @@
     $this->Encoding = 'utf-8';
     $this->Style = 'new';
-
-    // TODO: Move to external code
-    if (isset($this->System->Config['Web']['FormatHTML']))
-      $this->FormatHTML = $this->System->Config['Web']['FormatHTML'];
-    if (isset($this->System->Config['Web']['ShowRuntimeInfo']))
-      $this->ShowRuntimeInfo = $this->System->Config['Web']['ShowRuntimeInfo'];
-    if (isset($this->System->Config['Web']['Charset']))
-      $this->Encoding = $this->System->Config['Web']['Charset'];
-    if (isset($this->System->Config['Web']['Style']))
-      $this->Style = $this->System->Config['Web']['Style'];
   }
 
@@ -110 +99 @@
   function ShowFooter(): string
   {
-    global $ScriptTimeStart, $Revision, $ReleaseTime;
+    global $Revision, $ReleaseTime;
 
-    $Time = round(GetMicrotime() - $ScriptTimeStart, 2);
+    $Time = round(GetMicrotime() - $this->System->ScriptTimeStart, 2);
     $Output = '';
     if ($this->BasicHTML == false)

trunk/Application/Core.php

@@ -26 +26 @@
   public LocaleManager $LocaleManager;
   public array $LinkLocaleExceptions;
+  public float $ScriptTimeStart;
 
   function __construct()
@@ -59 +60 @@
   {
     $this->BaseView = new BaseView($this);
+    if (isset($this->Config['Web']['FormatHTML']))
+      $this->BaseView->FormatHTML = $this->Config['Web']['FormatHTML'];
+    if (isset($this->Config['Web']['ShowRuntimeInfo']))
+      $this->BaseView->ShowRuntimeInfo = $this->Config['Web']['ShowRuntimeInfo'];
+    if (isset($this->Config['Web']['Charset']))
+      $this->BaseView->Encoding = $this->Config['Web']['Charset'];
+    if (isset($this->Config['Web']['Style']))
+      $this->BaseView->Style = $this->Config['Web']['Style'];
 
     /* @var $Page Page */
@@ -89 +98 @@
   function RunCommon(): void
   {
-    global $Database, $ScriptTimeStart, $ConfigFileName, $Config, $GlobalLocaleManager;
+    global $Database, $ConfigFileName, $Config, $GlobalLocaleManager;
 
     date_default_timezone_set('Europe/Prague');
     mb_internal_encoding("UTF-8");
-    $ScriptTimeStart = GetMicrotime();
+    $this->ScriptTimeStart = GetMicrotime();
 
     // SQL injection hack protection

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 914; // Subversion revision
+$Revision = 915; // Subversion revision
 $DatabaseRevision = 911; // SQL structure revision
-$ReleaseTime = strtotime('2021-09-22');
+$ReleaseTime = strtotime('2021-12-07');

trunk/Modules/IS/IS.php

@@ -648 +648 @@
       }
     }
-    echo($UserFilter);
     if ($UserFilter != '')
     {

trunk/Modules/NetworkConfigLinux/Generators/DNS.php

@@ -159 +159 @@
     $MinimumTime = 10800;
     $TTL = 86400;
-    $BaseDir = '/var/cache/bind';
+    if ($this->System->Config['DNS']['BaseDir'])
+      $BaseDir = $this->System->Config['DNS']['BaseDir'];
+      else $BaseDir = '/var/cache/bind';
     if (!file_exists($BaseDir)) die('Base directory "'.$BaseDir.'" not exists.');
     $MailServer = 'centrala';

trunk/Modules/NetworkConfigRouterOS/Routerboard.php

@@ -44 +44 @@
   }
 
-  function ExecuteBatch(string $Commands): string
+  function ExecuteBatch(string $Commands): array
   {
     $Commands = trim($Commands);
@@ -60 +60 @@
       $Output = array();
       exec($Command, $Output);
-    } else $Output = '';
+    } else $Output = array();
     if ($this->Debug) print_r($Output);
     return $Output;
@@ -140 +140 @@
           if (count($Value) > 1)
           {
-            if ($Value[1]{0} == '"') $Value[1] = substr($Value[1], 1, -1);
+            if ($Value[1][0] == '"') $Value[1] = substr($Value[1], 1, -1);
             //if (strlen($Value[1]) > 0)
             $ListItem[$Value[0]] = $Value[1];

trunk/Modules/NetworkConfigRouterOS/RouterboardAPI.php

@@ -10 +10 @@
   public int $Port;        // Port to connect to
   public int $Timeout;        // Connection attempt timeout and data read timeout
-  public int $Socket;             // Variable for storing socket resource
+  public $Socket;             // Variable for storing socket resource
   public bool $Debug;
   public bool $SSL; // If SSL API connection is used. You need also change port to 8729
@@ -23 +23 @@
     $this->Debug = false;
     $this->SSL = false;
-  }
-
-  function EncodeLength(int $Length): int
+    $this->ErrorNo = 0;
+    $this->ErrorStr = "";
+  }
+
+  function EncodeLength(int $Length): string
   {
     if ($Length < 0x80)

trunk/Modules/NetworkConfigRouterOS/SSH.php

@@ -37 +37 @@
           }
             /*
-            //echo(') '.strlen($Buffer).' '.ord($Buffer{0}).'(');
+            //echo(') '.strlen($Buffer).' '.ord($Buffer[0]).'(');
             for ($I = 0; $I < strlen($Buffer); $I++)
             {
-              if (((ord($Buffer{$I}) >= 32) and (ord($Buffer{$I}) <= 128)) or ($Buffer{$I} = "\n") or ($Buffer{$I} = "\r")) echo($Buffer{$I});
-              if ($Buffer{$I} == '>')
+              if (((ord($Buffer[$I]) >= 32) and (ord($Buffer[$I]) <= 128)) or ($Buffer[$I] = "\n") or ($Buffer[$I] = "\r")) echo($Buffer[$I]);
+              if ($Buffer[$I] == '>')
               {
                 fwrite($Stream, $Commands."\n\r");

trunk/Packages/Common/Error.php

@@ -16 +16 @@
   }
 
-  function Start()
+  function Start(): void
   {
     set_error_handler(array($this, 'ErrorHandler'));
@@ -22 +22 @@
   }
 
-  function Stop()
+  function Stop(): void
   {
     restore_error_handler();
@@ -28 +28 @@
   }
 
-  function ErrorHandler($Number, $Message, $FileName, $LineNumber, $Variables)
+  function ErrorHandler(int $Number, string $Message, string $FileName, int $LineNumber, array $Variables = array()): bool
   {
     $ErrorType = array
@@ -63 +63 @@
   }
 
-  function ExceptionHandler(Throwable $Exception)
+  function ExceptionHandler(Throwable $Exception): void
   {
     $Backtrace = $Exception->getTrace();
@@ -88 +88 @@
   }
 
-  function Report($Backtrace)
+  function Report(array $Backtrace): void
   {
     $Date = date('Y-m-d H:i:s');