Fixed: FS#1815 - Domain from Domains module not deleted, when user is deleted

tbrehm

2011-10-20 cbc04d01b8d40d40b1b474145c4b939e0f0c087d

Fixed: FS#1815 - Domain from Domains module not deleted, when user is deleted

 interface/web/client/client_del.php

@@ -131,7 +131,7 @@
            $app->db->query("DELETE FROM sys_user WHERE client_id = $client_id");
            
            // Delete all records (sub-clients, mail, web, etc....)  of this client.
            $tables = 'client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_domain,web_traffic,web_folder,web_folder_user';
            $tables = 'client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_domain,web_traffic,web_folder,web_folder_user,domain';
            $tables_array = explode(',',$tables);
            $client_group_id = intval($client_group['groupid']);
            if($client_group_id > 1) {

 interface/web/sites/web_domain_del.php

@@ -55,37 +55,37 @@
        
        if($app->tform->checkPerm($this->id,'d') == false) $app->error($app->lng('error_no_delete_permission'));
        
        // Delete all records that belog to this zone.
        //* Delete all records that belog to this zone.
        $records = $app->db->queryAllRecords("SELECT domain_id FROM web_domain WHERE parent_domain_id = '".intval($this->id)."' AND type != 'vhost'");
        foreach($records as $rec) {
            $app->db->datalogDelete('web_domain','domain_id',$rec['domain_id']);
        }
        
        // Delete all records that belog to this zone.
        //* Delete all records that belog to this zone.
        $records = $app->db->queryAllRecords("SELECT ftp_user_id FROM ftp_user WHERE parent_domain_id = '".intval($this->id)."'");
        foreach($records as $rec) {
            $app->db->datalogDelete('ftp_user','ftp_user_id',$rec['ftp_user_id']);
        }
        
        // Delete all records that belog to this zone.
        //* Delete all records that belog to this web.
        $records = $app->db->queryAllRecords("SELECT shell_user_id FROM shell_user WHERE parent_domain_id = '".intval($this->id)."'");
        foreach($records as $rec) {
            $app->db->datalogDelete('shell_user','shell_user_id',$rec['shell_user_id']);
        }
        
        // Delete all records that belog to this zone.
        //* Delete all records that belog to this web.
        $records = $app->db->queryAllRecords("SELECT id FROM cron WHERE parent_domain_id = '".intval($this->id)."'");
        foreach($records as $rec) {
            $app->db->datalogDelete('cron','id',$rec['id']);
        }
        
        // Delete all records that belog to this zone.
        //* Delete all records that belog to this web.
        $records = $app->db->queryAllRecords("SELECT id FROM cron WHERE parent_domain_id = '".intval($this->id)."'");
        foreach($records as $rec) {
            $app->db->datalogDelete('cron','id',$rec['id']);
        }
        
        // Delete all records that belog to this zone.
        //* Delete all records that belog to this web
        $records = $app->db->queryAllRecords("SELECT webdav_user_id FROM webdav_user WHERE parent_domain_id = '".intval($this->id)."'");
        foreach($records as $rec) {
            $app->db->datalogDelete('webdav_user','webdav_user_id',$rec['webdav_user_id']);