From 757c2388deb647324d061d0c4231033e5df1fbe9 Mon Sep 17 00:00:00 2001
From: aschwarz <a.schwarz@polizei.bwl.de>
Date: Thu, 16 Feb 2023 10:50:14 +0100
Subject: [PATCH] =?UTF-8?q?pdf=5Fgen.php=20Anf=C3=BChrungszeichen=20korrig?=
 =?UTF-8?q?iert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pdf_gen.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pdf_gen.php b/pdf_gen.php
index 67f98739..ebb9a9f4 100644
--- a/pdf_gen.php
+++ b/pdf_gen.php
@@ -349,7 +349,7 @@ $textwort =preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|M
 
 $textwort = str_replace (array("<ul>", chr(10), "<ol>"), array("</div><div align='justify'><ul type='square'>","", "</div><div align='justify'><ol>"), $textwort);
 $textwort = str_replace (array("<br style=\"\" />", "&middot;", "&nbsp;", "&lt;", "&gt;", "&quot;", "&bdquo;", "&ldquo;", "&sbquo;", "&lsquo;", "&laquo;", "&raquo;", "&bull;")
-                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),chr(132), chr(148), "'", "'", chr(174), chr(175), chr(149))
+                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),'"', "'", "'", "'", chr(174), chr(175), chr(149))
                        , $textwort
                         );
 $textwort = trim($textwort);
@@ -376,10 +376,10 @@ $inhalt =preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mos
 #$inhalt = str_replace (array("<ul>", chr(10)), array("</div><div align='justify'><ul type='square'>",""), $inhalt);
 #$inhalt = str_replace (array("<ul>", chr(10), "<ol>"), array("</div><div align='justify'><ul type='square'>","", "</div><div align='justify'><ol>"), $inhalt);
 $inhalt = str_replace (array("<br style=\"\" />", "&middot;", "&nbsp;", "&lt;", "&gt;", "&quot;", "&bdquo;", "&ldquo;", "&sbquo;", "&lsquo;", "&laquo;", "&raquo;", "&bull;")
-                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),chr(132), chr(148), "'", "'", chr(174), chr(175), chr(149))
+                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),'"','"', "'", "'", chr(174), chr(175), chr(149))
                        , $inhalt
                         );
-
+                        
 $zusammenfassung = strip_tags($row['zusammenfassung'], '<br>,<strong>,<ul>,<li>,<ol>');
 $zusammenfassung = str_replace('"', '\"', $zusammenfassung);
 $zusammenfassung =preg_replace_callback("/([0-9]*)(\s*)(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
@@ -388,7 +388,7 @@ $#zusammenfassung = preg_replace('/([0-9][0-9]?\.\s*)?(Sirach|Mose|Josua|Richter
 $zusammenfassung=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid);}, $zusammenfassung);
 #$zusammenfassung = str_replace (array("<ul>"), array("<ul type='disc'>"), $zusammenfassung);
 $zusammenfassung = str_replace (array("<br style=\"\" />", "&middot;", "&nbsp;", "&lt;", "&gt;", "&quot;", "&bdquo;", "&ldquo;", "&sbquo;", "&lsquo;", "&laquo;", "&raquo;", "&bull;")
-                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),chr(132), chr(148), "'", "'", chr(174), chr(175), chr(149))
+                              , array("", chr(183), " ",  chr(60),chr(62),chr(34),'"', "'", "'", "'", chr(174), chr(175), chr(149))
                        , $zusammenfassung
                         );
 
@@ -400,7 +400,7 @@ $kontext=preg_replace_callback("/([0-9]*)(\s*)(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Ch
 $kontext=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid);}, $kontext);
 $kontext = str_replace (array("<ul>", chr(10), "<ol>"), array("</div><div align='justify'><ul type='square'>","", "</div><div align='justify'><ol>"), $kontext);
 $kontext = str_replace (array("<br style=\"\" />", "&middot;", "&nbsp;", "&lt;", "&gt;", "&quot;", "&bdquo;", "&ldquo;", "&sbquo;", "&lsquo;", "&laquo;", "&raquo;", "&bull;")
-                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),chr(132), chr(148), "'", "'", chr(174), chr(175), chr(149))
+                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),'"', "'", "'", "'", chr(174), chr(175), chr(149))
                        , $kontext
                         );
                         
@@ -412,7 +412,7 @@ $notiz=preg_replace_callback("/([0-9]*)(\s*)(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|
 $notiz=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid);}, $notiz);
 $notiz = str_replace (array("<ul>", chr(10), "<ol>"), array("</div><div align='justify'><ul type='square'>","", "</div><div align='justify'><ol>"), $notiz);
 $notiz = str_replace (array("<br style=\"\" />", "&middot;", "&nbsp;", "&lt;", "&gt;", "&quot;", "&bdquo;", "&ldquo;", "&sbquo;", "&lsquo;", "&laquo;", "&raquo;", "&bull;")
-                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),chr(132), chr(148), "'", "'", chr(174), chr(175), chr(149))
+                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),'"', "'", "'", "'", chr(174), chr(175), chr(149))
                        , $notiz
                         );
 
@@ -695,8 +695,7 @@ if($row7['notiz'] != ''){
 require __DIR__.'/vendor/autoload.php';
 use Spipu\Html2Pdf\Html2Pdf;
     $inhalt_fin = '<page backtop="0mm" backbottom="10mm" style="font-size: 11pt" style="font-family: freeserif">'.nl2br($inhalt_fin).'</page>';
-#echo $inhalt_fin;
-#exit;
+
     try
     {
   
@@ -712,6 +711,8 @@ use Spipu\Html2Pdf\Html2Pdf;
 #        $html2pdf->setDefaultFont('arialunicid0'); //add this line
 #       $html2pdf->setModeDebug();
 #        $html2pdf->setDefaultFont('Arial');
+#echo $inhalt_fin;
+#exit;
         $html2pdf->writeHTML($inhalt_fin, isset($_GET['vuehtml']));
         $html2pdf->Output("LG_$lid.pdf",'D');
 #*/
@@ -727,4 +728,4 @@ use Spipu\Html2Pdf\Html2Pdf;
         exit;
     }
 
-?>
\ No newline at end of file
+?>