diff options
| author | Christian Klinger | 2016-06-15 16:43:17 +0200 |
|---|---|---|
| committer | Christian Klinger | 2016-06-15 16:43:17 +0200 |
| commit | 2b18d0d0c49c3a75bd221ab86b7315f7bae98008 (patch) | |
| tree | 7d44e103224c1a79e8ccdd5d0313f76180847303 /modules-available/locations/baseconfig/getconfig.inc.php | |
| parent | small style changes (diff) | |
| parent | [sysconfignew] Move css from global file to module specific one (diff) | |
| download | slx-admin-2b18d0d0c49c3a75bd221ab86b7315f7bae98008.tar.gz slx-admin-2b18d0d0c49c3a75bd221ab86b7315f7bae98008.tar.xz slx-admin-2b18d0d0c49c3a75bd221ab86b7315f7bae98008.zip | |
Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into modularization
Conflicts:
install/content.sql
install/schema.sql
Diffstat (limited to 'modules-available/locations/baseconfig/getconfig.inc.php')
| -rw-r--r-- | modules-available/locations/baseconfig/getconfig.inc.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/modules-available/locations/baseconfig/getconfig.inc.php b/modules-available/locations/baseconfig/getconfig.inc.php index d4a4f40b..2cf5495d 100644 --- a/modules-available/locations/baseconfig/getconfig.inc.php +++ b/modules-available/locations/baseconfig/getconfig.inc.php @@ -1,7 +1,14 @@ <?php // Location handling: figure out location -$locationId = false; // TODO: machine specific mapping +$locationId = false; +if (Request::any('force', 0, 'int') === 1 && Request::any('module', false, 'string') === 'locations') { + // Force location for testing, but require logged in admin + if (User::load()) { + $locationId = Request::any('value', 0, 'int'); + } +} +// TODO: machine specific mapping if ($locationId === false) { // Fallback to subnets $locationId = Location::getFromIp($ip); |