Fixed: FS#3222 - Backup cleaner bug

Till Brehm · Till Brehm · commit b7899214010f · 2014-02-16T14:54:18.000+01:00
diff --git a/server/cron_daily.php b/server/cron_daily.php
@@ -1230,6 +1230,9 @@ function send_notification_email($template, $placeholders, $recipients) {
 					$web_backup_dir = realpath($backup_dir.'/web'.$web_id);
 					if(is_dir($web_backup_dir)) {
 						exec('sudo -u '.escapeshellarg($web_user).' rm -f '.escapeshellarg($web_backup_dir.'/*'));
+						$sql = "DELETE FROM web_backup WHERE server_id = ".intval($conf['server_id'])." AND parent_domain_id = ".intval($web_id);
+						$app->db->query($sql);
+						if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
 					}
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -1230,6 +1230,9 @@ function send_notification_email($template, $placeholders, $recipients) {`
`1230`	`1230`	`$web_backup_dir = realpath($backup_dir.'/web'.$web_id);`
`1231`	`1231`	`if(is_dir($web_backup_dir)) {`
`1232`	`1232`	`exec('sudo -u '.escapeshellarg($web_user).' rm -f '.escapeshellarg($web_backup_dir.'/*'));`
	`1233`	`+ $sql = "DELETE FROM web_backup WHERE server_id = ".intval($conf['server_id'])." AND parent_domain_id = ".intval($web_id);`
	`1234`	`+ $app->db->query($sql);`
	`1235`	`+ if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);`
`1233`	`1236`	`}`
`1234`	`1237`	`}`
`1235`	`1238`	`}`