Commit 723662f1 authored by tbrehm's avatar tbrehm
Browse files

- Fixed a warning in apache2_plugin.inc.php

- Fixed UTF-8 support in email function.
parent edf806b9
......@@ -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);
}
......
......@@ -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);
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment