From 84569173c9a21ebab5ecdb662d9b4fb98b7c336b Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Mon, 16 Apr 2012 08:19:56 -0400 Subject: [PATCH] Fixed: FS#2176 - collision between shell/ftp accounts and client accounts named webXX is not checked --- interface/lib/classes/functions.inc.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php index 2102992..b744e35 100644 --- a/interface/lib/classes/functions.inc.php +++ b/interface/lib/classes/functions.inc.php @@ -45,6 +45,7 @@ $content = file_get_contents($filepath); $content = chunk_split(base64_encode($content)); $uid = strtoupper(md5(uniqid(time()))); + $subject = "=?utf-8?B?".base64_encode($subject)."?="; if($filename == '') { $path_parts = pathinfo($filepath); @@ -73,6 +74,9 @@ 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"; + $subject = "=?utf-8?B?".base64_encode($subject)."?="; mail($to, $subject, $text, $header); } -- Gitblit v1.9.1