diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt index e8af4cd420d..32c47fc9b17 100644 --- a/dev/dolibarr_changes.txt +++ b/dev/dolibarr_changes.txt @@ -66,14 +66,12 @@ NUSOAP: TCPDF: ------ * Replace in tcpdf.php: - if (isset($this->imagekeys)) { foreach($this->imagekeys as $file) { unlink($file); } } with - if (isset($this->imagekeys)) { foreach($this->imagekeys as $file) { // DOL CHANGE If we keep this, source image files are physically destroyed @@ -81,8 +79,7 @@ with } } -* Replace in tcpdf.php - +* Replace in tcpdf.php: $preserve = array( 'file_id', 'internal_encoding', @@ -90,9 +87,7 @@ with 'bufferlen', 'buffer', 'cached_files', - with - $preserve = array( 'file_id', 'internal_encoding', @@ -103,14 +98,11 @@ with // @CHANGE DOL 'imagekeys', -* Replace in tcpdf.php - +* Replace in tcpdf.php: if (!@TCPDF_STATIC::file_exists($file)) { return false; } - with - if (!@TCPDF_STATIC::file_exists($file)) { // DOL CHANGE If we keep this, the image is not visible on pages after the first one. //var_dump($file.' '.(!@TCPDF_STATIC::file_exists($file))); @@ -121,12 +113,9 @@ with } } -* Replace in tcpdf.php - +* Replace in tcpdf.php: if (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) { - with - // @CHANGE LDR Add support for src="file://..." links if (strpos($imgsrc, 'file://') === 0) { $imgsrc = str_replace('file://', '/', $imgsrc); @@ -143,12 +132,9 @@ with elseif (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) { -* In tecnickcom/tcpdf/include/tcpdf_static.php, in function fopenLocal, replace - +* In tecnickcom/tcpdf/include/tcpdf_static.php, in function fopenLocal, replace: if (strpos($filename, '://') === false) { - with - if (strpos($filename, '//') === 0) { // Share folder on a (windows) server // e.g.: "//[MyServerName]/[MySharedFolder]/" @@ -157,11 +143,16 @@ with } elseif (strpos($filename, '://') === false) -* To avoid to have QRcode changed because generated with a random mask, replace -define('QR_FIND_FROM_RANDOM', 2); +* To avoid to have QRcode changed because generated with a random mask, replace: + define('QR_FIND_FROM_RANDOM', 2); with -define('QR_FIND_FROM_RANDOM', false); + define('QR_FIND_FROM_RANDOM', false); +* Change line: + imagesetpixel($imgalpha, $xpx, $ypx, $alpha); +into + imagesetpixel($imgalpha, $xpx, $ypx, (int) $alpha); + * Removed useless directories ("examples", "tools") * Optionnaly, removed all fonts except