From 9cd5c1e1c180c1deed393f7b7067b116dcc2fcdb Mon Sep 17 00:00:00 2001 From: tbrehm Date: Mon, 7 Mar 2011 16:22:56 +0000 Subject: [PATCH] Fixed: FS#1548 - Resellers cannot add slave DNS zones --- interface/lib/config.inc.php | 2 +- interface/web/dns/dns_slave_edit.php | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php index b6a113001..84a15e603 100644 --- a/interface/lib/config.inc.php +++ b/interface/lib/config.inc.php @@ -50,7 +50,7 @@ define('ISPC_APP_VERSION', '3.0.2'); //** Database $conf['db_type'] = 'mysql'; $conf['db_host'] = 'localhost'; -$conf['db_database'] = 'ispconfig3'; +$conf['db_database'] = 'ispconfig3_stable'; $conf['db_user'] = 'root'; $conf['db_password'] = ''; $conf['db_charset'] = 'utf8'; // same charset as html-charset - (HTML --> MYSQL: "utf-8" --> "utf8", "iso-8859-1" --> "latin1") diff --git a/interface/web/dns/dns_slave_edit.php b/interface/web/dns/dns_slave_edit.php index 9ffbf8360..c40eb96b6 100644 --- a/interface/web/dns/dns_slave_edit.php +++ b/interface/web/dns/dns_slave_edit.php @@ -129,11 +129,11 @@ class page_action extends tform_actions { $this->dataRecord["server_id"] = $client["default_dnsserver"]; // Check if the user may add anoter secondary domain. - if($client["limit_slave_dns_zone"] >= 0) { - $tmp = $app->db->queryOneRecord("SELECT count(id) as number FROM dns_slave WHERE sys_groupid = $client_group_id"); - if($tmp["number"] >= $client["limit_dns_slave_zone"]) { - $app->error($app->tform->wordbook["limit_dns_slave_zone_txt"]); - } + if(!$app->tform->checkClientLimit('limit_dns_slave_zone')) { + $app->error($app->tform->wordbook["limit_dns_slave_zone_txt"]); + } + if(!$app->tform->checkResellerLimit('limit_dns_slave_zone')) { + $app->error('Reseller: '.$app->tform->wordbook["limit_dns_slave_zone_txt"]); } } } -- GitLab