Merge branch 'release/0.2.2'

Author: jekuaitk

CHANGELOG.md

@@ -8,6 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.2] - 2025-02-28
+
+- Updated logging messages.
+- Checked nested elements when checking for CPR values.
+
 ## [0.2.1] - 2025-02-25
 
 - Removed types from class constants.
@@ -63,7 +68,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - First version of the module
 - Added submodule to log user CUD events.
 
-[Unreleased]: https://github.com/OS2web/os2web_audit/compare/0.2.1...HEAD
+[Unreleased]: https://github.com/OS2web/os2web_audit/compare/0.2.2...HEAD
+[0.2.2]: https://github.com/OS2web/os2web_audit/compare/0.2.1...0.2.2
 [0.2.1]: https://github.com/OS2web/os2web_audit/compare/0.2.0...0.2.1
 [0.2.0]: https://github.com/OS2web/os2web_audit/compare/0.1.6...0.2.0
 [0.1.6]: https://github.com/OS2web/os2web_audit/compare/0.1.5...0.1.6

modules/os2web_audit_entity/os2web_audit_entity.module

@@ -13,23 +13,23 @@ use Drupal\os2web_audit_entity\Form\SettingsForm;
  * Implements hook_entity_insert().
  */
 function os2web_audit_entity_entity_insert(EntityInterface $entity): void {
-  $msg = sprintf('Entity (%d) of type "%s" created.', $entity->id(), $entity->getEntityTypeId());
+  $msg = sprintf('Entity (%s) of type "%s" created.', $entity->id(), $entity->getEntityTypeId());
   os2web_audit_entity_log($msg);
 }
 
 /**
  * Implements hook_entity_update().
  */
 function os2web_audit_entity_entity_update(EntityInterface $entity): void {
-  $msg = sprintf('Entity (%d) of type "%s" updated.', $entity->id(), $entity->getEntityTypeId());
+  $msg = sprintf('Entity (%s) of type "%s" updated.', $entity->id(), $entity->getEntityTypeId());
   os2web_audit_entity_log($msg);
 }
 
 /**
  * Implements hook_entity_delete().
  */
 function os2web_audit_entity_entity_delete(EntityInterface $entity): void {
-  $msg = sprintf('Entity (%d) of type "%s" deleted.', $entity->id(), $entity->getEntityTypeId());
+  $msg = sprintf('Entity (%s) of type "%s" deleted.', $entity->id(), $entity->getEntityTypeId());
   os2web_audit_entity_log($msg);
 }
 
@@ -44,7 +44,7 @@ function os2web_audit_entity_entity_storage_load(mixed $entities, string $entity
       /** @var \Drupal\file\Entity\File $entity */
       $fid = $entity->id();
       $uri = $entity->getFileUri();
-      $msg = sprintf('File (%d) accessed. Uri "%s"', $fid, $uri);
+      $msg = sprintf('File (%s) accessed. Uri "%s"', $fid, $uri);
       os2web_audit_entity_log($msg);
     }
   }
@@ -62,7 +62,7 @@ function os2web_audit_entity_webform_post_load_data(mixed $submissions): void {
     // Detect field of type that contains "cpr" in name or where field name
     // contains "cpr".
     $webform = $submission->getWebform();
-    $elements = $webform->getElementsDecoded();
+    $elements = $webform->getElementsDecodedAndFlattened();
     foreach ($elements as $fieldName => $element) {
       if (str_contains(strtolower($element['#type']), 'cpr') || str_contains(strtolower($fieldName), 'cpr')) {
         $filterFields[] = $fieldName;
@@ -82,14 +82,14 @@ function os2web_audit_entity_webform_post_load_data(mixed $submissions): void {
     if (preg_match('~(.*)/print/pdf/(.*)|(.*)\d.*/attachment(.*)~', $request->getPathInfo())) {
       // We know that a webform submission has been loaded and this is a print
       // pdf path. This indicates that this is an attachment download action.
-      $msg = sprintf('Webform submission (%d) downloaded as attachment.%s Webform id "%s".', $submission->id(), $personal, $submission->getWebform()->id());
+      $msg = sprintf('Webform submission (%s) downloaded as attachment.%s Webform id "%s".', $submission->id(), $personal, $submission->getWebform()->id());
       os2web_audit_entity_log($msg);
 
       // Exit to prevent double log entry.
       return;
     }
 
-    $msg = sprintf('Webform submission (%d) looked up.%s Webform id "%s".', $submission->id(), $personal, $submission->getWebform()->id());
+    $msg = sprintf('Webform submission (%s) looked up.%s Webform id "%s".', $submission->id(), $personal, $submission->getWebform()->id());
     os2web_audit_entity_log($msg);
   }
 }