Alan Lam 7 роки тому
батько
коміт
ed7f053ac2

+ 2 - 1
composer.json

@@ -1,6 +1,7 @@
 {
     "require": {
         "phpmailer/phpmailer": "^6.0",
-		"phpoffice/phppresentation": "dev-master"
+		"phpoffice/phppresentation": "dev-master",
+        "mpdf/mpdf": "^7.1"
     }
 }

+ 259 - 2
composer.lock

@@ -4,8 +4,169 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "d3cdf144ec8301681fb8f12546af92b8",
+    "content-hash": "3f02ca5c7eec779e858e901ae5bd2c76",
     "packages": [
+        {
+            "name": "mpdf/mpdf",
+            "version": "v7.1.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mpdf/mpdf.git",
+                "reference": "a0fc1215d2306aa3b4ba6e97bd6ebe4bab6a88fb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mpdf/mpdf/zipball/a0fc1215d2306aa3b4ba6e97bd6ebe4bab6a88fb",
+                "reference": "a0fc1215d2306aa3b4ba6e97bd6ebe4bab6a88fb",
+                "shasum": ""
+            },
+            "require": {
+                "ext-gd": "*",
+                "ext-mbstring": "*",
+                "myclabs/deep-copy": "^1.7",
+                "paragonie/random_compat": "^1.4|^2.0|9.99.99",
+                "php": "^5.6 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0",
+                "psr/log": "^1.0",
+                "setasign/fpdi": "1.6.*"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.5",
+                "phpunit/phpunit": "^5.0",
+                "squizlabs/php_codesniffer": "^2.7.0",
+                "tracy/tracy": "^2.4"
+            },
+            "suggest": {
+                "ext-bcmath": "Needed for generation of some types of barcodes",
+                "ext-xml": "Needed mainly for SVG manipulation",
+                "ext-zlib": "Needed for compression of embedded resources, such as fonts"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-development": "7.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Mpdf\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0-only"
+            ],
+            "authors": [
+                {
+                    "name": "Matěj Humpál",
+                    "role": "Developer, maintainer"
+                },
+                {
+                    "name": "Ian Back",
+                    "role": "Developer (retired)"
+                }
+            ],
+            "description": "PHP library generating PDF files from UTF-8 encoded HTML",
+            "homepage": "https://mpdf.github.io",
+            "keywords": [
+                "pdf",
+                "php",
+                "utf-8"
+            ],
+            "time": "2019-02-06T13:32:19+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "replace": {
+                "myclabs/deep-copy": "self.version"
+            },
+            "require-dev": {
+                "doctrine/collections": "^1.0",
+                "doctrine/common": "^2.6",
+                "phpunit/phpunit": "^7.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                },
+                "files": [
+                    "src/DeepCopy/deep_copy.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "time": "2018-06-11T23:09:50+00:00"
+        },
+        {
+            "name": "paragonie/random_compat",
+            "version": "v9.99.99",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/random_compat.git",
+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*|5.*",
+                "vimeo/psalm": "^1"
+            },
+            "suggest": {
+                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com"
+                }
+            ],
+            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+            "keywords": [
+                "csprng",
+                "polyfill",
+                "pseudorandom",
+                "random"
+            ],
+            "time": "2018-07-02T15:55:56+00:00"
+        },
         {
             "name": "pclzip/pclzip",
             "version": "2.8.2",
@@ -231,7 +392,103 @@
                 "pptx",
                 "presentations"
             ],
-            "time": "2017-07-05 12:13:02"
+            "time": "2017-07-05T12:13:02+00:00"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "time": "2018-11-20T15:27:04+00:00"
+        },
+        {
+            "name": "setasign/fpdi",
+            "version": "1.6.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Setasign/FPDI.git",
+                "reference": "a6ad58897a6d97cc2d2cd2adaeda343b25a368ea"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/a6ad58897a6d97cc2d2cd2adaeda343b25a368ea",
+                "reference": "a6ad58897a6d97cc2d2cd2adaeda343b25a368ea",
+                "shasum": ""
+            },
+            "suggest": {
+                "setasign/fpdf": "FPDI will extend this class but as it is also possible to use \"tecnickcom/tcpdf\" as an alternative there's no fixed dependency configured.",
+                "setasign/fpdi-fpdf": "Use this package to automatically evaluate dependencies to FPDF.",
+                "setasign/fpdi-tcpdf": "Use this package to automatically evaluate dependencies to TCPDF."
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "filters/",
+                    "fpdi.php",
+                    "fpdf_tpl.php",
+                    "fpdi_pdf_parser.php",
+                    "pdf_context.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jan Slabon",
+                    "email": "jan.slabon@setasign.com",
+                    "homepage": "https://www.setasign.com"
+                }
+            ],
+            "description": "FPDI is a collection of PHP classes facilitating developers to read pages from existing PDF documents and use them as templates in FPDF. Because it is also possible to use FPDI with TCPDF, there are no fixed dependencies defined. Please see suggestions for packages which evaluates the dependencies automatically.",
+            "homepage": "https://www.setasign.com/fpdi",
+            "keywords": [
+                "fpdf",
+                "fpdi",
+                "pdf"
+            ],
+            "time": "2017-05-11T14:25:49+00:00"
         }
     ],
     "packages-dev": [],

+ 5 - 2
controllers/test.php

@@ -373,8 +373,8 @@ else if(Core::$user->level >= User::LEVEL_ADMIN) {
 				}
 
 				// Save PDF
-				$pdf = $test->getPDF();
-				$pdf_string = $pdf->Output("S");
+				$mpdf = $test->getMPDF();
+				$pdf_string = $mpdf->Output("", "S");
 				$pdf_path = $directory . "/pdf.pdf";
 
 				$success = file_put_contents($pdf_path, $pdf_string);
@@ -383,6 +383,8 @@ else if(Core::$user->level >= User::LEVEL_ADMIN) {
 				$email_location = http::value("email_location");
 				$email_location_area_manager = http::value("email_location_area_manager");
 
+				/*
+
 				if($email_customer && $customer->email_after_test && $customer->email) {
 					$test->sendResultEmail($customer->email);
 				}
@@ -402,6 +404,7 @@ else if(Core::$user->level >= User::LEVEL_ADMIN) {
 				if(EMAIL_TEST_RESULT_COPY) {
 					$test->sendResultEmail(EMAIL_TEST_RESULT_COPY);
 				}
+				*/
 
 			}
 

+ 188 - 163
controllers/test_invoice.php

@@ -1,5 +1,7 @@
 <?php
 
+use \Mpdf\Mpdf;
+
 $test = Test::get($id);
 if(!$test) throw new Exception("Test not found.");
 if($test->status != Test::STATUS_COMPLETED) throw new Exception("An invoice cannot be generated for this test yet.");
@@ -34,25 +36,20 @@ $address_parts = array_filter([
 	$address->city,
 	$address->county,
 	$address->postal_code,
-	str_repeat("-", 32),
-	"Tel: " . $tester->phone,
-	"Email: " . $tester->email,
 ]);
 
+$bill_to_address_parts = [
+	"8 Market Street",
+	"Liskeard",
+	"Cornwall",
+	"PL14 3JJ",
+];
+
 $reference =
 	"T" . str_pad($test->id, 3, "0", STR_PAD_LEFT) .
 	"/L" . str_pad($location->id, 3, "0", STR_PAD_LEFT) .
 	"/U" . str_pad($tester->id, 3, "0", STR_PAD_LEFT);
 
-
-$tiny_font_size = 8;
-$small_font_size = 10;
-$normal_font_size = 10;
-$header_font_size = 14;
-
-$cell_height = 5;
-$cell_margin = 2;
-
 list($date_start, $time_start) = explode(" ", $test->dts_start);
 list($date_end, $time_end) = explode(" ", $test->dts_end);
 
@@ -63,158 +60,186 @@ $diff = $dt_start->diff($dt_end, true);
 
 $date_start = date("d/m/Y", strtotime($test->dts_start));
 
+
+$tiny_font_size = 8;
+$small_font_size = 10;
+$normal_font_size = 10;
+$header_font_size = 14;
+
+$cell_height = 5;
+$cell_margin = 2;
+
 // A4 size: 210x297mm
+$mpdf = new Mpdf();
+
+$mpdf->SetSubject("Test Invoice");
+$mpdf->SetCreator(APP_NAME);
+$mpdf->SetAuthor(APP_NAME);
+$mpdf->SetTitle("Invoice ({$reference})");
+
+$mpdf->useSubstitutions = true;
+
+ob_start();
+?>
+<!DOCTYPE html>
+<html>
+	<head>
+		<style>
+			body {
+				font-family: sans-serif;
+			}
+
+			.title {
+				font-size: 3rem;
+			}
+
+			td {
+				padding: 8px;
+			}
+		</style>
+	</head>
+	<body>
+		<div>
+			<div style="float: left; width: 49.5%; font-size: 0.875rem;">
+
+				<div style="float: left; width: 49.5%;">
+					<strong><?=htmlspecialchars($tester->getDisplayName())?></strong><br />
+					<?=nl2br(htmlspecialchars(implode("\n", $address_parts)))?><br />
+				</div>
+				<div style="float: right; width: 49.5%;">
+					Tel: <?=htmlspecialchars($tester->phone)?><br />
+					Email: <?=htmlspecialchars($tester->email)?><br />
+				</div>
+
+				<br />
+				<br />
+
+				<span color="gray">Bill To:</span><br />
+
+				<div style="float: left; width: 49.5%;">
+					<strong><?=htmlspecialchars(COMPANY_NAME)?></strong><br />
+					<?=nl2br(htmlspecialchars(implode("\n", $bill_to_address_parts)))?>
+				</div>
+				<div style="float: right; width: 49.5%;">
+					Tel: <?=htmlspecialchars(PHONE)?>
+				</div>
+
+
+
+
+			</div>
+			<div style="float: right; width: 49.5%; text-align: right;">
+				<div class="title">
+					INVOICE
+				</div>
+				Ref: <?=$reference?><br />
+
+				<br />
+
+				<table width="100%" cellspacing="0">
+					<tr>
+						<td width="50%" align="right" color="gray">Date:</td>
+						<td width="50%" align="right"><?=date("d/m/Y")?></td>
+					</tr>
+					<tr>
+						<td align="right" color="gray">Due Date:</td>
+						<td align="right"><?=date("d/m/Y", time() + 2592000)?></td>
+					</tr>
+					<tr bgcolor="#eee">
+						<td align="right">Balance Due:</td>
+						<td align="right">£<?=number_format($invoice_total, 2)?></td>
+					</tr>
+				</table>
+
+			</div>
+			<div style="clear: both;"></div>
+			<br />
+			<table width="100%" cellspacing="0" border="1">
+				<tr bgcolor="#444">
+					<td color="white" width="55%">Item</td>
+					<td color="white">Quantity</td>
+					<td color="white">Rate</td>
+					<td color="white">Amount</td>
+				</tr>
+				<tr>
+					<td>
+						<strong><?=htmlspecialchars($template->name)?> Test</strong><br />
+						<?=nl2br(htmlspecialchars("$location_address\n" . date("d/m/Y H:i", strtotime($test->dts_start . " UTC"))))?>
+					</td>
+					<td align="right" valign="top">1</td>
+					<td align="right" valign="top">£<?=number_format($fee, 2)?></td>
+					<td align="right" valign="top">£<?=number_format($fee, 2)?></td>
+				</tr>
+				<?php
+				if($play_spent) {
+					?>
+					<tr>
+						<td>
+							<strong>Play Costs</strong>
+						</td>
+						<td align="right" valign="top">1</td>
+						<td align="right" valign="top">£<?=number_format($play_spent, 2)?></td>
+						<td align="right" valign="top">£<?=number_format($play_spent, 2)?></td>
+					</tr>
+					<?php
+				}
+				if($travel_cost) {
+					?>
+					<tr>
+						<td>
+							<strong>Travel Costs</strong>
+						</td>
+						<td align="right" valign="top">1</td>
+						<td align="right" valign="top">£<?=number_format($travel_cost, 2)?></td>
+						<td align="right" valign="top">£<?=number_format($travel_cost, 2)?></td>
+					</tr>
+					<?php
+				}
+				?>
+				<tr>
+					<td colspan="3" align="right" valign="top" color="gray">Total:</td>
+					<td align="right" valign="top">£<?=number_format($invoice_total, 2)?></td>
+				</tr>
+
+			</table>
+
+			<br />
+
+			<span color="gray">Pay To:</span><br />
+
+			<?=htmlspecialchars($tester->getDisplayName())?><br />
+
+
+			<?php
+			switch($tester->preferred_payment_method) {
+				case User::PAYMENT_METHOD_BANK_TRANSFER:
+					?>
+					<strong>Bank Transfer</strong><br />
+					Bank Name: <?=htmlspecialchars($tester->bank_name)?>
+					Sort Code: <?=htmlspecialchars($tester->bank_sort_code)?>
+					Account Number: <?=htmlspecialchars($tester->bank_account_number)?>
+					<?php
+					break;
+
+				case User::PAYMENT_METHOD_PAYPAL:
+					?>
+					<strong>PayPal</strong><br />
+					PayPal Address: <?=htmlspecialchars($tester->paypal_email)?>
+					<?php
+					break;
+			}
+			?>
+
+
+		</div>
+	</body>
+</html>
+<?php
 
-// Full Width = 210 - 20 = 190
-// Half Width = (210 - 20 - 10) / 2 = 90
-// Column 1 x = 10
-// Column 2 x = 110
-
-$pdf = new TestPDF("P", "mm", "A4");
-
-$pdf->SetSubject("Test Invoice");
-$pdf->SetCreator(APP_NAME);
-$pdf->SetAuthor(APP_NAME);
-$pdf->SetTitle("Invoice ($reference)");
-
-$pdf->AddPage();
-$pdf->SetFont("Arial");
-$pdf->SetDrawColor(240, 240, 240);
-$pdf->SetFillColor(240);
-$pdf->SetAutoPageBreak(false);
-
-// Right title
-$pdf->SetLeftMargin(110);
-$pdf->SetFont("Arial", "", 30);
-$pdf->MultiCell(90, 8, "INVOICE", 0, "R");
-$pdf->SetFontSize($normal_font_size);
-$pdf->MultiCell(90, 8, "Ref: $reference", 0, "R");
-
-$pdf->MoveY(8);
-
-$pdf->SetTextColor(128);
-$pdf->Cell(45, 8, "Date:", 0, 0, "R");
-$pdf->SetTextColor(0);
-$pdf->Cell(45, 8, date("d/m/Y"), 0, 1, "R");
-
-$pdf->SetTextColor(128);
-$pdf->Cell(45, 8, "Due Date:", 0, 0, "R");
-$pdf->SetTextColor(0);
-$pdf->Cell(45, 8, date("d/m/Y", time() + 2592000), 0, 1, "R");
-
-$pdf->Rect(110, $pdf->GetY(), 90, 8, "F");
-$pdf->Cell(45, 8, "Balance Due:", 0, 0, "R");
-$pdf->SetTextColor(0);
-$pdf->Cell(45, 8, utf8_decode("£") . number_format($invoice_total, 2), 0, 1, "R");
-
-// Left addresses
-$pdf->SetXY(10, 10);
-$pdf->SetLeftMargin(10);
-$pdf->SetTextColor(0);
-
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->Cell(90, 4, $tester->getDisplayName(), 0, 1);
-
-$pdf->SetFont("Arial");
-$pdf->MultiCell(90, 4, implode("\n", $address_parts));
-
-$pdf->MoveY(8);
-
-$pdf->SetTextColor(128);
-$pdf->Cell(90, 4, "Bill To:", 0, 1);
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->SetTextColor(0, 0, 0);
-$pdf->Cell(90, 4, APP_NAME, 0, 1);
-$pdf->SetFont("Arial");
-$pdf->MultiCell(90, 4, implode("\n", ["8 Market Street", "Liskeard", "Cornwall", "PL14 3JJ", str_repeat("-", 32), "Tel: 07841 353775"]));
-
-// Header
-$pdf->MoveY(8);
-
-$pdf->SetFillColor(64);
-$pdf->Rect(10, $pdf->GetY(), 190, 8, "F");
-
-$pdf->SetTextColor(255);
-$pdf->Cell(115, 8, "Item");
-$pdf->Cell(15, 8, "Quantity");
-$pdf->Cell(30, 8, "Rate", 0, 0, "R");
-$pdf->Cell(30, 8, "Amount", 0, 0, "R");
-$pdf->MoveY(10);
-
-// Item
-
-$pdf->SetTextColor(0);
-$pdf->SetFont("Arial", "", $normal_font_size);
-
-$y = $pdf->GetY();
-$pdf->MultiCell(115, 5, $template->name . " Test\n$location_address\n" . date("d/m/Y H:i", strtotime($test->dts_start . " UTC")), 0, "L");
-$next_y = $pdf->GetY();
-$pdf->SetXY(125, $y);
-$pdf->Cell(15, 5, 1, 0, 0, "R");
-$pdf->Cell(30, 5, utf8_decode("£") . number_format($fee, 2), 0, 0, "R");
-$pdf->Cell(30, 5, utf8_decode("£") . number_format($fee, 2), 0, 0, "R");
-$pdf->SetXY(10, $next_y);
-
-if($play_spent) {
-	$pdf->MoveY(5);
-	$y = $pdf->GetY();
-	$pdf->MultiCell(115, 5, "Play Costs", 0, "L");
-	$next_y = $pdf->GetY();
-	$pdf->SetXY(125, $y);
-	$pdf->Cell(15, 5, 1, 0, 0, "R");
-	$pdf->Cell(30, 5, utf8_decode("£") . number_format($play_spent, 2), 0, 0, "R");
-	$pdf->Cell(30, 5, utf8_decode("£") . number_format($play_spent, 2), 0, 0, "R");
-	$pdf->SetXY(10, $next_y);
-}
-
-if($travel_cost) {
-	$pdf->MoveY(5);
-	$y = $pdf->GetY();
-	$pdf->MultiCell(115, 5, "Travel Costs", 0, "L");
-	$next_y = $pdf->GetY();
-	$pdf->SetXY(125, $y);
-	$pdf->Cell(15, 5, 1, 0, 0, "R");
-	$pdf->Cell(30, 5, utf8_decode("£") . number_format($travel_cost, 2), 0, 0, "R");
-	$pdf->Cell(30, 5, utf8_decode("£") . number_format($travel_cost, 2), 0, 0, "R");
-	$pdf->SetXY(10, $next_y);
-}
-
-$pdf->MoveY(10);
-
-$pdf->SetTextColor(128);
-$pdf->Cell(150, 5, "Total:", 0, 0, "R");
-$pdf->SetTextColor(0);
-$pdf->Cell(40, 5, utf8_decode("£") . number_format($invoice_total, 2), 0, 1, "R");
-
-$pdf->MoveY(10);
-
-$pdf->SetTextColor(128);
-$pdf->MultiCell(190, 6, "Pay To:");
-$pdf->SetTextColor(0);
-$pdf->MultiCell(190, 6, $tester->getDisplayName());
-switch($tester->preferred_payment_method) {
-	case User::PAYMENT_METHOD_BANK_TRANSFER: {
-		$pdf->SetFont("Arial", "B");
-		$pdf->MultiCell(190, 6, "Bank Transfer");
-		$pdf->SetFont("Arial");
-		$pdf->MultiCell(190, 6, "Bank Name: $tester->bank_name");
-		$pdf->MultiCell(190, 6, "Sort Code: $tester->bank_sort_code");
-		$pdf->MultiCell(190, 6, "Account Number: $tester->bank_account_number");
-		break;
-	}
-
-	case User::PAYMENT_METHOD_PAYPAL: {
-		$pdf->SetFont("Arial", "B");
-		$pdf->MultiCell(190, 6, "PayPal");
-		$pdf->SetFont("Arial");
-		$pdf->MultiCell(190, 6, "PayPal Address: $tester->paypal_email");
-		break;
-	}
-}
-
-// Output
-$name = str_replace("/", "_", $reference) . " - " . $tester->getDisplayName() . " - Invoice.pdf";
+$html = ob_get_clean();
+
+$mpdf->WriteHTML($html);
 
