From 82973267f3f6b09cc16dfbfa2239f64a255e28de Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Fri, 19 Apr 2013 15:32:10 +0200 Subject: [PATCH] respect deactivation of 'nameserver' yes|no in domain-edit (thx to monumentum); beautify preconfig Signed-off-by: Michael Kaufmann (d00p) --- admin_domains.php | 2 +- install/updates/preconfig/0.9/preconfig_0.9.inc.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin_domains.php b/admin_domains.php index 014e3203..a9c4597b 100644 --- a/admin_domains.php +++ b/admin_domains.php @@ -815,7 +815,7 @@ if($page == 'domains' $zonefile = $result['zonefile']; if ($settings['system']['bind_enable'] == '1') { if (isset($_POST['isbinddomain'])) { - $isbinddomain = '1'; + $isbinddomain = (int)$_POST['isbinddomain']; } $zonefile = validate($_POST['zonefile'], 'zonefile'); } diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php index 1d3ac9a8..82312eac 100644 --- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php +++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php @@ -520,8 +520,8 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version) if (versionInUpdate($current_version, '0.9.29-dev2')) { $has_preconfig = true; $description = 'You can now decide whether admins/customers are able to change the theme
'; - $question = 'If you want to disallow theme-changing, uncheck the checkboxes below: '; - $question.= "Admins: ". makeyesno('allow_themechange_a', '1', '0', '1'); + $question = 'If you want to disallow theme-changing, select "no" from the dropdowns: '; + $question.= "Admins: ". makeyesno('allow_themechange_a', '1', '0', '1').'  '; $question.= "Customers: ".makeyesno('allow_themechange_c', '1', '0', '1'); eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); }