Changeset 735 for trunk/lib/Email.inc.php

Timestamp:

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

Author:

anonymous

Message:

Minor polish. Add getHttpHeader function

File:

• trunk/lib/Email.inc.php (modified) (2 diffs)

trunk/lib/Email.inc.php

@@ -112 +112 @@
         . '((?:[^.<>\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+\([^,@]+\)\s*)'                               // TRUE, ensure ending >
@@ -398 +398 @@
             $envelope_sender_address = sprintf('<%s>', trim($this->_params['envelope_sender_address'], '<>'));
         } else {
-            $envelope_sender_address = preg_replace('/^.*<?([^\s@\[\]<>()]+\@[A-Za-z0-9.-]{1,}\.[A-Za-z]{2,5})>?$/iU' . $app->getParam('preg_u'), '$1', $this->_params['from']);
+            $envelope_sender_address = preg_replace('/^.*<?([^\s@\[\]<>()]+\@[A-Za-z0-9.-]{1,}\.[A-Za-z]{2,19})>?$/iU' . $app->getParam('preg_u'), '$1', $this->_params['from']);
         }
         if ('' != $envelope_sender_address && $this->validEmail($envelope_sender_address)) {