diff options
| author | dvserg <dv_serg@mail.ru> | 2010-04-12 21:51:39 +0400 |
|---|---|---|
| committer | dvserg <dv_serg@mail.ru> | 2010-04-12 21:51:39 +0400 |
| commit | 8d8c3e1278c35aaf235710d07cbe6583337700d5 (patch) | |
| tree | a1ff6b7641cfe2289ba4d3624ba5bca028fe888b /config/squidGuard/squidguard_configurator.inc | |
| parent | 62eadf9df48d2bf3e21e0634d8b35efc70ee0244 (diff) | |
| download | pfsense-packages-8d8c3e1278c35aaf235710d07cbe6583337700d5.tar.gz pfsense-packages-8d8c3e1278c35aaf235710d07cbe6583337700d5.tar.bz2 pfsense-packages-8d8c3e1278c35aaf235710d07cbe6583337700d5.zip | |
Signed-off-by: dvserg <dv_serg@mail.ru>
Diffstat (limited to 'config/squidGuard/squidguard_configurator.inc')
| -rw-r--r-- | config/squidGuard/squidguard_configurator.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/squidGuard/squidguard_configurator.inc b/config/squidGuard/squidguard_configurator.inc index dcbb28f4..73f935bc 100644 --- a/config/squidGuard/squidguard_configurator.inc +++ b/config/squidGuard/squidguard_configurator.inc @@ -1797,7 +1797,7 @@ function is_masksubnet($subnet) # ------------------------------------------------------------------------------ # is_iprange - check ip1-ip2 # ------------------------------------------------------------------------------ -function is_iprange($ip_range) { +function is_iprange_sg($ip_range) { if (!is_string($ip_range)) return false; list($ip1,$ip2) = explode('-', $ip_range); @@ -1813,7 +1813,7 @@ function is_iprange($ip_range) { # ------------------------------------------------------------------------------ function is_ipaddr_valid($val) { - return is_string($val) && (is_ipaddr($val) || is_masksubnet($val) || is_subnet($val) || is_iprange($val)); + return is_string($val) && (is_ipaddr($val) || is_masksubnet($val) || is_subnet($val) || is_iprange_sg($val)); } # ------------------------------------------------------------------------------ @@ -1831,7 +1831,7 @@ function is_domain_valid($domain) # ------------------------------------------------------------------------------ function is_username($username) { - $unm_fmt = "^\'[a-zA-Z_0-9\-]{1,}\'$"; + $unm_fmt = "^\'[a-zA-Z_0-9\.\-]{1,}\'$"; return is_string($username) && eregi($unm_fmt, trim($username)); } # ------------------------------------------------------------------------------ |