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

Timestamp:

Aug 8, 2019 10:03:59 PM (5 years ago)

Author:

anonymous

Message:

Add unicode flag (/u) to preg_* patterns. Remove usage of create_function().

File:

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

trunk/lib/Email.inc.php

@@ -118 +118 @@
         . '(?:\s*>\s*|>\s+\([^,@]+\)\s*)'                               // TRUE, ensure ending >
         . '|'
-        . '(?:|\s*|\s+\([^,@]+\)\s*))$/i'));                            // FALSE ensure there is no ending >
+        . '(?:|\s*|\s+\([^,@]+\)\s*))$/iu'));                            // FALSE ensure there is no ending >
 
         if (isset($params)) {
@@ -260 +260 @@
         // Apply regex pattern to search elements.
         $search = array_keys($replacements);
-        array_walk($search, create_function('&$v', '$v = "{" . mb_strtoupper($v) . "}";'));
+        array_walk($search, function (&$v) {
+            $v = '{' . mb_strtoupper($v) . '}';
+        });
 
         // Replacement values.
@@ -274 +276 @@
     * You can also use this function to do post-processing on the email body before sending it,
     * like removing extraneous lines:
-    * $email->setString(preg_replace('/(?:(?:\r\n|\r|\n)\s*){2}/s', "\n\n", $email->getBody()));
+    * $email->setString(preg_replace('/(?:(?:\r\n|\r|\n)\s*){2}/su', "\n\n", $email->getBody()));
     *
     * @access   public
@@ -367 +369 @@
         foreach ($headers as $key => $val) {
             // Validate key and values.
-            if (empty($val)) {
+            if (!strlen($val)) {
                 $app->logMsg(sprintf('Empty email header provided: %s', $key), LOG_NOTICE, __FILE__, __LINE__);
                 continue;
             }
-            if (empty($key) || !is_string($key) || !is_string($val) || preg_match("/[\n\r]/", $key . $val) || preg_match('/[^\w-]/', $key)) {
+            if (!strlen($key) || preg_match("/[\n\r]/", $key . $val) || preg_match('/[^\w-]/', $key)) {
                 $app->logMsg(sprintf('Broken email header provided: %s=%s', $key, $val), LOG_WARNING, __FILE__, __LINE__);
                 continue;
@@ -394 +396 @@
             $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', '$1', $this->_params['from']);
+            $envelope_sender_address = preg_replace('/^.*<?([^\s@\[\]<>()]+\@[A-Za-z0-9.-]{1,}\.[A-Za-z]{2,5})>?$/iUu', '$1', $this->_params['from']);
         }
         if ('' != $envelope_sender_address && $this->validEmail($envelope_sender_address)) {