diff options
author | Vinicius Coque <vinicius.coque@bluepex.com> | 2010-07-27 17:28:59 -0300 |
---|---|---|
committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2010-07-27 17:28:59 -0300 |
commit | 21eb1c2a5ab7ae5d188d1927f3d5817b64f61980 (patch) | |
tree | a9990a006afb38112805e36cf1af6c5322d43d49 /usr | |
parent | 8e7b2ae2dc4197f34a82493c89848e6d0bd8b120 (diff) | |
parent | 4a71c0873c237ecd4c6e50337b8550e3bb4184c2 (diff) | |
download | pfsense-21eb1c2a5ab7ae5d188d1927f3d5817b64f61980.zip pfsense-21eb1c2a5ab7ae5d188d1927f3d5817b64f61980.tar.gz |
Merge remote branch 'mainline/master'
Diffstat (limited to 'usr')
-rwxr-xr-x | usr/local/www/interfaces_groups_edit.php | 5 | ||||
-rwxr-xr-x | usr/local/www/status.php | 2 | ||||
-rw-r--r-- | usr/local/www/system_advanced_misc.php | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/usr/local/www/interfaces_groups_edit.php b/usr/local/www/interfaces_groups_edit.php index 51feffd..430bd7b 100755 --- a/usr/local/www/interfaces_groups_edit.php +++ b/usr/local/www/interfaces_groups_edit.php @@ -71,6 +71,11 @@ if ($_POST) { if (preg_match("/([^a-zA-Z])+/", $_POST['ifname'], $match)) $input_errors[] = "Only letters A-Z are allowed as the group name."; + $ifaces = get_configured_interface_with_descr(); + foreach ($ifaces as $gif => $gdescr) { + if ($gdescr == $_POST['ifname'] || $gif == $_POST['ifname']) + $input_errors[] = "The specified group name is already used by an interface. Please choose another name."; + } $ifgroupentry = array(); $ifgroupentry['ifname'] = $_POST['ifname']; $members = ""; diff --git a/usr/local/www/status.php b/usr/local/www/status.php index e21cfe3..f01b5bf 100755 --- a/usr/local/www/status.php +++ b/usr/local/www/status.php @@ -168,7 +168,7 @@ defCmdT("pftop -w 150 -a -b -v speed","/usr/local/sbin/pftop -w 150 -a -b -v spe defCmdT("resolv.conf","cat /etc/resolv.conf"); defCmdT("Processes","ps xauww"); -defCmdT("dhcpd.conf","cat /var/etc/dhcpd.conf"); +defCmdT("dhcpd.conf","cat /var/dhcpd/etc/dhcpd.conf"); defCmdT("ez-ipupdate.cache","cat /conf/ez-ipupdate.cache"); defCmdT("df","/bin/df"); diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php index 41f0979..1bdefe9 100644 --- a/usr/local/www/system_advanced_misc.php +++ b/usr/local/www/system_advanced_misc.php @@ -224,7 +224,7 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Security Assocications"); ?></td> <td width="78%" class="vtable"> - <input name="preferoldsa_enable" type="checkbox" id="preferoldsa_enable" value="yes" <?php if ($pconfig['preferoldsa_enable']) echo "checked"; ?> /> + <input name="preferoldsa_enable" type="checkbox" id="preferoldsa_enable" value="yes" <?php if (isset($pconfig['preferoldsa_enable'])) echo "checked"; ?> /> <strong><?=gettext("Prefer older IPsec SAs"); ?></strong> <br /> <?=gettext("By default, if several SAs match, the newest one is " . |