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

Merge branch '13.0' of https://github.com/AlexisLaurier/dolibarr into 13.0

Browse Source
This commit is contained in:
Alexis LAURIER 2021-02-10 13:19:47 +01:00
commit 05b1171e90
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/contrat/card.php
View File

@ -883,8 +883,8 @@ if (empty($reshook))
$action = 'editref'; $action = 'editref';
} else { } else {
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$old_filedir = $conf->contrat->dir_output.'/'.dol_sanitizeFileName($old_ref); $old_filedir = $conf->contrat->multidir_output[$object->entity].'/'.dol_sanitizeFileName($old_ref);
$new_filedir = $conf->contrat->dir_output.'/'.dol_sanitizeFileName($object->ref); $new_filedir = $conf->contrat->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
$files = dol_dir_list($old_filedir); $files = dol_dir_list($old_filedir);
if (!empty($files)) if (!empty($files))
@ -929,7 +929,7 @@ if (empty($reshook))
// Actions to build doc // Actions to build doc
$upload_dir = $conf->contrat->dir_output; $upload_dir = $conf->contrat->multidir_output[$object->entity];
$permissiontoadd = $user->rights->contrat->creer; $permissiontoadd = $user->rights->contrat->creer;
include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
@ -2131,13 +2131,13 @@ if ($action == 'create')
* Documents generes * Documents generes
*/ */
$filename = dol_sanitizeFileName($object->ref); $filename = dol_sanitizeFileName($object->ref);
$filedir = $conf->contrat->dir_output."/".dol_sanitizeFileName($object->ref); $filedir = $conf->contrat->multidir_output[$object->entity]."/".dol_sanitizeFileName($object->ref);
$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id; $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
$genallowed = $user->rights->contrat->lire; $genallowed = $user->rights->contrat->lire;
$delallowed = $user->rights->contrat->creer; $delallowed = $user->rights->contrat->creer;
print $formfile->showdocuments('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang); print $formfile->showdocuments('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang, '', $object);
// Show links to link elements // Show links to link elements
@ -2162,7 +2162,7 @@ if ($action == 'create')
// Presend form // Presend form
$modelmail = 'contract'; $modelmail = 'contract';
$defaulttopic = 'SendContractRef'; $defaulttopic = 'SendContractRef';
$diroutput = $conf->contrat->dir_output; $diroutput = $conf->contrat->multidir_output[$object->entity];
$trackid = 'con'.$object->id; $trackid = 'con'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';

2
htdocs/contrat/document.php
View File

@ -74,7 +74,7 @@ if ($object->id > 0)
$object->fetch_thirdparty(); $object->fetch_thirdparty();
} }
$upload_dir = $conf->contrat->dir_output.'/'.dol_sanitizeFileName($object->ref); $upload_dir = $conf->contrat->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
$modulepart = 'contract'; $modulepart = 'contract';
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context

4
htdocs/core/lib/files.lib.php
View File

@ -2709,13 +2709,13 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
} }
if (!empty($conf->stock->enabled)) $original_file = $conf->stock->multidir_output[$entity].'/movement/'.$original_file; if (!empty($conf->stock->enabled)) $original_file = $conf->stock->multidir_output[$entity].'/movement/'.$original_file;
} // Wrapping pour les contrats } // Wrapping pour les contrats
elseif ($modulepart == 'contract' && !empty($conf->contrat->dir_output)) elseif ($modulepart == 'contract' && !empty($conf->contrat->multidir_output[$entity]))
{ {
if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file)) if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file))
{ {
$accessallowed = 1; $accessallowed = 1;
} }
$original_file = $conf->contrat->dir_output.'/'.$original_file; $original_file = $conf->contrat->multidir_output[$entity].'/'.$original_file;
$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract').")"; $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract').")";
} // Wrapping pour les dons } // Wrapping pour les dons
elseif ($modulepart == 'donation' && !empty($conf->don->dir_output)) elseif ($modulepart == 'donation' && !empty($conf->don->dir_output))