Project

General

Profile

« Previous | Next » 

Revision eeffd48c

Added by Ross Williams over 8 years ago

Add ddnsforcehostname option to DHCP Server configuration editor

(cherry picked from commit cf15bcb41f5befb3668f4608aafeddcb8bb18a58)

View differences:

src/usr/local/www/services_dhcp.php
207 207
	$pconfig['ddnsdomainkeyname'] = $dhcpdconf['ddnsdomainkeyname'];
208 208
	$pconfig['ddnsdomainkey'] = $dhcpdconf['ddnsdomainkey'];
209 209
	$pconfig['ddnsupdate'] = isset($dhcpdconf['ddnsupdate']);
210
	$pconfig['ddnsforcehostname'] = isset($dhcpdconf['ddnsforcehostname']);
210 211
	$pconfig['mac_allow'] = $dhcpdconf['mac_allow'];
211 212
	$pconfig['mac_deny'] = $dhcpdconf['mac_deny'];
212 213
	list($pconfig['ntp1'], $pconfig['ntp2']) = $dhcpdconf['ntpserver'];
......
573 574
		$dhcpdconf['ddnsdomainkeyname'] = $_POST['ddnsdomainkeyname'];
574 575
		$dhcpdconf['ddnsdomainkey'] = $_POST['ddnsdomainkey'];
575 576
		$dhcpdconf['ddnsupdate'] = ($_POST['ddnsupdate']) ? true : false;
577
		$dhcpdconf['ddnsforcehostname'] = ($_POST['ddnsforcehostname']) ? true : false;
576 578
		$dhcpdconf['mac_allow'] = $_POST['mac_allow'];
577 579
		$dhcpdconf['mac_deny'] = $_POST['mac_deny'];
578 580

  
......
1041 1043
))->setHelp('Leave blank to disable dynamic DNS registration.' . '<br />' .
1042 1044
			'Enter the dynamic DNS domain which will be used to register client names in the DNS server.');
1043 1045

  
1046
$section->addInput(new Form_Checkbox(
1047
	'ddnsforcehostname',
1048
	null,
1049
	'Force dynamic DNS hostname to be the same as configured hostname for Static Mappings',
1050
	$pconfig['ddnsforcehostname']
1051
))->setHelp('Default is to allow DHCP client to supply hostname to be registered.');
1052

  
1044 1053
$section->addInput(new Form_IpAddress(
1045 1054
	'ddnsdomainprimary',
1046 1055
	'Primary DDNS address',
......
1424 1433
		// On page load decide the initial state based on the data.
1425 1434
		if (ispageload) {
1426 1435
<?php
1427
			if (!$pconfig['ddnsupdate'] && empty($pconfig['ddnsdomain']) && empty($pconfig['ddnsdomainprimary']) &&
1436
			if (!$pconfig['ddnsupdate'] && !$pconfig['ddnsforcehostname'] && empty($pconfig['ddnsdomain']) && empty($pconfig['ddnsdomainprimary']) &&
1428 1437
			    empty($pconfig['ddnsdomainkeyname']) && empty($pconfig['ddnsdomainkey'])) {
1429 1438
				$showadv = false;
1430 1439
			} else {
......
1439 1448

  
1440 1449
		hideCheckbox('ddnsupdate', !showadvdns);
1441 1450
		hideInput('ddnsdomain', !showadvdns);
1451
		hideCheckbox('ddnsforcehostname', !showadvdns);
1442 1452
		hideInput('ddnsdomainprimary', !showadvdns);
1443 1453
		hideInput('ddnsdomainkeyname', !showadvdns);
1444 1454
		hideInput('ddnsdomainkey', !showadvdns);

Also available in: Unified diff