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

Timestamp:

May 4, 2020 2:25:31 AM (4 years ago)

Author:

anonymous

Message:

Use the /u regex modifier only when using UTF-8. Disable indexed array key removal from URL query args.

File:

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

trunk/lib/Email.inc.php

@@ -102 +102 @@
     public function __construct($params=null)
     {
+        $app =& App::getInstance();
+
         // The regex used in validEmail(). Set here instead of in the default _params above so we can use the concatenation . dot.
         // This matches a (valid) email address as complex as:
@@ -118 +120 @@
         . '(?:\s*>\s*|>\s+\([^,@]+\)\s*)'                               // TRUE, ensure ending >
         . '|'
-        . '(?:|\s*|\s+\([^,@]+\)\s*))$/iu'));                            // FALSE ensure there is no ending >
+        . '(?:|\s*|\s+\([^,@]+\)\s*))$/i' . $app->getParam('preg_u'))); // FALSE ensure there is no ending >
 
         if (isset($params)) {
@@ -396 +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})>?$/iUu', '$1', $this->_params['from']);
+            $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']);
         }
         if ('' != $envelope_sender_address && $this->validEmail($envelope_sender_address)) {