admin/Studio-42-elFinder
1
0
Fork 0
mirror of https://github.com/Studio-42/elFinder synced 2026-06-08 12:37:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

src build elFinder-2.1-0708b81

Browse Source
This commit is contained in:
nao-pon
2017-03-14 22:02:58 +09:00
parent 008867d930
commit 2c989061d4
8 changed files with 125 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeBox.class.php
+17 -7
View File
@@ -628,12 +628,16 @@ class elFinderVolumeBox extends elFinderVolumeDriver
}
if (empty($this->token)) {
$result = null;
$result = false;
} else {
$result = $this->_bd_query('0', $fetch_self = false, $recursive = false);
$path = $options['path'];
if ($path === '/' || $path === 'root') {
$path = '0';
}
$result = $this->_bd_query($path, $fetch_self = false, $recursive = false);
}
if (!$result) {
if ($result === false) {
$cdata = '';
$innerKeys = array('cmd', 'host', 'options', 'pass', 'protocol', 'user');
$this->ARGS = $_SERVER['REQUEST_METHOD'] === 'POST' ? $_POST : $_GET;
@@ -667,13 +671,19 @@ class elFinderVolumeBox extends elFinderVolumeDriver
} else {
$folders = [];
foreach ($result as $res) {
if ($res->type == 'folder') {
$folders[$res->id.' '] = $res->name;
if ($result) {
foreach ($result as $res) {
if ($res->type == 'folder') {
$folders[$res->id.' '] = $res->name;
}
}
natcasesort($folders);
}
if ($options['pass'] === 'folders') {
return ['exit' => true, 'folders' => $folders];
}
natcasesort($folders);
$folders = ['root' => 'My Box'] + $folders;
$folders = json_encode($folders);