Revision a3de8b9e
Added by Pierre POMES over 13 years ago
| etc/inc/services.inc | ||
|---|---|---|
| 499 | 499 |
} |
| 500 | 500 |
|
| 501 | 501 |
if($dhcpifconf['domainsearchlist'] <> "") {
|
| 502 |
$dnscfg .= " option domain-search \"" . join("\",\"", preg_split("/[ ;]+/", $dhcpifconf['domainsearchlist'])) . "\";\n";
|
|
| 502 |
$dnscfg .= " option domain-search \"" . join("\",\"", preg_split("/[ ;]+/", $dhcpifconf['domainsearchlist'])) . "\";\n";
|
|
| 503 | 503 |
} |
| 504 | 504 |
|
| 505 | 505 |
if (isset($dhcpifconf['ddnsupdate'])) {
|
| ... | ... | |
| 833 | 833 |
} |
| 834 | 834 |
|
| 835 | 835 |
if($dhcpv6ifconf['domainsearchlist'] <> "") {
|
| 836 |
$dnscfgv6 .= " option domain-search-list \"{$dhcpifconf['domainsearchlist']}\";\n";
|
|
| 836 |
$dnscfgv6 .= " option domain-search \"" . join("\",\"", preg_split("/[ ;]+/", $dhcpv6ifconf['domainsearchlist'])) . "\";\n";
|
|
| 837 | 837 |
} |
| 838 | 838 |
|
| 839 | 839 |
if (isset($dhcpv6ifconf['ddnsupdate'])) {
|
| usr/local/www/services_dhcp.php | ||
|---|---|---|
| 679 | 679 |
<td width="22%" valign="top" class="vncell"><?=gettext("Domain search list");?></td>
|
| 680 | 680 |
<td width="78%" class="vtable"> |
| 681 | 681 |
<input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="20" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>"><br> |
| 682 |
<?=gettext("The DHCP server can optionally provide a domain search list. Use the semicolon as seperator ");?>
|
|
| 682 |
<?=gettext("The DHCP server can optionally provide a domain search list. Use the semicolon character as seperator ");?>
|
|
| 683 | 683 |
</td> |
| 684 | 684 |
</tr> |
| 685 | 685 |
<tr> |
| usr/local/www/services_dhcpv6.php | ||
|---|---|---|
| 197 | 197 |
$input_errors[] = gettext("The maximum lease time must be at least 60 seconds and higher than the default lease time.");
|
| 198 | 198 |
if (($_POST['ddnsdomain'] && !is_domain($_POST['ddnsdomain']))) |
| 199 | 199 |
$input_errors[] = gettext("A valid domain name must be specified for the dynamic DNS registration.");
|
| 200 |
if ($_POST['domainsearchlist']) {
|
|
| 201 |
$domain_array=preg_split("/[ ;]+/",$_POST['domainsearchlist']);
|
|
| 202 |
foreach ($domain_array as $curdomain) {
|
|
| 203 |
if (!is_domain($curdomain)) {
|
|
| 204 |
$input_errors[] = gettext("A valid domain search list must be specified.");
|
|
| 205 |
break; |
|
| 206 |
} |
|
| 207 |
} |
|
| 208 |
} |
|
| 209 |
|
|
| 200 | 210 |
if (($_POST['ntp1'] && !is_ipaddrv6($_POST['ntp1'])) || ($_POST['ntp2'] && !is_ipaddrv6($_POST['ntp2']))) |
| 201 | 211 |
$input_errors[] = gettext("A valid IPv6 address must be specified for the primary/secondary NTP servers.");
|
| 202 | 212 |
if (($_POST['domain'] && !is_domain($_POST['domain']))) |
| ... | ... | |
| 618 | 628 |
<td width="22%" valign="top" class="vncell"><?=gettext("Domain search list");?></td>
|
| 619 | 629 |
<td width="78%" class="vtable"> |
| 620 | 630 |
<input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="28" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>"><br> |
| 621 |
<?=gettext("The DHCP server can optionally provide a domain search list.");?>
|
|
| 631 |
<?=gettext("The DHCP server can optionally provide a domain search list. Use the semicolon character as seperator");?>
|
|
| 622 | 632 |
</td> |
| 623 | 633 |
</tr> |
| 624 | 634 |
<tr> |
Also available in: Unified diff
Ticket #1917: fix typos, fix domain-search for dhcpv6