diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-09-15 15:01:25 -0400 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-09-15 15:02:45 -0400 |
commit | 54c605d497f4d8fa36074118c67b7926253d75e4 (patch) | |
tree | f13857fd4a2ade39d06d6563682f7446867a75b2 /src/usr/local/www/system.php | |
parent | 97979640093aa090c2fd7d5cb4486afe10b7abd3 (diff) | |
download | pfsense-54c605d497f4d8fa36074118c67b7926253d75e4.zip pfsense-54c605d497f4d8fa36074118c67b7926253d75e4.tar.gz |
Fixed #5140
Removed conditional causing only configured servers to be displayed
Updated formatting
Modified help display for better layout
Diffstat (limited to 'src/usr/local/www/system.php')
-rw-r--r-- | src/usr/local/www/system.php | 105 |
1 files changed, 70 insertions, 35 deletions
diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php index 79be7a6..51b3bae 100644 --- a/src/usr/local/www/system.php +++ b/src/usr/local/www/system.php @@ -3,32 +3,59 @@ /* system.php part of m0n0wall (http://m0n0.ch/wall) - - Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2015 Electric Sheep Fencing, LP - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. */ +/* ==================================================================== + * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. + * Copyright (c) 2004, 2005 Scott Ullrich + * Copyright (c) 2003-2004 Manuel Kasper <mk@neon1.net> + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgment: + * "This product includes software developed by the pfSense Project + * for use in the pfSense software distribution. (http://www.pfsense.org/). + * + * 4. The names "pfSense" and "pfSense Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * coreteam@pfsense.org. + * + * 5. Products derived from this software may not be called "pfSense" + * nor may "pfSense" appear in their names without prior written + * permission of the Electric Sheep Fencing, LLC. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * + * "This product includes software developed by the pfSense Project + * for use in the pfSense software distribution (http://www.pfsense.org/). + * + * THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ==================================================================== + * + */ /* pfSense_BUILDER_BINARIES: /bin/kill /usr/bin/tar pfSense_MODULE: system @@ -335,23 +362,29 @@ $section = new Form_Section('DNS server settings'); for ($i=1; $i<5; $i++) { - if (!isset($pconfig['dns'.$i])) - continue; +// if (!isset($pconfig['dns'.$i])) +// continue; + + $group = new Form_Group('DNS Server ' . $i); + + $group->add(new Form_Input( + 'dns['.$i.']', + 'DNS Server', + 'text', + $pconfig['dns'.$i] + ))->setHelp(($i == 4) ? 'Address':null); - $group = new Form_Group('DNS Server'); - $group->add(new Form_Input('dns['.$i.']', 'DNS Server', 'text', $pconfig['dns'.$i])); $help = "Enter IP addresses to be used by the system for DNS resolution. " . "These are also used for the DHCP service, DNS forwarder and for PPTP VPN clients."; - if ($multiwan) - { + if ($multiwan) { $options = array('none' => 'none'); - foreach($arr_gateways as $gwname => $gwitem) - { + foreach($arr_gateways as $gwname => $gwitem) { if((is_ipaddrv4(lookup_gateway_ip_by_name($pconfig[$dnsgw])) && (is_ipaddrv6($gwitem['gateway'])))) { continue; } + if((is_ipaddrv6(lookup_gateway_ip_by_name($pconfig[$dnsgw])) && (is_ipaddrv4($gwitem['gateway'])))) { continue; } @@ -364,13 +397,15 @@ for ($i=1; $i<5; $i++) 'Gateway', $pconfig['dns'.$i.'gw'], $options - )); + ))->setHelp(($i == 4) ? 'Gateway':null);; $help .= '<br/>'. "In addition, optionally select the gateway for each DNS server. " . "When using multiple WAN connections there should be at least one unique DNS server per gateway."; } - $group->setHelp($help); + if($i == 4) + $group->setHelp($help); + $section->add($group); } |