-$pdf->Output("D", $name);
+$name = str_replace("/", "_", $reference) . " - " . $tester->getDisplayName() . " - Invoice.pdf";
 
-?>
+$mpdf->Output($name, "D");

+ 140 - 52
controllers/test_pdf.php

@@ -1,11 +1,15 @@
 <?php
 
+use \Mpdf\Mpdf;
+
 // Controller may be included directly and $pdf can be accessed.
 
 $test = Test::get($id);
 if(!$test) throw new Exception("Test not found.");
 
 $project = $test->getProject();
+$customer = $project->getCustomer();
+
 $template = $project->getTemplate();
 $template->setOverrides($project->getTemplateOverrides());
 
@@ -33,14 +37,6 @@ $values = array_filter($values, function($value) {
 	return strlen($value) !== 0;
 });
 
-$tiny_font_size = 8;
-$small_font_size = 10;
-$normal_font_size = 10;
-$header_font_size = 14;
-
-$cell_height = 5;
-$cell_margin = 2;
-
 list($date_start, $time_start) = explode(" ", $test->dts_start);
 list($date_end, $time_end) = explode(" ", $test->dts_end);
 
@@ -55,63 +51,155 @@ $time_end = $dt_end->format("H:i:s");
 $diff = $dt_start->diff($dt_end, true);
 
 $date_start = date("d/m/Y", strtotime($test->dts_start . " UTC"));
+$duration_text = str_pad($diff->h, 2, "0", STR_PAD_LEFT) . ":" . str_pad($diff->i, 2, "0", STR_PAD_LEFT) . ":" . str_pad($diff->s, 2, "0", STR_PAD_LEFT);
 
 $location_text = " $location->name";
 if($location->internal_id) {
-	$location_text .= " (ID: $location->internal_id)";
+	$location_text .= " ({$customer->internal_id_field_name}: {$location->internal_id})";
 }
 
 $template_processing_file_path = $template->getProcessingFilePath("test_pdf.php");
 
 // A4 size: 210x297mm
 // Start PDF Building
+$mpdf = new Mpdf([
+	"margin_top" => 26,
+	"margin_bottom" => 30,
+	"margin_left" => 15,
+	"margin_right" => 15,
+]);
+
+$mpdf->SetSubject("Test Result");
+$mpdf->SetCreator(APP_NAME);
+$mpdf->SetAuthor(APP_NAME);
+$mpdf->SetTitle("{$location->name} Test Result @ {$date_start}");
+
+$mpdf->useSubstitutions = true;
+
+ob_start()
+?>
+
+<!DOCTYPE html>
+<html>
+	<head>
+		<style>
+			body {
+				font-family: sans-serif;
+				font-size: 0.75rem;
+			}
+
+			a {
+				color: blue;
+			}
+
+			.bl {
+				border-bottom: 1px solid #eee;
+			}
+
+			.section {
+				background: #e2f0d9;
+				color: #385723;
+				padding: 4px 8px;
+				margin-bottom: 8px;
+				font-size: 1.25rem;
+			}
+
+			.subheader {
+				text-transform: uppercase;
+				color: #888;
+				padding: 4px 8px;
+				background: #eee;
+				margin-bottom: 8px;
+			}
+
+			div.field {
+				float: left;
+				width: 29%;
+				font-weight: bold;
+			}
+
+			div.value {
+				float: left;
+				padding-left: 1%;
+				width: 69%;
+			}
+
+			.wide-field-names div.field {
+				width: 59%;
+			}
+
+			.wide-field-names div.value {
+				width: 39%;
+			}
+
+			div.clear {
+				clear: both;
+			}
+
+			.text-muted {
+				color: #ccc;
+			}
+
+			.hr {
+				border-bottom: 2px solid #39b549;
+				margin-bottom: 1rem;
+			}
+
+		</style>
+	</head>
+	<body>
+		<!--mpdf
+		<htmlpageheader name="Header">
+			<table class="header" width="100%">
+				<tr>
+					<td width="33%">
+						<img src="/img/logo.png" height="50" />
+					</td>
+					<td width="34%" align="center">
+					<?php
+					if($test->retest) {
+						?>
+						<img src="/img/retest.png" height="38" />
+						<?php
+					}
+					?>
+					</td>
+					<td width="33%" align="right">
+						<strong color="red">Test / Location ID: <?=$test->id?> / <?=$location->id?></strong><br />
+						Tel: 01579 342 104<br />
+						<a href="https://check-policy.com">check-policy.com</a><br />
+						<a href="mailto:info@check-policy.com">info@check-policy.com</a>
+					</td>
+				</tr>
+			</table>
+		</htmlpageheader>
+
+		<htmlpagefooter name="Footer">
+			<div class="hr"></div>
+			<br />
+			<strong>Check Policy Limited</strong><br />
+			8 Market Street, Liskeard, Cornwall, PL14 3JJ<br />
+			Company Number: 09506865
+		</htmlpagefooter>
+
+		<sethtmlpageheader name="Header" value="on" show-this-page="1" />
+		<sethtmlpagefooter name="Footer" value="on" />
+		mpdf-->
+
+		<?php
+		require $template_processing_file_path;
+		?>
+
+	</body>
+</html>
 
-$pdf = new TestPDF("P", "mm", "A4");
-
-$pdf->SetSubject("Test Result");
-$pdf->SetCreator(APP_NAME);
-$pdf->SetAuthor(APP_NAME);
-$pdf->SetTitle($location->name . " Test Result @ $date_start");
-
-$pdf->AddPage();
-$pdf->SetFont("Arial");
-$pdf->SetDrawColor(240, 240, 240);
-$pdf->SetFillColor(226, 240, 217);
-$pdf->SetAutoPageBreak(false);
-
-// Logo
-$pdf->Image("public/img/logo.png", 11, 10, 60);
-
-// Right contact info
-$pdf->SetFont("Arial", "B", $tiny_font_size);
-$pdf->SetTextColor(255, 0, 0);
-
-$pdf->SetLeftMargin(120);
-$pdf->SetY(10);
-
-$pdf->Cell(80, 4, "Test / Location ID: $test->id / $location->id", 0, 1, "R");
-
-$pdf->SetFont("Arial", "");
-$pdf->SetTextColor(0, 0, 0);
-
-
-$pdf->Cell(80, 4, "Tel: 01579 342 104", 0, 1, "R", false, "tel:01579+342+104");
-
-$pdf->SetFont("Arial", "U");
-$pdf->SetTextColor(0, 128, 255);
-
-$pdf->Cell(80, 4, "check-policy.com", 0, 1, "R", false, "https://check-policy.com");
-$pdf->Cell(80, 4, "info@check-policy.com", 0, 1, "R");
-
-$pdf->SetLeftMargin(10);
-$pdf->SetXY(10, $pdf->GetY() + $cell_margin);
+<?php
 
-require $template_processing_file_path;
+$html = ob_get_clean();
 
+$mpdf->WriteHTML($html);
 
 // Output
 if($output) {
-	$pdf->Output();
+	$mpdf->Output();
 }
-
-?>

+ 5 - 1
engine/customer.php

