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

Erase full user dir instead of just Maildir/ when erasing customer email data.

Browse Source
This commit is contained in:
Fabrício Zimmerer Murta
2012-07-10 00:54:03 -03:00
parent 72cefb38db
commit 1c3690a882
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/jobs/cron_tasks.php
View File

@@ -400,12 +400,13 @@ while($row = $db->fetch_array($result_tasks))
// Add trailing slash to Maildir if needed // Add trailing slash to Maildir if needed
$maildirpath=$maildirname; $maildirpath=$maildirname;
if (!empty($maildirname) and substr($maildirname,-1) != "/") $maildirpath.="/"; 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) if($maildir != '/' && !empty($maildir) && !empty($email_full)
&& $maildir != $settings['system']['vmail_homedir'] && $maildir != $settings['system']['vmail_homedir']
&& substr($maildir, 0, strlen($settings['system']['vmail_homedir'])) == $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'] && fileowner($maildir) == $settings['system']['vmail_uid']
&& filegroup($maildir) == $settings['system']['vmail_gid']) && filegroup($maildir) == $settings['system']['vmail_gid'])
{ {