QT/InvoiceShelf
1
0
Fork 0
mirror of https://github.com/InvoiceShelf/InvoiceShelf.git synced 2026-04-07 05:31:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Closes #588

Browse Source
This commit is contained in:
mchev
2026-04-01 21:30:32 +02:00
parent 7004bf375e
commit aa88dc340d
8 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Support/PdfHtmlSanitizer.php
View File

@@ -19,6 +19,9 @@ final class PdfHtmlSanitizer
return '';
}
// Legacy/invalid `</br>` is dropped by libxml and collapses lines in PDF output; normalize to `<br />`.
$html = str_replace('</br>', '<br />', $html);
$allowedTags = '<br><br/><p><b><strong><i><em><u><ol><ul><li><table><tr><td><th><thead><tbody><tfoot><h1><h2><h3><h4><blockquote>';
$html = strip_tags($html, $allowedTags);

2
app/Traits/GeneratesPdfTrait.php
View File

@@ -180,7 +180,7 @@ trait GeneratesPdfTrait
$str = str_replace('<p>', '', $str);
$str = str_replace('</p>', '</br>', $str);
$str = str_replace('</p>', '<br />', $str);
return $str;
}

4
resources/views/app/pdf/estimate/estimate1.blade.php
View File

@@ -436,7 +436,7 @@
</div>
<div class="customer-address-container">
@if ($billing_address !== '</br>')
@if ($billing_address !== '<br />')
<div class="billing-address-container billing-address">
@if ($billing_address)
<b>@lang('pdf_bill_to')</b> <br>
@@ -446,7 +446,7 @@
@endif
<div @if ($billing_address !== '</br>') class="shipping-address-container shipping-address" @else class="shipping-address-container--left shipping-address" style="padding-left:30px;" @endif>
<div @if ($billing_address !== '<br />') class="shipping-address-container shipping-address" @else class="shipping-address-container--left shipping-address" style="padding-left:30px;" @endif>
@if ($shipping_address)
<b>@lang('pdf_ship_to') </b> <br>

4
resources/views/app/pdf/estimate/estimate2.blade.php
View File

@@ -444,7 +444,7 @@
{!! $company_address !!}
</div>
@if ($shipping_address !== '</br>')
@if ($shipping_address !== '<br />')
<div class="shipping-address-container shipping-address">
@if ($shipping_address)
<b>@lang('pdf_ship_to')</b> <br>
@@ -453,7 +453,7 @@
</div>
@endif
<div class="billing-address-container billing-address" @if ($shipping_address === '</br>') style="float:right; margin-right:30px;" @endif>
<div class="billing-address-container billing-address" @if ($shipping_address === '<br />') style="float:right; margin-right:30px;" @endif>
@if ($billing_address)
<b>@lang('pdf_bill_to')</b> <br>
{!! $billing_address !!}

2
resources/views/app/pdf/invoice/invoice1.blade.php
View File

@@ -384,7 +384,7 @@
@endif
</div>
<div class="shipping-address-container shipping-address" @if ($billing_address !== '</br>') style="float:left;" @else style="display:block; float:left: padding-left: 0px;" @endif>
<div class="shipping-address-container shipping-address" @if ($billing_address !== '<br />') style="float:left;" @else style="display:block; float:left: padding-left: 0px;" @endif>
@if ($shipping_address)
<b>@lang('pdf_ship_to')</b> <br>

4
resources/views/app/pdf/invoice/invoice2.blade.php
View File

@@ -415,7 +415,7 @@
{!! $company_address !!}
</div>
@if ($shipping_address !== '</br>')
@if ($shipping_address !== '<br />')
<div class="shipping-address-container shipping-address">
@if ($shipping_address)
<b>@lang('pdf_ship_to')</b> <br>
@@ -425,7 +425,7 @@
@endif
<div class="billing-address-container billing-address" @if ($shipping_address === '</br>') style="float:right; margin-right:30px;" @endif>
<div class="billing-address-container billing-address" @if ($shipping_address === '<br />') style="float:right; margin-right:30px;" @endif>
@if ($billing_address)
<b>@lang('pdf_bill_to')</b> <br>
{!! $billing_address !!}

2
resources/views/app/pdf/invoice/invoice3.blade.php
View File

@@ -343,7 +343,7 @@
@endif
</div>
<div @if ($billing_address !== '</br>') class="shipping-address-container shipping-address" @else class="shipping-address-container--left shipping-address" @endif>
<div @if ($billing_address !== '<br />') class="shipping-address-container shipping-address" @else class="shipping-address-container--left shipping-address" @endif>
@if ($shipping_address)
<b>@lang('pdf_ship_to')</b> <br>
{!! $shipping_address !!}

9
tests/Unit/PdfHtmlSanitizerTest.php
View File

@@ -25,3 +25,12 @@ it('strips style and link attributes that may carry URLs', function () {
it('returns empty string for empty input', function () {
expect(PdfHtmlSanitizer::sanitize(''))->toBe('');
});
it('normalizes legacy closing-br markup so lines are not collapsed in PDF output', function () {
$html = 'line1</br>line2';
$out = PdfHtmlSanitizer::sanitize($html);
expect($out)->toContain('<br')->toContain('line1')->toContain('line2');
expect($out)->not->toBe('line1line2');
});