diff options
| author | Simon Rettberg | 2016-06-16 16:14:42 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-06-16 16:14:42 +0200 |
| commit | 872de4e07609d8dae7660e467a73fc6f4061956a (patch) | |
| tree | a0f856c659e71b1ff7e57883ad1f071e23a50e67 /modules-available/locations/baseconfig | |
| parent | Don't need these anymore (diff) | |
| download | slx-admin-872de4e07609d8dae7660e467a73fc6f4061956a.tar.gz slx-admin-872de4e07609d8dae7660e467a73fc6f4061956a.tar.xz slx-admin-872de4e07609d8dae7660e467a73fc6f4061956a.zip | |
[locations] Handle machine UUID param to determine location
Diffstat (limited to 'modules-available/locations/baseconfig')
| -rw-r--r-- | modules-available/locations/baseconfig/getconfig.inc.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules-available/locations/baseconfig/getconfig.inc.php b/modules-available/locations/baseconfig/getconfig.inc.php index 2cf5495d..3a0c918f 100644 --- a/modules-available/locations/baseconfig/getconfig.inc.php +++ b/modules-available/locations/baseconfig/getconfig.inc.php @@ -8,11 +8,11 @@ if (Request::any('force', 0, 'int') === 1 && Request::any('module', false, 'stri $locationId = Request::any('value', 0, 'int'); } } -// TODO: machine specific mapping + if ($locationId === false) { - // Fallback to subnets - $locationId = Location::getFromIp($ip); + $locationId = Location::getFromIpAndUuid($ip, $uuid); } + $matchingLocations = array(); if ($locationId !== false) { // Get all parents |