Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32258 from frederic34/getMultiDirOutput

Browse Source 
enhance getMultiDirOutput
This commit is contained in:
Laurent Destailleur
2024-12-08 10:38:34 +01:00
committed by GitHub
parent 715366b9ff 44a3c76c7a
commit 2da5ff0d8a
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/lib/functions.lib.php
View File

@@ -163,12 +163,23 @@ function getMultidirOutput($object, $module = '', $forobject = 0, $mode = 'outpu
$s .= ($mode != 'outputrel' ? '/' : '').get_exdir(0, 0, 0, 0, $object); $s .= ($mode != 'outputrel' ? '/' : '').get_exdir(0, 0, 0, 0, $object);
} }
return $s; return $s;
} elseif (isset($conf->$module) && property_exists($conf->$module, 'dir_output')) {
$s = '';
if ($mode != 'outputrel') {
$s = $conf->$module->dir_output;
}
if ($forobject && $object->id > 0) {
$s .= ($mode != 'outputrel' ? '/' : '').get_exdir(0, 0, 0, 0, $object);
}
return $s;
} else { } else {
return 'error-diroutput-not-defined-for-this-object='.$module; return 'error-diroutput-not-defined-for-this-object='.$module;
} }
} elseif ($mode == 'temp') { } elseif ($mode == 'temp') {
if (isset($conf->$module) && property_exists($conf->$module, 'multidir_temp')) { if (isset($conf->$module) && property_exists($conf->$module, 'multidir_temp')) {
return $conf->$module->multidir_temp[(empty($object->entity) ? $conf->entity : $object->entity)]; return $conf->$module->multidir_temp[(empty($object->entity) ? $conf->entity : $object->entity)];
} elseif (isset($conf->$module) && property_exists($conf->$module, 'dir_temp')) {
return $conf->$module->dir_temp;
} else { } else {
return 'error-dirtemp-not-defined-for-this-object='.$module; return 'error-dirtemp-not-defined-for-this-object='.$module;
} }