From 086767c8f273e3bdd6c455876ccbcd876041b503 Mon Sep 17 00:00:00 2001 From: alecpl Date: Sat, 4 Sep 2010 07:59:48 +0000 Subject: - Added mail_header_delimiter validation --- program/include/rcube_config.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'program/include/rcube_config.php') diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php index eb2e088c4..488ffc420 100644 --- a/program/include/rcube_config.php +++ b/program/include/rcube_config.php @@ -247,8 +247,17 @@ class rcube_config public function header_delimiter() { // 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)); -- cgit v1.2.3