Changeset 915 for trunk/Modules

Timestamp:

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

Author:

chronos

Message:

• Fixed: Various PHP 8.0 related fixes.

Location:

trunk/Modules

Files:

• IS/IS.php (modified) (1 diff)
• NetworkConfigLinux/Generators/DNS.php (modified) (1 diff)
• NetworkConfigRouterOS/Routerboard.php (modified) (3 diffs)
• NetworkConfigRouterOS/RouterboardAPI.php (modified) (2 diffs)
• NetworkConfigRouterOS/SSH.php (modified) (1 diff)

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");