fixed remove inactive mail-backups

Florian Schaal · Florian Schaal · commit ef5c451dabfe · 2015-11-17T13:12:49.000+01:00
diff --git a/server/lib/classes/cron.d/500-backup_mail.inc.php b/server/lib/classes/cron.d/500-backup_mail.inc.php
@@ -203,9 +203,14 @@ public function onRunJob() {
 							$dir_handle = opendir($mail_backup_dir.'/');
 							while ($file = readdir($dir_handle)) {
 								if(!is_dir($file)) {
-									unlink ("$mail_backup_dir/"."$file");
+									if(substr($file,0,strlen($mail_backup_file)) == $mail_backup_file) {
+										unlink ($mail_backup_dir.'/'.$file);
+									}
 								}
 							}
+							if(count(glob($mail_backup_dir."/*", GLOB_NOSORT)) === 0) {
+								rmdir($mail_backup_dir);
+							}
 						}
 						/* remove backups from db */
 						$sql = "DELETE FROM mail_backup WHERE server_id = ? AND parent_domain_id = ? AND mailuser_id = ?";

Original file line number	Diff line number	Diff line change
`@@ -203,9 +203,14 @@ public function onRunJob() {`
`203`	`203`	`$dir_handle = opendir($mail_backup_dir.'/');`
`204`	`204`	`while ($file = readdir($dir_handle)) {`
`205`	`205`	`if(!is_dir($file)) {`
`206`		`- unlink ("$mail_backup_dir/"."$file");`
	`206`	`+ if(substr($file,0,strlen($mail_backup_file)) == $mail_backup_file) {`
	`207`	`+ unlink ($mail_backup_dir.'/'.$file);`
	`208`	`+ }`
`207`	`209`	`}`
`208`	`210`	`}`
	`211`	`+ if(count(glob($mail_backup_dir."/*", GLOB_NOSORT)) === 0) {`
	`212`	`+ rmdir($mail_backup_dir);`
	`213`	`+ }`
`209`	`214`	`}`
`210`	`215`	`/* remove backups from db */`
`211`	`216`	`$sql = "DELETE FROM mail_backup WHERE server_id = ? AND parent_domain_id = ? AND mailuser_id = ?";`