Changeset 15 for Common

Timestamp:

Dec 27, 2022, 3:11:01 PM (2 years ago)

Author:

chronos

Message:

• Modified: Updates and fixes.

Location:

Common

Files:

• Error.php (modified) (5 diffs)
• Mail.php (modified) (4 diffs)
• ModelDesc.php (modified) (3 diffs)
• NetworkAddress.php (modified) (1 diff)

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

Common/Mail.php

@@ -20 +20 @@
   private array $Priorities;
   private string $Boundary;
+  public bool $TestMode;
 
   function __construct()
@@ -26 +27 @@
     $this->Boundary = md5(date('r', time()));
     $this->AgentIdent = 'PHP/Mail';
+    $this->TestMode = false;
     $this->Clear();
   }
@@ -133 +135 @@
     if ($this->AgentIdent != '') $this->Headers['X-Mailer'] = $this->AgentIdent;
     if ($this->ReplyTo != '') $this->Headers['Reply-To'] = $this->ReplyTo;
-    if ($this->From != '') $this->Headers['From'] = $this->From;
+    if ($this->From != '')
+    {
+      $IndexStart = strpos($this->From, '<');
+      if ($IndexStart !== false)
+      {
+        $this->Headers['From'] = '=?utf-8?Q?'.quoted_printable_encode(trim(substr($this->From, 0, $IndexStart))).'?= '.substr($this->From, $IndexStart);
+      } else
+      {
+        $this->Headers['From'] = $this->From;
+      }
+    }
 
     $Headers = '';
@@ -145 +157 @@
     if ($this->Subject == '') throw new Exception(T('Mail message missing Subject'));
 
-    $res = mail($To, $this->Subject, $Body, $Headers);
+    if ($this->TestMode)
+    {
+      echo('to: '.$To.', subject: '.$this->Subject.', body: '.$Body.', headers: '.$Headers);
+      $res = true;
+    } else
+    {
+      $res = mail($To, $this->Subject, $Body, $Headers);
+    }
     return $res;
   }

Common/ModelDesc.php

@@ -16 +16 @@
     $this->PrimaryKey = 'Id';
     $this->Memory = false;
+    $this->DefaultValuesMethod = null;
   }
 
@@ -179 +180 @@
 {
   public ?string $Default;
+  public int $MaxLength;
 
   function __construct(string $Name)
@@ -185 +187 @@
     $this->HasDefault = false;
     $this->Default = null;
+    $this->MaxLength = 255;
   }
 

Common/NetworkAddress.php

@@ -102 +102 @@
     foreach ($Data as $Item)
     {
-
       $Result[] = dechex($Item & 15);
       $Result[] = dechex(($Item >> 4) & 15);