From 22efd48fd42104a2526eef58cad543d4abbb83b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 04 Feb 2016 10:17:40 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
security/check.php | 22 ++++++++++++----------
interface/web/client/client_del.php | 2 +-
interface/lib/classes/remote.d/client.inc.php | 2 +-
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/interface/lib/classes/remote.d/client.inc.php b/interface/lib/classes/remote.d/client.inc.php
index 8e1324e..c9441f5 100644
--- a/interface/lib/classes/remote.d/client.inc.php
+++ b/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']);
diff --git a/interface/web/client/client_del.php b/interface/web/client/client_del.php
index 4344118..206082c 100644
--- a/interface/web/client/client_del.php
+++ b/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']);
diff --git a/security/check.php b/security/check.php
index dc930c5..cfa820f 100644
--- a/security/check.php
+++ b/security/check.php
@@ -53,18 +53,20 @@
$data_file = $data_dir.'/admincount';
//get number of admins
$tmp = $app->db->queryOneRecord("SELECT count(userid) AS number FROM sys_user WHERE typ = 'admin'");
- $admin_user_count_new = intval($tmp['number']);
-
- if(is_file($data_file)) {
- $admin_user_count_old = intval(file_get_contents($data_file));
- if($admin_user_count_new != $admin_user_count_old) {
- $alert .= "The number of ISPConfig administrator users has changed. Old: $admin_user_count_old New: $admin_user_count_new \n";
+ if($tmp) {
+ $admin_user_count_new = intval($tmp['number']);
+
+ if(is_file($data_file)) {
+ $admin_user_count_old = intval(file_get_contents($data_file));
+ if($admin_user_count_new != $admin_user_count_old) {
+ $alert .= "The number of ISPConfig administrator users has changed. Old: $admin_user_count_old New: $admin_user_count_new \n";
+ file_put_contents($data_file,$admin_user_count_new);
+ }
+ } else {
+ // first run, so we save the current count
file_put_contents($data_file,$admin_user_count_new);
+ chmod($data_file,0700);
}
- } else {
- // first run, so we save the current count
- file_put_contents($data_file,$admin_user_count_new);
- chmod($data_file,0700);
}
}
--
Gitblit v1.9.1