From 3764dc4ad0b85b25cfe1247f68c5df00a2f0445d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 27 Oct 2009 11:34:34 -0400
Subject: [PATCH] Implemented: FS#539 - ssl domain must be selectable
---
interface/web/dns/dns_wizard.php | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/interface/web/dns/dns_wizard.php b/interface/web/dns/dns_wizard.php
index a683d22..61d6bb6 100644
--- a/interface/web/dns/dns_wizard.php
+++ b/interface/web/dns/dns_wizard.php
@@ -137,11 +137,26 @@
if(isset($_POST['ns2']) && $_POST['ns2'] == '') $error .= $app->lng('error_ns2_empty').'<br />';
if(isset($_POST['email']) && $_POST['email'] == '') $error .= $app->lng('error_email_empty').'<br />';
- if(!$app->tform->checkClientLimit('limit_dns_zone')) {
- $error .= $app->tform->wordbook["limit_dns_zone_txt"];
+ // make sure that the record belongs to the clinet group and not the admin group when a dmin inserts it
+ if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($_POST['client_group_id'])) {
+ $sys_groupid = intval($_POST['client_group_id']);
+ } elseif($app->auth->has_clients($_SESSION['s']['user']['userid']) && isset($_POST['client_group_id'])) {
+ $sys_groupid = intval($_POST['client_group_id']);
+ } else {
+ $sys_groupid = $_SESSION["s"]["user"]["default_group"];
}
- if(!$app->tform->checkResellerLimit('limit_dns_zone')) {
- $error .= $app->tform->wordbook["limit_dns_zone_txt"];
+
+ $tform_def_file = "form/dns_soa.tform.php";
+ $app->uses('tform');
+ $app->tform->loadFormDef($tform_def_file);
+
+ if($_SESSION['s']['user']['typ'] != 'admin') {
+ if(!$app->tform->checkClientLimit('limit_dns_zone')) {
+ $error .= $app->tform->wordbook["limit_dns_zone_txt"];
+ }
+ if(!$app->tform->checkResellerLimit('limit_dns_zone')) {
+ $error .= $app->tform->wordbook["limit_dns_zone_txt"];
+ }
}
--
Gitblit v1.9.1