diff options
| author | Phil Davis <phil.davis@inf.org> | 2016-12-20 22:40:42 +0545 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-20 22:40:42 +0545 |
| commit | dc9388397301912340b34398307936b5c9dc3fd6 (patch) | |
| tree | 2f0803235d9862657eee90e21810ed5c9f809395 /src/etc/inc/util.inc | |
| parent | 24eb39e29641488c7fa970d69f42edd84e2fbb1e (diff) | |
| download | pfsense-dc9388397301912340b34398307936b5c9dc3fd6.zip pfsense-dc9388397301912340b34398307936b5c9dc3fd6.tar.gz | |
validateipaddr use constants from globals.inc
Diffstat (limited to 'src/etc/inc/util.inc')
| -rw-r--r-- | src/etc/inc/util.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index 901b762..9025a12 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -2491,10 +2491,10 @@ function validateipaddr(&$addr, $type, $label, &$err_msg, $alias=false) { switch ($type) { case IPV4: if (is_ipaddrv4($addr)) { - return 4; + return IPV4; } else if ($alias) { if (is_alias($addr)) { - return 1; + return ALIAS; } else { $err_msg[] = sprintf(gettext("%s must be a valid IPv4 address or alias."), $label); return false; @@ -2507,10 +2507,10 @@ function validateipaddr(&$addr, $type, $label, &$err_msg, $alias=false) { case IPV6: if (is_ipaddrv6($addr)) { $addr = strtolower($addr); - return 6; + return IPV6; } else if ($alias) { if (is_alias($addr)) { - return 1; + return ALIAS; } else { $err_msg[] = sprintf(gettext("%s must be a valid IPv6 address or alias."), $label); return false; @@ -2523,12 +2523,12 @@ function validateipaddr(&$addr, $type, $label, &$err_msg, $alias=false) { case IPV4V6: if (is_ipaddrv6($addr)) { $addr = strtolower($addr); - return 6; + return IPV6; } else if (is_ipaddrv4($addr)) { - return 4; + return IPV4; } else if ($alias) { if (is_alias($addr)) { - return 1; + return ALIAS; } else { $err_msg[] = sprintf(gettext("%s must be a valid IPv4 or IPv6 address or alias."), $label); return false; |
