From f382f091aa97d10056b4c433aa55298fece010d4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 13 Aug 2014 07:16:30 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'
---
interface/web/dns/dns_import.php | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php
index c78e41a..5598b56 100644
--- a/interface/web/dns/dns_import.php
+++ b/interface/web/dns/dns_import.php
@@ -56,7 +56,8 @@
$server_id = $app->functions->intval($_POST['server_id_value']);
$post_server_id = true;
} else {
- $server_id = 1;
+ $settings = $app->getconf->get_global_config('dns');
+ $server_id = $app->functions->intval($settings['default_dnsserver']);
$post_server_id = false;
}
@@ -151,6 +152,44 @@
}
+/*
+ * Now we have to check, if we should use the domain-module to select the domain
+ * or not
+ */
+$app->uses('ini_parser,getconf');
+$settings = $app->getconf->get_global_config('domains');
+if ($settings['use_domain_module'] == 'y') {
+ /*
+ * The domain-module is in use.
+ */
+ $domains = $app->tools_sites->getDomainModuleDomains("dns_soa");
+ /*
+ * We can leave domain empty if domain is filename
+ */
+ $domain_select = "<option value=''></option>\r\n";
+ if(is_array($domains) && sizeof($domains) > 0) {
+ /* We have domains in the list, so create the drop-down-list */
+ foreach( $domains as $domain) {
+ $domain_select .= "<option value=" . $domain['domain_id'] ;
+ if ($domain['domain'] == $_POST['domain']) {
+ $domain_select .= " selected";
+ }
+ $domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . ".</option>\r\n";
+ }
+ }
+ $app->tpl->setVar("domain_option", $domain_select);
+ /* check if the selected domain can be used! */
+ if ($domain) {
+ $domain_check = $app->tools_sites->checkDomainModuleDomain($domain);
+ if(!$domain_check) {
+ // invalid domain selected
+ $domain = NULL;
+ } else {
+ $domain = $domain_check;
+ }
+ }
+}
+
$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_dns_import.lng';
include $lng_file;
$app->tpl->setVar($wb);
--
Gitblit v1.9.1