From 723662f1b98e13b556fc289ea209953375a5b5ae Mon Sep 17 00:00:00 2001 From: tbrehm Date: Mon, 21 Nov 2011 15:05:57 +0000 Subject: [PATCH] - Fixed a warning in apache2_plugin.inc.php - Fixed UTF-8 support in email function. --- interface/lib/classes/functions.inc.php | 2 ++ server/plugins-available/apache2_plugin.inc.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php index 21029929d..3e926aeec 100644 --- a/interface/lib/classes/functions.inc.php +++ b/interface/lib/classes/functions.inc.php @@ -73,6 +73,8 @@ class functions { mail($to, $subject, "", $header); } else { $header = "From: $from\nReply-To: $from\n"; + $header .= "Content-Type: text/plain;\n\tcharset=\"UTF-8\"\n"; + $header .= "Content-Transfer-Encoding: 8bit\n\n"; mail($to, $subject, $text, $header); } diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 7dc07fe74..49bb90fa5 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -167,7 +167,7 @@ class apache2_plugin { $app->log("Creating CA-signed SSL Cert for: $domain",LOGLEVEL_DEBUG); if (filesize($crt_file)==0 || !file_exists($crt_file)) $app->log("CA-Certificate signing failed. openssl ca -out $crt_file -config ".$web_config['CA_path']."/openssl.cnf -passin pass:".$web_config['CA_pass']." -in $csr_file",LOGLEVEL_ERROR); }; - if (filesize($crt_file)==0 || !file_exists($crt_file)){ + if (@filesize($crt_file)==0 || !file_exists($crt_file)){ exec("openssl req -x509 -passin pass:$ssl_password -passout pass:$ssl_password -key $key_file -in $csr_file -out $crt_file -days $ssl_days -config $config_file "); $app->log("Creating self-signed SSL Cert for: $domain",LOGLEVEL_DEBUG); }; -- GitLab