diff options
author | Renato Botelho <garga@FreeBSD.org> | 2013-04-02 15:41:09 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2013-04-02 15:41:27 -0300 |
commit | 6a45942fb5939b5e1906580d338bafff61195995 (patch) | |
tree | 5af7c8d58256b2298010c31795f398e231364199 /usr/local/www/firewall_aliases_edit.php | |
parent | c5eaef8e5bc92505f2a2312192be7bc2fc1a9015 (diff) | |
download | pfsense-6a45942fb5939b5e1906580d338bafff61195995.zip pfsense-6a45942fb5939b5e1906580d338bafff61195995.tar.gz |
Preserve old URLs when an error happens, also, fix descriptions save for URLs
Diffstat (limited to 'usr/local/www/firewall_aliases_edit.php')
-rwxr-xr-x | usr/local/www/firewall_aliases_edit.php | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php index 2f566dd..eaf4463 100755 --- a/usr/local/www/firewall_aliases_edit.php +++ b/usr/local/www/firewall_aliases_edit.php @@ -226,11 +226,13 @@ if ($_POST) { $tmp = trim($tmp); if(!empty($tmp) && (is_ipaddr($tmp) || is_subnet($tmp))) { $address[] = $tmp; - $isfirst = 1; - if ($_POST["detail{$x}"] <> "") - $final_address_details[] = $_POST["detail{$x}"]; - else - $final_address_details[] = sprintf(gettext("Entry added %s"), date('r')); + if ($isfirst == 0) { + if ($_POST["detail{$x}"] <> "") + $final_address_details[] = $_POST["detail{$x}"]; + else + $final_address_details[] = sprintf(gettext("Entry added %s"), date('r')); + $isfirst = 1; + } $address_count++; } } @@ -369,7 +371,10 @@ if ($_POST) { { $pconfig['name'] = $_POST['name']; $pconfig['descr'] = $_POST['descr']; - $pconfig['address'] = implode(" ", $address); + if ($_POST['type'] == 'url') + $pconfig['address'] = implode(" ", $alias['aliasurl']); + else + $pconfig['address'] = implode(" ", $address); $pconfig['type'] = $_POST['type']; $pconfig['detail'] = implode("||", $final_address_details); } |