From ec7f3c81d3f9978867942a2a084f8252dddc61dd Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 19 Feb 2016 10:33:54 +0100
Subject: [trigger] detect server ip: Ignore IPv6

---
 inc/trigger.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc/trigger.inc.php')

diff --git a/inc/trigger.inc.php b/inc/trigger.inc.php
index fcd1b3c0..0f7e1b13 100644
--- a/inc/trigger.inc.php
+++ b/inc/trigger.inc.php
@@ -48,10 +48,10 @@ class Trigger
 		$publicCandidate = 'none';
 		$privateCandidate = 'none';
 		foreach ($task['data']['addresses'] as $addr) {
+			if (substr($addr['ip'], 0, 4) === '127.' || preg_match('/^\d+\.\d+\.\d+\.\d+$/', $addr['ip']) !== 1)
+				continue;
 			if ($addr['ip'] === $serverIp)
 				return true;
-			if (substr($addr['ip'], 0, 4) === '127.')
-				continue;
 			if (Util::isPublicIpv4($addr['ip'])) {
 				if ($publicCandidate === 'none')
 					$publicCandidate = $addr['ip'];
-- 
cgit v1.2.3-55-g7522