Changeset 942 for trunk

Timestamp:

Aug 26, 2022, 11:04:38 PM (2 years ago)

Author:

chronos

Message:

• Fixed: Do not terminate script with error if fsockopen fails.

Location:

trunk

Files:

• Common/Global.php (modified) (1 diff)
• Modules/NetworkConfigLinux/Generators/DNS.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/RouterboardAPI.php (modified) (1 diff)

trunk/Common/Global.php

@@ -397 +397 @@
   return $Data;
 }
+
+function ExeceuteNoError(callable $Function): void
+{
+  try
+  {
+    $LastErrorReporting = error_reporting();
+    error_reporting(0);
+    $function();
+  }
+  finally
+  {
+    error_reporting($LastErrorReporting);
+  }
+}

trunk/Modules/NetworkConfigLinux/Generators/DNS.php

@@ -158 +158 @@
     $MinimumTime = 10800;
     $TTL = 86400;
-    if ($this->System->Config['DNS']['BaseDir'])
+    if (isset($this->System->Config['DNS']['BaseDir']))
       $BaseDir = $this->System->Config['DNS']['BaseDir'];
       else $BaseDir = '/var/cache/bind';

trunk/Modules/NetworkConfigRouterOS/RouterboardAPI.php

@@ -56 +56 @@
       $IP = 'ssl://'.$IP;
     }
-    $this->Socket = @fsockopen($IP, $this->Port, $this->ErrorNo, $this->ErrorStr, $this->Timeout);
-    if ($this->Socket)
-    {
-      socket_set_timeout($this->Socket, $this->Timeout);
-      $this->Write('/login', false);
-      $this->Write('=name=' . $Login, false);
-      $this->Write('=password='.$Password);
-      $Response = $this->Read(false);
-      if ((count($Response) > 0) and ($Response[0] == '!done')) $this->Connected = true;
-      if (!$this->Connected) fclose($this->Socket);
+    try
+    {
+      $LastErrorReporting = error_reporting();
+      error_reporting(0);
+
+      $this->Socket = @fsockopen($IP, $this->Port, $this->ErrorNo, $this->ErrorStr, $this->Timeout);
+      if ($this->Socket)
+      {
+        socket_set_timeout($this->Socket, $this->Timeout);
+        $this->Write('/login', false);
+        $this->Write('=name=' . $Login, false);
+        $this->Write('=password='.$Password);
+        $Response = $this->Read(false);
+        if ((count($Response) > 0) and ($Response[0] == '!done')) $this->Connected = true;
+        if (!$this->Connected) fclose($this->Socket);
+      }
+    } finally
+    {
+      error_reporting($LastErrorReporting);
     }
   }