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

backward-compatibility for old mail-folder-structure

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <mkaufmann@nutime.de>
This commit is contained in:
Michael Kaufmann (d00p)
2013-02-25 13:07:35 +01:00
parent bfcd824799
commit 177e8cf064
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/jobs/cron_tasks.php
View File

@@ -413,6 +413,21 @@ while($row = $db->fetch_array($result_tasks))
$cronlog->logAction(CRON_ACTION, LOG_NOTICE, 'Running: rm -rf ' . escapeshellarg($maildir));
safe_exec('rm -rf '.escapeshellarg($maildir));
}
else {
// backward-compatibility for old folder-structure
$maildir_old = makeCorrectDir($settings['system']['vmail_homedir'] .'/'. $row['data']['loginname'] .'/'. $row['data']['email']);
if ($maildir_old != '/' && !empty($maildir_old)
&& $maildir_old != $settings['system']['vmail_homedir']
&& substr($maildir_old, 0, strlen($settings['system']['vmail_homedir'])) == $settings['system']['vmail_homedir']
&& is_dir($maildir_old)
&& fileowner($maildir_old) == $settings['system']['vmail_uid']
&& filegroup($maildir_old) == $settings['system']['vmail_gid'])
{
$cronlog->logAction(CRON_ACTION, LOG_NOTICE, 'Running: rm -rf ' . escapeshellarg($maildir_old));
safe_exec('rm -rf '.escapeshellarg($maildir_old));
}
}
}
}
}