@@ -4,7 +4,11 @@ class Customer extends Model {
 
 	protected static $table = "customer";
 	protected static $id_field = "id";
-	protected static $fillable_fields = ["name", "address_1", "address_2", "city", "county", "postal_code", "country", "email", "phone", "email_after_test", "email_locations_after_test"];
+	protected static $fillable_fields = ["name", "address_1", "address_2",
+		"city", "county", "postal_code", "country", "email", "phone",
+		"email_after_test", "email_locations_after_test",
+		"internal_id_field_name", "region_field_name", "area_manager_field_name",
+	];
 
 	// Static methods
 	public static function getForAdmin() {

+ 0 - 1898
engine/fpdf.php

@@ -1,1898 +0,0 @@
-<?php
-/*******************************************************************************
-* FPDF                                                                         *
-*                                                                              *
-* Version: 1.81                                                                *
-* Date:    2015-12-20                                                          *
-* Author:  Olivier PLATHEY                                                     *
-*******************************************************************************/
-
-define('FPDF_VERSION','1.81');
-
-class FPDF
-{
-protected $page;               // current page number
-protected $n;                  // current object number
-protected $offsets;            // array of object offsets
-protected $buffer;             // buffer holding in-memory PDF
-protected $pages;              // array containing pages
-protected $state;              // current document state
-protected $compress;           // compression flag
-protected $k;                  // scale factor (number of points in user unit)
-protected $DefOrientation;     // default orientation
-protected $CurOrientation;     // current orientation
-protected $StdPageSizes;       // standard page sizes
-protected $DefPageSize;        // default page size
-protected $CurPageSize;        // current page size
-protected $CurRotation;        // current page rotation
-protected $PageInfo;           // page-related data
-protected $wPt, $hPt;          // dimensions of current page in points
-protected $w, $h;              // dimensions of current page in user unit
-protected $lMargin;            // left margin
-protected $tMargin;            // top margin
-protected $rMargin;            // right margin
-protected $bMargin;            // page break margin
-protected $cMargin;            // cell margin
-protected $x, $y;              // current position in user unit
-protected $lasth;              // height of last printed cell
-protected $LineWidth;          // line width in user unit
-protected $fontpath;           // path containing fonts
-protected $CoreFonts;          // array of core font names
-protected $fonts;              // array of used fonts
-protected $FontFiles;          // array of font files
-protected $encodings;          // array of encodings
-protected $cmaps;              // array of ToUnicode CMaps
-protected $FontFamily;         // current font family
-protected $FontStyle;          // current font style
-protected $underline;          // underlining flag
-protected $CurrentFont;        // current font info
-protected $FontSizePt;         // current font size in points
-protected $FontSize;           // current font size in user unit
-protected $DrawColor;          // commands for drawing color
-protected $FillColor;          // commands for filling color
-protected $TextColor;          // commands for text color
-protected $ColorFlag;          // indicates whether fill and text colors are different
-protected $WithAlpha;          // indicates whether alpha channel is used
-protected $ws;                 // word spacing
-protected $images;             // array of used images
-protected $PageLinks;          // array of links in pages
-protected $links;              // array of internal links
-protected $AutoPageBreak;      // automatic page breaking
-protected $PageBreakTrigger;   // threshold used to trigger page breaks
-protected $InHeader;           // flag set when processing header
-protected $InFooter;           // flag set when processing footer
-protected $AliasNbPages;       // alias for total number of pages
-protected $ZoomMode;           // zoom display mode
-protected $LayoutMode;         // layout display mode
-protected $metadata;           // document properties
-protected $PDFVersion;         // PDF version number
-
-/*******************************************************************************
-*                               Public methods                                 *
-*******************************************************************************/
-
-function __construct($orientation='P', $unit='mm', $size='A4')
-{
-	// Some checks
-	$this->_dochecks();
-	// Initialization of properties
-	$this->state = 0;
-	$this->page = 0;
-	$this->n = 2;
-	$this->buffer = '';
-	$this->pages = array();
-	$this->PageInfo = array();
-	$this->fonts = array();
-	$this->FontFiles = array();
-	$this->encodings = array();
-	$this->cmaps = array();
-	$this->images = array();
-	$this->links = array();
-	$this->InHeader = false;
-	$this->InFooter = false;
-	$this->lasth = 0;
-	$this->FontFamily = '';
-	$this->FontStyle = '';
-	$this->FontSizePt = 12;
-	$this->underline = false;
-	$this->DrawColor = '0 G';
-	$this->FillColor = '0 g';
-	$this->TextColor = '0 g';
-	$this->ColorFlag = false;
-	$this->WithAlpha = false;
-	$this->ws = 0;
-	// Font path
-	if(defined('FPDF_FONTPATH'))
-	{
-		$this->fontpath = FPDF_FONTPATH;
-		if(substr($this->fontpath,-1)!='/' && substr($this->fontpath,-1)!='\\')
-			$this->fontpath .= '/';
-	}
-	elseif(is_dir(dirname(__FILE__).'/font'))
-		$this->fontpath = dirname(__FILE__).'/font/';
-	else
-		$this->fontpath = '';
-	// Core fonts
-	$this->CoreFonts = array('courier', 'helvetica', 'times', 'symbol', 'zapfdingbats');
-	// Scale factor
-	if($unit=='pt')
-		$this->k = 1;
-	elseif($unit=='mm')
-		$this->k = 72/25.4;
-	elseif($unit=='cm')
-		$this->k = 72/2.54;
-	elseif($unit=='in')
-		$this->k = 72;
-	else
-		$this->Error('Incorrect unit: '.$unit);
-	// Page sizes
-	$this->StdPageSizes = array('a3'=>array(841.89,1190.55), 'a4'=>array(595.28,841.89), 'a5'=>array(420.94,595.28),
-		'letter'=>array(612,792), 'legal'=>array(612,1008));
-	$size = $this->_getpagesize($size);
-	$this->DefPageSize = $size;
-	$this->CurPageSize = $size;
-	// Page orientation
-	$orientation = strtolower($orientation);
-	if($orientation=='p' || $orientation=='portrait')
-	{
-		$this->DefOrientation = 'P';
-		$this->w = $size[0];
-		$this->h = $size[1];
-	}
-	elseif($orientation=='l' || $orientation=='landscape')
-	{
-		$this->DefOrientation = 'L';
-		$this->w = $size[1];
-		$this->h = $size[0];
-	}
-	else
-		$this->Error('Incorrect orientation: '.$orientation);
-	$this->CurOrientation = $this->DefOrientation;
-	$this->wPt = $this->w*$this->k;
-	$this->hPt = $this->h*$this->k;
-	// Page rotation
-	$this->CurRotation = 0;
-	// Page margins (1 cm)
-	$margin = 28.35/$this->k;
-	$this->SetMargins($margin,$margin);
-	// Interior cell margin (1 mm)
-	$this->cMargin = $margin/10;
-	// Line width (0.2 mm)
-	$this->LineWidth = .567/$this->k;
-	// Automatic page break
-	$this->SetAutoPageBreak(true,2*$margin);
-	// Default display mode
-	$this->SetDisplayMode('default');
-	// Enable compression
-	$this->SetCompression(true);
-	// Set default PDF version number
-	$this->PDFVersion = '1.3';
-}
-
-function SetMargins($left, $top, $right=null)
-{
-	// Set left, top and right margins
-	$this->lMargin = $left;
-	$this->tMargin = $top;
-	if($right===null)
-		$right = $left;
-	$this->rMargin = $right;
-}
-
-function SetLeftMargin($margin)
-{
-	// Set left margin
-	$this->lMargin = $margin;
-	if($this->page>0 && $this->x<$margin)
-		$this->x = $margin;
-}
-
-function SetTopMargin($margin)
-{
-	// Set top margin
-	$this->tMargin = $margin;
-}
-
-function SetRightMargin($margin)
-{
-	// Set right margin
-	$this->rMargin = $margin;
-}
-
-function SetAutoPageBreak($auto, $margin=0)
-{
-	// Set auto page break mode and triggering margin
-	$this->AutoPageBreak = $auto;
-	$this->bMargin = $margin;
-	$this->PageBreakTrigger = $this->h-$margin;
-}
-
-function SetDisplayMode($zoom, $layout='default')
-{
-	// Set display mode in viewer
-	if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))
-		$this->ZoomMode = $zoom;
-	else
-		$this->Error('Incorrect zoom display mode: '.$zoom);
-	if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')
-		$this->LayoutMode = $layout;
-	else
-		$this->Error('Incorrect layout display mode: '.$layout);
-}
-
-function SetCompression($compress)
-{
-	// Set page compression
-	if(function_exists('gzcompress'))
-		$this->compress = $compress;
-	else
-		$this->compress = false;
-}
-
-function SetTitle($title, $isUTF8=false)
-{
-	// Title of document
-	$this->metadata['Title'] = $isUTF8 ? $title : utf8_encode($title);
-}
-
-function SetAuthor($author, $isUTF8=false)
-{
-	// Author of document
-	$this->metadata['Author'] = $isUTF8 ? $author : utf8_encode($author);
-}
-
-function SetSubject($subject, $isUTF8=false)
-{
-	// Subject of document
-	$this->metadata['Subject'] = $isUTF8 ? $subject : utf8_encode($subject);
-}
-
-function SetKeywords($keywords, $isUTF8=false)
-{
-	// Keywords of document
-	$this->metadata['Keywords'] = $isUTF8 ? $keywords : utf8_encode($keywords);
-}
-
-function SetCreator($creator, $isUTF8=false)
-{
-	// Creator of document
-	$this->metadata['Creator'] = $isUTF8 ? $creator : utf8_encode($creator);
-}
-
-function AliasNbPages($alias='{nb}')
-{
-	// Define an alias for total number of pages
-	$this->AliasNbPages = $alias;
-}
-
-function Error($msg)
-{
-	// Fatal error
-	throw new Exception('FPDF error: '.$msg);
-}
-
-function Close()
-{
-	// Terminate document
-	if($this->state==3)
-		return;
-	if($this->page==0)
-		$this->AddPage();
-	// Page footer
-	$this->InFooter = true;
-	$this->Footer();
-	$this->InFooter = false;
-	// Close page
-	$this->_endpage();
-	// Close document
-	$this->_enddoc();
-}
-
-function AddPage($orientation='', $size='', $rotation=0)
-{
-	// Start a new page
-	if($this->state==3)
-		$this->Error('The document is closed');
-	$family = $this->FontFamily;
-	$style = $this->FontStyle.($this->underline ? 'U' : '');
-	$fontsize = $this->FontSizePt;
-	$lw = $this->LineWidth;
-	$dc = $this->DrawColor;
-	$fc = $this->FillColor;
-	$tc = $this->TextColor;
-	$cf = $this->ColorFlag;
-	if($this->page>0)
-	{
-		// Page footer
-		$this->InFooter = true;
-		$this->Footer();
-		$this->InFooter = false;
-		// Close page
-		$this->_endpage();
-	}
-	// Start new page
-	$this->_beginpage($orientation,$size,$rotation);
-	// Set line cap style to square
-	$this->_out('2 J');
-	// Set line width
-	$this->LineWidth = $lw;
-	$this->_out(sprintf('%.2F w',$lw*$this->k));
-	// Set font
-	if($family)
-		$this->SetFont($family,$style,$fontsize);
-	// Set colors
-	$this->DrawColor = $dc;
-	if($dc!='0 G')
-		$this->_out($dc);
-	$this->FillColor = $fc;
-	if($fc!='0 g')
-		$this->_out($fc);
-	$this->TextColor = $tc;
-	$this->ColorFlag = $cf;
-	// Page header
-	$this->InHeader = true;
-	$this->Header();
-	$this->InHeader = false;
-	// Restore line width
-	if($this->LineWidth!=$lw)
-	{
-		$this->LineWidth = $lw;
-		$this->_out(sprintf('%.2F w',$lw*$this->k));
-	}
-	// Restore font
-	if($family)
-		$this->SetFont($family,$style,$fontsize);
-	// Restore colors
-	if($this->DrawColor!=$dc)
-	{
-		$this->DrawColor = $dc;
-		$this->_out($dc);
-	}
-	if($this->FillColor!=$fc)
-	{
-		$this->FillColor = $fc;
-		$this->_out($fc);
-	}
-	$this->TextColor = $tc;
-	$this->ColorFlag = $cf;
-}
-
-function Header()
-{
-	// To be implemented in your own inherited class
-}
-
-function Footer()
-{
-	// To be implemented in your own inherited class
-}
-
-function PageNo()
-{
-	// Get current page number
-	return $this->page;
-}
-
-function SetDrawColor($r, $g=null, $b=null)
-{
-	// Set color for all stroking operations
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->DrawColor = sprintf('%.3F G',$r/255);
-	else
-		$this->DrawColor = sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
-	if($this->page>0)
-		$this->_out($this->DrawColor);
-}
-
-function SetFillColor($r, $g=null, $b=null)
-{
-	// Set color for all filling operations
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->FillColor = sprintf('%.3F g',$r/255);
-	else
-		$this->FillColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
-	$this->ColorFlag = ($this->FillColor!=$this->TextColor);
-	if($this->page>0)
-		$this->_out($this->FillColor);
-}
-
-function SetTextColor($r, $g=null, $b=null)
-{
-	// Set color for text
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->TextColor = sprintf('%.3F g',$r/255);
-	else
-		$this->TextColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
-	$this->ColorFlag = ($this->FillColor!=$this->TextColor);
-}
-
-function GetStringWidth($s)
-{
-	// Get width of a string in the current font
-	$s = (string)$s;
-	$cw = &$this->CurrentFont['cw'];
-	$w = 0;
-	$l = strlen($s);
-	for($i=0;$i<$l;$i++)
-		$w += $cw[$s[$i]];
-	return $w*$this->FontSize/1000;
-}
-
-function SetLineWidth($width)
-{
-	// Set line width
-	$this->LineWidth = $width;
-	if($this->page>0)
-		$this->_out(sprintf('%.2F w',$width*$this->k));
-}
-
-function Line($x1, $y1, $x2, $y2)
-{
-	// Draw a line
-	$this->_out(sprintf('%.2F %.2F m %.2F %.2F l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k));
-}
-
-function Rect($x, $y, $w, $h, $style='')
-{
-	// Draw a rectangle
-	if($style=='F')
-		$op = 'f';
-	elseif($style=='FD' || $style=='DF')
-		$op = 'B';
-	else
-		$op = 'S';
-	$this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
-}
-
-function AddFont($family, $style='', $file='')
-{
-	// Add a TrueType, OpenType or Type1 font
-	$family = strtolower($family);
-	if($file=='')
-		$file = str_replace(' ','',$family).strtolower($style).'.php';
-	$style = strtoupper($style);
-	if($style=='IB')
-		$style = 'BI';
-	$fontkey = $family.$style;
-	if(isset($this->fonts[$fontkey]))
-		return;
-	$info = $this->_loadfont($file);
-	$info['i'] = count($this->fonts)+1;
-	if(!empty($info['file']))
-	{
-		// Embedded font
-		if($info['type']=='TrueType')
-			$this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);
-		else
-			$this->FontFiles[$info['file']] = array('length1'=>$info['size1'], 'length2'=>$info['size2']);
-	}
-	$this->fonts[$fontkey] = $info;
-}
-
-function SetFont($family, $style='', $size=0)
-{
-	// Select a font; size given in points
-	if($family=='')
-		$family = $this->FontFamily;
-	else
-		$family = strtolower($family);
-	$style = strtoupper($style);
-	if(strpos($style,'U')!==false)
-	{
-		$this->underline = true;
-		$style = str_replace('U','',$style);
-	}
-	else
-		$this->underline = false;
-	if($style=='IB')
-		$style = 'BI';
-	if($size==0)
-		$size = $this->FontSizePt;
-	// Test if font is already selected
-	if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size)
-		return;
-	// Test if font is already loaded
-	$fontkey = $family.$style;
-	if(!isset($this->fonts[$fontkey]))
-	{
-		// Test if one of the core fonts
-		if($family=='arial')
-			$family = 'helvetica';
-		if(in_array($family,$this->CoreFonts))
-		{
-			if($family=='symbol' || $family=='zapfdingbats')
-				$style = '';
-			$fontkey = $family.$style;
-			if(!isset($this->fonts[$fontkey]))
-				$this->AddFont($family,$style);
-		}
-		else
-			$this->Error('Undefined font: '.$family.' '.$style);
-	}
-	// Select it
-	$this->FontFamily = $family;
-	$this->FontStyle = $style;
-	$this->FontSizePt = $size;
-	$this->FontSize = $size/$this->k;
-	$this->CurrentFont = &$this->fonts[$fontkey];
-	if($this->page>0)
-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
-}
-
-function SetFontSize($size)
-{
-	// Set font size in points
-	if($this->FontSizePt==$size)
-		return;
-	$this->FontSizePt = $size;
-	$this->FontSize = $size/$this->k;
-	if($this->page>0)
-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
-}
-
-function AddLink()
-{
-	// Create a new internal link
-	$n = count($this->links)+1;
-	$this->links[$n] = array(0, 0);
-	return $n;
-}
-
-function SetLink($link, $y=0, $page=-1)
-{
-	// Set destination of internal link
-	if($y==-1)
-		$y = $this->y;
-	if($page==-1)
-		$page = $this->page;
-	$this->links[$link] = array($page, $y);
-}
-
-function Link($x, $y, $w, $h, $link)
-{
-	// Put a link on the page
-	$this->PageLinks[$this->page][] = array($x*$this->k, $this->hPt-$y*$this->k, $w*$this->k, $h*$this->k, $link);
-}
-
-function Text($x, $y, $txt)
-{
-	// Output a string
-	if(!isset($this->CurrentFont))
-		$this->Error('No font has been set');
-	$s = sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
-	if($this->underline && $txt!='')
-		$s .= ' '.$this->_dounderline($x,$y,$txt);
-	if($this->ColorFlag)
-		$s = 'q '.$this->TextColor.' '.$s.' Q';
-	$this->_out($s);
-}
-
-function AcceptPageBreak()
-{
-	// Accept automatic page break or not
-	return $this->AutoPageBreak;
-}
-
-function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='')
-{
-	// Output a cell
-	$k = $this->k;
-	if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
-	{
-		// Automatic page break
-		$x = $this->x;
-		$ws = $this->ws;
-		if($ws>0)
-		{
-			$this->ws = 0;
-			$this->_out('0 Tw');
-		}
-		$this->AddPage($this->CurOrientation,$this->CurPageSize,$this->CurRotation);
-		$this->x = $x;
-		if($ws>0)
-		{
-			$this->ws = $ws;
-			$this->_out(sprintf('%.3F Tw',$ws*$k));
-		}
-	}
-	if($w==0)
-		$w = $this->w-$this->rMargin-$this->x;
-	$s = '';
-	if($fill || $border==1)
-	{
-		if($fill)
-			$op = ($border==1) ? 'B' : 'f';
-		else
-			$op = 'S';
-		$s = sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
-	}
-	if(is_string($border))
-	{
-		$x = $this->x;
-		$y = $this->y;
-		if(strpos($border,'L')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
-		if(strpos($border,'T')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
-		if(strpos($border,'R')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
-		if(strpos($border,'B')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
-	}
-	if($txt!=='')
-	{
-		if(!isset($this->CurrentFont))
-			$this->Error('No font has been set');
-		if($align=='R')
-			$dx = $w-$this->cMargin-$this->GetStringWidth($txt);
-		elseif($align=='C')
-			$dx = ($w-$this->GetStringWidth($txt))/2;
-		else
-			$dx = $this->cMargin;
-		if($this->ColorFlag)
-			$s .= 'q '.$this->TextColor.' ';
-		$s .= sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$this->_escape($txt));
-		if($this->underline)
-			$s .= ' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
-		if($this->ColorFlag)
-			$s .= ' Q';
-		if($link)
-			$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
-	}
-	if($s)
-		$this->_out($s);
-	$this->lasth = $h;
-	if($ln>0)
-	{
-		// Go to next line
-		$this->y += $h;
-		if($ln==1)
-			$this->x = $this->lMargin;
-	}
-	else
-		$this->x += $w;
-}
-
-function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)
-{
-	// Output text with automatic or explicit line breaks
-	if(!isset($this->CurrentFont))
-		$this->Error('No font has been set');
-	$cw = &$this->CurrentFont['cw'];
-	if($w==0)
-		$w = $this->w-$this->rMargin-$this->x;
-	$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
-	$s = str_replace("\r",'',$txt);
-	$nb = strlen($s);
-	if($nb>0 && $s[$nb-1]=="\n")
-		$nb--;
-	$b = 0;
-	if($border)
-	{
-		if($border==1)
-		{
-			$border = 'LTRB';
-			$b = 'LRT';
-			$b2 = 'LR';
-		}
-		else
-		{
-			$b2 = '';
-			if(strpos($border,'L')!==false)
-				$b2 .= 'L';
-			if(strpos($border,'R')!==false)
-				$b2 .= 'R';
-			$b = (strpos($border,'T')!==false) ? $b2.'T' : $b2;
-		}
-	}
-	$sep = -1;
-	$i = 0;
-	$j = 0;
-	$l = 0;
-	$ns = 0;
-	$nl = 1;
-	while($i<$nb)
-	{
-		// Get next character
-		$c = $s[$i];
-		if($c=="\n")
-		{
-			// Explicit line break
-			if($this->ws>0)
-			{
-				$this->ws = 0;
-				$this->_out('0 Tw');
-			}
-			$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
-			$i++;
-			$sep = -1;
-			$j = $i;
-			$l = 0;
-			$ns = 0;
-			$nl++;
-			if($border && $nl==2)
-				$b = $b2;
-			continue;
-		}
-		if($c==' ')
-		{
-			$sep = $i;
-			$ls = $l;
-			$ns++;
-		}
-		$l += $cw[$c];
-		if($l>$wmax)
-		{
-			// Automatic line break
-			if($sep==-1)
-			{
-				if($i==$j)
-					$i++;
-				if($this->ws>0)
-				{
-					$this->ws = 0;
-					$this->_out('0 Tw');
-				}
-				$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
-			}
-			else
-			{
-				if($align=='J')
-				{
-					$this->ws = ($ns>1) ? ($wmax-$ls)/1000*$this->FontSize/($ns-1) : 0;
-					$this->_out(sprintf('%.3F Tw',$this->ws*$this->k));
-				}
-				$this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill);
-				$i = $sep+1;
-			}
-			$sep = -1;
-			$j = $i;
-			$l = 0;
-			$ns = 0;
-			$nl++;
-			if($border && $nl==2)
-				$b = $b2;
-		}
-		else
-			$i++;
-	}
-	// Last chunk
-	if($this->ws>0)
-	{
-		$this->ws = 0;
-		$this->_out('0 Tw');
-	}
-	if($border && strpos($border,'B')!==false)
-		$b .= 'B';
-	$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
-	$this->x = $this->lMargin;
-}
-
-function Write($h, $txt, $link='')
-{
-	// Output text in flowing mode
-	if(!isset($this->CurrentFont))
-		$this->Error('No font has been set');
-	$cw = &$this->CurrentFont['cw'];
-	$w = $this->w-$this->rMargin-$this->x;
-	$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
-	$s = str_replace("\r",'',$txt);
-	$nb = strlen($s);
-	$sep = -1;
-	$i = 0;
-	$j = 0;
-	$l = 0;
-	$nl = 1;
-	while($i<$nb)
-	{
-		// Get next character
-		$c = $s[$i];
-		if($c=="\n")
-		{
-			// Explicit line break
-			$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',false,$link);
-			$i++;
-			$sep = -1;
-			$j = $i;
-			$l = 0;
-			if($nl==1)
-			{
-				$this->x = $this->lMargin;
-				$w = $this->w-$this->rMargin-$this->x;
-				$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
-			}
-			$nl++;
-			continue;
-		}
-		if($c==' ')
-			$sep = $i;
-		$l += $cw[$c];
-		if($l>$wmax)
-		{
-			// Automatic line break
-			if($sep==-1)
-			{
-				if($this->x>$this->lMargin)
-				{
-					// Move to next line
-					$this->x = $this->lMargin;
-					$this->y += $h;
-					$w = $this->w-$this->rMargin-$this->x;
-					$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
-					$i++;
-					$nl++;
-					continue;
-				}
-				if($i==$j)
-					$i++;
-				$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',false,$link);
-			}
-			else
-			{
-				$this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',false,$link);
-				$i = $sep+1;
-			}
-			$sep = -1;
-			$j = $i;
-			$l = 0;
-			if($nl==1)
-			{
-				$this->x = $this->lMargin;
-				$w = $this->w-$this->rMargin-$this->x;
-				$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
-			}
-			$nl++;
-		}
-		else
-			$i++;
-	}
-	// Last chunk
-	if($i!=$j)
-		$this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',false,$link);
-}
-
-function Ln($h=null)
-{
-	// Line feed; default value is the last cell height
-	$this->x = $this->lMargin;
-	if($h===null)
-		$this->y += $this->lasth;
-	else
-		$this->y += $h;
-}
-
-function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')
-{
-	// Put an image on the page
-	if($file=='')
-		$this->Error('Image file name is empty');
-	if(!isset($this->images[$file]))
-	{
-		// First use of this image, get info
-		if($type=='')
-		{
-			$pos = strrpos($file,'.');
-			if(!$pos)
-				$this->Error('Image file has no extension and no type was specified: '.$file);
-			$type = substr($file,$pos+1);
-		}
-		$type = strtolower($type);
-		if($type=='jpeg')
-			$type = 'jpg';
-		$mtd = '_parse'.$type;
-		if(!method_exists($this,$mtd))
-			$this->Error('Unsupported image type: '.$type);
-		$info = $this->$mtd($file);
-		$info['i'] = count($this->images)+1;
-		$this->images[$file] = $info;
-	}
-	else
-		$info = $this->images[$file];
-
-	// Automatic width and height calculation if needed
-	if($w==0 && $h==0)
-	{
-		// Put image at 96 dpi
-		$w = -96;
-		$h = -96;
-	}
-	if($w<0)
-		$w = -$info['w']*72/$w/$this->k;
-	if($h<0)
-		$h = -$info['h']*72/$h/$this->k;
-	if($w==0)
-		$w = $h*$info['w']/$info['h'];
-	if($h==0)
-		$h = $w*$info['h']/$info['w'];
-
-	// Flowing mode
-	if($y===null)
-	{
-		if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
-		{
-			// Automatic page break
-			$x2 = $this->x;
-			$this->AddPage($this->CurOrientation,$this->CurPageSize,$this->CurRotation);
-			$this->x = $x2;
-		}
-		$y = $this->y;
-		$this->y += $h;
-	}
-
-	if($x===null)
-		$x = $this->x;
-	$this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));
-	if($link)
-		$this->Link($x,$y,$w,$h,$link);
-}
-
-function GetPageWidth()
-{
-	// Get current page width
-	return $this->w;
-}
-
-function GetPageHeight()
-{
-	// Get current page height
-	return $this->h;
-}
-
-function GetX()
-{
-	// Get x position
-	return $this->x;
-}
-
-function SetX($x)
-{
-	// Set x position
-	if($x>=0)
-		$this->x = $x;
-	else
-		$this->x = $this->w+$x;
-}
-
-function GetY()
-{
-	// Get y position
-	return $this->y;
-}
-
-function SetY($y, $resetX=true)
-{
-	// Set y position and optionally reset x
-	if($y>=0)
-		$this->y = $y;
-	else
-		$this->y = $this->h+$y;
-	if($resetX)
-		$this->x = $this->lMargin;
-}
-
-function SetXY($x, $y)
-{
-	// Set x and y positions
-	$this->SetX($x);
-	$this->SetY($y,false);
-}
-
-function Output($dest='', $name='', $isUTF8=false)
-{
-	// Output PDF to some destination
-	$this->Close();
-	if(strlen($name)==1 && strlen($dest)!=1)
-	{
-		// Fix parameter order
-		$tmp = $dest;
-		$dest = $name;
-		$name = $tmp;
-	}
-	if($dest=='')
-		$dest = 'I';
-	if($name=='')
-		$name = 'doc.pdf';
-	switch(strtoupper($dest))
-	{
-		case 'I':
-			// Send to standard output
-			$this->_checkoutput();
-			if(PHP_SAPI!='cli')
-			{
-				// We send to a browser
-				header('Content-Type: application/pdf');
-				header('Content-Disposition: inline; '.$this->_httpencode('filename',$name,$isUTF8));
-				header('Cache-Control: private, max-age=0, must-revalidate');
-				header('Pragma: public');
-			}
-			echo $this->buffer;
-			break;
-		case 'D':
-			// Download file
-			$this->_checkoutput();
-			header('Content-Type: application/x-download');
-			header('Content-Disposition: attachment; '.$this->_httpencode('filename',$name,$isUTF8));
-			header('Cache-Control: private, max-age=0, must-revalidate');
-			header('Pragma: public');
-			echo $this->buffer;
-			break;
-		case 'F':
-			// Save to local file
-			if(!file_put_contents($name,$this->buffer))
-				$this->Error('Unable to create output file: '.$name);
-			break;
-		case 'S':
-			// Return as a string
-			return $this->buffer;
-		default:
-			$this->Error('Incorrect output destination: '.$dest);
-	}
-	return '';
-}
-
-/*******************************************************************************
-*                              Protected methods                               *
-*******************************************************************************/
-
-protected function _dochecks()
-{
-	// Check mbstring overloading
-	if(ini_get('mbstring.func_overload') & 2)
-		$this->Error('mbstring overloading must be disabled');
-	// Ensure runtime magic quotes are disabled
-	if(get_magic_quotes_runtime())
-		@set_magic_quotes_runtime(0);
-}
-
-protected function _checkoutput()
-{
-	if(PHP_SAPI!='cli')
-	{
-		if(headers_sent($file,$line))
-			$this->Error("Some data has already been output, can't send PDF file (output started at $file:$line)");
-	}
-	if(ob_get_length())
-	{
-		// The output buffer is not empty
-		if(preg_match('/^(\xEF\xBB\xBF)?\s*$/',ob_get_contents()))
-		{
-			// It contains only a UTF-8 BOM and/or whitespace, let's clean it
-			ob_clean();
-		}
-		else
-			$this->Error("Some data has already been output, can't send PDF file");
-	}
-}
-
-protected function _getpagesize($size)
-{
-	if(is_string($size))
-	{
-		$size = strtolower($size);
-		if(!isset($this->StdPageSizes[$size]))
-			$this->Error('Unknown page size: '.$size);
-		$a = $this->StdPageSizes[$size];
-		return array($a[0]/$this->k, $a[1]/$this->k);
-	}
-	else
-	{
-		if($size[0]>$size[1])
-			return array($size[1], $size[0]);
-		else
-			return $size;
-	}
-}
-
-protected function _beginpage($orientation, $size, $rotation)
-{
-	$this->page++;
-	$this->pages[$this->page] = '';
-	$this->state = 2;
-	$this->x = $this->lMargin;
-	$this->y = $this->tMargin;
-	$this->FontFamily = '';
-	// Check page size and orientation
-	if($orientation=='')
-		$orientation = $this->DefOrientation;
-	else
-		$orientation = strtoupper($orientation[0]);
-	if($size=='')
-		$size = $this->DefPageSize;
-	else
-		$size = $this->_getpagesize($size);
-	if($orientation!=$this->CurOrientation || $size[0]!=$this->CurPageSize[0] || $size[1]!=$this->CurPageSize[1])
-	{
-		// New size or orientation
-		if($orientation=='P')
-		{
-			$this->w = $size[0];
-			$this->h = $size[1];
-		}
-		else
-		{
-			$this->w = $size[1];
-			$this->h = $size[0];
-		}
-		$this->wPt = $this->w*$this->k;
-		$this->hPt = $this->h*$this->k;
-		$this->PageBreakTrigger = $this->h-$this->bMargin;
-		$this->CurOrientation = $orientation;
-		$this->CurPageSize = $size;
-	}
-	if($orientation!=$this->DefOrientation || $size[0]!=$this->DefPageSize[0] || $size[1]!=$this->DefPageSize[1])
-		$this->PageInfo[$this->page]['size'] = array($this->wPt, $this->hPt);
-	if($rotation!=0)
-	{
-		if($rotation%90!=0)
-			$this->Error('Incorrect rotation value: '.$rotation);
-		$this->CurRotation = $rotation;
-		$this->PageInfo[$this->page]['rotation'] = $rotation;
-	}
-}
-
-protected function _endpage()
-{
-	$this->state = 1;
-}
-
-protected function _loadfont($font)
-{
-	// Load a font definition file from the font directory
-	if(strpos($font,'/')!==false || strpos($font,"\\")!==false)
-		$this->Error('Incorrect font definition file name: '.$font);
-	include($this->fontpath.$font);
-	if(!isset($name))
-		$this->Error('Could not include font definition file');
-	if(isset($enc))
-		$enc = strtolower($enc);
-	if(!isset($subsetted))
-		$subsetted = false;
-	return get_defined_vars();
-}
-
-protected function _isascii($s)
-{
-	// Test if string is ASCII
-	$nb = strlen($s);
-	for($i=0;$i<$nb;$i++)
-	{
-		if(ord($s[$i])>127)
-			return false;
-	}
-	return true;
-}
-
-protected function _httpencode($param, $value, $isUTF8)
-{
-	// Encode HTTP header field parameter
-	if($this->_isascii($value))
-		return $param.'="'.$value.'"';
-	if(!$isUTF8)
-		$value = utf8_encode($value);
-	if(strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')!==false)
-		return $param.'="'.rawurlencode($value).'"';
-	else
-		return $param."*=UTF-8''".rawurlencode($value);
-}
-
-protected function _UTF8toUTF16($s)
-{
-	// Convert UTF-8 to UTF-16BE with BOM
-	$res = "\xFE\xFF";
-	$nb = strlen($s);
-	$i = 0;
-	while($i<$nb)
-	{
-		$c1 = ord($s[$i++]);
-		if($c1>=224)
-		{
-			// 3-byte character
-			$c2 = ord($s[$i++]);
-			$c3 = ord($s[$i++]);
-			$res .= chr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2));
-			$res .= chr((($c2 & 0x03)<<6) + ($c3 & 0x3F));
-		}
-		elseif($c1>=192)
-		{
-			// 2-byte character
-			$c2 = ord($s[$i++]);
-			$res .= chr(($c1 & 0x1C)>>2);
-			$res .= chr((($c1 & 0x03)<<6) + ($c2 & 0x3F));
-		}
-		else
-		{
-			// Single-byte character
-			$res .= "\0".chr($c1);
-		}
-	}
-	return $res;
-}
-
-protected function _escape($s)
-{
-	// Escape special characters
-	if(strpos($s,'(')!==false || strpos($s,')')!==false || strpos($s,'\\')!==false || strpos($s,"\r")!==false)
-		return str_replace(array('\\','(',')',"\r"), array('\\\\','\\(','\\)','\\r'), $s);
-	else
-		return $s;
-}
-
-protected function _textstring($s)
-{
-	// Format a text string
-	if(!$this->_isascii($s))
-		$s = $this->_UTF8toUTF16($s);
-	return '('.$this->_escape($s).')';
-}
-
-protected function _dounderline($x, $y, $txt)
-{
-	// Underline text
-	$up = $this->CurrentFont['up'];
-	$ut = $this->CurrentFont['ut'];
-	$w = $this->GetStringWidth($txt)+$this->ws*substr_count($txt,' ');
-	return sprintf('%.2F %.2F %.2F %.2F re f',$x*$this->k,($this->h-($y-$up/1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt);
-}
-
-protected function _parsejpg($file)
-{
-	// Extract info from a JPEG file
-	$a = getimagesize($file);
-	if(!$a)
-		$this->Error('Missing or incorrect image file: '.$file);
-	if($a[2]!=2)
-		$this->Error('Not a JPEG file: '.$file);
-	if(!isset($a['channels']) || $a['channels']==3)
-		$colspace = 'DeviceRGB';
-	elseif($a['channels']==4)
-		$colspace = 'DeviceCMYK';
-	else
-		$colspace = 'DeviceGray';
-	$bpc = isset($a['bits']) ? $a['bits'] : 8;
-	$data = file_get_contents($file);
-	return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);
-}
-
-protected function _parsepng($file)
-{
-	// Extract info from a PNG file
-	$f = fopen($file,'rb');
-	if(!$f)
-		$this->Error('Can\'t open image file: '.$file);
-	$info = $this->_parsepngstream($f,$file);
-	fclose($f);
-	return $info;
-}
-
-protected function _parsepngstream($f, $file)
-{
-	// Check signature
-	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
-		$this->Error('Not a PNG file: '.$file);
-
-	// Read header chunk
-	$this->_readstream($f,4);
-	if($this->_readstream($f,4)!='IHDR')
-		$this->Error('Incorrect PNG file: '.$file);
-	$w = $this->_readint($f);
-	$h = $this->_readint($f);
-	$bpc = ord($this->_readstream($f,1));
-	if($bpc>8)
-		$this->Error('16-bit depth not supported: '.$file);
-	$ct = ord($this->_readstream($f,1));
-	if($ct==0 || $ct==4)
-		$colspace = 'DeviceGray';
-	elseif($ct==2 || $ct==6)
-		$colspace = 'DeviceRGB';
-	elseif($ct==3)
-		$colspace = 'Indexed';
-	else
-		$this->Error('Unknown color type: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Unknown compression method: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Unknown filter method: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Interlacing not supported: '.$file);
-	$this->_readstream($f,4);
-	$dp = '/Predictor 15 /Colors '.($colspace=='DeviceRGB' ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w;
-
-	// Scan chunks looking for palette, transparency and image data
-	$pal = '';
-	$trns = '';
-	$data = '';
-	do
-	{
-		$n = $this->_readint($f);
-		$type = $this->_readstream($f,4);
-		if($type=='PLTE')
-		{
-			// Read palette
-			$pal = $this->_readstream($f,$n);
-			$this->_readstream($f,4);
-		}
-		elseif($type=='tRNS')
-		{
-			// Read transparency info
-			$t = $this->_readstream($f,$n);
-			if($ct==0)
-				$trns = array(ord(substr($t,1,1)));
-			elseif($ct==2)
-				$trns = array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));
-			else
-			{
-				$pos = strpos($t,chr(0));
-				if($pos!==false)
-					$trns = array($pos);
-			}
-			$this->_readstream($f,4);
-		}
-		elseif($type=='IDAT')
-		{
-			// Read image data block
-			$data .= $this->_readstream($f,$n);
-			$this->_readstream($f,4);
-		}
-		elseif($type=='IEND')
-			break;
-		else
-			$this->_readstream($f,$n+4);
-	}
-	while($n);
-
-	if($colspace=='Indexed' && empty($pal))
-		$this->Error('Missing palette in '.$file);
-	$info = array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'dp'=>$dp, 'pal'=>$pal, 'trns'=>$trns);
-	if($ct>=4)
-	{
-		// Extract alpha channel
-		if(!function_exists('gzuncompress'))
-			$this->Error('Zlib not available, can\'t handle alpha channel: '.$file);
-		$data = gzuncompress($data);
-		$color = '';
-		$alpha = '';
-		if($ct==4)
-		{
-			// Gray image
-			$len = 2*$w;
-			for($i=0;$i<$h;$i++)
-			{
-				$pos = (1+$len)*$i;
-				$color .= $data[$pos];
-				$alpha .= $data[$pos];
-				$line = substr($data,$pos+1,$len);
-				$color .= preg_replace('/(.)./s','$1',$line);
-				$alpha .= preg_replace('/.(.)/s','$1',$line);
-			}
-		}
-		else
-		{
-			// RGB image
-			$len = 4*$w;
-			for($i=0;$i<$h;$i++)
-			{
-				$pos = (1+$len)*$i;
-				$color .= $data[$pos];
-				$alpha .= $data[$pos];
-				$line = substr($data,$pos+1,$len);
-				$color .= preg_replace('/(.{3})./s','$1',$line);
-				$alpha .= preg_replace('/.{3}(.)/s','$1',$line);
-			}
-		}
-		unset($data);
-		$data = gzcompress($color);
-		$info['smask'] = gzcompress($alpha);
-		$this->WithAlpha = true;
-		if($this->PDFVersion<'1.4')
-			$this->PDFVersion = '1.4';
-	}
-	$info['data'] = $data;
-	return $info;
-}
-
-protected function _readstream($f, $n)
-{
-	// Read n bytes from stream
-	$res = '';
-	while($n>0 && !feof($f))
-	{
-		$s = fread($f,$n);
-		if($s===false)
-			$this->Error('Error while reading stream');
-		$n -= strlen($s);
-		$res .= $s;
-	}
-	if($n>0)
-		$this->Error('Unexpected end of stream');
-	return $res;
-}
-
-protected function _readint($f)
-{
-	// Read a 4-byte integer from stream
-	$a = unpack('Ni',$this->_readstream($f,4));
-	return $a['i'];
-}
-
-protected function _parsegif($file)
-{
-	// Extract info from a GIF file (via PNG conversion)
-	if(!function_exists('imagepng'))
-		$this->Error('GD extension is required for GIF support');
-	if(!function_exists('imagecreatefromgif'))
-		$this->Error('GD has no GIF read support');
-	$im = imagecreatefromgif($file);
-	if(!$im)
-		$this->Error('Missing or incorrect image file: '.$file);
-	imageinterlace($im,0);
-	ob_start();
-	imagepng($im);
-	$data = ob_get_clean();
-	imagedestroy($im);
-	$f = fopen('php://temp','rb+');
-	if(!$f)
-		$this->Error('Unable to create memory stream');
-	fwrite($f,$data);
-	rewind($f);
-	$info = $this->_parsepngstream($f,$file);
-	fclose($f);
-	return $info;
-}
-
-protected function _out($s)
-{
-	// Add a line to the document
-	if($this->state==2)
-		$this->pages[$this->page] .= $s."\n";
-	elseif($this->state==1)
-		$this->_put($s);
-	elseif($this->state==0)
-		$this->Error('No page has been added yet');
-	elseif($this->state==3)
-		$this->Error('The document is closed');
-}
-
-protected function _put($s)
-{
-	$this->buffer .= $s."\n";
-}
-
-protected function _getoffset()
-{
-	return strlen($this->buffer);
-}
-
-protected function _newobj($n=null)
-{
-	// Begin a new object
-	if($n===null)
-		$n = ++$this->n;
-	$this->offsets[$n] = $this->_getoffset();
-	$this->_put($n.' 0 obj');
-}
-
-protected function _putstream($data)
-{
-	$this->_put('stream');
-	$this->_put($data);
-	$this->_put('endstream');
-}
-
-protected function _putstreamobject($data)
-{
-	if($this->compress)
-	{
-		$entries = '/Filter /FlateDecode ';
-		$data = gzcompress($data);
-	}
-	else
-		$entries = '';
-	$entries .= '/Length '.strlen($data);
-	$this->_newobj();
-	$this->_put('<<'.$entries.'>>');
-	$this->_putstream($data);
-	$this->_put('endobj');
-}
-
-protected function _putpage($n)
-{
-	$this->_newobj();
-	$this->_put('<</Type /Page');
-	$this->_put('/Parent 1 0 R');
-	if(isset($this->PageInfo[$n]['size']))
-		$this->_put(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageInfo[$n]['size'][0],$this->PageInfo[$n]['size'][1]));
-	if(isset($this->PageInfo[$n]['rotation']))
-		$this->_put('/Rotate '.$this->PageInfo[$n]['rotation']);
-	$this->_put('/Resources 2 0 R');
-	if(isset($this->PageLinks[$n]))
-	{
-		// Links
-		$annots = '/Annots [';
-		foreach($this->PageLinks[$n] as $pl)
-		{
-			$rect = sprintf('%.2F %.2F %.2F %.2F',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
-			$annots .= '<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
-			if(is_string($pl[4]))
-				$annots .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
-			else
-			{
-				$l = $this->links[$pl[4]];
-				if(isset($this->PageInfo[$l[0]]['size']))
-					$h = $this->PageInfo[$l[0]]['size'][1];
-				else
-					$h = ($this->DefOrientation=='P') ? $this->DefPageSize[1]*$this->k : $this->DefPageSize[0]*$this->k;
-				$annots .= sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',$this->PageInfo[$l[0]]['n'],$h-$l[1]*$this->k);
-			}
-		}
-		$this->_put($annots.']');
-	}
-	if($this->WithAlpha)
-		$this->_put('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');
-	$this->_put('/Contents '.($this->n+1).' 0 R>>');
-	$this->_put('endobj');
-	// Page content
-	if(!empty($this->AliasNbPages))
-		$this->pages[$n] = str_replace($this->AliasNbPages,$this->page,$this->pages[$n]);
-	$this->_putstreamobject($this->pages[$n]);
-}
-
-protected function _putpages()
-{
-	$nb = $this->page;
-	for($n=1;$n<=$nb;$n++)
-		$this->PageInfo[$n]['n'] = $this->n+1+2*($n-1);
-	for($n=1;$n<=$nb;$n++)
-		$this->_putpage($n);
-	// Pages root
-	$this->_newobj(1);
-	$this->_put('<</Type /Pages');
-	$kids = '/Kids [';
-	for($n=1;$n<=$nb;$n++)
-		$kids .= $this->PageInfo[$n]['n'].' 0 R ';
-	$this->_put($kids.']');
-	$this->_put('/Count '.$nb);
-	if($this->DefOrientation=='P')
-	{
-		$w = $this->DefPageSize[0];
-		$h = $this->DefPageSize[1];
-	}
-	else
-	{
-		$w = $this->DefPageSize[1];
-		$h = $this->DefPageSize[0];
-	}
-	$this->_put(sprintf('/MediaBox [0 0 %.2F %.2F]',$w*$this->k,$h*$this->k));
-	$this->_put('>>');
-	$this->_put('endobj');
-}
-
-protected function _putfonts()
-{
-	foreach($this->FontFiles as $file=>$info)
-	{
-		// Font file embedding
-		$this->_newobj();
-		$this->FontFiles[$file]['n'] = $this->n;
-		$font = file_get_contents($this->fontpath.$file,true);
-		if(!$font)
-			$this->Error('Font file not found: '.$file);
-		$compressed = (substr($file,-2)=='.z');
-		if(!$compressed && isset($info['length2']))
-			$font = substr($font,6,$info['length1']).substr($font,6+$info['length1']+6,$info['length2']);
-		$this->_put('<</Length '.strlen($font));
-		if($compressed)
-			$this->_put('/Filter /FlateDecode');
-		$this->_put('/Length1 '.$info['length1']);
-		if(isset($info['length2']))
-			$this->_put('/Length2 '.$info['length2'].' /Length3 0');
-		$this->_put('>>');
-		$this->_putstream($font);
-		$this->_put('endobj');
-	}
-	foreach($this->fonts as $k=>$font)
-	{
-		// Encoding
-		if(isset($font['diff']))
-		{
-			if(!isset($this->encodings[$font['enc']]))
-			{
-				$this->_newobj();
-				$this->_put('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$font['diff'].']>>');
-				$this->_put('endobj');
-				$this->encodings[$font['enc']] = $this->n;
-			}
-		}
-		// ToUnicode CMap
-		if(isset($font['uv']))
-		{
-			if(isset($font['enc']))
-				$cmapkey = $font['enc'];
-			else
-				$cmapkey = $font['name'];
-			if(!isset($this->cmaps[$cmapkey]))
-			{
-				$cmap = $this->_tounicodecmap($font['uv']);
-				$this->_putstreamobject($cmap);
-				$this->cmaps[$cmapkey] = $this->n;
-			}
-		}
-		// Font object
-		$this->fonts[$k]['n'] = $this->n+1;
-		$type = $font['type'];
-		$name = $font['name'];
-		if($font['subsetted'])
-			$name = 'AAAAAA+'.$name;
-		if($type=='Core')
-		{
-			// Core font
-			$this->_newobj();
-			$this->_put('<</Type /Font');
-			$this->_put('/BaseFont /'.$name);
-			$this->_put('/Subtype /Type1');
-			if($name!='Symbol' && $name!='ZapfDingbats')
-				$this->_put('/Encoding /WinAnsiEncoding');
-			if(isset($font['uv']))
-				$this->_put('/ToUnicode '.$this->cmaps[$cmapkey].' 0 R');
-			$this->_put('>>');
-			$this->_put('endobj');
-		}
-		elseif($type=='Type1' || $type=='TrueType')
-		{
-			// Additional Type1 or TrueType/OpenType font
-			$this->_newobj();
-			$this->_put('<</Type /Font');
-			$this->_put('/BaseFont /'.$name);
-			$this->_put('/Subtype /'.$type);
-			$this->_put('/FirstChar 32 /LastChar 255');
-			$this->_put('/Widths '.($this->n+1).' 0 R');
-			$this->_put('/FontDescriptor '.($this->n+2).' 0 R');
-			if(isset($font['diff']))
-				$this->_put('/Encoding '.$this->encodings[$font['enc']].' 0 R');
-			else
-				$this->_put('/Encoding /WinAnsiEncoding');
-			if(isset($font['uv']))
-				$this->_put('/ToUnicode '.$this->cmaps[$cmapkey].' 0 R');
-			$this->_put('>>');
-			$this->_put('endobj');
-			// Widths
-			$this->_newobj();
-			$cw = &$font['cw'];
-			$s = '[';
-			for($i=32;$i<=255;$i++)
-				$s .= $cw[chr($i)].' ';
-			$this->_put($s.']');
-			$this->_put('endobj');
-			// Descriptor
-			$this->_newobj();
-			$s = '<</Type /FontDescriptor /FontName /'.$name;
-			foreach($font['desc'] as $k=>$v)
-				$s .= ' /'.$k.' '.$v;
-			if(!empty($font['file']))
-				$s .= ' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$font['file']]['n'].' 0 R';
-			$this->_put($s.'>>');
-			$this->_put('endobj');
-		}
-		else
-		{
-			// Allow for additional types
-			$mtd = '_put'.strtolower($type);
-			if(!method_exists($this,$mtd))
-				$this->Error('Unsupported font type: '.$type);
-			$this->$mtd($font);
-		}
-	}
-}
-
-protected function _tounicodecmap($uv)
-{
-	$ranges = '';
-	$nbr = 0;
-	$chars = '';
-	$nbc = 0;
-	foreach($uv as $c=>$v)
-	{
-		if(is_array($v))
-		{
-			$ranges .= sprintf("<%02X> <%02X> <%04X>\n",$c,$c+$v[1]-1,$v[0]);
-			$nbr++;
-		}
-		else
-		{
-			$chars .= sprintf("<%02X> <%04X>\n",$c,$v);
-			$nbc++;
-		}
-	}
-	$s = "/CIDInit /ProcSet findresource begin\n";
-	$s .= "12 dict begin\n";
-	$s .= "begincmap\n";
-	$s .= "/CIDSystemInfo\n";
-	$s .= "<</Registry (Adobe)\n";
-	$s .= "/Ordering (UCS)\n";
-	$s .= "/Supplement 0\n";
-	$s .= ">> def\n";
-	$s .= "/CMapName /Adobe-Identity-UCS def\n";
-	$s .= "/CMapType 2 def\n";
-	$s .= "1 begincodespacerange\n";
-	$s .= "<00> <FF>\n";
-	$s .= "endcodespacerange\n";
-	if($nbr>0)
-	{
-		$s .= "$nbr beginbfrange\n";
-		$s .= $ranges;
-		$s .= "endbfrange\n";
-	}
-	if($nbc>0)
-	{
-		$s .= "$nbc beginbfchar\n";
-		$s .= $chars;
-		$s .= "endbfchar\n";
-	}
-	$s .= "endcmap\n";
-	$s .= "CMapName currentdict /CMap defineresource pop\n";
-	$s .= "end\n";
-	$s .= "end";
-	return $s;
-}
-
-protected function _putimages()
-{
-	foreach(array_keys($this->images) as $file)
-	{
-		$this->_putimage($this->images[$file]);
-		unset($this->images[$file]['data']);
-		unset($this->images[$file]['smask']);
-	}
-}
-
-protected function _putimage(&$info)
-{
-	$this->_newobj();
-	$info['n'] = $this->n;
-	$this->_put('<</Type /XObject');
-	$this->_put('/Subtype /Image');
-	$this->_put('/Width '.$info['w']);
-	$this->_put('/Height '.$info['h']);
-	if($info['cs']=='Indexed')
-		$this->_put('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');
-	else
-	{
-		$this->_put('/ColorSpace /'.$info['cs']);
-		if($info['cs']=='DeviceCMYK')
-			$this->_put('/Decode [1 0 1 0 1 0 1 0]');
-	}
-	$this->_put('/BitsPerComponent '.$info['bpc']);
-	if(isset($info['f']))
-		$this->_put('/Filter /'.$info['f']);
-	if(isset($info['dp']))
-		$this->_put('/DecodeParms <<'.$info['dp'].'>>');
-	if(isset($info['trns']) && is_array($info['trns']))
-	{
-		$trns = '';
-		for($i=0;$i<count($info['trns']);$i++)
-			$trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';
-		$this->_put('/Mask ['.$trns.']');
-	}
-	if(isset($info['smask']))
-		$this->_put('/SMask '.($this->n+1).' 0 R');
-	$this->_put('/Length '.strlen($info['data']).'>>');
-	$this->_putstream($info['data']);
-	$this->_put('endobj');
-	// Soft mask
-	if(isset($info['smask']))
-	{
-		$dp = '/Predictor 15 /Colors 1 /BitsPerComponent 8 /Columns '.$info['w'];
-		$smask = array('w'=>$info['w'], 'h'=>$info['h'], 'cs'=>'DeviceGray', 'bpc'=>8, 'f'=>$info['f'], 'dp'=>$dp, 'data'=>$info['smask']);
-		$this->_putimage($smask);
-	}
-	// Palette
-	if($info['cs']=='Indexed')
-		$this->_putstreamobject($info['pal']);
-}
-
-protected function _putxobjectdict()
-{
-	foreach($this->images as $image)
-		$this->_put('/I'.$image['i'].' '.$image['n'].' 0 R');
-}
-
-protected function _putresourcedict()
-{
-	$this->_put('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
-	$this->_put('/Font <<');
-	foreach($this->fonts as $font)
-		$this->_put('/F'.$font['i'].' '.$font['n'].' 0 R');
-	$this->_put('>>');
-	$this->_put('/XObject <<');
-	$this->_putxobjectdict();
-	$this->_put('>>');
-}
-
-protected function _putresources()
-{
-	$this->_putfonts();
-	$this->_putimages();
-	// Resource dictionary
-	$this->_newobj(2);
-	$this->_put('<<');
-	$this->_putresourcedict();
-	$this->_put('>>');
-	$this->_put('endobj');
-}
-
-protected function _putinfo()
-{
-	$this->metadata['Producer'] = 'FPDF '.FPDF_VERSION;
-	$this->metadata['CreationDate'] = 'D:'.@date('YmdHis');
-	foreach($this->metadata as $key=>$value)
-		$this->_put('/'.$key.' '.$this->_textstring($value));
-}
-
-protected function _putcatalog()
-{
-	$n = $this->PageInfo[1]['n'];
-	$this->_put('/Type /Catalog');
-	$this->_put('/Pages 1 0 R');
-	if($this->ZoomMode=='fullpage')
-		$this->_put('/OpenAction ['.$n.' 0 R /Fit]');
-	elseif($this->ZoomMode=='fullwidth')
-		$this->_put('/OpenAction ['.$n.' 0 R /FitH null]');
-	elseif($this->ZoomMode=='real')
-		$this->_put('/OpenAction ['.$n.' 0 R /XYZ null null 1]');
-	elseif(!is_string($this->ZoomMode))
-		$this->_put('/OpenAction ['.$n.' 0 R /XYZ null null '.sprintf('%.2F',$this->ZoomMode/100).']');
-	if($this->LayoutMode=='single')
-		$this->_put('/PageLayout /SinglePage');
-	elseif($this->LayoutMode=='continuous')
-		$this->_put('/PageLayout /OneColumn');
-	elseif($this->LayoutMode=='two')
-		$this->_put('/PageLayout /TwoColumnLeft');
-}
-
-protected function _putheader()
-{
-	$this->_put('%PDF-'.$this->PDFVersion);
-}
-
-protected function _puttrailer()
-{
-	$this->_put('/Size '.($this->n+1));
-	$this->_put('/Root '.$this->n.' 0 R');
-	$this->_put('/Info '.($this->n-1).' 0 R');
-}
-
-protected function _enddoc()
-{
-	$this->_putheader();
-	$this->_putpages();
-	$this->_putresources();
-	// Info
-	$this->_newobj();
-	$this->_put('<<');
-	$this->_putinfo();
-	$this->_put('>>');
-	$this->_put('endobj');
-	// Catalog
-	$this->_newobj();
-	$this->_put('<<');
-	$this->_putcatalog();
-	$this->_put('>>');
-	$this->_put('endobj');
-	// Cross-ref
-	$offset = $this->_getoffset();
-	$this->_put('xref');
-	$this->_put('0 '.($this->n+1));
-	$this->_put('0000000000 65535 f ');
-	for($i=1;$i<=$this->n;$i++)
-		$this->_put(sprintf('%010d 00000 n ',$this->offsets[$i]));
-	// Trailer
-	$this->_put('trailer');
-	$this->_put('<<');
-	$this->_puttrailer();
-	$this->_put('>>');
-	$this->_put('startxref');
-	$this->_put($offset);
-	$this->_put('%%EOF');
-	$this->state = 3;
-}
-}
-?>

