diff options
| author | Phil Davis <phil.davis@world.inf.org> | 2014-01-07 07:05:07 -0800 |
|---|---|---|
| committer | Phil Davis <phil.davis@world.inf.org> | 2014-01-07 07:05:07 -0800 |
| commit | 7d14b000370166f0d18d212ff5bdb8b2733eb0c5 (patch) | |
| tree | af06e68dc9fed03732789f81d750221575616336 /usr/local/www/firewall_aliases_import.php | |
| parent | 244456913632715ab777e34b056ecf5c440c2ce4 (diff) | |
| download | pfsense-7d14b000370166f0d18d212ff5bdb8b2733eb0c5.zip pfsense-7d14b000370166f0d18d212ff5bdb8b2733eb0c5.tar.gz | |
Check for vertical bar at start or end of description
Diffstat (limited to 'usr/local/www/firewall_aliases_import.php')
| -rwxr-xr-x | usr/local/www/firewall_aliases_import.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/firewall_aliases_import.php b/usr/local/www/firewall_aliases_import.php index 6de2965..276dfb5 100755 --- a/usr/local/www/firewall_aliases_import.php +++ b/usr/local/www/firewall_aliases_import.php @@ -98,7 +98,7 @@ if($_POST['aliasimport'] <> "") { $impip = $implinea[0]; $impdesc = trim($implinea[1]); if (strlen($impdesc) < 200) { - if (strpos($impdesc, "||") === false) { + if ((strpos($impdesc, "||") === false) && (substr($impdesc, 0, 1) != "|") && (substr($impdesc, -1, 1) != "|")) { if (is_iprange($impip)) { list($startip, $endip) = explode('-', $impip); $rangesubnets = ip_range_to_subnet_array($startip, $endip); @@ -114,7 +114,7 @@ if($_POST['aliasimport'] <> "") { } else { if (!$desc_fmt_err_found) { - $input_errors[] = gettext("Descriptions may not contain double vertical bar ||."); + $input_errors[] = gettext("Descriptions may not start or end with vertical bar (|) or contain double vertical bar ||."); $desc_fmt_err_found = true; } } |
