Projet

Général

Profil

« Précédent | Suivant » 

Révision 6190312f

Ajouté par Phil Davis il y a plus de 9 ans

Support up to 4 DNS Servers in DHCP

Voir les différences:

usr/local/www/services_router_advertisements.php
96 96
		$pconfig['rapriority'] = "medium";
97 97
	$pconfig['rainterface'] = $config['dhcpdv6'][$if]['rainterface'];
98 98
	$pconfig['radomainsearchlist'] = $config['dhcpdv6'][$if]['radomainsearchlist'];
99
	list($pconfig['radns1'],$pconfig['radns2']) = $config['dhcpdv6'][$if]['radnsserver'];
99
	list($pconfig['radns1'],$pconfig['radns2'],$pconfig['radns3'],$pconfig['radns4']) = $config['dhcpdv6'][$if]['radnsserver'];
100 100
	$pconfig['rasamednsasdhcp6'] = isset($config['dhcpdv6'][$if]['rasamednsasdhcp6']);
101 101

  
102 102
	$pconfig['subnets'] = $config['dhcpdv6'][$if]['subnets']['item'];
......
145 145
		}
146 146
	}
147 147

  
148
	if (($_POST['radns1'] && !is_ipaddrv6($_POST['radns1'])) || ($_POST['radns2'] && !is_ipaddrv6($_POST['radns2'])))
149
		$input_errors[] = gettext("A valid IPv6 address must be specified for the primary/secondary DNS servers.");
148
	if (($_POST['radns1'] && !is_ipaddrv6($_POST['radns1'])) || ($_POST['radns2'] && !is_ipaddrv6($_POST['radns2'])) || ($_POST['radns3'] && !is_ipaddrv6($_POST['radns3'])) || ($_POST['radns4'] && !is_ipaddrv6($_POST['radns4'])))
149
		$input_errors[] = gettext("A valid IPv6 address must be specified for each of the DNS servers.");
150 150
	if ($_POST['radomainsearchlist']) {
151 151
		$domain_array=preg_split("/[ ;]+/",$_POST['radomainsearchlist']);
152 152
		foreach ($domain_array as $curdomain) {
......
171 171
			$config['dhcpdv6'][$if]['radnsserver'][] = $_POST['radns1'];
172 172
		if ($_POST['radns2'])
173 173
			$config['dhcpdv6'][$if]['radnsserver'][] = $_POST['radns2'];
174
		if ($_POST['radns3'])
175
			$config['dhcpdv6'][$if]['radnsserver'][] = $_POST['radns3'];
176
		if ($_POST['radns4'])
177
			$config['dhcpdv6'][$if]['radnsserver'][] = $_POST['radns4'];
174 178

  
175 179
		$config['dhcpdv6'][$if]['rasamednsasdhcp6'] = ($_POST['rasamednsasdhcp6']) ? true : false;
176 180

  
......
373 377
			<td width="78%" class="vtable">
374 378
				<input name="radns1" type="text" class="formfld unknown" id="radns1" size="28" value="<?=htmlspecialchars($pconfig['radns1']);?>" /><br />
375 379
				<input name="radns2" type="text" class="formfld unknown" id="radns2" size="28" value="<?=htmlspecialchars($pconfig['radns2']);?>" /><br />
380
				<input name="radns3" type="text" class="formfld unknown" id="radns3" size="28" value="<?=htmlspecialchars($pconfig['radns3']);?>" /><br />
381
				<input name="radns4" type="text" class="formfld unknown" id="radns4" size="28" value="<?=htmlspecialchars($pconfig['radns4']);?>" /><br />
376 382
				<?=gettext("NOTE: leave blank to use the system default DNS servers - this interface's IP if DNS forwarder is enabled, otherwise the servers configured on the General page.");?>
377 383
			</td>
378 384
			</tr>
......
411 417
//<![CDATA[
412 418
	jQuery(function ($) {
413 419
		var $rasamednsasdhcp6 = $("#rasamednsasdhcp6");
414
		var $triggered_checkboxes = $("#radns1, #radns2, #radomainsearchlist");
420
		var $triggered_checkboxes = $("#radns1, #radns2, #radns3, #radns4, #radomainsearchlist");
415 421
		if ($rasamednsasdhcp6.length !== 1) { return; }
416 422
		var onchange = function () {
417 423
			var checked = $rasamednsasdhcp6.is(":checked");
......
433 439
		<?php } ?>
434 440
		new AutoSuggestControl(document.getElementById('radns1'), new StateSuggestions(addressarray));
435 441
		new AutoSuggestControl(document.getElementById('radns2'), new StateSuggestions(addressarray));
442
		new AutoSuggestControl(document.getElementById('radns3'), new StateSuggestions(addressarray));
443
		new AutoSuggestControl(document.getElementById('radns4'), new StateSuggestions(addressarray));
436 444
	}
437 445
	setTimeout(createAutoSuggest, 500);
438 446
//]]>

Formats disponibles : Unified diff