Merge branch 'stable-3.1'

Marius Burkard

2016-02-04 22efd48fd42104a2526eef58cad543d4abbb83b5

Merge branch 'stable-3.1'

 interface/lib/classes/remote.d/client.inc.php

@@ -406,7 +406,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_database_user,web_domain,web_traffic';
            $tables = 'cron,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_database_user,web_domain,web_traffic,domain';
            $tables_array = explode(',', $tables);
            $client_group_id = $app->functions->intval($client_group['groupid']);


 interface/web/client/client_del.php

@@ -77,7 +77,7 @@
            $client_group = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ?", $client_id);

            // Get all records (sub-clients, mail, web, etc....)  of this client.
            $tables = 'cron,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_database_user,web_domain';
            $tables = 'cron,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_database_user,web_domain,web_traffic,domain';
            $tables_array = explode(',', $tables);
            $client_group_id = $app->functions->intval($client_group['groupid']);


 security/check.php

@@ -53,6 +53,7 @@
    $data_file = $data_dir.'/admincount';
    //get number of admins
    $tmp = $app->db->queryOneRecord("SELECT count(userid) AS number FROM sys_user WHERE typ = 'admin'");
    if($tmp) {
    $admin_user_count_new = intval($tmp['number']);
    
    if(is_file($data_file)) {
@@ -67,6 +68,7 @@
        chmod($data_file,0700);
    }
}
}

// Check if /etc/passwd file has been changed
if($security_config['warn_passwd_change'] == 'yes') {