Merge branch 'master' into 'master'

Marius Cramer

2015-01-08 513a1785121fe98ced58bb0713885926a1ee42a9

 server/plugins-available/mail_plugin.inc.php

@@ -457,7 +457,7 @@
            exec(escapeshellcmd('rm -rf '.$mail_backup_dir));
            //* cleanup database
            $sql = "DELETE FROM mail_backup WHERE server_id = ? AND parent_domain_id = ? AND mailuser_id = ?";
            $app->db->query($sql, $conf['server_id'], $domain_rec['domain_id'], $data['old']['mailuser_id']);
            $app->db->query($sql, $conf['server_id'], $data['old']['domain_id'], $data['old']['mailuser_id']);
            if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $domain_rec['domain_id'], $data['old']['mailuser_id']);

            $app->log('Deleted the mail backup directory: '.$mail_backup_dir, LOGLEVEL_DEBUG);