diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-07-12 09:47:51 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-07-12 09:47:51 -0300 |
| commit | 74aff49c2e38851147c02e5da25ddd1ecb637532 (patch) | |
| tree | b680ba12e73c23fb85a4020198a62a90343d1aee /usr/local/www/firewall_rules_edit.php | |
| parent | 05facb3e72e43e6ff0b112e38b21f7feb6dafbd3 (diff) | |
| parent | 68cbabcbfd0f09814e4077e91f20fcf7b447b6a2 (diff) | |
| download | pfsense-74aff49c2e38851147c02e5da25ddd1ecb637532.zip pfsense-74aff49c2e38851147c02e5da25ddd1ecb637532.tar.gz | |
Merge remote branch 'mainline/master' into 2_firewall
Conflicts:
usr/local/www/firewall_nat_out.php
usr/local/www/firewall_rules.php
usr/local/www/firewall_rules_edit.php
Diffstat (limited to 'usr/local/www/firewall_rules_edit.php')
| -rwxr-xr-x | usr/local/www/firewall_rules_edit.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index df1f087..f5890c6 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -168,7 +168,8 @@ if (isset($id) && $a_filter[$id]) { //schedule support $pconfig['sched'] = $a_filter[$id]['sched']; - $pconfig['associated-rule-id'] = $a_filter[$id]['associated-rule-id']; + if (!isset($_GET['dup'])) + $pconfig['associated-rule-id'] = $a_filter[$id]['associated-rule-id']; } else { /* defaults */ @@ -643,9 +644,10 @@ include("head.inc"); $interfaces["enc0"] = "IPsec"; /* add openvpn/tun interfaces */ if ($config['openvpn']["openvpn-server"] || $config['openvpn']["openvpn-client"]) - $interfaces["openvpn"] = "OpenVPN"; + $interfaces["openvpn"] = "OpenVPN"; + $selected_interfaces = explode(",", $pconfig['interface']); foreach ($interfaces as $iface => $ifacename): ?> - <option value="<?=$iface;?>" <?php if ($pconfig['interface'] <> "" && (strcasecmp($pconfig['interface'], $iface) == 0)) echo "selected"; ?>><?=$ifacename?></option> + <option value="<?=$iface;?>" <?php if ($pconfig['interface'] <> "" && ( strcasecmp($pconfig['interface'], $iface) == 0 || in_array($iface, $selected_interfaces) )) echo "selected"; ?>><?=$ifacename?></option> <?php endforeach; ?> </select> <br /> |
