Merge remote-tracking branch 'origin/develop' into feature/441_sms

lam-packaging/debian/changelog

@@ -1,10 +1,10 @@
-ldap-account-manager (9.2.RC1-1) unstable; urgency=medium
+ldap-account-manager (9.2-1) unstable; urgency=medium
 
   * new upstream release
   * Fix "Please upgrade to upstream release >= 9.1" by packaging
       new version (Closes: #1100719)
 
- -- Roland Gruber <post@rolandgruber.de>  Thu, 20 May 2025 07:41:13 +0200
+ -- Roland Gruber <post@rolandgruber.de>  Fri, 06 Jun 2025 07:41:13 +0200
 
 ldap-account-manager (9.1-1) unstable; urgency=medium
 

lam-packaging/debian/control

@@ -2,7 +2,7 @@ Source: ldap-account-manager
 Maintainer: Roland Gruber <post@rolandgruber.de>
 Section: web
 Priority: optional
-Standards-Version: 4.7.1
+Standards-Version: 4.7.2
 Build-Depends: debhelper (>= 12), debhelper-compat (= 12), po-debconf, cleancss (>= 5.2), uglifyjs (>= 3.12)
 Homepage: https://www.ldap-account-manager.org/
 Rules-Requires-Root: binary-targets

lam-packaging/docker/Dockerfile

@@ -29,7 +29,7 @@
 FROM debian:bookworm-slim
 LABEL maintainer="Roland Gruber <post@rolandgruber.de>"
 
-ARG LAM_RELEASE=9.2.RC1
+ARG LAM_RELEASE=9.2
 EXPOSE 80
 
 ENV \

lam-packaging/docker/docker-compose.yml

@@ -3,7 +3,7 @@ services:
   ldap-account-manager:
     build:
       context: .
-    image: ldapaccountmanager/lam:9.2.RC1
+    image: ldapaccountmanager/lam:9.2
     restart: unless-stopped
     ports:
       - "8080:80"

lam/HISTORY

@@ -1,4 +1,4 @@
-June 2025 9.2
+06.06.2025 9.2
  - PHP 8.4 compatibility
  - TAK support added
  - Active Directory: allow to restore deleted entries in tree view (415)
@@ -10,6 +10,7 @@ June 2025 9.2
  - Fixed bugs:
   -> Unix: profile editor for users not working (418)
   -> Custom fields: problems with deleting facsimileTelephoneNumber (419)
+  -> Cannot add user (windowsUser) to group (windowsGroup) (444)
 
 
 13.03.2025 9.1

lam/VERSION

@@ -1 +1 @@
-9.2.RC1
+9.2

lam/lib/config.inc

@@ -3199,7 +3199,6 @@ class LAMCfgMain {
 	public function importData($data) {
 		foreach ($data as $dataKey => $dataValue) {
 			if (!in_array($dataKey, $this->settings)) {
-				logNewMessage(LOG_WARNING, 'Ignored setting during import: ' . $dataKey);
 				continue;
 			}
 			if (!(($dataValue === null) || is_array($dataValue) || is_string($dataValue) || is_int($dataValue) || is_bool($dataValue))) {

lam/lib/modules.inc

@@ -1615,14 +1615,18 @@ class accountContainer {
 		}
 		// find deleted attributes (in $orig but no longer in $attributes)
 		foreach ($orig as $name => $value) {
-			if (!isset($attributes[$name])) {
+			if (count($value) === 0) {
+				continue;
+			}
+			if (!isset($attributes[$name]) || (count($attributes[$name]) === 0)) {
 				$toModify[$name] = [];
 			}
 		}
 		// find changed attributes
 		foreach ($attributes as $name => $value) {
 			// new/changed attributes
-			if (!isset($orig[$name]) || !areArrayContentsEqual($value, $orig[$name])) {
+			if ((!isset($orig[$name]) && (count($value) !== 0))
+				|| (isset($orig[$name]) && !areArrayContentsEqual($value, $orig[$name]))) {
 				$toModify[$name] = $value;
 			}
 			// unchanged attributes