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-9d4693d

Browse Source
This commit is contained in:
nao-pon
2016-12-09 17:19:29 +09:00
parent 3a76f5484f
commit 84ee6e95dd
5 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeDriver.class.php
+16 -8
View File
@@ -3341,10 +3341,11 @@ abstract class elFinderVolumeDriver {
*
* @param array $hashes target hashes
* @param string $dir destination directory (for recurcive)
* @param string $canLink it can use link() (for recurcive)
* @return string|false saved path name
* @author Naoki Sawada
*/
protected function getItemsInHand($hashes, $dir = null) {
protected function getItemsInHand($hashes, $dir = null, $canLink = null) {
static $totalSize = 0;
if (is_null($dir)) {
$totalSize = 0;
@@ -3357,6 +3358,9 @@ abstract class elFinderVolumeDriver {
}
register_shutdown_function(array($this, 'rmdirRecursive'), $dir);
}
if (is_null($canLink)) {
$canLink = ($this instanceof elFinderVolumeLocalFileSystem);
}
elFinder::extendTimeLimit();
$res = true;
$files = array();
@@ -3386,7 +3390,7 @@ abstract class elFinderVolumeDriver {
}
}
if (($res = mkdir($target, 0700, true)) && $chashes) {
$res = $this->getItemsInHand($chashes, $target);
$res = $this->getItemsInHand($chashes, $target, $canLink);
}
if (!$res) {
break;
@@ -3394,13 +3398,17 @@ abstract class elFinderVolumeDriver {
!empty($file['ts']) && touch($target, $file['ts']);
} else {
$path = $this->decode($hash);
if ($fp = $this->fopenCE($path)) {
if ($tfp = fopen($target, 'wb')) {
$totalSize += stream_copy_to_stream($fp, $tfp);
fclose($tfp);
if (! $canLink || ! ($canLink = link($path, $target))) {
if ($fp = $this->fopenCE($path)) {
if ($tfp = fopen($target, 'wb')) {
$totalSize += stream_copy_to_stream($fp, $tfp);
fclose($tfp);
}
!empty($file['ts']) && touch($target, $file['ts']);
$this->fcloseCE($fp, $path);
}
!empty($file['ts']) && touch($target, $file['ts']);
$this->fcloseCE($fp, $path);
} else {
$totalSize += filesize($path);
}
if ($this->options['maxArcFilesSize'] > 0 && $this->options['maxArcFilesSize'] < $totalSize) {
$res = $this->setError(elFinder::ERROR_ARC_MAXSIZE);