From 49ec6aabd641875117cfd86a32717daadcd58686 Mon Sep 17 00:00:00 2001 From: Jellyfrog Date: Fri, 30 Apr 2021 05:43:47 +0200 Subject: [PATCH] Bump tecnickcom/tcpdf dependency to support php 8 (#12816) Also fix undefined variable error --- composer.json | 2 +- composer.lock | 23 ++++++++++++++------- includes/html/reports/alert-log.pdf.inc.php | 3 +++ 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 6f1794de3b..0256a799d6 100644 --- a/composer.json +++ b/composer.json @@ -56,7 +56,7 @@ "predis/predis": "^1.1", "rmccue/requests": "^1.7", "symfony/yaml": "^4.0", - "tecnickcom/tcpdf": "~6.2.0", + "tecnickcom/tcpdf": "^6.4", "tightenco/ziggy": "^0.9", "wpb/string-blade-compiler": "^6.0" }, diff --git a/composer.lock b/composer.lock index d5d64db8b0..fa0b549cf8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "85d20b0e5d6205452dac25d0d5db067b", + "content-hash": "dae39e5a41421453723b043a8a321e35", "packages": [ { "name": "amenadiel/jpgraph", @@ -6469,16 +6469,16 @@ }, { "name": "tecnickcom/tcpdf", - "version": "6.2.26", + "version": "6.4.1", "source": { "type": "git", "url": "https://github.com/tecnickcom/TCPDF.git", - "reference": "367241059ca166e3a76490f4448c284e0a161f15" + "reference": "5ba838befdb37ef06a16d9f716f35eb03cb1b329" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/367241059ca166e3a76490f4448c284e0a161f15", - "reference": "367241059ca166e3a76490f4448c284e0a161f15", + "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/5ba838befdb37ef06a16d9f716f35eb03cb1b329", + "reference": "5ba838befdb37ef06a16d9f716f35eb03cb1b329", "shasum": "" }, "require": { @@ -6507,7 +6507,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL-3.0" + "LGPL-3.0-only" ], "authors": [ { @@ -6528,9 +6528,16 @@ "qrcode" ], "support": { - "source": "https://github.com/tecnickcom/TCPDF/tree/master" + "issues": "https://github.com/tecnickcom/TCPDF/issues", + "source": "https://github.com/tecnickcom/TCPDF/tree/6.4.1" }, - "time": "2018-10-16T17:24:05+00:00" + "funding": [ + { + "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_donations¤cy_code=GBP&business=paypal@tecnick.com&item_name=donation%20for%20tcpdf%20project", + "type": "custom" + } + ], + "time": "2021-03-27T16:00:33+00:00" }, { "name": "tightenco/ziggy", diff --git a/includes/html/reports/alert-log.pdf.inc.php b/includes/html/reports/alert-log.pdf.inc.php index 4879eaa512..cf31ec0ae9 100644 --- a/includes/html/reports/alert-log.pdf.inc.php +++ b/includes/html/reports/alert-log.pdf.inc.php @@ -3,6 +3,9 @@ $pdf->AddPage('L'); $where = '1'; +$param = []; +$data = []; + if (is_numeric($_GET['device_id'])) { $where .= ' AND E.device_id = ?'; $param[] = $_GET['device_id'];