yetangitu/lam
1
0
Fork 0
mirror of https://github.com/LDAPAccountManager/lam.git synced 2025-10-03 09:49:16 +02:00
Code Issues Releases Wiki Activity

refactoring

Browse source
This commit is contained in:
Roland Gruber 2024-12-06 07:48:31 +01:00
parent 6e7b36429a
commit 5b4c8ccce4
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lam/lib/modules.inc
View file

@ -1192,7 +1192,7 @@ class accountContainer {
$forcePwdGroup->addElement(new htmlImage('../../graphics/' . $module->getIcon(), '16px', '16px', $module->get_alias(), $module->get_alias())); $forcePwdGroup->addElement(new htmlImage('../../graphics/' . $module->getIcon(), '16px', '16px', $module->get_alias(), $module->get_alias()));
$forcePwdGroup->addElement(new htmlSpacer('0.1rem', null)); $forcePwdGroup->addElement(new htmlSpacer('0.1rem', null));
} }
$forcePwdGroup->addElement(new htmlHelpLink('406'), true); $forcePwdGroup->addElement(new htmlHelpLink('406'));
$container->addField($forcePwdGroup); $container->addField($forcePwdGroup);
} }
if (isLAMProVersion() && (isset($this->attributes_orig['mail'][0]) || $this->anyModuleManagesMail())) { if (isLAMProVersion() && (isset($this->attributes_orig['mail'][0]) || $this->anyModuleManagesMail())) {
@ -2232,7 +2232,7 @@ class accountContainer {
for ($i = 0; $i < sizeof($modules); $i++) { for ($i = 0; $i < sizeof($modules); $i++) {
// insert waiting modules // insert waiting modules
for ($w = 0; $w < sizeof($depModules); $w++) { for ($w = 0; $w < sizeof($depModules); $w++) {
$dependencies = $this->module[$depModules[$w]]->get_dependencies($this->type->getScope()); $dependencies = $this->module[$depModules[$w]]->get_dependencies();
$dependencies = $dependencies['depends']; $dependencies = $dependencies['depends'];
$everything_found = true; $everything_found = true;
for ($d = 0; $d < sizeof($dependencies); $d++) { for ($d = 0; $d < sizeof($dependencies); $d++) {
@ -2250,7 +2250,7 @@ class accountContainer {
} }
} }
// check next module // check next module
$dependencies = $this->module[$modules[$i]]->get_dependencies($this->type->getScope()); $dependencies = $this->module[$modules[$i]]->get_dependencies();
if (is_array($dependencies['depends'])) { if (is_array($dependencies['depends'])) {
$everything_found = true; $everything_found = true;
$dependencies = $dependencies['depends']; $dependencies = $dependencies['depends'];

2
lam/lib/remote.inc
View file

@ -178,7 +178,7 @@ class Remote {
} }
} }
catch (NoKeyLoadedException $e) { catch (NoKeyLoadedException $e) {
logNewMessage(LOG_ERR, 'Unable to load key %s: %s', $keyPath, $e->getMessage()); logNewMessage(LOG_ERR, sprintf('Unable to load key %s: %s', $keyPath, $e->getMessage()));
throw new LAMException(sprintf(_("Unable to load key %s."), htmlspecialchars($keyPath))); throw new LAMException(sprintf(_("Unable to load key %s."), htmlspecialchars($keyPath)));
} }
} }