fix(Tinebase): strike text export function does not work with muti by…

…te chars
tine20 · Mar 21, 2023 · 56127e7 · 56127e7
1 parent e613c8d
commit 56127e7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 18 deletions.
diff --git a/tine20/Calendar/Export/Doc.php b/tine20/Calendar/Export/Doc.php
@@ -49,17 +49,12 @@ public function _processRecord(Tinebase_Record_Interface $record)
 
         if ($record->status == 'CANCELED'){
             $translation = Tinebase_Translation::getTranslation('Calendar');
-            $record->summary =  $this->_strikeText($record->summary) . '  (' . $translation->_('Canceled') . ')';
+            $record->summary =  $this->strikeText($record->summary) . '  (' . $translation->_('Canceled') . ')';
         };
 
         return parent::_processRecord($record);
     }
 
-    private function _strikeText($text){
-        $splitText = str_split($text);
-        return implode(IntlChar::chr(822), $splitText) . IntlChar::chr(822);
-    }
-
     /**
      * @param array $context
      * @return array

diff --git a/tine20/Calendar/Export/DocV2.php b/tine20/Calendar/Export/DocV2.php
@@ -55,17 +55,12 @@ public function _processRecord(Tinebase_Record_Interface $record)
 
         if ($record->status == 'CANCELED'){
             $translation = Tinebase_Translation::getTranslation('Calendar');
-            $record->summary =  $this->_strikeText($record->summary) . '  (' . $translation->_('Canceled') . ')';
+            $record->summary =  $this->strikeText($record->summary) . '  (' . $translation->_('Canceled') . ')';
         };
 
         return parent::_processRecord($record);
     }
 
-    private function _strikeText($text){
-        $splitText = str_split($text);
-        return implode(IntlChar::chr(822), $splitText) . IntlChar::chr(822);
-    }
-
     /**
      * @param array $context
      * @return array

diff --git a/tine20/Calendar/Export/Ods.php b/tine20/Calendar/Export/Ods.php
@@ -47,14 +47,9 @@ public function processRecord($record, $idx)
         $translation = Tinebase_Translation::getTranslation('Calendar');
 
         if ($record->status == 'CANCELED'){
-            $record->summary =  $this->_strikeText($record->summary) . '  (' . $translation->_('Canceled') . ')';
+            $record->summary =  $this->strikeText($record->summary) . '  (' . $translation->_('Canceled') . ')';
         };
 
         return parent::processRecord($record, $idx);
     }
-
-    private function _strikeText($text){
-        $splitText = str_split($text);
-        return implode(IntlChar::chr(822), $splitText) . IntlChar::chr(822);
-    }
 }
diff --git a/tine20/Tinebase/Export/Abstract.php b/tine20/Tinebase/Export/Abstract.php
@@ -1798,4 +1798,10 @@ public static function getPluginOptionsDefinition()
             ],
         ];
     }
+
+    public function strikeText($text){
+        $splitText = preg_split('//u', $text, null, PREG_SPLIT_NO_EMPTY);
+        return implode(IntlChar::chr(822), $splitText) . IntlChar::chr(822);
+    }
+
 }
diff --git a/tine20/Tinebase/Export/AbstractDeprecated.php b/tine20/Tinebase/Export/AbstractDeprecated.php
@@ -730,4 +730,9 @@ public function save($target = null)
             stream_copy_to_stream(fopen($this->_tmpFile, 'r'), fopen($target, 'w'));
         }
     }
+
+    public function strikeText($text){
+        $splitText = preg_split('//u', $text, null, PREG_SPLIT_NO_EMPTY);
+        return implode(IntlChar::chr(822), $splitText) . IntlChar::chr(822);
+    }
 }