From 7c2fa3e8a1d5a3ef3b2406cd1e4fafcae844af00 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 20 May 2025 01:09:52 +0200 Subject: [PATCH] Fix CI --- htdocs/core/lib/files.lib.php | 6 +++--- htdocs/ecm/class/ecmfiles.class.php | 2 +- htdocs/install/mysql/tables/llx_ecm_files.sql | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 41540a1eb62..88e2eb965ca 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -765,7 +765,7 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile = '', $newmask dolChmod($newpathoftmpdestfile, $newmask); // Rename - $moreinfo = array('gen_or_uploaded' => 'dolReplaceInFile'); + $moreinfo = array('gen_or_uploaded' => 'unknown'); $result = dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile) ? 1 : 0), 0, $indexdatabase, $moreinfo); if (!$result) { dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING); @@ -1146,7 +1146,7 @@ function dol_move($srcfile, $destfile, $newmask = '0', $overwriteifexists = 1, $ if (!empty($moreinfo) && !empty($moreinfo['gen_or_uploaded'])) { $ecmfile->gen_or_uploaded = $moreinfo['gen_or_uploaded']; } else { - $ecmfile->gen_or_uploaded = 'undefined'; // or 'generated', 'uploaded' + $ecmfile->gen_or_uploaded = 'unknown'; // 'generated', 'uploaded', 'api' } if (!empty($moreinfo) && !empty($moreinfo['description'])) { $ecmfile->description = $moreinfo['description']; // indexed content @@ -1273,7 +1273,7 @@ function dol_move_dir($srcdir, $destdir, $overwriteifexists = 1, $indexdatabase if ($file["type"] == "dir") { $res = dol_move_dir($filepath.'/'.$oldname, $filepath.'/'.$newname, $overwriteifexists, $indexdatabase, $renamedircontent); } else { - $moreinfo = array('gen_or_uploaded' => 'dol_move_dir'); + $moreinfo = array('gen_or_uploaded' => 'unknown'); $res = dol_move($filepath.'/'.$oldname, $filepath.'/'.$newname, '0', $overwriteifexists, 0, $indexdatabase, $moreinfo); } if (!$res) { diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php index ca50768a5af..84f90cfedee 100644 --- a/htdocs/ecm/class/ecmfiles.class.php +++ b/htdocs/ecm/class/ecmfiles.class.php @@ -113,7 +113,7 @@ class EcmFiles extends CommonObject public $position; /** - * @var 'generated'|'uploaded'|'unknown'|'copy'|'' + * @var 'generated'|'uploaded'|'unknown'|'api'|'copy'|'' */ public $gen_or_uploaded; diff --git a/htdocs/install/mysql/tables/llx_ecm_files.sql b/htdocs/install/mysql/tables/llx_ecm_files.sql index f99b6d06fb1..f81a7b60dca 100644 --- a/htdocs/install/mysql/tables/llx_ecm_files.sql +++ b/htdocs/install/mysql/tables/llx_ecm_files.sql @@ -35,7 +35,7 @@ CREATE TABLE llx_ecm_files content text, cover varchar(32), -- is this file a file to use for a cover position integer, -- position of file among others - gen_or_uploaded varchar(12), -- 'generated' or 'uploaded' + gen_or_uploaded varchar(12), -- 'generated' 'uploaded' 'api' 'unknown' extraparams varchar(255), -- for stocking other parameters with json format date_c datetime, tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,