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

Extract files from archive updated

Browse Source 
Before extract archive in place - check it in quarantine folder.
If archive contains only one item - extract in current directory,
otherwise - extract in new folder
This commit is contained in:
Dmitry (dio) Levashov
2011-07-15 17:40:36 +04:00
parent 8930961158
commit 970bb1e236
9 changed files with 71 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeDriver.class.php
+4 -12
View File
@@ -1477,6 +1477,7 @@ abstract class elFinderVolumeDriver {
$archiver = isset($this->archivers['extract'][$file['mime']])
? $this->archivers['extract'][$file['mime']]
: false;
if (!$archiver) {
return $this->setError(elFinder::ERROR_NOT_ARCHIVE);
}
@@ -1487,20 +1488,11 @@ abstract class elFinderVolumeDriver {
return $this->setError(elFinder::ERROR_PERM_DENIED);
}
$before = $this->scandir($file['phash']);
if (!$this->_extract($path, $archiver)) {
if (($path = $this->_extract($path, $archiver)) == false) {
return false;
}
$after = $this->scandir($file['phash']);
$diff = array();
foreach ($after as $file) {
if (!in_array($file, $before)) {
$diff[] = $file;
}
}
return $diff;
return $this->stat($path);
return $this->_extract($path, $archiver);
}
/**