vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix CI

Browse source
This commit is contained in:
Laurent Destailleur 2025-05-20 01:09:52 +02:00
parent 0f4bf91fcd
commit 7c2fa3e8a1
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
htdocs/core/lib/files.lib.php
View file

@ -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) {

2
htdocs/ecm/class/ecmfiles.class.php
View file

@ -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;

2
htdocs/install/mysql/tables/llx_ecm_files.sql
View file

@ -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,