- use correct table-field for email deletion, refs #245

This commit is contained in:
Michael Kaufmann (d00p)
2010-07-24 19:42:03 +00:00
parent fe3728d522
commit ced78ac6f7
2 changed files with 3 additions and 3 deletions

View File

@@ -187,7 +187,7 @@ elseif($page == 'emails')
if(isset($_POST['delete_userfiles']) if(isset($_POST['delete_userfiles'])
&& (int)$_POST['delete_userfiles'] == 1) && (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 . "'"); $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']) if(isset($_POST['delete_userfiles'])
&& (int)$_POST['delete_userfiles'] == 1) && (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'] . "'"); $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'] . "'");

View File

@@ -30,7 +30,7 @@ function maildirExists($result = null)
{ {
$loginname = getCustomerDetail($result['customerid'], 'loginname'); $loginname = getCustomerDetail($result['customerid'], 'loginname');
if($loginname !== false) { 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)) { if(@file_exists($maildir)) {
return true; return true;
} }