diff options
| author | Jannik Schönartz | 2017-11-23 10:19:29 +0100 |
|---|---|---|
| committer | Jannik Schönartz | 2017-11-23 10:19:29 +0100 |
| commit | b147236eddabaebaec0cdf5948742a891a5a37f7 (patch) | |
| tree | eab98006bffa4ed949a2f5f7049f1083ddb1eeac /modules-available/statistics | |
| parent | [statistics&syslog] Changed ip to machine-uuid for filtering. Fixed a bug wh... (diff) | |
| parent | [statistics] Also adapt MAC-UUID fixing code to mltk changes (diff) | |
| download | slx-admin-b147236eddabaebaec0cdf5948742a891a5a37f7.tar.gz slx-admin-b147236eddabaebaec0cdf5948742a891a5a37f7.tar.xz slx-admin-b147236eddabaebaec0cdf5948742a891a5a37f7.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/slx-admin
Diffstat (limited to 'modules-available/statistics')
| -rw-r--r-- | modules-available/statistics/api.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules-available/statistics/api.inc.php b/modules-available/statistics/api.inc.php index 566b1d69..c395220a 100644 --- a/modules-available/statistics/api.inc.php +++ b/modules-available/statistics/api.inc.php @@ -16,7 +16,7 @@ if ($type{0} === '~') { $uuid = Request::post('uuid', '', 'string'); if (strlen($uuid) !== 36) die("Invalid UUID.\n"); $macaddr = Request::post('macaddr', '', 'string'); - if (!empty($macaddr) && substr($uuid, 0, 16) === '000000000000000-') { + if (!empty($macaddr) && substr($uuid, 0, 16) === '000000000000001-') { // Override uuid if the mac is known and unique $res = Database::simpleQuery('SELECT machineuuid FROM machine WHERE macaddr = :macaddr AND machineuuid <> :uuid', compact('macaddr', 'uuid')); $override = false; |