diff options
| author | root | 2019-02-19 18:53:50 +0100 |
|---|---|---|
| committer | root | 2019-02-19 18:53:50 +0100 |
| commit | 0ad4c0f8196b61699754762aacbaab0223478ab9 (patch) | |
| tree | de434c4aea8d07ecd01cd3badd48d057d62c2d1b /modules-available/main/install.inc.php | |
| parent | [usb-lock-off] Edit rule cleanup and fix of the dropdown boxes. (diff) | |
| parent | [statistics] Fix RAM change warning to handle increase too (diff) | |
| download | slx-admin-0ad4c0f8196b61699754762aacbaab0223478ab9.tar.gz slx-admin-0ad4c0f8196b61699754762aacbaab0223478ab9.tar.xz slx-admin-0ad4c0f8196b61699754762aacbaab0223478ab9.zip | |
Merge branch 'master' into usb-lock-offusb-lock-off
Diffstat (limited to 'modules-available/main/install.inc.php')
| -rw-r--r-- | modules-available/main/install.inc.php | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/modules-available/main/install.inc.php b/modules-available/main/install.inc.php index e364a905..ec8554fd 100644 --- a/modules-available/main/install.inc.php +++ b/modules-available/main/install.inc.php @@ -43,6 +43,7 @@ $res[] = tableCreate('user', " `email` varchar(100) DEFAULT NULL, `permissions` int(10) unsigned NOT NULL, `lasteventid` int(10) unsigned NOT NULL DEFAULT '0', + `serverid` int(10) unsigned NULL DEFAULT NULL, PRIMARY KEY (`userid`), UNIQUE KEY `login` (`login`) "); @@ -72,6 +73,20 @@ if (!tableHasColumn('callback', 'args')) { Database::exec("ALTER TABLE `callback` ADD `args` TEXT NOT NULL DEFAULT ''"); } +// ####################### +// ##### 2018-03-19 +// In preparation for LDAP/AD auth: Column to rembember origin server +if (!tableHasColumn('user', 'serverid')) { + Database::exec("ALTER TABLE `user` ADD `serverid` int(10) unsigned NULL DEFAULT NULL"); +} + +// Make sure that if any users exist, one of the has UID=1, otherwise if the permission module is +// used we'd lock out everyone +$someUser = Database::queryFirst('SELECT userid FROM user ORDER BY userid ASC LIMIT 1'); +if ($someUser !== false && (int)$someUser['userid'] !== 1) { + Database::exec('UPDATE user SET userid = 1 WHERE userid = :oldid', ['oldid' => $someUser['userid']]); +} + // Create response for browser if (in_array(UPDATE_DONE, $res)) { |