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

[VD:LocalFileSystem] fix #417 Normalize path in options

Browse Source
This commit is contained in:
nao-pon
2015-04-13 17:41:37 +09:00
parent 0ab6da2817
commit 5701c60a66
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeLocalFileSystem.class.php
+29 -2
View File
@@ -50,6 +50,24 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
/* INIT AND CONFIGURE */
/*********************************************************************/
/**
* Prepare driver before mount volume.
* Return true if volume is ready.
*
* @return bool
**/
protected function init() {
// Normalize directory separator for windows
if (DIRECTORY_SEPARATOR !== '/') {
foreach(array('path', 'tmbPath', 'quarantine') as $key) {
if ($this->options[$key]) {
$this->options[$key] = str_replace('/', DIRECTORY_SEPARATOR, $this->options[$key]);
}
}
}
return true;
}
/**
* Configure after successfull mount.
*
@@ -64,7 +82,7 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
if ($this->options['tmbPath']) {
$this->options['tmbPath'] = strpos($this->options['tmbPath'], DIRECTORY_SEPARATOR) === false
// tmb path set as dirname under root dir
? $this->root.DIRECTORY_SEPARATOR.$this->options['tmbPath']
? $this->_abspath($this->options['tmbPath'])
// tmb path as full path
: $this->_normpath($this->options['tmbPath']);
}
@@ -90,7 +108,7 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
}
$this->options['quarantine'] = '';
} else {
$this->quarantine = $this->root.DIRECTORY_SEPARATOR.$this->options['quarantine'];
$this->quarantine = $this->_abspath($this->options['quarantine']);
if ((!is_dir($this->quarantine) && !$this->_mkdir($this->root, $this->options['quarantine'])) || !is_writable($this->quarantine)) {
$this->options['quarantine'] = $this->quarantine = '';
}
@@ -164,6 +182,11 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
if (empty($path)) {
return '.';
}
$changeSep = (DIRECTORY_SEPARATOR !== '/');
if ($changeSep) {
$path = str_replace(DIRECTORY_SEPARATOR, '/', $path);
}
if (strpos($path, '/') === 0) {
$initial_slashes = true;
@@ -200,6 +223,10 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
$path = str_repeat('/', $initial_slashes) . $path;
}
if ($changeSep) {
$path = str_replace('/', DIRECTORY_SEPARATOR, $path);
}
return $path ? $path : '.';
}