lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15286 from frederic34/patch-15

Browse Source 
The function each() has been deprecated: 7.2
This commit is contained in:
Laurent Destailleur 2020-11-04 18:36:49 +01:00 committed by GitHub
commit 32ed5cc07f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/core/lib/barcode.lib.php
View File

@ -373,11 +373,8 @@ function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0,
} }
$chars = explode(" ", $text); $chars = explode(" ", $text);
reset($chars); foreach ($chars as $v) {
while (list($n, $v) = each($chars)) if (trim($v)) {
{
if (trim($v))
{
$inf = explode(":", $v); $inf = explode(":", $v);
$fontsize = $scale * ($inf[1] / 1.8); $fontsize = $scale * ($inf[1] / 1.8);
$fontheight = $total_y - ($fontsize / 2.7) + 2; $fontheight = $total_y - ($fontsize / 2.7) + 2;
@ -387,16 +384,14 @@ function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0,
/* output the image */ /* output the image */
$mode = strtolower($mode); $mode = strtolower($mode);
if ($mode == 'jpg' || $mode == 'jpeg') if ($mode == 'jpg' || $mode == 'jpeg') {
{
header("Content-Type: image/jpeg; name=\"barcode.jpg\""); header("Content-Type: image/jpeg; name=\"barcode.jpg\"");
imagejpeg($im); imagejpeg($im);
} elseif ($mode == 'gif') } elseif ($mode == 'gif') {
{
header("Content-Type: image/gif; name=\"barcode.gif\""); header("Content-Type: image/gif; name=\"barcode.gif\"");
imagegif($im); imagegif($im);
} elseif (!empty($filebarcode)) // To wxrite into afile onto disk } elseif (!empty($filebarcode)) {
{ // To wxrite into afile onto disk
imagepng($im, $filebarcode); imagepng($im, $filebarcode);
} else { } else {
header("Content-Type: image/png; name=\"barcode.png\""); header("Content-Type: image/png; name=\"barcode.png\"");