Changeset 3937 in subversion

Timestamp:

Sep 4, 2010 3:59:48 AM (3 years ago)

Author:

alec

Message:

• Added mail_header_delimiter validation

File:

• trunk/roundcubemail/program/include/rcube_config.php (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_config.php

@@ -248 +248 @@
     {
         // use the configured delimiter for headers
-        if (!empty($this->prop['mail_header_delimiter']))
-            return $this->prop['mail_header_delimiter'];
+        if (!empty($this->prop['mail_header_delimiter'])) {
+            $delim = $this->prop['mail_header_delimiter'];
+            if ($delim == "\n" || $delim == "\r\n")
+                return $delim;
+            else
+                raise_error(array(
+                    'code' => 500, 'type' => 'php',
+                        'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Invalid mail_header_delimiter setting"
+                ), true, false);
+        }
 
         $php_os = strtolower(substr(PHP_OS, 0, 3));