fix(TB Export Xls) allow extended twig templates in xls

Change-Id: Ib4710c3d872b3bcec47bbcbdb6ec5e2e22f33280 Reviewed-on: http://gerrit.tine20.com/customers/19119 Tested-by: Jenkins CI (http://ci.tine20.com/) <tine20-jenkins@metaways.de> Reviewed-by: Paul Mehrer <p.mehrer@metaways.de>
tine20 · Feb 16, 2021 · 8c34b3a · 8c34b3a
1 parent 78785ce
commit 8c34b3a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/tests/tine20/Tinebase/files/export/addressbook_contact_twigFunctions.xlsx b/tests/tine20/Tinebase/files/export/addressbook_contact_twigFunctions.xlsx
diff --git a/tine20/Tinebase/Export/Abstract.php b/tine20/Tinebase/Export/Abstract.php
@@ -779,7 +779,12 @@ protected function _loadTwig()
 
         $this->_extendTwigSetup();
 
-        $this->_twigTemplate = $this->_twig->load($this->_templateFileName);
+        try {
+            $this->_twigTemplate = $this->_twig->load($this->_templateFileName);
+        } catch (Twig_Error $e) {
+            throw new Tinebase_Exception_Backend('twig error: ' . $e->getMessage() . ' for twig source: ' .
+                $this->_getTwigSource());
+        }
     }
 
     protected function _extendTwigSetup()

diff --git a/tine20/Tinebase/Export/Xls.php b/tine20/Tinebase/Export/Xls.php
@@ -405,10 +405,12 @@ public function _getTwigSource()
             /** @var Cell $cell */
             foreach($cellIter as $cell) {
                 if (false !== strpos($cell->getValue(), '${twig:') &&
-                        preg_match_all('/\${twig:([^}]+?)}/s', $cell->getValue(), $matches, PREG_SET_ORDER)) {
+                        preg_match_all('/(\${twig:(.+?[^}%])})([^}]|$)/s', $cell->getValue(), $matches, PREG_SET_ORDER)) {
                     foreach($matches as $match) {
-                        $this->_twigMapping[$i] = $match[0];
-                        $source .= ($i === 0 ? '' : ',') . '{{' . $match[1] . '}}';
+                        $this->_twigMapping[$i] = $match[1];
+                        $source .= ($i === 0 ? '' : ',') .
+                            (strpos($match[2], '{{') !== false || strpos($match[2], '{%') !== false ? $match[2]
+                                : '{{' . $match[2] . '}}');
                         ++$i;
                     }
                 }
@@ -418,11 +420,13 @@ public function _getTwigSource()
         foreach($this->_spreadsheet->getActiveSheet()->getDrawingCollection() as $drawing) {
             $desc = $drawing->getDescription();
             if (false !== strpos($desc, '${twig:') &&
-                preg_match_all('/\${twig:([^}]+?)}/s', $desc, $matches, PREG_SET_ORDER)
+                preg_match_all('/(\${twig:(.+?[^}%])})([^}]|$)/s', $desc, $matches, PREG_SET_ORDER)
             ) {
                 foreach ($matches as $match) {
-                    $this->_twigMapping[$i] = $match[0];
-                    $source .= ($i === 0 ? '' : ',') . '{{' . $match[1] . '}}';
+                    $this->_twigMapping[$i] = $match[1];
+                    $source .= ($i === 0 ? '' : ',') .
+                        (strpos($match[2], '{{') !== false || strpos($match[2], '{%') !== false ? $match[2]
+                            : '{{' . $match[2] . '}}');
                     ++$i;
                 }
             }
@@ -702,4 +706,4 @@ function convert($to, $from = null)
                 return null;
         }
     }
-}
+}