Skip to content

Commit

Permalink
8.8
Browse files Browse the repository at this point in the history
  • Loading branch information
gruberroland committed Jun 5, 2024
1 parent aaf2780 commit 435bb75
Show file tree
Hide file tree
Showing 14 changed files with 11,803 additions and 10,563 deletions.
18 changes: 13 additions & 5 deletions lam/lib/3rdParty/tcpdf/CHANGELOG.TXT
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
6.6.5 (2023-09-06)
6.7.5 (2024-04-20)
- Update GitHub actions
- fix: CSV-2024-22640 (#712)

6.7.4 (2024-03-24)
- Upgrade tcpdf tag encryption algorithm.
- Fix regression issue #699.
- Fix security issue.
- [BREAKING CHANGE] The tcpdf HTML tag syntax has changed, see example_049.php.
- New K_ALLOWED_TCPDF_TAGS configuration constant to set the allowed methods for the tcdpf HTML tag.
- Raised minimum PHP version to PHP 5.5.0.

6.6.5 (2023-09-02)
- Fix corrupted file.

6.6.4 (2023-09-06)
- Fix GitHub automation tests.

6.6.3 (2023-09-06)
- Fix SPDX license ID (#591)
- Fix warning "array offset on value of type null" (#620)
- Improve the README about the status of this library (#589)
Expand Down
2 changes: 1 addition & 1 deletion lam/lib/3rdParty/tcpdf/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

* **category** Library
* **author** Nicola Asuni <[email protected]>
* **copyright** 2002-2023 Nicola Asuni - Tecnick.com LTD
* **copyright** 2002-2024 Nicola Asuni - Tecnick.com LTD
* **license** http://www.gnu.org/copyleft/lesser.html GNU-LGPL v3 (see LICENSE.TXT)
* **link** http://www.tcpdf.org
* **source** https://github.com/tecnickcom/TCPDF
Expand Down
2 changes: 1 addition & 1 deletion lam/lib/3rdParty/tcpdf/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.6.5
6.7.5
4 changes: 2 additions & 2 deletions lam/lib/3rdParty/tcpdf/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"barcodes"
],
"homepage": "http://www.tcpdf.org/",
"version": "6.6.5",
"version": "6.7.5",
"license": "LGPL-3.0-or-later",
"authors": [
{
Expand All @@ -22,7 +22,7 @@
}
],
"require": {
"php": ">=5.3.0"
"php": ">=5.5.0"
},
"autoload": {
"classmap": [
Expand Down
8 changes: 8 additions & 0 deletions lam/lib/3rdParty/tcpdf/config/tcpdf_config.php
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,14 @@
*/
define('K_TCPDF_CALLS_IN_HTML', false);

/**
* List of TCPDF methods that are allowed to be called using HTML syntax.
* Note: each method name must end with surrounded with | (pipe) character.
* The constant K_TCPDF_CALLS_IN_HTML must be set to true.
* IMPORTANT: For security reason, disable this feature if you are allowing user HTML content.
*/
define('K_ALLOWED_TCPDF_TAGS', '');

/**
* If true and PHP version is greater than 5, then the Error() method throw new exception instead of terminating the execution.
*/
Expand Down
2 changes: 1 addition & 1 deletion lam/lib/3rdParty/tcpdf/include/tcpdf_colors.php
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ public static function convertHTMLColorToDec($hcolor, &$spotc, $defcol=array('R'
$color = strtolower($color);
// check for javascript color array syntax
if (strpos($color, '[') !== false) {
if (preg_match('/[\[][\"\'](t|g|rgb|cmyk)[\"\'][\,]?([0-9\.]*)[\,]?([0-9\.]*)[\,]?([0-9\.]*)[\,]?([0-9\.]*)[\]]/', $color, $m) > 0) {
if (preg_match('/[\[][\"\'](t|g|rgb|cmyk)[\"\'][\,]?([0-9\.]*+)[\,]?([0-9\.]*+)[\,]?([0-9\.]*+)[\,]?([0-9\.]*+)[\]]/', $color, $m) > 0) {
$returncolor = array();
switch ($m[1]) {
case 'cmyk': {
Expand Down
2 changes: 1 addition & 1 deletion lam/lib/3rdParty/tcpdf/include/tcpdf_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class TCPDF_STATIC {
* Current TCPDF version.
* @private static
*/
private static $tcpdf_version = '6.6.5';
private static $tcpdf_version = '6.7.5';

/**
* String alias for total number of pages.
Expand Down
Loading

0 comments on commit 435bb75

Please sign in to comment.