summaryrefslogtreecommitdiffstats
path: root/modules-available/sysconfig/addmodule_ldapauth.inc.php
diff options
context:
space:
mode:
authorSimon Rettberg2017-12-18 14:25:47 +0100
committerSimon Rettberg2017-12-18 14:25:47 +0100
commitc324749267d31498f28b170dfb3d0d3968fadc61 (patch)
tree60f4050b5a64a9a95576c76d913cc3bd6871db83 /modules-available/sysconfig/addmodule_ldapauth.inc.php
parent[syconfig] AD: Better error messages, don't lose DN if homeAttrCheck fails (diff)
downloadslx-admin-c324749267d31498f28b170dfb3d0d3968fadc61.tar.gz
slx-admin-c324749267d31498f28b170dfb3d0d3968fadc61.tar.xz
slx-admin-c324749267d31498f28b170dfb3d0d3968fadc61.zip
[sysconfig] Fix logic by which condition the LDADPd gets (re)started
Diffstat (limited to 'modules-available/sysconfig/addmodule_ldapauth.inc.php')
-rw-r--r--modules-available/sysconfig/addmodule_ldapauth.inc.php21
1 files changed, 1 insertions, 20 deletions
diff --git a/modules-available/sysconfig/addmodule_ldapauth.inc.php b/modules-available/sysconfig/addmodule_ldapauth.inc.php
index a193f779..e0de06ac 100644
--- a/modules-available/sysconfig/addmodule_ldapauth.inc.php
+++ b/modules-available/sysconfig/addmodule_ldapauth.inc.php
@@ -281,8 +281,7 @@ class LdapAuth_Finish extends AddModule_Base
Message::addError('main.value-invalid', 'any', 'any');
$tgz = false;
} else {
- $parent = $this->stopOldInstance();
- $tgz = $module->generate($this->edit === false, $parent);
+ $tgz = $module->generate($this->edit === false);
}
if ($tgz === false) {
AddModule_Base::setStep('LdapAuth_Start'); // Continues with LdapAuth_Start for render()
@@ -293,24 +292,6 @@ class LdapAuth_Finish extends AddModule_Base
);
}
- private function stopOldInstance()
- {
- if ($this->edit === false)
- return NULL;
- $list = ConfigTgz::getAllForModule($this->edit->id());
- if (!is_array($list))
- return NULL;
- $parent = NULL;
- foreach ($list as $tgz) {
- if (!$tgz->isActive())
- continue;
- $task = Trigger::ldadp($tgz->id(), $parent);
- if (isset($task['id']))
- $parent = $task['id'];
- }
- return $parent;
- }
-
protected function renderInternal()
{
Render::addDialog(Dictionary::translateFile('config-module', 'ldapAuth_title'), false, 'ldap-finish', $this->taskIds);