From 5b4c8ccce46c60acfee6e4eb86ac813a73e96ffc Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Fri, 6 Dec 2024 07:48:31 +0100
Subject: [PATCH] refactoring

---
 lam/lib/modules.inc | 6 +++---
 lam/lib/remote.inc  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc
index 888a44ed9..90ddb8691 100644
--- a/lam/lib/modules.inc
+++ b/lam/lib/modules.inc
@@ -1192,7 +1192,7 @@ class accountContainer {
 				$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 htmlHelpLink('406'), true);
+			$forcePwdGroup->addElement(new htmlHelpLink('406'));
 			$container->addField($forcePwdGroup);
 		}
 		if (isLAMProVersion() && (isset($this->attributes_orig['mail'][0]) || $this->anyModuleManagesMail())) {
@@ -2232,7 +2232,7 @@ class accountContainer {
 		for ($i = 0; $i < sizeof($modules); $i++) {
 			// insert waiting modules
 			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'];
 				$everything_found = true;
 				for ($d = 0; $d < sizeof($dependencies); $d++) {
@@ -2250,7 +2250,7 @@ class accountContainer {
 				}
 			}
 			// 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'])) {
 				$everything_found = true;
 				$dependencies = $dependencies['depends'];
diff --git a/lam/lib/remote.inc b/lam/lib/remote.inc
index 64670acf7..8b795191d 100644
--- a/lam/lib/remote.inc
+++ b/lam/lib/remote.inc
@@ -178,7 +178,7 @@ class Remote {
 			}
 		}
 		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)));
 		}
 	}