Merge branch 'master' into 'stable-3.1'

Till Brehm · Till Brehm · commit e67465933361 · 2016-06-16T11:58:33.000+02:00
fixed remove mail-backups (Bernd Kilmer)



See merge request !356
diff --git a/server/lib/classes/cron.d/500-backup_mail.inc.php b/server/lib/classes/cron.d/500-backup_mail.inc.php
@@ -176,7 +176,7 @@ public function onRunJob() {
 						$dir_handle = dir($mail_backup_dir);
 						$files = array();
 						while (false !== ($entry = $dir_handle->read())) {
-							if($entry != '.' && $entry != '..' && substr($entry,0,4+strlen($rec['mailuser_id'])) == 'mail'.$rec['mailuser_id'] && is_file($mail_backup_dir.'/'.$entry)) {
+							if($entry != '.' && $entry != '..' && substr($entry,0,5+strlen($rec['mailuser_id'])) == 'mail'.$rec['mailuser_id'].'_' && is_file($mail_backup_dir.'/'.$entry)) {
 								$files[] = $entry;
 							}
 						}

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public function onRunJob() {`
`176`	`176`	`$dir_handle = dir($mail_backup_dir);`
`177`	`177`	`$files = array();`
`178`	`178`	`while (false !== ($entry = $dir_handle->read())) {`
`179`		`- if($entry != '.' && $entry != '..' && substr($entry,0,4+strlen($rec['mailuser_id'])) == 'mail'.$rec['mailuser_id'] && is_file($mail_backup_dir.'/'.$entry)) {`
	`179`	`+ if($entry != '.' && $entry != '..' && substr($entry,0,5+strlen($rec['mailuser_id'])) == 'mail'.$rec['mailuser_id'].'_' && is_file($mail_backup_dir.'/'.$entry)) {`
`180`	`180`	`$files[] = $entry;`
`181`	`181`	`}`
`182`	`182`	`}`