Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-02-17 ebbe6374fc9c308daf729d2ad1b2f8007ed771ce

 server/lib/classes/cron.d/500-backup.inc.php

@@ -199,6 +199,9 @@
                     $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);
                     }
                  }
               }