From 22241a5d822aca4755b4f9be3bb78b36371ff216 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 14 Jun 2016 10:59:05 +0200 Subject: [PATCH] CS fixes --- program/lib/Roundcube/rcube.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php index 4de2dd300..e43a67f22 100644 --- a/program/lib/Roundcube/rcube.php +++ b/program/lib/Roundcube/rcube.php @@ -1618,9 +1618,9 @@ class rcube true, false); } else { - $delim = $this->config->header_delimiter(); - $to = $headers['To']; - $subject = $headers['Subject']; + $delim = $this->config->header_delimiter(); + $to = $headers['To']; + $subject = $headers['Subject']; $header_str = rtrim($header_str); if ($delim != "\r\n") { @@ -1630,10 +1630,8 @@ class rcube $subject = str_replace("\r\n", $delim, $subject); } - if (filter_var(ini_get('safe_mode'), FILTER_VALIDATE_BOOLEAN)) - $sent = mail($to, $subject, $msg_body, $header_str); - else - $sent = mail($to, $subject, $msg_body, $header_str, "-f$from"); + $opts = filter_var(ini_get('safe_mode'), FILTER_VALIDATE_BOOLEAN) ? null : "-f$from"; + $sent = mail($to, $subject, $msg_body, $header_str, $opts); } }