From dc9388397301912340b34398307936b5c9dc3fd6 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@inf.org>
Date: Tue, 20 Dec 2016 22:40:42 +0545
Subject: validateipaddr use constants from globals.inc

---
 src/etc/inc/util.inc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/etc/inc/util.inc')

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;
-- 
cgit v1.1