diff options
| author | Simon Rettberg | 2016-02-19 10:33:54 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2016-02-19 10:33:54 +0100 |
| commit | ec7f3c81d3f9978867942a2a084f8252dddc61dd (patch) | |
| tree | b2eab3d4afcb944a3cc2038dc0c5d9be948ca31e /inc/trigger.inc.php | |
| parent | [adauth] Add field for homeDirectory attribute (diff) | |
| download | slx-admin-ec7f3c81d3f9978867942a2a084f8252dddc61dd.tar.gz slx-admin-ec7f3c81d3f9978867942a2a084f8252dddc61dd.tar.xz slx-admin-ec7f3c81d3f9978867942a2a084f8252dddc61dd.zip | |
[trigger] detect server ip: Ignore IPv6
Diffstat (limited to 'inc/trigger.inc.php')
| -rw-r--r-- | inc/trigger.inc.php | 4 |
1 files changed, 2 insertions, 2 deletions
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']; |