From 1c3690a88208f897c73892bc0d6efaceb8ba9651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabr=C3=ADcio=20Zimmerer=20Murta?= Date: Tue, 10 Jul 2012 00:54:03 -0300 Subject: [PATCH] Erase full user dir instead of just Maildir/ when erasing customer email data. --- scripts/jobs/cron_tasks.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/jobs/cron_tasks.php b/scripts/jobs/cron_tasks.php index 94216b04..76b18fa9 100644 --- a/scripts/jobs/cron_tasks.php +++ b/scripts/jobs/cron_tasks.php @@ -400,12 +400,13 @@ while($row = $db->fetch_array($result_tasks)) // Add trailing slash to Maildir if needed $maildirpath=$maildirname; if (!empty($maildirname) and substr($maildirname,-1) != "/") $maildirpath.="/"; - $maildir = makeCorrectDir($settings['system']['vmail_homedir'] .'/'. $row['data']['loginname'] .'/'. $email_domain .'/'. $email_user .'/'. $maildirpath); + $maildir = makeCorrectDir($settings['system']['vmail_homedir'] .'/'. $row['data']['loginname'] .'/'. $email_domain .'/'. $email_user); if($maildir != '/' && !empty($maildir) && !empty($email_full) && $maildir != $settings['system']['vmail_homedir'] && substr($maildir, 0, strlen($settings['system']['vmail_homedir'])) == $settings['system']['vmail_homedir'] - && is_dir($maildir) + && is_dir($maildir) + && is_dir(makeCorrectDir($maildir.'/'.$maildirpath)) && fileowner($maildir) == $settings['system']['vmail_uid'] && filegroup($maildir) == $settings['system']['vmail_gid']) {