diff options
author | Phil Davis <phil.davis@inf.org> | 2016-12-03 19:21:07 +0545 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-12-27 10:47:49 -0200 |
commit | 4a1a2050862defed55ce2e06537af694ca6a2561 (patch) | |
tree | cf3f777c6130cd9a8e70b090f57bfab872e8da74 /src/usr/local/www/firewall_rules_edit.php | |
parent | 914ddfa2830879618a7f61168c46b1efb8c39336 (diff) | |
download | pfsense-4a1a2050862defed55ce2e06537af694ca6a2561.zip pfsense-4a1a2050862defed55ce2e06537af694ca6a2561.tar.gz |
Form_IpAddress add types remove patterns
1) Add alias and host types to Form_IpAddress with the appropriate hover
text.
2) Remove the patterns - the UI of those is not so effective anyway, so
leave the validation of input to the back end.
3) Update uses of Form_IpAddress to use the appropriate Alias or Host
type as needed.
4) Remove explicit setPattern() from those uses of Form_IpAddress.
(cherry picked from commit 45541aae63596ea28aa18c84b65946bce6adbffd)
Diffstat (limited to 'src/usr/local/www/firewall_rules_edit.php')
-rw-r--r-- | src/usr/local/www/firewall_rules_edit.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index 5df533b..3762921 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -1357,8 +1357,9 @@ foreach (['src' => 'Source', 'dst' => 'Destination'] as $type => $name) { $group->add(new Form_IpAddress( $type, $name .' Address', - $pconfig[$type] - ))->addMask($type .'mask', $pconfig[$type.'mask'])->setPattern('[a-zA-Z0-9_.:]+'); + $pconfig[$type], + 'ALIASV4V6' + ))->addMask($type .'mask', $pconfig[$type.'mask']); $section->add($group); |