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

Timestamp:

Nov 15, 2014 9:34:39 PM (10 years ago)

Author:

anonymous

Message:

Many auth and crypto changes; various other bugfixes while working on pulso.

File:

• trunk/lib/Email.inc.php (modified) (1 diff)

trunk/lib/Email.inc.php

@@ -314 +314 @@
         foreach ($headers as $key => $val) {
             // Validate key and values.
-            if (empty($key) || empty($val) || !is_string($key) || !is_string($val) || preg_match("/[\n\r]/", $key . $val) || preg_match('/[^\w-]/', $key)) {
-                $app->logMsg(sprintf('Broken headers provided: %s=%s', $key, $val), LOG_WARNING, __FILE__, __LINE__);
+            if (empty($val)) {
+                $app->logMsg(sprintf('Empty email header provided: %s', $key), LOG_DEBUG, __FILE__, __LINE__);
+                continue;
+            }
+            if (empty($key) || !is_string($key) || !is_string($val) || 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;
             }