Skip to content

Commit 723662f

Browse files
committed
- Fixed a warning in apache2_plugin.inc.php
- Fixed UTF-8 support in email function.
1 parent edf806b commit 723662f

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

interface/lib/classes/functions.inc.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ public function mail($to, $subject, $text, $from, $filepath = '', $filetype = 'a
7373
mail($to, $subject, "", $header);
7474
} else {
7575
$header = "From: $from\nReply-To: $from\n";
76+
$header .= "Content-Type: text/plain;\n\tcharset=\"UTF-8\"\n";
77+
$header .= "Content-Transfer-Encoding: 8bit\n\n";
7678
mail($to, $subject, $text, $header);
7779
}
7880

server/plugins-available/apache2_plugin.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ function ssl($event_name,$data) {
167167
$app->log("Creating CA-signed SSL Cert for: $domain",LOGLEVEL_DEBUG);
168168
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);
169169
};
170-
if (filesize($crt_file)==0 || !file_exists($crt_file)){
170+
if (@filesize($crt_file)==0 || !file_exists($crt_file)){
171171
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 ");
172172
$app->log("Creating self-signed SSL Cert for: $domain",LOGLEVEL_DEBUG);
173173
};

0 commit comments

Comments
 (0)