From ff4da3edea10612d5a3e4f569b164fd5f2c1a7ae Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 31 Jan 2016 06:52:36 -0500
Subject: [PATCH] Improved client message form.
---
install/lib/installer_base.lib.php | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 7643043..607b7cd 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -68,6 +68,12 @@
} else {
$input = $autoinstall[$name];
}
+ } elseif($name != '' && $autoupdate[$name] != '') {
+ if($autoupdate[$name] == 'default') {
+ $input = $default;
+ } else {
+ $input = $autoupdate[$name];
+ }
} else {
$answers_str = implode(',', $answers);
swrite($this->lng($query).' ('.$answers_str.') ['.$default.']: ');
@@ -104,6 +110,12 @@
$input = $default;
} else {
$input = $autoinstall[$name];
+ }
+ } elseif($name != '' && $autoupdate[$name] != '') {
+ if($autoupdate[$name] == 'default') {
+ $input = $default;
+ } else {
+ $input = $autoupdate[$name];
}
} else {
swrite($this->lng($query).' ['.$default.']: ');
@@ -1502,22 +1514,15 @@
//* Create the slave subdirectory
$content .= 'slave';
- if(!@is_dir($content)) mkdir($content, 2770, true);
+ if(!@is_dir($content)) mkdir($content, 02770, true);
//* Chown the slave subdirectory to $conf['bind']['bind_user']
chown($content, $conf['bind']['bind_user']);
chgrp($content, $conf['bind']['bind_group']);
- chmod($content, 2770);
+ chmod($content, 02770);
//* Install scripts for dnssec implementation
- $this->process_bind_file('dnssec-update.sh', '/server/scripts/');
- $this->process_bind_file('dnssec-create.sh', '/server/scripts/');
- $this->process_bind_file('dnssec-delete.sh', '/server/scripts/');
- $this->process_bind_file('dnssec-autoupdate.sh', '/server/scripts/');
- $this->process_bind_file('dnssec-autopickup.sh', '/server/scripts/');
- $this->process_bind_file('dnssec-autocreate.sh', '/server/scripts/');
- $this->process_bind_file('dnssec-config.sh', '/server/scripts/');
-
+ $this->process_bind_file('named.conf.options', '/etc/bind/', true); //TODO replace hardcoded path
}
@@ -2852,4 +2857,4 @@
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1