maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

remove not-functional method 'maildirExists' as maildirs have chmod 700, show 'remove files' on overview-delete if mail-address is an account, fixes #1275

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-11-30 16:40:27 +01:00
parent f278b42353
commit f8e7f1a975
2 changed files with 3 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
customer_email.php
View File

@@ -143,7 +143,6 @@ if ($page == 'overview') {
if ($result['popaccountid'] != 0) {
// Free the Quota used by the email account
if ($settings['system']['mail_quota_enabled'] == 1) {
$stmt = Database::prepare("SELECT `quota` FROM `" . TABLE_MAIL_USERS . "`
WHERE `customerid`= :customerid
@@ -167,7 +166,8 @@ if ($page == 'overview') {
}
if (isset($_POST['delete_userfiles'])
&& (int)$_POST['delete_userfiles'] == 1) {
&& (int)$_POST['delete_userfiles'] == 1
) {
inserttask('7', $userinfo['loginname'], $result['email_full']);
}
@@ -188,7 +188,7 @@ if ($page == 'overview') {
$log->logAction(USR_ACTION, LOG_INFO, "deleted email address '" . $result['email'] . "'");
redirectTo($filename, array('page' => $page, 's' => $s));
} else {
if (maildirExists($result)) {
if ($result['popaccountid'] != '0') {
$show_checkbox = true;
} else {
$show_checkbox = false;