blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-26 09:04:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rc1_FHC4_C4' into demo-cis40

Browse Source
This commit is contained in:
Andreas Österreicher
2025-08-05 09:31:18 +02:00
parent 3dc1cf520a 2a9432d076
commit c476f7339c
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/DocumentExportLib.php
+8 -3
View File
@@ -398,15 +398,19 @@ class DocumentExportLib
foreach ($vorlage_stg as $k => $v) foreach ($vorlage_stg as $k => $v)
$vorlage->$k = $v; $vorlage->$k = $v;
if ($sign_user)
{
$this->addSignToData($xml_data);
}
$result = $this->create($temp_folder, $outputformat, $vorlage, $xml_data, $images); $result = $this->create($temp_folder, $outputformat, $vorlage, $xml_data, $images);
if (isError($result)) if (isError($result))
return $result; return $result;
$temp_filename = getData($result); $temp_filename = getData($result);
if ($sign_user) { if ($sign_user)
$this->addSignToData($xml_data); {
$result = $this->sign($temp_folder, $temp_filename, $outputformat, $sign_user, $sign_profile); $result = $this->sign($temp_folder, $temp_filename, $outputformat, $sign_user, $sign_profile);
if (isError($result)) if (isError($result))
return $result; return $result;
@@ -445,6 +449,7 @@ class DocumentExportLib
if ($xml_data->firstChild->tagName == 'error') if ($xml_data->firstChild->tagName == 'error')
return error($xml_data->firstChild->textContent); return error($xml_data->firstChild->textContent);
$styles_xsl = null;
// styles.xml erstellen // styles.xml erstellen
if ($vorlage->style) { if ($vorlage->style) {
$styles_xsl = new DOMDocument(); $styles_xsl = new DOMDocument();