Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 12:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: ajout de la dtection des caractres spciaux

Browse Source
This commit is contained in:
Regis Houssin
2007-11-20 13:29:55 +00:00
parent beaf3586b3
commit c17cc300f8
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/lib/functions.inc.php
View File

@@ -3212,13 +3212,14 @@ function dol_textishtml($msg,$option=0)
} }
else else
{ {
if (eregi('<html',$msg)) return true; if (eregi('<html',$msg)) return true;
elseif (eregi('<body',$msg)) return true; elseif (eregi('<body',$msg)) return true;
elseif (eregi('<br',$msg)) return true; elseif (eregi('<br',$msg)) return true;
elseif (eregi('<table',$msg)) return true; elseif (eregi('<table',$msg)) return true;
elseif (eregi('<font',$msg)) return true; elseif (eregi('<font',$msg)) return true;
elseif (eregi('<strong',$msg)) return true; elseif (eregi('<strong',$msg)) return true;
elseif (eregi('<img',$msg)) return true; elseif (eregi('<img',$msg)) return true;
elseif (eregi('&[A-Z0-9]+;',$msg)) return true;
return false; return false;
} }
} }

5
htdocs/livraison/mods/pdf/pdf_typhon.modules.php
View File

@@ -241,8 +241,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->SetFont('Arial','', 9); // Dans boucle pour g<>rer multi-page $pdf->SetFont('Arial','', 9); // Dans boucle pour g<>rer multi-page
$pdf->SetXY ($this->posxdesc-1, $curY); $pdf->writeHTMLCell(108, 4, $this->posxdesc-1, $curY, $libelleproduitservice, 0, 1);
$pdf->MultiCell(108, 4, $libelleproduitservice, 0, 'J');
$pdf->SetFont('Arial','', 9); // On repositionne la police par d<>faut
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
/* /*