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 /inc/trigger.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 'inc/trigger.inc.php')
| -rw-r--r-- | inc/trigger.inc.php | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/inc/trigger.inc.php b/inc/trigger.inc.php index 353d6d69..db4a2148 100644 --- a/inc/trigger.inc.php +++ b/inc/trigger.inc.php @@ -86,19 +86,16 @@ class Trigger public static function ldadp($exclude = NULL, $parent = NULL) { // TODO: Fetch list from ConfigModule_AdAuth (call loadDb first) - $res = Database::simpleQuery("SELECT moduleid, configtgz.filepath FROM configtgz_module" + $res = Database::simpleQuery("SELECT DISTINCT moduleid FROM configtgz_module" . " INNER JOIN configtgz_x_module USING (moduleid)" . " INNER JOIN configtgz USING (configid)" + . " INNER JOIN configtgz_location USING (configid)" . " WHERE moduletype IN ('AdAuth', 'LdapAuth')"); - // TODO: Multiconfig support $id = array(); while ($row = $res->fetch(PDO::FETCH_ASSOC)) { - if (readlink('/srv/openslx/www/boot/default/config.tgz') === $row['filepath']) { - if (!is_null($exclude) && (int)$row['moduleid'] === (int)$exclude) - continue; - $id[] = (int)$row['moduleid']; - break; - } + if (!is_null($exclude) && (int)$row['moduleid'] === (int)$exclude) + continue; + $id[] = (int)$row['moduleid']; } $task = Taskmanager::submit('LdadpLauncher', array( 'ids' => $id, |