+ 2 - 2
engine/test.php

@@ -321,11 +321,11 @@ class Test extends Model {
 		return $this->pass ? "Pass" : "Fail";
 	}
 
-	public function getPDF() {
+	public function getMPDF() {
 		$id = $this->id;
 		$output = false;
 		require ROOT_DIR . "/controllers/test_pdf.php";
-		return $pdf;
+		return $mpdf;
 	}
 
 	public function assignTester($tester) {

+ 5 - 63
engine/test_pdf.php

@@ -1,70 +1,12 @@
 <?php
 
-class TestPDF extends FPDF {
+class TestPDF {
 
-	private $currentTextColor = [0, 0, 0];
-
-	public function GetFontSize() {
-		return $this->FontSizePt;
-	}
-
-	public function SetTextColor($r, $g = null, $b = null) {
-
-		if($r != 192) {
-			$this->currentTextColor = [$r, $g, $b];
+	public static function getValueHtml($value) {
+		if(empty($value)) {
+			return "<span class=\"text-muted\">N/A</span>";
 		}
-		parent::SetTextColor($r, $g, $b);
-	}
-
-	public function Write($height, $text, $link = "") {
-
-		$font_size = $this->GetFontSize();
-
-		if(empty($text)) {
-			$text = "N/A";
-		}
-
-		if($text == "N/A") {
-			$this->SetTextColor(192, 192, 192);
-		}
-
-		parent::Write($height, $text, $link);
-
-		call_user_func_array([$this, "SetTextColor"], $this->currentTextColor);
-
-		// Restore font size
-		$this->SetFontSize($font_size);
-	}
-
-	public function Cell($width, $height = 0, $text = "", $border = 0, $line_mode = 0, $align = "", $fill = false, $link = "") {
-
-		$font_size = $this->GetFontSize();
-
-		if(empty($text)) {
-			$text = "N/A";
-		}
-
-		if($text == "N/A") {
-			$this->SetTextColor(192, 192, 192);
-			$this->SetFontSize($font_size - 2);
-		}
-
-		parent::Cell($width, $height, $text, $border, $line_mode, $align, $fill, $link);
-
-		call_user_func_array([$this, "SetTextColor"], $this->currentTextColor);
-
-		// Restore font size
-		$this->SetFontSize($font_size);
-	}
-
-	public function MoveX($adjustment) {
-		$this->SetX($this->GetX() + $adjustment);
-	}
-
-	public function MoveY($adjustment) {
-		$this->SetY($this->GetY() + $adjustment);
+		return htmlspecialchars($value);
 	}
 
 }
-
-?>

+ 256 - 324
template_processing/age_verification/test_pdf.php

@@ -1,328 +1,260 @@
 <?php
 
-$main_y = $pdf->GetY();
-
-// Retest info
-if($test->retest) {
-	$pdf->SetLeftMargin(83);
-	$pdf->SetY(10);
-
-	$pdf->Image("public/img/retest.png", 83, $pdf->GetY(), 63);
-}
-
-$pdf->SetLeftMargin(10);
-$pdf->SetY($main_y);
-
-// Header
-$pdf->SetTextColor(56, 87, 35);
-$pdf->SetFont("Arial", "B", $header_font_size);
-$pdf->Cell(190, 10, " Test Result", 0, 1, "L", true);
-
-// Pass/Fail
-$image_width = 130;
-
-if($test->pass) {
-	$pdf->Image("public/img/pass.png", (210 - $image_width) / 2, $pdf->GetY() + 2, $image_width);
-}
-else {
-	$pdf->Image("public/img/fail.png", (210 - $image_width) / 2, $pdf->GetY() + 2, $image_width);
-}
-
-$pdf->SetY($pdf->GetY() + 30);
-
-$pdf->SetTextColor(56, 87, 35);
-
-// Location / Tester Headers
-$pdf->SetFont("Arial", "B", $header_font_size);
-
-$tester_x = 150;
-$tester_y = $pdf->GetY();
-
-$pdf->Cell(135, 10, $location_text, 0, 1, "L", true);
-$pdf->SetY($pdf->GetY() + 2);
-
-$pdf->SetFont("Arial", "", $normal_font_size);
-$pdf->SetTextColor(0, 0, 0);
-
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 135, $pdf->GetY());
-$pdf->Cell(30, $cell_height, "Region / Manager:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Write($cell_height, $location->region);
-$pdf->Write($cell_height, " / ");
-$pdf->Write($cell_height, $location->area_manager);
-$pdf->SetY($pdf->GetY() + $cell_height);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 135, $pdf->GetY());
-
-$pdf->Cell(30, $cell_height, "Address:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->MultiCell(100, $cell_height, $location->getDisplayAddress(["address_1", "address_2", "city"], "\n"), 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 135, $pdf->GetY());
-
-$pdf->Cell(30, $cell_height, "Postcode:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(100, $cell_height, $location->postal_code, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 135, $pdf->GetY());
-
-$pdf->Cell(30, $cell_height, "Shop Name - Left:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(100, $cell_height, $test->shop_left, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 135, $pdf->GetY());
-
-$pdf->Cell(30, $cell_height, "Shop Name - Right:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(100, $cell_height, $test->shop_right, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 135, $pdf->GetY());
-
-$test_details_y = $pdf->GetY();
-
-// Tester Info
-$pdf->SetXY($tester_x, $tester_y);
-$pdf->SetLeftMargin(150);
-
-$pdf->SetTextColor(56, 87, 35);
-$pdf->SetFont("Arial", "B", $header_font_size);
-
-$pdf->Cell(50, 10, " Tester", 0, 1, "L", true);
-$pdf->SetY($pdf->GetY() + 2);
-
-$pdf->SetFont("Arial", "", $normal_font_size);
-$pdf->SetTextColor(0, 0, 0);
-
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 50, $pdf->GetY());
-$pdf->Cell(20, $cell_height, "Gender:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(20, $cell_height, $tester->getGenderText(), 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 50, $pdf->GetY());
-
-$pdf->Cell(20, $cell_height, "Attire:", 0, 1);
-$pdf->SetX(150);
-$pdf->SetFont("Arial", "", $small_font_size);
-$pdf->MultiCell(50, 4, $test->attire, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 50, $pdf->GetY());
-
-
-// Test Details
-$pdf->SetLeftMargin(10);
-
-$pdf->setXY(10, $test_details_y + 5 + 2);
-
-$pdf->SetTextColor(56, 87, 35);
-$pdf->SetFont("Arial", "B", $header_font_size);
-
-$pdf->Cell(190, 10, " Test Details", 0, 1, "L", true);
-$pdf->SetY($pdf->GetY() + 2);
-
-// Date / Time
-$id_requests_y = $pdf->GetY();
-
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->SetTextColor(0, 0, 0);
-
-$pdf->Cell(95, $cell_height, "Date & Time", 0, 1);
-$pdf->SetY($pdf->GetY() + 2);
-
-$pdf->SetFont("Arial");
-
-$pdf->Cell(23, $cell_height, "Date");
-$pdf->Cell(23, $cell_height, "Entry");
-$pdf->Cell(23, $cell_height, "Exit");
-$pdf->Cell(23, $cell_height, "Duration", 0, 1);
-
-$pdf->SetFont("Arial", "", $small_font_size);
-
-$pdf->Cell(23, $cell_height, $date_start);
-$pdf->Cell(23, $cell_height, $time_start);
-$pdf->Cell(23, $cell_height, $time_end);
-$pdf->Cell(23, $cell_height, str_pad($diff->h, 2, "0", STR_PAD_LEFT) . ":" . str_pad($diff->i, 2, "0", STR_PAD_LEFT) . ":" . str_pad($diff->s, 2, "0", STR_PAD_LEFT), 0, 1);
-
-$pdf->SetY($pdf->GetY() + 2);
-
-// Staff
-
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->Cell(95, $cell_height, "Staff", 0, 1);
-$pdf->SetY($pdf->GetY() + 2);
-
-$pdf->SetFont("Arial");
-
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-$pdf->Cell(30, $cell_height, "Name:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(57.5, $cell_height, $test->challenger_name, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->Cell(30, $cell_height, "Gender:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(57.5, $cell_height, $test->challenger_gender, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->Cell(30, $cell_height, "Description:", 0, 1);
-$pdf->SetFont("Arial", "", $small_font_size);
-$pdf->MultiCell(90, 4, $test->challenger_description, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-$pdf->SetY($pdf->GetY() + 2);
-
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->Cell(95, $cell_height, "Tester's Notes", 0, 1);
-$pdf->SetY($pdf->GetY() + 2);
-$pdf->SetFont("Arial");
-
-$pdf->SetFont("Arial", "", $small_font_size);
-$pdf->MultiCell(90, 4, Util::convertUTF8($test->additional_notes), 0, 1);
-$pdf->SetY($pdf->GetY() + 2);
-
-// Challenge
-$pdf->SetLeftMargin(107.5);
-$pdf->SetY($id_requests_y);
-
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->Cell(95, $cell_height, "ID Request", 0, 1);
-$pdf->SetY($pdf->GetY() + 2);
-$pdf->SetFont("Arial");
-
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->Cell(30, $cell_height, "Result:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(60, $cell_height, $test->getPassText(), 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->Cell(30, $cell_height, "ID Stage:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(60, $cell_height, $test->challenge_stage . " - " . $test->getChallengeStageText(), 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->SetY($pdf->GetY() + 2);
-
-$pdf->SetFont("Arial", "", $small_font_size);
-$pdf->SetTextColor(0, 128, 0);
-$pdf->MultiCell(95, 4, "1: Challenge on entry", 0, 1);
-
-$pdf->SetTextColor(255, 128, 0);
-$pdf->MultiCell(95, 4, "2: Challenge while browsing
-3: Challenge during play", 0, 1);
-
-$pdf->SetTextColor(255, 0, 0);
-
-$pdf->MultiCell(95, 4, "4: Challenge on exit
-5: No challenge", 0, 1);
-
-$pdf->SetFont("Arial", "", $normal_font_size);
-$pdf->SetTextColor(0, 0, 0);
-
-$pdf->SetY($pdf->GetY() + 2);
-
-$pdf->SetFont("Arial", "", $normal_font_size);
-
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-$pdf->Cell(30, $cell_height, "Eye Contact:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(60, $cell_height, $test->challenger_eye_contact ? "Y" : "N", 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->Cell(95, $cell_height, "Description:", 0, 1);
-$pdf->SetFont("Arial", "", $small_font_size);
-$pdf->MultiCell(90, 4, $test->challenge_description, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->SetY($pdf->GetY() + 2);
-
-// Details / Signage
-
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->Cell(95, $cell_height, "Play Details & Signage", 0, 1);
-$pdf->SetY($pdf->GetY() + 2);
-$pdf->SetFont("Arial");
-
-$field_width = 50;
-$value_width = 40;
-
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->Cell($field_width, $cell_height, "Machine Played:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $values["play_machine"] ?? "N/A", 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$value = $values["play_jackpot"] ?? "N/A";
-if($value != "N/A") $value = "\xa3" . number_format($value);
-
-$pdf->Cell($field_width, $cell_height, "Jackpot Value:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $value, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$value = $values["play_machine_stake"] ?? "N/A";
-if($value != "N/A") $value = "\xa3" . number_format($value, 2);
-
-$pdf->Cell($field_width, $cell_height, "Stake Played:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $value, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->Cell($field_width, $cell_height, "Minutes Played:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $values["play_minutes"] ?? "N/A", 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$value = $values["play_spent"] ?? "N/A";
-if($value != "N/A") $value = "\xa3" . number_format($value, 2);
-
-$pdf->Cell($field_width, $cell_height, "Amount Spent:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $value, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->Cell($field_width, $cell_height, "Think 21/25:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $values["think_21_25"] ?? "N/A", 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$value = $values["citizen_card_brochure_displayed"] ?? "";
-if(strlen($value) > 0) $value = $value ? "Yes" : "No";
-
-$pdf->Cell($field_width, $cell_height, "Citizen Card Brochure Displayed:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $value ?? "N/A", 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$value = $values["think_21_badge"] ?? "";
-if(strlen($value) > 0) $value = $value ? "Yes" : "No";
-
-$pdf->Cell($field_width, $cell_height, "Think 21/25 Badge Worn by Staff:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $value ?? "N/A", 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$value = $values["think_21_poster"] ?? "";
-if(strlen($value) > 0) $value = $value ? "Yes" : "No";
-
-$pdf->Cell($field_width, $cell_height, "Think 21/25 Posters Displayed:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $value ?? "N/A", 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->Cell($field_width, $cell_height, "Think 21/25 Poster Notes:", 0, 1);
-$pdf->SetFont("Arial", "", $small_font_size);
-$pdf->MultiCell(95, 4, $values["think_21_poster_notes"] ?? "N/A", 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-// Footer
-$pdf->SetLeftMargin(10);
-
-$pdf->SetY(265);
-
-$pdf->SetFillColor(0, 146, 69);
-$pdf->Rect($pdf->GetX(), $pdf->GetY(), 190, 1, "DF");
-
-$pdf->SetY($pdf->GetY() + 6);
-
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->Cell(0, $cell_height, "Check Policy Limited");
-$pdf->SetY($pdf->GetY() + $cell_height);
-$pdf->SetFont("Arial", "", $normal_font_size);
-$pdf->Cell(0, $cell_height, "8 Market Street, Liskeard, Cornwall, PL14 3JJ");
-$pdf->SetY($pdf->GetY() + $cell_height);
-$pdf->Cell(0, $cell_height, "Company Number: 09506865");
+$pass_image = $test->pass ? "pass.png" : "fail.png";
 
 ?>
+
+<h3 class="section">Test Result</h3>
+
+<div align="center" style="margin: auto; width: 75%;">
+	<img src="/img/<?=htmlspecialchars($pass_image)?>" alt="" />
+</div>
+
+<div style="float: left; width: 70%; position: relative;">
+	<h3 class="section"><?=htmlspecialchars($location_text)?></h3>
+
+	<div class="bl">
+		<div class="field"><?=htmlspecialchars($customer->region_field_name)?> / <?=htmlspecialchars($customer->area_manager_field_name)?>:</div>
+		<div class="value">
+			<?=TestPDF::getValueHtml($location->region)?> / <?=TestPDF::getValueHtml($location->area_manager)?>
+		</div>
+	</div>
+
+	<div class="bl">
+		<div class="field">Address:</div>
+		<div class="value">
+			<?=htmlspecialchars($location->address_1)?><br />
+			<?php
+			if($location->address_2) {
+				?>
+				<?=htmlspecialchars($location->address_2)?><br />
+				<?php
+			}
+			?>
+			<?=htmlspecialchars($location->city)?>
+		</div>
+	</div>
+
+	<div class="bl">
+		<div class="field">Postcode:</div>
+		<div class="value"><?=htmlspecialchars($location->postal_code)?></div>
+	</div>
+
+	<div class="bl">
+		<div class="field">Shop Name - Left:</div>
+		<div class="value"><?=htmlspecialchars($test->shop_left)?></div>
+	</div>
+
+	<div>
+		<div class="field">Shop Name - Right:</div>
+		<div class="value"><?=htmlspecialchars($test->shop_right)?></div>
+	</div>
+
+</div>
+
+<div style="float: right; width: 29%">
+	<h3 class="section">Tester</h3>
+
+	<div class="bl">
+		<div class="field">Gender:</div>
+		<div class="value"><?=htmlspecialchars($tester->getGenderText())?></div>
+	</div>
+
+	<div>
+		<strong>Attire:</strong><br />
+		<?=htmlspecialchars($test->attire)?>
+	</div>
+</div>
+
+<div style="clear: both;"></div>
+
+<h3 class="section">Test Details</h3>
+
+<div style="float: left; width: 49.5%">
+	<div class="subheader">
+		<strong>Date &amp; Time</strong>
+	</div>
+
+	<div style="float: left; width: 24%">
+		<strong>Date:</strong><br />
+		<?=htmlspecialchars($date_start)?>
+	</div>
+	<div style="float: left; width: 24%">
+		<strong>Entry:</strong><br />
+		<?=htmlspecialchars($time_start)?>
+	</div>
+	<div style="float: left; width: 24%">
+		<strong>Exit:</strong><br />
+		<?=htmlspecialchars($time_end)?>
+	</div>
+	<div style="float: left; width: 24%">
+		<strong>Duration:</strong><br />
+		<?=htmlspecialchars($duration_text)?>
+	</div>
+
+	<div style="clear: both;"></div><br />
+
+	<div class="subheader">
+		<strong>Staff</strong>
+	</div>
+
+	<div class="bl">
+		<div class="field">Name:</div>
+		<div class="value"><?=TestPDF::getValueHtml($test->challenger_name)?></div>
+	</div>
+
+	<div class="bl">
+		<div class="field">Gender:</div>
+		<div class="value"><?=TestPDF::getValueHtml($test->challenger_gender)?></div>
+	</div>
+
+	<strong>Description:</strong><br />
+	<?=TestPDF::getValueHtml($test->challenger_description)?><br />
+
+	<br />
+
+	<div class="subheader">
+		<strong>Tester's Notes</strong>
+	</div>
+
+	<?=TestPDF::getValueHtml($test->additional_notes)?>
+</div>
+
+<div style="float: right; width: 49.5%">
+	<div class="subheader">
+		<strong>ID Request</strong>
+	</div>
+
+	<div class="bl">
+		<div class="field">Result:</div>
+		<div class="value"><?=htmlspecialchars($test->getPassText())?></div>
+	</div>
+
+	<div>
+		<div class="field">ID Stage:</div>
+		<div class="value"><?=htmlspecialchars($test->challenge_stage . " - " . $test->getChallengeStageText())?></div>
+	</div>
+
+	<br />
+
+	<div>
+		<div style="color: green;">1: Challenge on entry</div>
+		<div style="color: orange;">2: Challenge while browsing</div>
+		<div style="color: orange;">3: Challenge during play</div>
+		<div style="color: red;">4: Challenge on exit</div>
+		<div style="color: red;">5: No challenge</div>
+	</div>
+
+	<br />
+
+	<div class="bl">
+		<div class="field">Eye Contact:</div>
+		<div class="value"><?=($test->challenger_eye_contact ? "Y" : "N")?></div>
+	</div>
+
+	<div>
+		<strong>Description:</strong><br />
+		<?=TestPDF::getValueHtml($test->challenge_description)?>
+	</div>
+</div>
+
+<div class="clear"></div>
+
+<br />
+
+<div style="float: left; width: 49.5%">
+	<div class="subheader">
+		<strong>Play Details</strong>
+	</div>
+	<div class="wide-field-names">
+		<div class="bl">
+			<div class="field">Machine Played:</div>
+			<div class="value"><?=TestPDF::getValueHtml($values["play_machine"] ?? "")?></div>
+		</div>
+
+		<?php
+		$play_jackpot = $values["play_jackpot"] ?? "";
+		if(!empty($play_jackpot)) {
+			$play_jackpot = "£{$play_jackpot}";
+		}
+		?>
+
+		<div class="bl">
+			<div class="field">Jackpot Value:</div>
+			<div class="value"><?=TestPDF::getValueHtml($play_jackpot)?></div>
+		</div>
+
+		<?php
+		$play_stake = $values["play_stake"] ?? "";
+		if(!empty($play_stake)) {
+			$play_stake = "£{$play_stake}";
+		}
+		?>
+
+		<div class="bl">
+			<div class="field">Stake Played:</div>
+			<div class="value"><?=TestPDF::getValueHtml($play_stake)?></div>
+		</div>
+
+		<div class="bl">
+			<div class="field">Minutes Played:</div>
+			<div class="value"><?=TestPDF::getValueHtml($values["play_minutes"] ?? "")?></div>
+		</div>
+
+		<?php
+		$play_spent = $values["play_spent"] ?? "";
+		if(!empty($play_spent)) $play_spent = "£{$play_spent}";
+		?>
+
+		<div>
+			<div class="field">Amount Spent:</div>
+			<div class="value"><?=TestPDF::getValueHtml($play_spent)?></div>
+		</div>
+	</div>
+</div>
+
+<div style="float: right; width: 49.5%">
+	<div class="subheader">
+		<strong>Signage</strong>
+	</div>
+
+	<div class="wide-field-names">
+		<div class="bl">
+			<div class="field">Think 21/25:</div>
+			<div class="value"><?=TestPDF::getValueHtml($values["think_21_25"] ?? "")?></div>
+		</div>
+
+		<?php
+		$value = $values["citizen_card_brochure_displayed"] ?? "";
+		if(strlen($value)) $value = $value ? "Yes" : "No";
+		?>
+
+		<div class="bl">
+			<div class="field">Citizen Card Brochure Displayed:</div>
+			<div class="value"><?=TestPDF::getValueHtml($value)?></div>
+		</div>
+
+		<?php
+		$value = $values["think_21_badge"] ?? "";
+		if(strlen($value)) $value = $value ? "Yes" : "No";
+		?>
+
+		<div class="bl">
+			<div class="field">Think 21/25 Badge Worn by Staff:</div>
+			<div class="value"><?=TestPDF::getValueHtml($value)?></div>
+		</div>
+
+		<?php
+		$value = $values["think_21_poster"] ?? "";
+		if(strlen($value)) $value = $value ? "Yes" : "No";
+		?>
+
+		<div class="bl">
+			<div class="field">Think 21/25 Posters Displayed:</div>
+			<div class="value"><?=TestPDF::getValueHtml($value)?></div>
+		</div>
+
+		<strong>Think 21/25 Poster Notes:</strong><br />
+		<?=TestPDF::getValueHtml($values["think_21_poster_notes"] ?? "")?>
+	</div>
+</div>

+ 278 - 343
template_processing/age_verification_mitchells_butlers/test_pdf.php

@@ -1,347 +1,282 @@
 <?php
 
-$main_y = $pdf->GetY();
-
-// Retest info
-if($test->retest) {
-	$pdf->SetLeftMargin(83);
-	$pdf->SetY(10);
-
-	$pdf->Image("public/img/retest.png", 83, $pdf->GetY(), 63);
-}
-
-$pdf->SetLeftMargin(10);
-$pdf->SetY($main_y);
-
-// Header
-$pdf->SetTextColor(56, 87, 35);
-$pdf->SetFont("Arial", "B", $header_font_size);
-$pdf->Cell(190, 10, " Test Result", 0, 1, "L", true);
-
-// Pass/Fail
-$image_width = 130;
-
-if($test->pass) {
-	$pdf->Image("public/img/pass.png", (210 - $image_width) / 2, $pdf->GetY() + 2, $image_width);
-}
-else {
-	$pdf->Image("public/img/fail.png", (210 - $image_width) / 2, $pdf->GetY() + 2, $image_width);
-}
-
-$pdf->SetY($pdf->GetY() + 30);
-
-$pdf->SetTextColor(56, 87, 35);
-
-// Location / Tester Headers
-$pdf->SetFont("Arial", "B", $header_font_size);
-
-$tester_x = 150;
-$tester_y = $pdf->GetY();
-
-$pdf->Cell(135, 10, $location_text, 0, 1, "L", true);
-$pdf->SetY($pdf->GetY() + 2);
-
-$pdf->SetFont("Arial", "", $normal_font_size);
-$pdf->SetTextColor(0, 0, 0);
-
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 135, $pdf->GetY());
-$pdf->Cell(30, $cell_height, "Region / Manager:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Write($cell_height, $location->region);
-$pdf->Write($cell_height, " / ");
-$pdf->Write($cell_height, $location->area_manager);
-$pdf->SetY($pdf->GetY() + $cell_height);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 135, $pdf->GetY());
-
-$pdf->Cell(30, $cell_height, "Address:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->MultiCell(100, $cell_height, $location->getDisplayAddress(["address_1", "address_2", "city"], "\n"), 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 135, $pdf->GetY());
-
-$pdf->Cell(30, $cell_height, "Postcode:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(100, $cell_height, $location->postal_code, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 135, $pdf->GetY());
-
-$pdf->Cell(30, $cell_height, "Shop Name - Left:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(100, $cell_height, $test->shop_left, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 135, $pdf->GetY());
-
-$pdf->Cell(30, $cell_height, "Shop Name - Right:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(100, $cell_height, $test->shop_right, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 135, $pdf->GetY());
-
-$test_details_y = $pdf->GetY();
-
-// Tester Info
-$pdf->SetXY($tester_x, $tester_y);
-$pdf->SetLeftMargin(150);
-
-$pdf->SetTextColor(56, 87, 35);
-$pdf->SetFont("Arial", "B", $header_font_size);
-
-$pdf->Cell(50, 10, " Tester", 0, 1, "L", true);
-$pdf->SetY($pdf->GetY() + 2);
-
-$pdf->SetFont("Arial", "", $normal_font_size);
-$pdf->SetTextColor(0, 0, 0);
-
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 50, $pdf->GetY());
-$pdf->Cell(20, $cell_height, "Gender:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(20, $cell_height, $tester->getGenderText(), 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 50, $pdf->GetY());
-
-$pdf->Cell(20, $cell_height, "Attire:", 0, 1);
-$pdf->SetX(150);
-$pdf->SetFont("Arial", "", $small_font_size);
-$pdf->MultiCell(50, 4, $test->attire, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 50, $pdf->GetY());
-
-
-// Test Details
-$pdf->SetLeftMargin(10);
-
-$pdf->setXY(10, $test_details_y + 2);
-
-$pdf->SetTextColor(56, 87, 35);
-$pdf->SetFont("Arial", "B", $header_font_size);
-
-$pdf->Cell(190, 10, " Test Details", 0, 1, "L", true);
-$pdf->SetY($pdf->GetY() + 2);
-
-// Date / Time
-$id_requests_y = $pdf->GetY();
-
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->SetTextColor(0, 0, 0);
-
-$pdf->Cell(95, $cell_height, "Date & Time", 0, 1);
-$pdf->SetY($pdf->GetY() + 2);
-
-$pdf->SetFont("Arial");
-
-$pdf->Cell(23, $cell_height, "Date");
-$pdf->Cell(23, $cell_height, "Entry");
-$pdf->Cell(23, $cell_height, "Exit");
-$pdf->Cell(23, $cell_height, "Duration", 0, 1);
-
-$pdf->SetFont("Arial", "", $small_font_size);
-
-$pdf->Cell(23, $cell_height, $date_start);
-$pdf->Cell(23, $cell_height, $time_start);
-$pdf->Cell(23, $cell_height, $time_end);
-$pdf->Cell(23, $cell_height, str_pad($diff->h, 2, "0", STR_PAD_LEFT) . ":" . str_pad($diff->i, 2, "0", STR_PAD_LEFT) . ":" . str_pad($diff->s, 2, "0", STR_PAD_LEFT), 0, 1);
-
-$pdf->SetY($pdf->GetY() + 2);
-
-// Staff
-
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->Cell(95, $cell_height, "Staff", 0, 1);
-$pdf->SetY($pdf->GetY() + 2);
-
-$pdf->SetFont("Arial");
-
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-$pdf->Cell(30, $cell_height, "Name:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(57.5, $cell_height, $test->challenger_name, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->Cell(30, $cell_height, "Gender:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(57.5, $cell_height, $test->challenger_gender, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->Cell(30, $cell_height, "Description:", 0, 1);
-$pdf->SetFont("Arial", "", $small_font_size);
-$pdf->MultiCell(90, 4, $test->challenger_description, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-$pdf->SetY($pdf->GetY() + 2);
-
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->Cell(95, $cell_height, "Tester's Notes", 0, 1);
-$pdf->SetY($pdf->GetY() + 2);
-$pdf->SetFont("Arial");
-
-$pdf->SetFont("Arial", "", $small_font_size);
-$pdf->MultiCell(90, 4, Util::convertUTF8($test->additional_notes), 0, 1);
-$pdf->SetY($pdf->GetY() + 2);
-
-// Challenge
-$pdf->SetLeftMargin(107.5);
-$pdf->SetY($id_requests_y);
-
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->Cell(95, $cell_height, "ID Request", 0, 1);
-$pdf->SetY($pdf->GetY() + 2);
-$pdf->SetFont("Arial");
-
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->Cell(30, $cell_height, "Result:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(60, $cell_height, $test->getPassText(), 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->Cell(30, $cell_height, "ID Stage:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(60, $cell_height, $test->challenge_stage . " - " . $test->getChallengeStageText(), 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->SetY($pdf->GetY() + 2);
-
-$pdf->SetFont("Arial", "", $small_font_size);
-$pdf->SetTextColor(0, 128, 0);
-$pdf->MultiCell(95, 4, "1: Challenge on entry", 0, 1);
-
-$pdf->SetTextColor(255, 128, 0);
-$pdf->MultiCell(95, 4, "2: Challenge while browsing
-3: Challenge during play", 0, 1);
-
-$pdf->SetTextColor(255, 0, 0);
-
-$pdf->MultiCell(95, 4, "4: Challenge on exit
-5: No challenge", 0, 1);
-
-$pdf->SetFont("Arial", "", $normal_font_size);
-$pdf->SetTextColor(0, 0, 0);
-
-$pdf->SetY($pdf->GetY() + 2);
-
-$pdf->SetFont("Arial", "", $normal_font_size);
-
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-$pdf->Cell(30, $cell_height, "Eye Contact:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(60, $cell_height, $test->challenger_eye_contact ? "Y" : "N", 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->Cell(95, $cell_height, "Description:", 0, 1);
-$pdf->SetFont("Arial", "", $small_font_size);
-$pdf->MultiCell(90, 4, $test->challenge_description, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->SetY($pdf->GetY() + 2);
-
-// Details / Signage
-
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->Cell(95, $cell_height, "Play Details & Signage", 0, 1);
-$pdf->SetY($pdf->GetY() + 2);
-$pdf->SetFont("Arial");
-
-$field_width = 50;
-$value_width = 40;
-
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->Cell($field_width, $cell_height, "Machine Played:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $values["play_machine"] ?? "N/A", 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-// Machine Position
-$value = $values["play_machine_position"] ?? "N/A";
-
-$pdf->Cell($field_width, $cell_height, "Machine Position:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $value, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-// Machine Line of Sight
-$value = $values["play_machine_line_of_sight"] ?? "";
-if(strlen($value) > 0) $value = $value ? "Yes" : "No";
-
-$pdf->Cell($field_width, $cell_height, "Line of Sight of Bar:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $value, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-// Jackpot Value
-$value = $values["play_jackpot"] ?? "N/A";
-if($value != "N/A") $value = "\xa3" . number_format($value);
-
-$pdf->Cell($field_width, $cell_height, "Jackpot Value:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $value, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-// Stake Played
-$value = $values["play_machine_stake"] ?? "N/A";
-if($value != "N/A") $value = "\xa3" . number_format($value, 2);
-
-$pdf->Cell($field_width, $cell_height, "Stake Played:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $value, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->Cell($field_width, $cell_height, "Minutes Played:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $values["play_minutes"] ?? "N/A", 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$value = $values["play_spent"] ?? "N/A";
-if($value != "N/A") $value = "\xa3" . number_format($value, 2);
-
-$pdf->Cell($field_width, $cell_height, "Amount Spent:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $value, 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->Cell($field_width, $cell_height, "Think 21/25:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $values["think_21_25"] ?? "N/A", 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$value = $values["citizen_card_brochure_displayed"] ?? "";
-if(strlen($value) > 0) $value = $value ? "Yes" : "No";
-
-$pdf->Cell($field_width, $cell_height, "Citizen Card Brochure Displayed:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $value ?? "N/A", 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$value = $values["think_21_badge"] ?? "";
-if(strlen($value) > 0) $value = $value ? "Yes" : "No";
-
-$pdf->Cell($field_width, $cell_height, "Think 21/25 Badge Worn by Staff:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $value ?? "N/A", 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$value = $values["think_21_poster"] ?? "";
-if(strlen($value) > 0) $value = $value ? "Yes" : "No";
-
-$pdf->Cell($field_width, $cell_height, "Think 21/25 Posters Displayed:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell($value_width, $cell_height, $value ?? "N/A", 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-$pdf->Cell($field_width, $cell_height, "Think 21/25 Poster Notes:", 0, 1);
-$pdf->SetFont("Arial", "", $small_font_size);
-$pdf->MultiCell(95, 4, $values["think_21_poster_notes"] ?? "N/A", 0, 1);
-$pdf->Line($pdf->GetX(), $pdf->GetY(), $pdf->GetX() + 92.5, $pdf->GetY());
-
-// Footer
-$pdf->SetLeftMargin(10);
-
-$pdf->SetY(265);
-
-$pdf->SetFillColor(0, 146, 69);
-$pdf->Rect($pdf->GetX(), $pdf->GetY(), 190, 1, "DF");
-
-$pdf->SetY($pdf->GetY() + 6);
-
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->Cell(0, $cell_height, "Check Policy Limited");
-$pdf->SetY($pdf->GetY() + $cell_height);
-$pdf->SetFont("Arial", "", $normal_font_size);
-$pdf->Cell(0, $cell_height, "8 Market Street, Liskeard, Cornwall, PL14 3JJ");
-$pdf->SetY($pdf->GetY() + $cell_height);
-$pdf->Cell(0, $cell_height, "Company Number: 09506865");
+$pass_image = $test->pass ? "pass.png" : "fail.png";
 
 ?>
+
+<h3 class="section">Test Result</h3>
+
+<div align="center" style="margin: auto; width: 75%;">
+	<img src="/img/<?=htmlspecialchars($pass_image)?>" alt="" />
+</div>
+
+<div style="float: left; width: 70%; position: relative;">
+	<h3 class="section"><?=htmlspecialchars($location_text)?></h3>
+
+	<div class="bl">
+		<div class="field"><?=htmlspecialchars($customer->region_field_name)?> / <?=htmlspecialchars($customer->area_manager_field_name)?>:</div>
+		<div class="value">
+			<div style="float: left; width: 25%;">
+				<?=TestPDF::getValueHtml($location->region)?> / <?=TestPDF::getValueHtml($location->area_manager)?>
+			</div>
+			<div style="float: right; width: 74%; text-align: right;">
+				<?=TestPDF::getValueHtml($location->region_name)?> / <?=TestPDF::getValueHtml($location->area_manager_name)?>
+			</div>
+		</div>
+	</div>
+
+	<div class="bl">
+		<div class="field">Address:</div>
+		<div class="value">
+			<div style="float: left; width: 50%;">
+				<?=htmlspecialchars($location->address_1)?><br />
+				<?php
+				if($location->address_2) {
+					?>
+					<?=htmlspecialchars($location->address_2)?><br />
+					<?php
+				}
+				?>
+				<?=htmlspecialchars($location->city)?>
+			</div>
+			<div style="float: right; width: 49%; text-align: right;">
+				<?=htmlspecialchars($location->legal_entity_name)?><br />
+				<?=htmlspecialchars($location->operations_manager_name)?><br />
+				<?=htmlspecialchars($location->brand)?>
+			</div>
+		</div>
+	</div>
+
+	<div class="bl">
+		<div class="field">Postcode:</div>
+		<div class="value"><?=htmlspecialchars($location->postal_code)?></div>
+	</div>
+
+	<div class="bl">
+		<div class="field">Shop Name - Left:</div>
+		<div class="value"><?=htmlspecialchars($test->shop_left)?></div>
+	</div>
+
+	<div>
+		<div class="field">Shop Name - Right:</div>
+		<div class="value"><?=htmlspecialchars($test->shop_right)?></div>
+	</div>
+
+</div>
+
+<div style="float: right; width: 29%">
+	<h3 class="section">Tester</h3>
+
+	<div class="bl">
+		<div class="field">Gender:</div>
+		<div class="value"><?=htmlspecialchars($tester->getGenderText())?></div>
+	</div>
+
+	<div>
+		<strong>Attire:</strong><br />
+		<?=htmlspecialchars($test->attire)?>
+	</div>
+</div>
+
+<div style="clear: both;"></div>
+
+<h3 class="section">Test Details</h3>
+
+<div style="float: left; width: 49.5%">
+	<div class="subheader">
+		<strong>Date &amp; Time</strong>
+	</div>
+
+	<div style="float: left; width: 24%">
+		<strong>Date:</strong><br />
+		<?=htmlspecialchars($date_start)?>
+	</div>
+	<div style="float: left; width: 24%">
+		<strong>Entry:</strong><br />
+		<?=htmlspecialchars($time_start)?>
+	</div>
+	<div style="float: left; width: 24%">
+		<strong>Exit:</strong><br />
+		<?=htmlspecialchars($time_end)?>
+	</div>
+	<div style="float: left; width: 24%">
+		<strong>Duration:</strong><br />
+		<?=htmlspecialchars($duration_text)?>
+	</div>
+
+	<div style="clear: both;"></div><br />
+
+	<div class="subheader">
+		<strong>Staff</strong>
+	</div>
+
+	<div class="bl">
+		<div class="field">Name:</div>
+		<div class="value"><?=TestPDF::getValueHtml($test->challenger_name)?></div>
+	</div>
+
+	<div class="bl">
+		<div class="field">Gender:</div>
+		<div class="value"><?=TestPDF::getValueHtml($test->challenger_gender)?></div>
+	</div>
+
+	<strong>Description:</strong><br />
+	<?=TestPDF::getValueHtml($test->challenger_description)?><br />
+
+	<br />
+
+	<div class="subheader">
+		<strong>Tester's Notes</strong>
+	</div>
+
+	<?=TestPDF::getValueHtml($test->additional_notes)?>
+</div>
+
+<div style="float: right; width: 49.5%">
+	<div class="subheader">
+		<strong>ID Request</strong>
+	</div>
+
+	<div class="bl">
+		<div class="field">Result:</div>
+		<div class="value"><?=htmlspecialchars($test->getPassText())?></div>
+	</div>
+
+	<div>
+		<div class="field">ID Stage:</div>
+		<div class="value"><?=htmlspecialchars($test->challenge_stage . " - " . $test->getChallengeStageText())?></div>
+	</div>
+
+	<br />
+
+	<div>
+		<div style="color: green;">1: Challenge on entry</div>
+		<div style="color: orange;">2: Challenge while browsing</div>
+		<div style="color: orange;">3: Challenge during play</div>
+		<div style="color: red;">4: Challenge on exit</div>
+		<div style="color: red;">5: No challenge</div>
+	</div>
+
+	<br />
+
+	<div class="bl">
+		<div class="field">Eye Contact:</div>
+		<div class="value"><?=($test->challenger_eye_contact ? "Y" : "N")?></div>
+	</div>
+
+	<div>
+		<strong>Description:</strong><br />
+		<?=TestPDF::getValueHtml($test->challenge_description)?>
+	</div>
+</div>
+
+<div class="clear"></div>
+
+<br />
+
+<div style="float: left; width: 49.5%">
+	<div class="subheader">
+		<strong>Play Details</strong>
+	</div>
+	<div class="wide-field-names">
+		<div class="bl">
+			<div class="field">Machine Played:</div>
+			<div class="value"><?=TestPDF::getValueHtml($values["play_machine"] ?? "")?></div>
+		</div>
+
+		<div class="bl">
+			<div class="field">Machine Position:</div>
+			<div class="value"><?=TestPDF::getValueHtml($values["play_machine_position"] ?? "")?></div>
+		</div>
+
+		<div class="bl">
+			<div class="field">Line of Sight of Bar:</div>
+			<div class="value"><?=TestPDF::getValueHtml($values["play_machine_line_of_sight"] ?? "")?></div>
+		</div>
+
+		<?php
+		$play_jackpot = $values["play_jackpot"] ?? "";
+		if(!empty($play_jackpot)) {
+			$play_jackpot = "£{$play_jackpot}";
+		}
+		?>
+
+		<div class="bl">
+			<div class="field">Jackpot Value:</div>
+			<div class="value"><?=TestPDF::getValueHtml($play_jackpot)?></div>
+		</div>
+
+		<?php
+		$play_stake = $values["play_stake"] ?? "";
+		if(!empty($play_stake)) {
+			$play_stake = "£{$play_stake}";
+		}
+		?>
+
+		<div class="bl">
+			<div class="field">Stake Played:</div>
+			<div class="value"><?=TestPDF::getValueHtml($play_stake)?></div>
+		</div>
+
+		<div class="bl">
+			<div class="field">Minutes Played:</div>
+			<div class="value"><?=TestPDF::getValueHtml($values["play_minutes"] ?? "")?></div>
+		</div>
+
+		<?php
+		$play_spent = $values["play_spent"] ?? "";
+		if(!empty($play_spent)) $play_spent = "£{$play_spent}";
+		?>
+
+		<div>
+			<div class="field">Amount Spent:</div>
+			<div class="value"><?=TestPDF::getValueHtml($play_spent)?></div>
+		</div>
+	</div>
+</div>
+
+<div style="float: right; width: 49.5%">
+	<div class="subheader">
+		<strong>Signage</strong>
+	</div>
+
+	<div class="wide-field-names">
+		<div class="bl">
+			<div class="field">Think 21/25:</div>
+			<div class="value"><?=TestPDF::getValueHtml($values["think_21_25"] ?? "")?></div>
+		</div>
+
+		<?php
+		$value = $values["citizen_card_brochure_displayed"] ?? "";
+		if(strlen($value)) $value = $value ? "Yes" : "No";
+		?>
+
+		<div class="bl">
+			<div class="field">Citizen Card Brochure Displayed:</div>
+			<div class="value"><?=TestPDF::getValueHtml($value)?></div>
+		</div>
+
+		<?php
+		$value = $values["think_21_badge"] ?? "";
+		if(strlen($value)) $value = $value ? "Yes" : "No";
+		?>
+
+		<div class="bl">
+			<div class="field">Think 21/25 Badge Worn by Staff:</div>
+			<div class="value"><?=TestPDF::getValueHtml($value)?></div>
+		</div>
+
+		<?php
+		$value = $values["think_21_poster"] ?? "";
+		if(strlen($value)) $value = $value ? "Yes" : "No";
+		?>
+
+		<div class="bl">
+			<div class="field">Think 21/25 Posters Displayed:</div>
+			<div class="value"><?=TestPDF::getValueHtml($value)?></div>
+		</div>
+
+		<strong>Think 21/25 Poster Notes:</strong><br />
+		<?=TestPDF::getValueHtml($values["think_21_poster_notes"] ?? "")?>
+	</div>
+</div>

+ 203 - 224
template_processing/mystery_shop/test_pdf.php

@@ -1,107 +1,6 @@
 <?php
 
-// Location / Tester Headers
-$pdf->SetTextColor(56, 87, 35);
-$pdf->SetFont("Arial", "B", $header_font_size);
-
-$tester_x = 150;
-$tester_y = $pdf->GetY();
-
-$pdf->Cell(135, 10, $location_text, 0, 1, "L", true);
-$pdf->SetY($pdf->GetY() + 2);
-
-$pdf->SetFont("Arial", "", $normal_font_size);
-$pdf->SetTextColor(0, 0, 0);
-
-$pdf->Cell(30, $cell_height, "Region / Manager:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Write($cell_height, $location->region);
-$pdf->Write($cell_height, " / ");
-$pdf->Write($cell_height, $location->area_manager);
-$pdf->SetY($pdf->GetY() + $cell_height);
-
-$pdf->Cell(30, $cell_height, "Address:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->MultiCell(100, $cell_height, $location->getDisplayAddress(["address_1", "address_2", "city"], "\n"), 0, 1);
-
-$pdf->Cell(30, $cell_height, "Postcode:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(100, $cell_height, $location->postal_code, 0, 1);
-
-$pdf->Cell(30, $cell_height, "Shop Name - Left:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(100, $cell_height, $test->shop_left, 0, 1);
-
-$pdf->Cell(30, $cell_height, "Shop Name - Right:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(100, $cell_height, $test->shop_right, 0, 1);
-
-$test_details_y = $pdf->GetY();
-
-// Tester Info
-$pdf->SetXY($tester_x, $tester_y);
-$pdf->SetLeftMargin(150);
-
-$pdf->SetTextColor(56, 87, 35);
-$pdf->SetFont("Arial", "B", $header_font_size);
-
-$pdf->Cell(50, 10, " Tester", 0, 1, "L", true);
-$pdf->SetY($pdf->GetY() + 2);
-
-$pdf->SetFont("Arial", "", $normal_font_size);
-$pdf->SetTextColor(0, 0, 0);
-
-$pdf->Cell(20, $cell_height, "Gender:", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(20, $cell_height, $tester->getGenderText(), 0, 1);
-
-$pdf->Cell(20, $cell_height, "Attire:", 0, 1);
-$pdf->SetX(150);
-$pdf->SetFont("Arial", "", $small_font_size);
-$pdf->MultiCell(50, 4, $test->attire, 0, 1);
-
-// Test Details
-$pdf->SetLeftMargin(10);
-
-$pdf->setXY(10, $test_details_y + 5 + 2);
-
-$pdf->SetTextColor(56, 87, 35);
-$pdf->SetFont("Arial", "B", $header_font_size);
-
-$pdf->Cell(190, 10, " Test Details", 0, 1, "L", true);
-$pdf->SetY($pdf->GetY() + 2);
-
-// Date / Time
-$id_requests_y = $pdf->GetY();
-
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->SetTextColor(0, 0, 0);
-
-$pdf->Cell(95, $cell_height, "Date & Time", 0, 1);
-
-$pdf->SetFont("Arial");
-
-$pdf->Cell(23, $cell_height, "Date");
-$pdf->Cell(23, $cell_height, "Entry");
-$pdf->Cell(23, $cell_height, "Exit");
-$pdf->Cell(23, $cell_height, "Duration", 0, 1);
-
-$pdf->SetFont("Arial", "", $small_font_size);
-
-$pdf->Cell(23, $cell_height, $date_start);
-$pdf->Cell(23, $cell_height, $time_start);
-$pdf->Cell(23, $cell_height, $time_end);
-$pdf->Cell(23, $cell_height, str_pad($diff->h, 2, "0", STR_PAD_LEFT) . ":" . str_pad($diff->i, 2, "0", STR_PAD_LEFT) . ":" . str_pad($diff->s, 2, "0", STR_PAD_LEFT), 0, 1);
-
-$pdf->SetY($pdf->GetY() + $cell_height);
-
-// Venue Details
-
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->Cell(95, $cell_height, "Venue", 0, 1);
-
-$pdf->SetFont("Arial");
-
+// Values
 $cleanliness = $values["cleanliness"];
 switch($cleanliness) {
 	case 1: $cleanliness = "Very dirty"; break;
@@ -111,145 +10,225 @@ switch($cleanliness) {
 	case 5: $cleanliness = "Very clean"; break;
 }
 
-$pdf->Cell(30, $cell_height, $field_name_label_map["cleanliness"] . ":", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(57.5, $cell_height, $cleanliness, 0, 1);
+$staff_badge_worn = $values["staff_badge_worn"] ?? "";
+if(strlen($staff_badge_worn) == 0) $staff_badge_worn = "Don't know/Not approached";
+else $staff_badge_worn = ($staff_badge_worn == 0) ? "No" : "Yes";
 
-$pdf->SetY($pdf->GetY() + $cell_height);
+$staff_offered_drink = $values["staff_offered_drink"] ?? "";
+$staff_offered_drink = $staff_offered_drink ? "Yes" : "No";
 
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->Cell(95, $cell_height, "Tester's Notes", 0, 1);
-$pdf->SetFont("Arial");
+$staff_offered_promotion = $values["staff_offered_promotion"] ?? "";
+$staff_offered_promotion = $staff_offered_promotion ? "Yes" : "No";
 
-$pdf->SetFont("Arial", "", $small_font_size);
-$pdf->MultiCell(90, 4, Util::convertUTF8($test->additional_notes), 0, 1);
+$staff_help = $values["staff_help"] ?? "";
+$staff_help = $staff_help ? "Yes" : "No";
 
-$pdf->SetY($pdf->GetY() + $cell_height);
+$staff_behaviour = $values["staff_behaviour"] ?? 0;
+switch($staff_behaviour) {
+	case 1: $staff_behaviour = "Rude"; break;
+	case 2: $staff_behaviour = "Slightly rude"; break;
+	case 3: $staff_behaviour = "Neither rude or polite"; break;
+	case 4: $staff_behaviour = "Polite and friendly"; break;
+	case 5: $staff_behaviour = "Very polite and friendly"; break;
+	default: $staff_behaviour = ""; break;
+}
 
-// Location photo
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->Cell(95, $cell_height, "Location Photo", 0, 1);
-$pdf->SetFont("Arial");
+$staff_uniform = $values["staff_uniform"] ?? "";
+$staff_uniform = $staff_uniform ? "Yes" : "No";
 
+// Location Photo
 $location_photo_path = $test->getDirectory() . "/location_photo.jpg";
+if(!file_exists($location_photo_path)) {
+	$location_photo_path = "public/img/no_image_4_3.png";
+}
 
 $size = getimagesize($location_photo_path);
 list($image_width, $image_height) = $size;
 
-$width = 0;
-$height = 0;
+$width = "";
+$height = "";
 if($image_height > $image_width) {
-	$height = 70;
+	$height = "8cm";
 }
 else {
-	$width = 70;
+	$width = "100%";
 }
 
-$pdf->Image($location_photo_path, $pdf->GetX(), $pdf->GetY(), $width, $height);
-
-// Staff Details
-$pdf->SetLeftMargin(107.5);
-$pdf->SetY($id_requests_y);
-
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->Cell(95, $cell_height, "Staff Details", 0, 1);
-$pdf->SetFont("Arial");
-
-$value = $values["staff_badge_worn"] ?? "";
-if(strlen($value) == 0) $value = "Don't know/Not approached";
-else $value = ($value == 0) ? "No" : "Yes";
-$pdf->Cell(45, $cell_height, $field_name_label_map["staff_badge_worn"] . ":", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(45, $cell_height, $value, 0, 1);
-
-$value = $values["staff_name"] ?? "";
-$pdf->Cell(45, $cell_height, $field_name_label_map["staff_name"] . ":", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(45, $cell_height, $value, 0, 1);
-
-$pdf->SetY($pdf->GetY() + $cell_height);
-
-$value = $values["staff_offered_drink"] ?? "";
-$value = $value ? "Yes" : "No";
-$pdf->Cell(45, $cell_height, $field_name_label_map["staff_offered_drink"] . ":", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(45, $cell_height, $value, 0, 1);
-
-$value = $values["staff_offered_drink_name"] ?? "";
-$value = $value ?: "N/A";
-$pdf->Cell(45, $cell_height, $field_name_label_map["staff_offered_drink_name"] . ":", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(45, $cell_height, $value, 0, 1);
-
-$pdf->SetY($pdf->GetY() + $cell_height);
-
-$value = $values["staff_offered_promotion"] ?? "";
-$value = $value ? "Yes" : "No";
-$pdf->Cell(45, $cell_height, $field_name_label_map["staff_offered_promotion"] . ":", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(45, $cell_height, $value, 0, 1);
-
-$value = $values["staff_offered_promotion_name"] ?? "";
-$value = $value ?: "No promotion offered";
-$pdf->Cell(95, $cell_height, $field_name_label_map["staff_offered_promotion_name"] . ":", 0, 1);
-$pdf->SetFont("Arial", "", $small_font_size);
-$pdf->MultiCell(90, 4, $value, 0, 1);
-
-$pdf->SetY($pdf->GetY() + $cell_height);
-
-$value = $values["staff_help"] ?? "";
-$value = $value ? "Yes" : "No";
-$pdf->Cell(30, $cell_height, $field_name_label_map["staff_help"] . ":", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(60, $cell_height, $value, 0, 1);
-
-$pdf->SetY($pdf->GetY() + $cell_height);
-
-$value = $values["staff_behaviour"] ?? 0;
-switch($value) {
-	case 1: $value = "Rude"; break;
-	case 2: $value = "Slightly rude"; break;
-	case 3: $value = "Neither rude or polite"; break;
-	case 4: $value = "Polite and friendly"; break;
-	case 5: $value = "Very polite and friendly"; break;
-	default: $value = "N/A"; break;
-}
-
-$pdf->Cell(30, $cell_height, $field_name_label_map["staff_behaviour"] . ":", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(60, $cell_height, $value, 0, 1);
-
-$pdf->SetY($pdf->GetY() + $cell_height);
-
-$value = $values["staff_uniform"] ?? "";
-$value = $value ? "Yes" : "No";
-$pdf->Cell(30, $cell_height, $field_name_label_map["staff_uniform"] . ":", 0, 0);
-$pdf->SetX($pdf->GetX() + 5);
-$pdf->Cell(60, $cell_height, $value, 0, 1);
-
-$value = $values["staff_uniform_description"] ?? "";
-$value = $value ?: "N/A";
-$pdf->Cell(95, $cell_height, $field_name_label_map["staff_uniform_description"] . ":", 0, 1);
-$pdf->SetFont("Arial", "", $small_font_size);
-$pdf->MultiCell(90, 4, $value, 0, 1);
+$mpdf->imageVars["location_photo"] = file_get_contents($location_photo_path);
 
-// Footer
-$pdf->SetLeftMargin(10);
-
-$pdf->SetY(265);
-
-$pdf->SetFillColor(0, 146, 69);
-$pdf->Rect($pdf->GetX(), $pdf->GetY(), 190, 1, "DF");
-
-$pdf->SetY($pdf->GetY() + 6);
+?>
 
-$pdf->SetFont("Arial", "B", $normal_font_size);
-$pdf->Cell(0, $cell_height, "Check Policy Limited");
-$pdf->SetY($pdf->GetY() + $cell_height);
-$pdf->SetFont("Arial", "", $normal_font_size);
-$pdf->Cell(0, $cell_height, "8 Market Street, Liskeard, Cornwall, PL14 3JJ");
-$pdf->SetY($pdf->GetY() + $cell_height);
-$pdf->Cell(0, $cell_height, "Company Number: 09506865");
+<div style="float: left; width: 70%; position: relative;">
+	<h3 class="section"><?=htmlspecialchars($location_text)?></h3>
+
+	<div class="bl">
+		<div class="field"><?=htmlspecialchars($customer->region_field_name)?> / <?=htmlspecialchars($customer->area_manager_field_name)?>:</div>
+		<div class="value">
+			<?=TestPDF::getValueHtml($location->region)?> / <?=TestPDF::getValueHtml($location->area_manager)?>
+		</div>
+	</div>
+
+	<div class="bl">
+		<div class="field">Address:</div>
+		<div class="value">
+			<?=htmlspecialchars($location->address_1)?><br />
+			<?php
+			if($location->address_2) {
+				?>
+				<?=htmlspecialchars($location->address_2)?><br />
+				<?php
+			}
+			?>
+			<?=htmlspecialchars($location->city)?>
+		</div>
+	</div>
+
+	<div class="bl">
+		<div class="field">Postcode:</div>
+		<div class="value"><?=htmlspecialchars($location->postal_code)?></div>
+	</div>
+
+	<div class="bl">
+		<div class="field">Shop Name - Left:</div>
+		<div class="value"><?=htmlspecialchars($test->shop_left)?></div>
+	</div>
+
+	<div>
+		<div class="field">Shop Name - Right:</div>
+		<div class="value"><?=htmlspecialchars($test->shop_right)?></div>
+	</div>
+
+</div>
+
+<div style="float: right; width: 29%">
+	<h3 class="section">Tester</h3>
+
+	<div class="bl">
+		<div class="field">Gender:</div>
+		<div class="value"><?=htmlspecialchars($tester->getGenderText())?></div>
+	</div>
+
+	<div>
+		<strong>Attire:</strong><br />
+		<?=htmlspecialchars($test->attire)?>
+	</div>
+</div>
+
+<div style="clear: both;"></div>
+
+<h3 class="section">Test Details</h3>
+
+<div style="float: left; width: 49.5%">
+	<div class="subheader">
+		<strong>Date &amp; Time</strong>
+	</div>
+
+	<div style="float: left; width: 24%">
+		<strong>Date:</strong><br />
+		<?=htmlspecialchars($date_start)?>
+	</div>
+	<div style="float: left; width: 24%">
+		<strong>Entry:</strong><br />
+		<?=htmlspecialchars($time_start)?>
+	</div>
+	<div style="float: left; width: 24%">
+		<strong>Exit:</strong><br />
+		<?=htmlspecialchars($time_end)?>
+	</div>
+	<div style="float: left; width: 24%">
+		<strong>Duration:</strong><br />
+		<?=htmlspecialchars($duration_text)?>
+	</div>
+
+	<div style="clear: both;"></div><br />
+
+	<div class="subheader">
+		<strong>Venue</strong>
+	</div>
+
+	<div>
+		<div class="field">Cleanliness:</div>
+		<div class="value"><?=TestPDF::getValueHtml($cleanliness)?></div>
+	</div>
+
+	<br />
+
+	<div class="subheader">
+		<strong>Tester's Notes</strong>
+	</div>
+
+	<?=TestPDF::getValueHtml($test->additional_notes)?><br />
+
+	<br />
+
+	<div class="subheader">
+		<strong>Location Photo</strong>
+	</div>
+	<img src="var:location_photo" width="<?=$width?>" height="<?=$height?>" />
+</div>
+
+<div style="float: right; width: 49.5%">
+
+	<div class="wide-field-names">
+		<div class="subheader">
+			<strong>Staff Details</strong>
+		</div>
+
+		<div>
+			<div class="field"><?=htmlspecialchars($field_name_label_map["staff_badge_worn"])?>:</div>
+			<div class="value"><?=TestPDF::getValueHtml($staff_badge_worn)?></div>
+		</div>
+
+		<div>
+			<div class="field"><?=htmlspecialchars($field_name_label_map["staff_name"])?>:</div>
+			<div class="value"><?=TestPDF::getValueHtml($values["staff_name"] ?? "")?></div>
+		</div>
+
+		<br />
+
+		<div>
+			<div class="field"><?=htmlspecialchars($field_name_label_map["staff_offered_drink"])?>:</div>
+			<div class="value"><?=TestPDF::getValueHtml($staff_offered_drink)?></div>
+		</div>
+
+		<div>
+			<div class="field"><?=htmlspecialchars($field_name_label_map["staff_offered_drink_name"])?>:</div>
+			<div class="value"><?=TestPDF::getValueHtml($values["staff_offered_drink_name"] ?? "")?></div>
+		</div>
+
+		<br />
 
+		<div>
+			<div class="field"><?=htmlspecialchars($field_name_label_map["staff_offered_promotion"])?>:</div>
+			<div class="value"><?=TestPDF::getValueHtml($staff_offered_promotion)?></div>
+		</div>
+
+		<div>
+			<div class="field"><?=htmlspecialchars($field_name_label_map["staff_offered_promotion_name"])?>:</div>
+			<div class="value"><?=TestPDF::getValueHtml($values["staff_offered_promotion_name"] ?? "")?></div>
+		</div>
+
+		<br />
+
+		<div>
+			<div class="field"><?=htmlspecialchars($field_name_label_map["staff_help"])?>:</div>
+			<div class="value"><?=TestPDF::getValueHtml($staff_help)?></div>
+		</div>
+
+		<div>
+			<div class="field"><?=htmlspecialchars($field_name_label_map["staff_behaviour"])?>:</div>
+			<div class="value"><?=TestPDF::getValueHtml($staff_behaviour)?></div>
+		</div>
+
+		<br />
+
+		<div>
+			<div class="field"><?=htmlspecialchars($field_name_label_map["staff_uniform"])?>:</div>
+			<div class="value"><?=TestPDF::getValueHtml($staff_uniform)?></div>
+		</div>
+	</div>
+
+	<strong><?=htmlspecialchars($field_name_label_map["staff_uniform_description"])?>:</strong><br />
+	<?=TestPDF::getValueHtml($values["staff_uniform_description"] ?? "")?>
 
-?>
+</div>