diff options
| author | Simon Rettberg | 2016-12-06 16:21:56 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2016-12-06 16:21:56 +0100 |
| commit | 8fa66377a1c97d42d83d91ef0821f37f1b885617 (patch) | |
| tree | 6386a99f2947194b89eac27127fe1805b25423d9 /modules-available/statistics/page.inc.php | |
| parent | [statistics] Check if module 'syslog' is active before showing client log (diff) | |
| download | slx-admin-8fa66377a1c97d42d83d91ef0821f37f1b885617.tar.gz slx-admin-8fa66377a1c97d42d83d91ef0821f37f1b885617.tar.xz slx-admin-8fa66377a1c97d42d83d91ef0821f37f1b885617.zip | |
[statistics/locations/..] Cache calculated locationid of machine in machine table
We now have three columns for the locationid:
- subnetlocationid
Updated whenever the clientip of a client changes on bootup, or when
locations/subnets are edited in the locations module.
- fixedlocationid
Takes the role of the old locationid field - set when a machine is
placed in a room via roomplanner, set to NULL otherwise.
- locationid
Set to fixedlocationid if it's not NULL, to subnetlocationid otherwise.
The field is updated by a BEFORE UPDATE trigger.
Diffstat (limited to 'modules-available/statistics/page.inc.php')
| -rw-r--r-- | modules-available/statistics/page.inc.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/modules-available/statistics/page.inc.php b/modules-available/statistics/page.inc.php index cc8acacc..6a9acd14 100644 --- a/modules-available/statistics/page.inc.php +++ b/modules-available/statistics/page.inc.php @@ -714,9 +714,6 @@ class Page_Statistics extends Page unset($client['data']); // Get locations if (Module::isAvailable('locations')) { - if (is_null($client['locationid'])) { - $client['locationid'] = Location::getFromIp($client['clientip']); - } $locs = Location::getLocationsAssoc(); $next = (int)$client['locationid']; $output = array(); |