Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2024-09-01 14:48:49 +02:00
parent 8d786cb73a 56e2c8bf36
commit d3aff00caf
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/viewimage.php
View File

@@ -3,6 +3,7 @@
* Copyright (C) 2005-2016 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2016 Regis Houssin <regis.houssin@inodbox.com> * Copyright (C) 2005-2016 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr> * Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -339,7 +340,7 @@ if ($modulepart == 'barcode') {
// If $code is virtualcard_xxx_999.vcf, it is a file to read to get code // If $code is virtualcard_xxx_999.vcf, it is a file to read to get code
$reg = array(); $reg = array();
if (preg_match('/virtualcard_([^_]+)_(\d+)\.vcf/', $code, $reg)) { if (preg_match('/^virtualcard_([^_]+)_(\d+)\.vcf$/', $code, $reg)) {
$vcffile = ''; $vcffile = '';
if ($reg[1] == 'user') { if ($reg[1] == 'user') {
$vcffile = $conf->user->dir_temp.'/'.$code; $vcffile = $conf->user->dir_temp.'/'.$code;