diff --git a/core/module/user/user.php b/core/module/user/user.php index 3ae6bc1b..28bf65d8 100644 --- a/core/module/user/user.php +++ b/core/module/user/user.php @@ -487,6 +487,7 @@ class user extends common 'rename' => $this->getInput('groupEditFolderRename', helper::FILTER_BOOLEAN), 'copycut' => $this->getInput('groupEditFolderCopycut', helper::FILTER_BOOLEAN), 'permission' => $this->getInput('groupEditFolderPermission', helper::FILTER_BOOLEAN), + 'path' => $this->getInput('groupEditPath'), ] ] ]); @@ -500,8 +501,9 @@ class user extends common self::$sharePath = $this->getSubdirectories('./site/file/source'); self::$sharePath = array_flip(self::$sharePath); + self::$sharePath = array_merge( ['./site/file/source/' => '/'], self::$sharePath); - // Valeurs en sortie + // Valeurs en sortie; $this->addOutput([ 'title' => helper::translate('Editer groupe'), 'view' => 'groupEdit' diff --git a/core/module/user/view/groupEdit/groupEdit.php b/core/module/user/view/groupEdit/groupEdit.php index 2ccd9b5a..94844076 100644 --- a/core/module/user/view/groupEdit/groupEdit.php +++ b/core/module/user/view/groupEdit/groupEdit.php @@ -116,9 +116,9 @@
- 'Racinde du dossier partagé', - 'selected' => $this->getData(['group', $this->getUrl(2), 'path']) + 'Racine du dossier partagé', + 'selected' => $this->getData(['group', $this->getUrl(2), 'folder', 'path']) ]); ?>
diff --git a/core/vendor/filemanager/config/config.php b/core/vendor/filemanager/config/config.php index e265131f..9c6b9206 100644 --- a/core/vendor/filemanager/config/config.php +++ b/core/vendor/filemanager/config/config.php @@ -24,9 +24,8 @@ $g = json_decode(file_get_contents('../../../site/data/group.json'), true); $group = $u['user'][$userId]['group']; $file = $g['group'][$group]['file']; $folder = $g['group'][$group]['folder']; - -$uploadDir = $g['group'][$group]['path']; -$currentPath = '../../..' . $uploadDir; +$uploadDir = $g['group'][$group]['folder']['path']; +$currentPath = '../../.' . $uploadDir; if (!is_dir($currentPath )) mkdir($currentPath );