diff options
| author | Simon Rettberg | 2016-07-06 11:55:35 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-07-06 11:55:35 +0200 |
| commit | dcb27f27031991668afafeffe5ea6dc04035a663 (patch) | |
| tree | 79612a6b4d44f29a808d95a34cf06198f4a4453f /modules-available/sysconfig/install.inc.php | |
| parent | [dozmod] api: Add error checks, implement lecture list resource type (diff) | |
| download | slx-admin-dcb27f27031991668afafeffe5ea6dc04035a663.tar.gz slx-admin-dcb27f27031991668afafeffe5ea6dc04035a663.tar.xz slx-admin-dcb27f27031991668afafeffe5ea6dc04035a663.zip | |
[sysconfig] Refactor ldapauth and adauth classes; show mainpage warning; improve config module handling
Diffstat (limited to 'modules-available/sysconfig/install.inc.php')
| -rw-r--r-- | modules-available/sysconfig/install.inc.php | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/modules-available/sysconfig/install.inc.php b/modules-available/sysconfig/install.inc.php index 0cde39c2..91f282dd 100644 --- a/modules-available/sysconfig/install.inc.php +++ b/modules-available/sysconfig/install.inc.php @@ -39,10 +39,17 @@ $res[] = tableCreate('configtgz_location', " // Constraints if (in_array(UPDATE_DONE, $res)) { - Database::exec("ALTER TABLE `configtgz_x_module` - ADD CONSTRAINT `configtgz_x_module_ibfk_1` FOREIGN KEY (`configid`) REFERENCES `configtgz` (`configid`) ON DELETE CASCADE"); - Database::exec("ALTER TABLE `configtgz_x_module` - ADD CONSTRAINT `configtgz_x_module_ibfk_2` FOREIGN KEY (`moduleid`) REFERENCES `configtgz_module` (`moduleid`)"); + $ret = Database::exec("ALTER TABLE `configtgz_x_module` + ADD CONSTRAINT `configtgz_x_module_ibfk_1` FOREIGN KEY (`configid`) REFERENCES `configtgz` (`configid`) + ON DELETE CASCADE"); + $ret = Database::exec("ALTER TABLE `configtgz_x_module` + ADD CONSTRAINT `configtgz_x_module_ibfk_2` FOREIGN KEY (`moduleid`) REFERENCES `configtgz_module` (`moduleid`)") || $ret; + $ret = Database::exec("ALTER TABLE `configtgz_location` + ADD CONSTRAINT `configtgz_location_fk_configid` FOREIGN KEY ( `configid` ) REFERENCES `openslx`.`configtgz` (`configid`) + ON DELETE CASCADE ON UPDATE CASCADE") || $ret; + if ($ret) { + $res[] = UPDATE_DONE; + } } // Update path @@ -77,14 +84,16 @@ if (!tableHasColumn('configtgz', 'status')) { } // ----- rebuild AD configs ------ -// TEMPORARY HACK; Rebuild AD configs.. move somewhere else +// TEMPORARY HACK; Rebuild configs.. move somewhere else? Module::isAvailable('sysconfig'); -$list = array_merge(ConfigModule::getAll('AdAuth'), ConfigModule::getAll('LdapAuth')); +$list = ConfigModule::getAll(); if ($list === false) { EventLog::warning('Could not regenerate AD/LDAP configs - please do so manually'); } else { foreach ($list as $ad) { - $ad->generate(false); + if ($ad->needRebuild()) { + $ad->generate(false); + } } } |