fmDNS - Issue #54 - Improved interface for selecting server update me…

…thod
WillyXJ · Mar 14, 2014 · 8fde0fb · 8fde0fb
1 parent f7638cd
commit 8fde0fb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/server/fm-modules/fmDNS/change.log b/server/fm-modules/fmDNS/change.log
@@ -15,6 +15,7 @@
 * Server - Prevent attempts to create non-existent record types for zones.
 * Server - (Git Issue 63) Added forward PTR support specifically for DNS-SD.
 * Server - (Git Issue 67) Added support for wildcard records.
+* Server - (Git Issue 54) Improved interface for selecting server update method.
 
 1.0.3 (2014-02-20)
 ==================

diff --git a/server/fm-modules/fmDNS/classes/class_servers.php b/server/fm-modules/fmDNS/classes/class_servers.php
@@ -356,14 +356,24 @@ function printForm($data = '', $action = 'add') {
 
 		$disabled = ($server_installed == 'yes') ? 'disabled' : null;
 
+		if ($server_installed == 'yes') {
+			if (strpos($server_update_method, 'http') === false) {
+				$server_update_method_choices = array($server_update_method);
+			} else {
+				$server_update_method_choices = array('http', 'https');
+			}
+		} else {
+			$server_update_method_choices = enumMYSQLSelect('fm_' . $__FM_CONFIG['fmDNS']['prefix'] . 'servers', 'server_update_method');
+		}
+
 		/** Check name field length */
 		$server_name_length = getColumnLength('fm_' . $__FM_CONFIG['fmDNS']['prefix'] . 'servers', 'server_name');
 		$server_config_file_length = getColumnLength('fm_' . $__FM_CONFIG['fmDNS']['prefix'] . 'servers', 'server_config_file');
 		$server_root_dir_length = getColumnLength('fm_' . $__FM_CONFIG['fmDNS']['prefix'] . 'servers', 'server_root_dir');
 		$server_zones_dir_length = getColumnLength('fm_' . $__FM_CONFIG['fmDNS']['prefix'] . 'servers', 'server_zones_dir');
 
 		$server_type = buildSelect('server_type', 'server_type', enumMYSQLSelect('fm_' . $__FM_CONFIG['fmDNS']['prefix'] . 'servers', 'server_type'), $server_type, 1);
-		$server_update_method = buildSelect('server_update_method', 'server_update_method', enumMYSQLSelect('fm_' . $__FM_CONFIG['fmDNS']['prefix'] . 'servers', 'server_update_method'), $server_update_method, 1, $disabled);
+		$server_update_method = buildSelect('server_update_method', 'server_update_method', $server_update_method_choices, $server_update_method, 1);
 		$server_key = buildSelect('server_key', 'server_key', $this->availableKeys(), $server_key);
 		$server_run_as_predefined = buildSelect('server_run_as_predefined', 'server_run_as_predefined', enumMYSQLSelect('fm_' . $__FM_CONFIG['fmDNS']['prefix'] . 'servers', 'server_run_as_predefined'), $server_run_as_predefined, 1, '', false, "showHideBox('run_as', 'server_run_as_predefined', 'as defined:')");