Merge branch '13306' into authKey

This commit is contained in:
Fred Tempez 2024-09-06 18:36:47 +02:00
commit 61369e7ad1
2 changed files with 2 additions and 2 deletions

View File

@ -152,7 +152,7 @@
<?php echo template::select('profilEditPath', $module::$sharePath, [ <?php echo template::select('profilEditPath', $module::$sharePath, [
'label' => 'Dossier', 'label' => 'Dossier',
'class' => 'filemanager', 'class' => 'filemanager',
'selected' => '.' . $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'folder', 'path']) 'selected' => $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'folder', 'path'])
]); ?> ]); ?>
</div> </div>
</div> </div>

View File

@ -54,7 +54,7 @@ if (!is_null($u) && !is_null($g) && !is_null($userId)) {
if ($g['profil'][$group][$profil]['filemanager'] === false) if ($g['profil'][$group][$profil]['filemanager'] === false)
exit('Accès interdit'); exit('Accès interdit');
// lecture du profil // lecture du profil
if (!is_null($profil)) { if (!is_null($profil) and $g['profil'][$group][$profil]['folder']['path'] !== '') {
$file = $g['profil'][$group][$profil]['file']; $file = $g['profil'][$group][$profil]['file'];
$folder = $g['profil'][$group][$profil]['folder']; $folder = $g['profil'][$group][$profil]['folder'];
$uploadDir = $g['profil'][$group][$profil]['folder']['path']; $uploadDir = $g['profil'][$group][$profil]['folder']['path'];