Version Description
- Bug: Resolve blank PDF problem when a large HTML block is processed by mPDF
- Bug: Resolve QueryPath deprecation notice about passing null to trim()
- Housekeeping: Update mPDF and URL Signer library to latest version
Download this release
Release Info
Developer | Blue Liquid Designs |
Plugin | Gravity PDF |
Version | 6.4.7 |
Comparing to | |
See all releases |
Code changes from version 6.4.6 to 6.4.7
- README.txt +6 -1
- pdf.php +2 -2
- src/Helper/Helper_QueryPath.php +2 -2
- src/assets/languages/gravity-forms-pdf-extended.pot +1 -1
- vendor/composer/installed.json +18 -15
- vendor/composer/installed.php +12 -12
- vendor_prefixed/mpdf/mpdf/src/Form.php +6 -0
- vendor_prefixed/mpdf/mpdf/src/Mpdf.php +8 -3
- vendor_prefixed/mpdf/mpdf/src/Tag/Input.php +4 -1
- vendor_prefixed/mpdf/mpdf/src/Tag/TextArea.php +4 -1
- vendor_prefixed/spatie/url-signer/src/BaseUrlSigner.php +1 -1
README.txt
CHANGED
@@ -5,7 +5,7 @@ Donate link: https://gravitypdf.com/donate-to-plugin/
|
|
5 |
Tags: gravityforms, gravity, forms, pdf, automation, attachment, email
|
6 |
Requires at least: 5.3
|
7 |
Tested up to: 6.0
|
8 |
-
Stable tag: 6.4.
|
9 |
Requires PHP: 7.3
|
10 |
License: GPLv2 or later
|
11 |
License URI: http://www.gnu.org/licenses/gpl.txt
|
@@ -107,6 +107,11 @@ If you aren't able to meet the v6 minimum requirements [you can download v5 whic
|
|
107 |
|
108 |
== Changelog ==
|
109 |
|
|
|
|
|
|
|
|
|
|
|
110 |
= 6.4.6 =
|
111 |
* Bug: Adjust Nested Forms and Repeater field PDF markup to ensure a unique ID attribute for any HTML tags
|
112 |
* Bug: Prevent duplicate grid css classes being added to Nested Forms HTML tags
|
5 |
Tags: gravityforms, gravity, forms, pdf, automation, attachment, email
|
6 |
Requires at least: 5.3
|
7 |
Tested up to: 6.0
|
8 |
+
Stable tag: 6.4.7
|
9 |
Requires PHP: 7.3
|
10 |
License: GPLv2 or later
|
11 |
License URI: http://www.gnu.org/licenses/gpl.txt
|
107 |
|
108 |
== Changelog ==
|
109 |
|
110 |
+
= 6.4.7 =
|
111 |
+
* Bug: Resolve blank PDF problem when a large HTML block is processed by mPDF
|
112 |
+
* Bug: Resolve QueryPath deprecation notice about passing null to trim()
|
113 |
+
* Housekeeping: Update mPDF and URL Signer library to latest version
|
114 |
+
|
115 |
= 6.4.6 =
|
116 |
* Bug: Adjust Nested Forms and Repeater field PDF markup to ensure a unique ID attribute for any HTML tags
|
117 |
* Bug: Prevent duplicate grid css classes being added to Nested Forms HTML tags
|
pdf.php
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?php
|
2 |
/*
|
3 |
Plugin Name: Gravity PDF
|
4 |
-
Version: 6.4.
|
5 |
Description: Automatically generate highly-customisable PDF documents using Gravity Forms.
|
6 |
Author: Blue Liquid Designs
|
7 |
Author URI: https://blueliquiddesigns.com.au
|
@@ -28,7 +28,7 @@ if ( ! defined( 'ABSPATH' ) ) {
|
|
28 |
/*
|
29 |
* Set base constants we'll use throughout the plugin
|
30 |
*/
|
31 |
-
define( 'PDF_EXTENDED_VERSION', '6.4.
|
32 |
define( 'PDF_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); /* plugin directory path */
|
33 |
define( 'PDF_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); /* plugin directory url */
|
34 |
define( 'PDF_PLUGIN_BASENAME', plugin_basename( __FILE__ ) ); /* the plugin basename */
|
1 |
<?php
|
2 |
/*
|
3 |
Plugin Name: Gravity PDF
|
4 |
+
Version: 6.4.7
|
5 |
Description: Automatically generate highly-customisable PDF documents using Gravity Forms.
|
6 |
Author: Blue Liquid Designs
|
7 |
Author URI: https://blueliquiddesigns.com.au
|
28 |
/*
|
29 |
* Set base constants we'll use throughout the plugin
|
30 |
*/
|
31 |
+
define( 'PDF_EXTENDED_VERSION', '6.4.7' ); /* the current plugin version */
|
32 |
define( 'PDF_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); /* plugin directory path */
|
33 |
define( 'PDF_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); /* plugin directory url */
|
34 |
define( 'PDF_PLUGIN_BASENAME', plugin_basename( __FILE__ ) ); /* the plugin basename */
|
src/Helper/Helper_QueryPath.php
CHANGED
@@ -31,7 +31,7 @@ class Helper_QueryPath extends QueryPath {
|
|
31 |
*
|
32 |
* @param mixed $html A document as a HTML string.
|
33 |
*
|
34 |
-
* @param string
|
35 |
*
|
36 |
* @param array $options
|
37 |
* An associative array of options, which is passed on into HTML5-PHP. Note
|
@@ -43,7 +43,7 @@ class Helper_QueryPath extends QueryPath {
|
|
43 |
* @throws QueryPath\Exception
|
44 |
* @since 4.0.3
|
45 |
*/
|
46 |
-
public function html5( $html = '', $selector =
|
47 |
$html5 = new HTML5();
|
48 |
$source = $html5->loadHTML( $html );
|
49 |
|
31 |
*
|
32 |
* @param mixed $html A document as a HTML string.
|
33 |
*
|
34 |
+
* @param string $selector A CSS3 selector.
|
35 |
*
|
36 |
* @param array $options
|
37 |
* An associative array of options, which is passed on into HTML5-PHP. Note
|
43 |
* @throws QueryPath\Exception
|
44 |
* @since 4.0.3
|
45 |
*/
|
46 |
+
public function html5( $html = '', $selector = '', $options = [] ) {
|
47 |
$html5 = new HTML5();
|
48 |
$source = $html5->loadHTML( $html );
|
49 |
|
src/assets/languages/gravity-forms-pdf-extended.pot
CHANGED
@@ -6,7 +6,7 @@ msgstr ""
|
|
6 |
"MIME-Version: 1.0\n"
|
7 |
"Content-Type: text/plain; charset=UTF-8\n"
|
8 |
"Content-Transfer-Encoding: 8bit\n"
|
9 |
-
"POT-Creation-Date: 2022-09-
|
10 |
"X-Poedit-Basepath: ..\n"
|
11 |
"X-Poedit-KeywordsList: __;_e;_ex:1,2c;_n:1,2;_n_noop:1,2;_nx:1,2,4c;_nx_noop:1,2,3c;_x:1,2c;esc_attr__;esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c\n"
|
12 |
"X-Poedit-SearchPath-0: .\n"
|
6 |
"MIME-Version: 1.0\n"
|
7 |
"Content-Type: text/plain; charset=UTF-8\n"
|
8 |
"Content-Transfer-Encoding: 8bit\n"
|
9 |
+
"POT-Creation-Date: 2022-09-21 00:07+0000\n"
|
10 |
"X-Poedit-Basepath: ..\n"
|
11 |
"X-Poedit-KeywordsList: __;_e;_ex:1,2c;_n:1,2;_n_noop:1,2;_nx:1,2,4c;_nx_noop:1,2,3c;_x:1,2c;esc_attr__;esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c\n"
|
12 |
"X-Poedit-SearchPath-0: .\n"
|
vendor/composer/installed.json
CHANGED
@@ -561,17 +561,17 @@
|
|
561 |
},
|
562 |
{
|
563 |
"name": "mpdf/mpdf",
|
564 |
-
"version": "
|
565 |
-
"version_normalized": "
|
566 |
"source": {
|
567 |
"type": "git",
|
568 |
"url": "https://github.com/mpdf/mpdf.git",
|
569 |
-
"reference": "
|
570 |
},
|
571 |
"dist": {
|
572 |
"type": "zip",
|
573 |
-
"url": "https://api.github.com/repos/mpdf/mpdf/zipball/
|
574 |
-
"reference": "
|
575 |
"shasum": ""
|
576 |
},
|
577 |
"require": {
|
@@ -1068,17 +1068,17 @@
|
|
1068 |
},
|
1069 |
{
|
1070 |
"name": "spatie/url-signer",
|
1071 |
-
"version": "1.2.
|
1072 |
-
"version_normalized": "1.2.
|
1073 |
"source": {
|
1074 |
"type": "git",
|
1075 |
-
"url": "https://github.com/
|
1076 |
-
"reference": "
|
1077 |
},
|
1078 |
"dist": {
|
1079 |
"type": "zip",
|
1080 |
-
"url": "https://api.github.com/repos/
|
1081 |
-
"reference": "
|
1082 |
"shasum": ""
|
1083 |
},
|
1084 |
"require": {
|
@@ -1089,7 +1089,7 @@
|
|
1089 |
"require-dev": {
|
1090 |
"phpunit/phpunit": "^8.0|^9.0"
|
1091 |
},
|
1092 |
-
"time": "
|
1093 |
"type": "library",
|
1094 |
"extra": {
|
1095 |
"branch-alias": {
|
@@ -1102,7 +1102,11 @@
|
|
1102 |
"Spatie\\UrlSigner\\": "src"
|
1103 |
}
|
1104 |
},
|
1105 |
-
"
|
|
|
|
|
|
|
|
|
1106 |
"license": [
|
1107 |
"MIT"
|
1108 |
],
|
@@ -1124,8 +1128,7 @@
|
|
1124 |
"url"
|
1125 |
],
|
1126 |
"support": {
|
1127 |
-
"
|
1128 |
-
"source": "https://github.com/spatie/url-signer/tree/1.2.2"
|
1129 |
},
|
1130 |
"install-path": "../spatie/url-signer"
|
1131 |
}
|
561 |
},
|
562 |
{
|
563 |
"name": "mpdf/mpdf",
|
564 |
+
"version": "dev-master",
|
565 |
+
"version_normalized": "dev-master",
|
566 |
"source": {
|
567 |
"type": "git",
|
568 |
"url": "https://github.com/mpdf/mpdf.git",
|
569 |
+
"reference": "0db129a868557016614132e2adc67f9e4c048d5e"
|
570 |
},
|
571 |
"dist": {
|
572 |
"type": "zip",
|
573 |
+
"url": "https://api.github.com/repos/mpdf/mpdf/zipball/0db129a868557016614132e2adc67f9e4c048d5e",
|
574 |
+
"reference": "0db129a868557016614132e2adc67f9e4c048d5e",
|
575 |
"shasum": ""
|
576 |
},
|
577 |
"require": {
|
1068 |
},
|
1069 |
{
|
1070 |
"name": "spatie/url-signer",
|
1071 |
+
"version": "1.2.3",
|
1072 |
+
"version_normalized": "1.2.3.0",
|
1073 |
"source": {
|
1074 |
"type": "git",
|
1075 |
+
"url": "https://github.com/GravityPDF/url-signer.git",
|
1076 |
+
"reference": "618d2eeea5ae75b21af43e326e1c6824d2814550"
|
1077 |
},
|
1078 |
"dist": {
|
1079 |
"type": "zip",
|
1080 |
+
"url": "https://api.github.com/repos/GravityPDF/url-signer/zipball/618d2eeea5ae75b21af43e326e1c6824d2814550",
|
1081 |
+
"reference": "618d2eeea5ae75b21af43e326e1c6824d2814550",
|
1082 |
"shasum": ""
|
1083 |
},
|
1084 |
"require": {
|
1089 |
"require-dev": {
|
1090 |
"phpunit/phpunit": "^8.0|^9.0"
|
1091 |
},
|
1092 |
+
"time": "2022-09-20T22:35:42+00:00",
|
1093 |
"type": "library",
|
1094 |
"extra": {
|
1095 |
"branch-alias": {
|
1102 |
"Spatie\\UrlSigner\\": "src"
|
1103 |
}
|
1104 |
},
|
1105 |
+
"scripts": {
|
1106 |
+
"test": [
|
1107 |
+
"phpunit"
|
1108 |
+
]
|
1109 |
+
},
|
1110 |
"license": [
|
1111 |
"MIT"
|
1112 |
],
|
1128 |
"url"
|
1129 |
],
|
1130 |
"support": {
|
1131 |
+
"source": "https://github.com/GravityPDF/url-signer/tree/1.2.3"
|
|
|
1132 |
},
|
1133 |
"install-path": "../spatie/url-signer"
|
1134 |
}
|
vendor/composer/installed.php
CHANGED
@@ -1,9 +1,9 @@
|
|
1 |
<?php return array(
|
2 |
'root' => array(
|
3 |
'name' => 'gravitypdf/gravitypdf',
|
4 |
-
'pretty_version' => '6.4.
|
5 |
-
'version' => '6.4.
|
6 |
-
'reference' => '
|
7 |
'type' => 'library',
|
8 |
'install_path' => __DIR__ . '/../../',
|
9 |
'aliases' => array(),
|
@@ -20,9 +20,9 @@
|
|
20 |
'dev_requirement' => false,
|
21 |
),
|
22 |
'gravitypdf/gravitypdf' => array(
|
23 |
-
'pretty_version' => '6.4.
|
24 |
-
'version' => '6.4.
|
25 |
-
'reference' => '
|
26 |
'type' => 'library',
|
27 |
'install_path' => __DIR__ . '/../../',
|
28 |
'aliases' => array(),
|
@@ -83,9 +83,9 @@
|
|
83 |
'dev_requirement' => false,
|
84 |
),
|
85 |
'mpdf/mpdf' => array(
|
86 |
-
'pretty_version' => '
|
87 |
-
'version' => '
|
88 |
-
'reference' => '
|
89 |
'type' => 'library',
|
90 |
'install_path' => __DIR__ . '/../mpdf/mpdf',
|
91 |
'aliases' => array(),
|
@@ -161,9 +161,9 @@
|
|
161 |
'dev_requirement' => false,
|
162 |
),
|
163 |
'spatie/url-signer' => array(
|
164 |
-
'pretty_version' => '1.2.
|
165 |
-
'version' => '1.2.
|
166 |
-
'reference' => '
|
167 |
'type' => 'library',
|
168 |
'install_path' => __DIR__ . '/../spatie/url-signer',
|
169 |
'aliases' => array(),
|
1 |
<?php return array(
|
2 |
'root' => array(
|
3 |
'name' => 'gravitypdf/gravitypdf',
|
4 |
+
'pretty_version' => '6.4.7',
|
5 |
+
'version' => '6.4.7.0',
|
6 |
+
'reference' => 'a24444c11e693e63e695fb5b238962b506756908',
|
7 |
'type' => 'library',
|
8 |
'install_path' => __DIR__ . '/../../',
|
9 |
'aliases' => array(),
|
20 |
'dev_requirement' => false,
|
21 |
),
|
22 |
'gravitypdf/gravitypdf' => array(
|
23 |
+
'pretty_version' => '6.4.7',
|
24 |
+
'version' => '6.4.7.0',
|
25 |
+
'reference' => 'a24444c11e693e63e695fb5b238962b506756908',
|
26 |
'type' => 'library',
|
27 |
'install_path' => __DIR__ . '/../../',
|
28 |
'aliases' => array(),
|
83 |
'dev_requirement' => false,
|
84 |
),
|
85 |
'mpdf/mpdf' => array(
|
86 |
+
'pretty_version' => 'dev-master',
|
87 |
+
'version' => 'dev-master',
|
88 |
+
'reference' => '0db129a868557016614132e2adc67f9e4c048d5e',
|
89 |
'type' => 'library',
|
90 |
'install_path' => __DIR__ . '/../mpdf/mpdf',
|
91 |
'aliases' => array(),
|
161 |
'dev_requirement' => false,
|
162 |
),
|
163 |
'spatie/url-signer' => array(
|
164 |
+
'pretty_version' => '1.2.3',
|
165 |
+
'version' => '1.2.3.0',
|
166 |
+
'reference' => '618d2eeea5ae75b21af43e326e1c6824d2814550',
|
167 |
'type' => 'library',
|
168 |
'install_path' => __DIR__ . '/../spatie/url-signer',
|
169 |
'aliases' => array(),
|
vendor_prefixed/mpdf/mpdf/src/Form.php
CHANGED
@@ -196,6 +196,9 @@ class Form
|
|
196 |
if (!empty($objattr['onKeystroke'])) {
|
197 |
$js[] = ['K', $objattr['onKeystroke']];
|
198 |
}
|
|
|
|
|
|
|
199 |
$this->SetFormText($w, $h, $objattr['fieldname'], $val, $val, $objattr['title'], $flags, $fieldalign, \false, isset($objattr['maxlength']) ? $objattr['maxlength'] : \false, $js, isset($objattr['background-col']) ? $objattr['background-col'] : \false, isset($objattr['border-col']) ? $objattr['border-col'] : \false);
|
200 |
} else {
|
201 |
$w -= $this->form_element_spacing['input']['outer']['h'] * 2 / $k;
|
@@ -281,6 +284,9 @@ class Form
|
|
281 |
if (!empty($objattr['onKeystroke'])) {
|
282 |
$js[] = ['K', $objattr['onKeystroke']];
|
283 |
}
|
|
|
|
|
|
|
284 |
$this->SetFormText($w, $h, $objattr['fieldname'], $texto, $texto, isset($objattr['title']) ? $objattr['title'] : '', $flags, $fieldalign, \false, -1, $js, isset($objattr['background-col']) ? $objattr['background-col'] : \false, isset($objattr['border-col']) ? $objattr['border-col'] : \false);
|
285 |
$this->mpdf->SetTColor($this->colorConverter->convert(0, $this->mpdf->PDFAXwarnings));
|
286 |
} else {
|
196 |
if (!empty($objattr['onKeystroke'])) {
|
197 |
$js[] = ['K', $objattr['onKeystroke']];
|
198 |
}
|
199 |
+
if (!empty($objattr['use_auto_fontsize']) && $objattr['use_auto_fontsize'] === \true) {
|
200 |
+
$this->mpdf->FontSizePt = 0.0;
|
201 |
+
}
|
202 |
$this->SetFormText($w, $h, $objattr['fieldname'], $val, $val, $objattr['title'], $flags, $fieldalign, \false, isset($objattr['maxlength']) ? $objattr['maxlength'] : \false, $js, isset($objattr['background-col']) ? $objattr['background-col'] : \false, isset($objattr['border-col']) ? $objattr['border-col'] : \false);
|
203 |
} else {
|
204 |
$w -= $this->form_element_spacing['input']['outer']['h'] * 2 / $k;
|
284 |
if (!empty($objattr['onKeystroke'])) {
|
285 |
$js[] = ['K', $objattr['onKeystroke']];
|
286 |
}
|
287 |
+
if (!empty($objattr['use_auto_fontsize']) && $objattr['use_auto_fontsize'] === \true) {
|
288 |
+
$this->mpdf->FontSizePt = 0.0;
|
289 |
+
}
|
290 |
$this->SetFormText($w, $h, $objattr['fieldname'], $texto, $texto, isset($objattr['title']) ? $objattr['title'] : '', $flags, $fieldalign, \false, -1, $js, isset($objattr['background-col']) ? $objattr['background-col'] : \false, isset($objattr['border-col']) ? $objattr['border-col'] : \false);
|
291 |
$this->mpdf->SetTColor($this->colorConverter->convert(0, $this->mpdf->PDFAXwarnings));
|
292 |
} else {
|
vendor_prefixed/mpdf/mpdf/src/Mpdf.php
CHANGED
@@ -28,7 +28,7 @@ class Mpdf implements \Psr\Log\LoggerAwareInterface
|
|
28 |
{
|
29 |
use Strict;
|
30 |
use FpdiTrait;
|
31 |
-
const VERSION = '8.1.
|
32 |
const SCALE = 72 / 25.4;
|
33 |
var $useFixedNormalLineHeight;
|
34 |
// mPDF 6
|
@@ -24573,8 +24573,13 @@ class Mpdf implements \Psr\Log\LoggerAwareInterface
|
|
24573 |
$html = \preg_replace('/<textarea([^>]*)><\\/textarea>/si', '<textarea\\1> </textarea>', $html);
|
24574 |
$html = \preg_replace('/(<table[^>]*>)\\s*(<caption)(.*?<\\/caption>)(.*?<\\/table>)/si', '\\2 position="top"\\3\\1\\4\\2 position="bottom"\\3', $html);
|
24575 |
// *TABLES*
|
24576 |
-
|
24577 |
-
|
|
|
|
|
|
|
|
|
|
|
24578 |
$html = \preg_replace("/���/", "\n", $html);
|
24579 |
// Fixes <p>₹</p> which browser copes with even though it is wrong!
|
24580 |
$html = \preg_replace("/(&#[x]{0,1}[0-9a-f]{1,5})</i", "\\1;<", $html);
|
28 |
{
|
29 |
use Strict;
|
30 |
use FpdiTrait;
|
31 |
+
const VERSION = '8.1.3';
|
32 |
const SCALE = 72 / 25.4;
|
33 |
var $useFixedNormalLineHeight;
|
34 |
// mPDF 6
|
24573 |
$html = \preg_replace('/<textarea([^>]*)><\\/textarea>/si', '<textarea\\1> </textarea>', $html);
|
24574 |
$html = \preg_replace('/(<table[^>]*>)\\s*(<caption)(.*?<\\/caption>)(.*?<\\/table>)/si', '\\2 position="top"\\3\\1\\4\\2 position="bottom"\\3', $html);
|
24575 |
// *TABLES*
|
24576 |
+
if ($this->use_kwt) {
|
24577 |
+
$returnHtml = \preg_replace('/<(h[1-6])([^>]*(?<!\\/))(>[^>]*<\\/\\1>\\s*<table)/si', '<\\1\\2 keep-with-table="1"\\3', $html);
|
24578 |
+
/* If no errors then save the return value */
|
24579 |
+
if (\preg_last_error() === \PREG_NO_ERROR) {
|
24580 |
+
$html = $returnHtml;
|
24581 |
+
}
|
24582 |
+
}
|
24583 |
$html = \preg_replace("/���/", "\n", $html);
|
24584 |
// Fixes <p>₹</p> which browser copes with even though it is wrong!
|
24585 |
$html = \preg_replace("/(&#[x]{0,1}[0-9a-f]{1,5})</i", "\\1;<", $html);
|
vendor_prefixed/mpdf/mpdf/src/Tag/Input.php
CHANGED
@@ -66,7 +66,7 @@ class Input extends \GFPDF_Vendor\Mpdf\Tag\Tag
|
|
66 |
if (isset($properties['FONT-FAMILY'])) {
|
67 |
$this->mpdf->SetFont($properties['FONT-FAMILY'], $this->mpdf->FontStyle, 0, \false);
|
68 |
}
|
69 |
-
if (isset($properties['FONT-SIZE'])) {
|
70 |
$mmsize = $this->sizeConverter->convert($properties['FONT-SIZE'], $this->mpdf->default_font_size / \GFPDF_Vendor\Mpdf\Mpdf::SCALE);
|
71 |
$this->mpdf->SetFontSize($mmsize * \GFPDF_Vendor\Mpdf\Mpdf::SCALE, \false);
|
72 |
}
|
@@ -318,6 +318,9 @@ class Input extends \GFPDF_Vendor\Mpdf\Tag\Tag
|
|
318 |
if (\strtoupper($attr['TYPE']) === 'PASSWORD') {
|
319 |
$type = 'PASSWORD';
|
320 |
}
|
|
|
|
|
|
|
321 |
if (isset($attr['VALUE'])) {
|
322 |
if ($type === 'PASSWORD') {
|
323 |
$num_stars = \mb_strlen($attr['VALUE'], $this->mpdf->mb_enc);
|
66 |
if (isset($properties['FONT-FAMILY'])) {
|
67 |
$this->mpdf->SetFont($properties['FONT-FAMILY'], $this->mpdf->FontStyle, 0, \false);
|
68 |
}
|
69 |
+
if (isset($properties['FONT-SIZE']) && $properties['FONT-SIZE'] !== 'auto') {
|
70 |
$mmsize = $this->sizeConverter->convert($properties['FONT-SIZE'], $this->mpdf->default_font_size / \GFPDF_Vendor\Mpdf\Mpdf::SCALE);
|
71 |
$this->mpdf->SetFontSize($mmsize * \GFPDF_Vendor\Mpdf\Mpdf::SCALE, \false);
|
72 |
}
|
318 |
if (\strtoupper($attr['TYPE']) === 'PASSWORD') {
|
319 |
$type = 'PASSWORD';
|
320 |
}
|
321 |
+
if ($properties['FONT-SIZE'] === 'auto' && $this->mpdf->useActiveForms) {
|
322 |
+
$objattr['use_auto_fontsize'] = \true;
|
323 |
+
}
|
324 |
if (isset($attr['VALUE'])) {
|
325 |
if ($type === 'PASSWORD') {
|
326 |
$num_stars = \mb_strlen($attr['VALUE'], $this->mpdf->mb_enc);
|
vendor_prefixed/mpdf/mpdf/src/Tag/TextArea.php
CHANGED
@@ -62,7 +62,7 @@ class TextArea extends \GFPDF_Vendor\Mpdf\Tag\Tag
|
|
62 |
if (isset($properties['FONT-FAMILY'])) {
|
63 |
$this->mpdf->SetFont($properties['FONT-FAMILY'], '', 0, \false);
|
64 |
}
|
65 |
-
if (isset($properties['FONT-SIZE'])) {
|
66 |
$mmsize = $this->sizeConverter->convert($properties['FONT-SIZE'], $this->mpdf->default_font_size / \GFPDF_Vendor\Mpdf\Mpdf::SCALE);
|
67 |
$this->mpdf->SetFontSize($mmsize * \GFPDF_Vendor\Mpdf\Mpdf::SCALE, \false);
|
68 |
}
|
@@ -121,6 +121,9 @@ class TextArea extends \GFPDF_Vendor\Mpdf\Tag\Tag
|
|
121 |
$objattr['height'] = $rowsize * $this->mpdf->lineheight + $this->form->form_element_spacing['textarea']['outer']['v'] * 2 + $this->form->form_element_spacing['textarea']['inner']['v'] * 2;
|
122 |
$objattr['rows'] = $rowsize;
|
123 |
$objattr['cols'] = $colsize;
|
|
|
|
|
|
|
124 |
$this->mpdf->specialcontent = \serialize($objattr);
|
125 |
if ($this->mpdf->tableLevel) {
|
126 |
// *TABLES*
|
62 |
if (isset($properties['FONT-FAMILY'])) {
|
63 |
$this->mpdf->SetFont($properties['FONT-FAMILY'], '', 0, \false);
|
64 |
}
|
65 |
+
if (isset($properties['FONT-SIZE']) && $properties['FONT-SIZE'] !== 'auto') {
|
66 |
$mmsize = $this->sizeConverter->convert($properties['FONT-SIZE'], $this->mpdf->default_font_size / \GFPDF_Vendor\Mpdf\Mpdf::SCALE);
|
67 |
$this->mpdf->SetFontSize($mmsize * \GFPDF_Vendor\Mpdf\Mpdf::SCALE, \false);
|
68 |
}
|
121 |
$objattr['height'] = $rowsize * $this->mpdf->lineheight + $this->form->form_element_spacing['textarea']['outer']['v'] * 2 + $this->form->form_element_spacing['textarea']['inner']['v'] * 2;
|
122 |
$objattr['rows'] = $rowsize;
|
123 |
$objattr['cols'] = $colsize;
|
124 |
+
if ($properties['FONT-SIZE'] === 'auto' && $this->mpdf->useActiveForms) {
|
125 |
+
$objattr['use_auto_fontsize'] = \true;
|
126 |
+
}
|
127 |
$this->mpdf->specialcontent = \serialize($objattr);
|
128 |
if ($this->mpdf->tableLevel) {
|
129 |
// *TABLES*
|
vendor_prefixed/spatie/url-signer/src/BaseUrlSigner.php
CHANGED
@@ -149,7 +149,7 @@ abstract class BaseUrlSigner implements \GFPDF_Vendor\Spatie\UrlSigner\UrlSigner
|
|
149 |
$intendedQuery = \GFPDF_Vendor\League\Uri\QueryString::extract($url->getQuery());
|
150 |
unset($intendedQuery[$this->expiresParameter]);
|
151 |
unset($intendedQuery[$this->signatureParameter]);
|
152 |
-
return $url->withQuery($this->buildQueryStringFromArray($intendedQuery));
|
153 |
}
|
154 |
/**
|
155 |
* Retrieve the expiration timestamp for a link based on an absolute DateTime or a relative number of days.
|
149 |
$intendedQuery = \GFPDF_Vendor\League\Uri\QueryString::extract($url->getQuery());
|
150 |
unset($intendedQuery[$this->expiresParameter]);
|
151 |
unset($intendedQuery[$this->signatureParameter]);
|
152 |
+
return $url->withQuery($this->buildQueryStringFromArray($intendedQuery) ?? '');
|
153 |
}
|
154 |
/**
|
155 |
* Retrieve the expiration timestamp for a link based on an absolute DateTime or a relative number of days.
|