From ced78ac6f7512df918ba17edc931b698fd867c70 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sat, 24 Jul 2010 19:42:03 +0000 Subject: [PATCH] - use correct table-field for email deletion, refs #245 --- customer_email.php | 4 ++-- lib/functions/filedir/function.maildirExists.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/customer_email.php b/customer_email.php index 178ffd74..adc0b8d2 100644 --- a/customer_email.php +++ b/customer_email.php @@ -187,7 +187,7 @@ elseif($page == 'emails') if(isset($_POST['delete_userfiles']) && (int)$_POST['delete_userfiles'] == 1) { - inserttask('7', $userinfo['loginname'], $result['email']); + inserttask('7', $userinfo['loginname'], $result['email_full']); } $db->query("DELETE FROM `" . TABLE_MAIL_VIRTUAL . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'"); @@ -616,7 +616,7 @@ elseif($page == 'accounts') if(isset($_POST['delete_userfiles']) && (int)$_POST['delete_userfiles'] == 1) { - inserttask('7', $userinfo['loginname'], $result['email']); + inserttask('7', $userinfo['loginname'], $result['email_full']); } $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `email_accounts_used` = `email_accounts_used` - 1, `email_quota_used` = `email_quota_used` - " . (int)$quota . " WHERE `customerid`='" . (int)$userinfo['customerid'] . "'"); diff --git a/lib/functions/filedir/function.maildirExists.php b/lib/functions/filedir/function.maildirExists.php index c5446c5a..86c8b4a5 100644 --- a/lib/functions/filedir/function.maildirExists.php +++ b/lib/functions/filedir/function.maildirExists.php @@ -30,7 +30,7 @@ function maildirExists($result = null) { $loginname = getCustomerDetail($result['customerid'], 'loginname'); if($loginname !== false) { - $maildir = makeCorrectDir($settings['system']['vmail_homedir'] .'/'. $loginname .'/'. $result['email']); + $maildir = makeCorrectDir($settings['system']['vmail_homedir'] .'/'. $loginname .'/'. $result['email_full']); if(@file_exists($maildir)) { return true; }