fixed remove of inactive web backups

Florian Schaal · Florian Schaal · commit 04eafed04793 · 2014-01-03T07:26:57.000+01:00
diff --git a/server/lib/classes/cron.d/500-backup.inc.php b/server/lib/classes/cron.d/500-backup.inc.php
@@ -72,7 +72,7 @@ public function onRunJob() {
 				chmod(escapeshellcmd($backup_dir), $backup_dir_permissions);
 			}
 
-			$sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain') AND backup_interval != 'none'";
+			$sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain')";
 			$records = $app->db->queryAllRecords($sql);
 			if(is_array($records)) {
 				foreach($records as $rec) {

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function onRunJob() {`
`72`	`72`	`chmod(escapeshellcmd($backup_dir), $backup_dir_permissions);`
`73`	`73`	`}`
`74`	`74`
`75`		`- $sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain') AND backup_interval != 'none'";`
	`75`	`+ $sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain')";`
`76`	`76`	`$records = $app->db->queryAllRecords($sql);`
`77`	`77`	`if(is_array($records)) {`
`78`	`78`	`foreach($records as $rec) {`