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

fix #1099 support view of symlink dirctory

Browse Source
This commit is contained in:
nao-pon
2015-10-02 00:50:11 +09:00
parent 934a87dcf5
commit a36c8721f8
6 changed files with 123 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeLocalFileSystem.class.php
+23 -4
View File
@@ -239,7 +239,16 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
* @author Dmitry (dio) Levashov
**/
protected function _relpath($path) {
return $path == $this->root ? '' : substr($path, strlen(rtrim($this->root, DIRECTORY_SEPARATOR)) + 1);
if ($path === $this->root) {
return '';
} else {
if (strpos($path, $this->root) === 0) {
return ltrim(substr($path, strlen($this->root)), DIRECTORY_SEPARATOR);
} else {
// for link
return $path;
}
}
}
/**
@@ -250,7 +259,16 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
* @author Dmitry (dio) Levashov
**/
protected function _abspath($path) {
return $path == DIRECTORY_SEPARATOR ? $this->root : $this->_joinPath($this->root, $path);
if ($path === DIRECTORY_SEPARATOR) {
return $this->root;
} else {
if ($path[0] === DIRECTORY_SEPARATOR) {
// for link
return $path;
} else {
return $this->_joinPath($this->root, $path);
}
}
}
/**
@@ -273,8 +291,8 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
* @author Dmitry (dio) Levashov
**/
protected function _inpath($path, $parent) {
$real_path = realpath($path);
$real_parent = realpath($parent);
$real_path = (strpos($path, $this->systemRoot) === 0)? $path : realpath($path);
$real_parent = (strpos($parent, $this->systemRoot) === 0)? $parent : realpath($parent);
if ($real_path && $real_parent) {
return $real_path === $real_parent || strpos($real_path, rtrim($real_parent, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR) === 0;
}
@@ -473,6 +491,7 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
}
}
return $target;
if ($this->_inpath($target, $this->root)) {
$atarget = realpath($target);
return $this->_normpath($this->_joinPath($this->root, substr($atarget, strlen(rtrim($this->aroot, DIRECTORY_SEPARATOR)) + 1)));