From 996f53786ff872814077ce7908b49d16da1fe6b8 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Thu, 19 Dec 2013 08:29:22 +0100 Subject: [PATCH] Fixed bug in webftp regarding email as ftp-login, fixes #1252 Signed-off-by: Florian Aders (EleRas) --- webftp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webftp.php b/webftp.php index 9ea5caa9..771b999f 100644 --- a/webftp.php +++ b/webftp.php @@ -686,7 +686,7 @@ function killslashes($input) { function parse_ftp_rawlist($list, $type = "UNIX") { if ($type == "UNIX") { - $regexp = "/([-ldrswx]{10})[ ]+([0-9]+)[ ]+([-A-Z0-9_]+)[ ]+([-A-Z0-9_]+)[ ]+([0-9]+)[ ]+([A-Z]{3}[ ]+[0-9]{1,2}[ ]+[0-9:]{4,5})[ ]+(.*)/i"; + $regexp = "/([-ldrswx]{10})[ ]+([0-9]+)[ ]+([-A-Z0-9_@\.]+)[ ]+([-A-Z0-9_@\.]+)[ ]+([0-9]+)[ ]+([A-Z]{3}[ ]+[0-9]{1,2}[ ]+[0-9:]{4,5})[ ]+(.*)/i"; $i = 0; foreach ($list as $line) { $is_dir = $is_link = FALSE;