Changeset 735 for branches/1.1dev/lib

Timestamp:

Oct 30, 2020 11:44:05 PM (4 years ago)

Author:

anonymous

Message:

Minor polish. Add getHttpHeader function

File:

• branches/1.1dev/lib/Email.inc.php (modified) (2 diffs)

branches/1.1dev/lib/Email.inc.php

@@ -76 +76 @@
         . '((?:[^.<>\s@\",\[\]]+[^<>\s@\",\[\]])*[^.<>\s@\",\[\]]+)'    // Local-part
         . '@'                                                           // @
-        . '((?:(\[)|[A-Z0-9]?)'                                         // Domain, first char
+        . '((?:(\[)|[a-z0-9]?)'                                         // Domain, first char
         . '(?(4)'                                                       // Domain conditional for if first domain char is [
         . '(?:[0-9]{1,3}\.){3}[0-9]{1,3}\]'                             // TRUE, matches IP address
         . '|'
-        . '[.-]?(?:[A-Z0-9]+[-.])*(?:[A-Z0-9]+\.)+[A-Z]{2,6}))'         // FALSE, matches domain name
+        . '[.-]?(?:[a-z0-9]+[-.])*(?:[a-z0-9]+\.)+[a-z]{2,19}))'        // FALSE, matches domain name
         . '(?(1)'                                                       // Comment conditional for if initial < exists
         . '(?:>\s*|>\s+\([^,@]+\)\s*)'                                  // TRUE, ensure ending >
@@ -292 +292 @@
 
         // This is the address where delivery problems are sent to. We must strip off everything except the local@domain part.
-        $envelope_sender_address = preg_replace('/^.*<?([^\s@\[\]<>()]+\@[A-Za-z0-9.-]{1,}\.[A-Za-z]{2,5})>?$/iU', '$1', $this->_params['from']);
+        $envelope_sender_address = preg_replace('/^.*<?([^\s@\[\]<>()]+\@[A-Za-z0-9.-]{1,}\.[A-Za-z]{2,19})>?$/iU', '$1', $this->_params['from']);
         if ('' != $envelope_sender_address && $this->validEmail($envelope_sender_address)) {
             $envelope_sender_header = sprintf('-f %s', $envelope_sender_address);