Fix handling of HistoryRecord string truncation in UTF-8 contexts (CF…

…M-76)
COmanage · Apr 18, 2025 · 15d8606 · 15d8606
1 parent 1b04a06
commit 15d8606
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/app/src/Model/Table/HistoryRecordsTable.php b/app/src/Model/Table/HistoryRecordsTable.php
@@ -136,9 +136,9 @@ public function beforeMarshal(EventInterface $event, \ArrayObject $data, \ArrayO
       $coId = null;
 
       if(!empty($data['person_id'])) {
-        $coId = $this->People->findCoForRecord($data['person_id']);
+        $coId = $this->People->findCoForRecord((int)$data['person_id']);
       } elseif(!empty($data['group_id'])) {
-        $coId = $this->Groups->findCoForRecord($data['group_id']);
+        $coId = $this->Groups->findCoForRecord((int)$data['group_id']);
       }
 
       if($coId) {
@@ -159,7 +159,7 @@ public function beforeMarshal(EventInterface $event, \ArrayObject $data, \ArrayO
       // Truncate the comment to fit the column width
       $column = $this->getSchema()->getColumn('comment');
 
-      $data['comment'] = substr($data['comment'], 0, $column['length']);
+      $data['comment'] = mb_substr($data['comment'], 0, $column['length']);
     }
   }
 

diff --git a/app/src/Model/Table/JobHistoryRecordsTable.php b/app/src/Model/Table/JobHistoryRecordsTable.php
@@ -112,7 +112,7 @@ public function beforeMarshal(EventInterface $event, \ArrayObject $data, \ArrayO
       // Truncate the comment to fit the column width
       $column = $this->getSchema()->getColumn('comment');
 
-      $data['comment'] = substr($data['comment'], 0, $column['length']);
+      $data['comment'] = mb_substr($data['comment'], 0, $column['length']);
     }
   }
 

diff --git a/app/src/Model/Table/PetitionHistoryRecordsTable.php b/app/src/Model/Table/PetitionHistoryRecordsTable.php
@@ -136,7 +136,7 @@ public function beforeMarshal(EventInterface $event, \ArrayObject $data, \ArrayO
       // Truncate the comment to fit the column width
       $column = $this->getSchema()->getColumn('comment');
 
-      $data['comment'] = substr($data['comment'], 0, $column['length']);
+      $data['comment'] = mb_substr($data['comment'], 0, $column['length']);
     }
   }
 

diff --git a/app/src/Model/Table/ProvisioningHistoryRecordsTable.php b/app/src/Model/Table/ProvisioningHistoryRecordsTable.php
@@ -116,7 +116,7 @@ public function beforeMarshal(EventInterface $event, \ArrayObject $data, \ArrayO
       // Truncate the comment to fit the column width
       $column = $this->getSchema()->getColumn('comment');
 
-      $data['comment'] = substr($data['comment'], 0, $column['length']);
+      $data['comment'] = mb_substr($data['comment'], 0, $column['length']);
     }
   }