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

fixes #43

Browse Source
This commit is contained in:
Dmitry (dio) Levashov
2011-07-14 18:57:34 +04:00
parent e2259d94ee
commit f94af37bc6
5 changed files with 60 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinder.class.php
+46 -5
View File
@@ -134,7 +134,6 @@ class elFinder {
const ERROR_NOT_ARCHIVE = 36;
const ERROR_ARCHIVE_TYPE = 37;
/**
* Error messages
*
@@ -179,7 +178,6 @@ class elFinder {
35 => 'errArchive',
36 => 'errNoArchive',
37 => 'errArcType',
);
/**
@@ -644,6 +642,10 @@ class elFinder {
return array('error' => $this->error($error, self::ERROR_TRGDIR_NOT_FOUND, '#'.$target));
}
if ($volume->commandDisabled('mkdir')) {
return array('error' => $this->error($error, self::ERROR_ACCESS_DENIED));
}
if (!$dir['read']) {
return array('error' => $this->error($error, self::ERROR_PERM_DENIED));
}
@@ -672,6 +674,10 @@ class elFinder {
return array('error' => $this->error($error, self::ERROR_TRGDIR_NOT_FOUND, '#'.$target));
}
if ($volume->commandDisabled('mkfile')) {
return array('error' => $this->error($error, self::ERROR_ACCESS_DENIED));
}
if (!$dir['read']) {
return array('error' => $this->error($error, self::ERROR_PERM_DENIED));
}
@@ -702,6 +708,10 @@ class elFinder {
|| ($rm = $volume->file($target)) == false) {
return array('error' => $this->error(self::ERROR_RENAME, '#'.$target, self::ERROR_FILE_NOT_FOUND));
}
if ($volume->commandDisabled('rename')) {
return array('error' => $this->error(self::ERROR_RENAME, $rm['name'], self::ERROR_ACCESS_DENIED));
}
if ($rm['name'] == $name) {
return array();
@@ -740,6 +750,10 @@ class elFinder {
break;
}
if ($volume->commandDisabled('duplicate')) {
return array('error' => $this->error(self::ERROR_COPY, $src['name'], self::ERROR_ACCESS_DENIED));
}
if (($file = $volume->duplicate($target)) == false) {
$result['warning'] = $this->error(self::ERROR_COPY, $src['name'], $volume->error());
break;
@@ -774,6 +788,10 @@ class elFinder {
break;
}
if ($volume->commandDisabled('rm')) {
return array('error' => $this->error(self::ERROR_RM, $file['name'], self::ERROR_ACCESS_DENIED));
}
if (!$volume->rm($target)) {
$result['warning'] = $this->error(self::ERROR_RM, $file['name'], $volume->error());
break;
@@ -808,6 +826,10 @@ class elFinder {
return array('error' => $this->error(self::ERROR_UPLOAD, $files['name'][0], self::ERROR_TRGDIR_NOT_FOUND, '#'.$target), 'header' => $header);
}
if ($volume->commandDisabled('upload')) {
return array('error' => $this->error(self::ERROR_UPLOAD, $files['name'][0], self::ERROR_ACCESS_DENIED));
}
foreach ($files['name'] as $i => $name) {
$tmpPath = $files['tmp_name'][$i];
@@ -861,6 +883,10 @@ class elFinder {
return array('error' => $this->error($error, '#'.$targets[0], self::ERROR_TRGDIR_NOT_FOUND, '#'.$dst));
}
if ($dstVolume->commandDisabled('paste')) {
return array('error' => $this->error($error, '#'.$targets[0], self::ERROR_ACCESS_DENIED));
}
if (!$dstDir['write']) {
return array('error' => $this->error($error, '#'.$targets[0], self::ERROR_PERM_DENIED));
}
@@ -922,12 +948,12 @@ class elFinder {
$target = $args['target'];
$volume = $this->volume($target);
if (!$volume) {
if (!$volume || ($file = $volume->file($target)) == false) {
return array('error' => $this->error(self::ERROR_OPEN, '#'.$target, self::ERROR_FILE_NOT_FOUND));
}
return ($content = $volume->getContents($target)) === false
? array('error' => $this->error(self::ERROR_OPEN, '#'.$target, $volume->error()))
? array('error' => $this->error(self::ERROR_OPEN, $file['name'], $volume->error()))
: array('content' => $content);
}
@@ -945,6 +971,11 @@ class elFinder {
|| ($file = $volume->file($target)) == false) {
return array('error' => $this->error($error, self::ERROR_FILE_NOT_FOUND));
}
$error[1] = $file['name'];
if ($volume->commandDisabled('edit')) {
return array('error' => $this->error($error, self::ERROR_ACCESS_DENIED));
}
if (($file = $volume->putContents($target, $args['content'])) == false) {
return array('error' => $this->error($error, $volume->error()));
@@ -974,8 +1005,14 @@ class elFinder {
return array('error' => $this->error($error, self::ERROR_FILE_NOT_FOUND));
}
$error[1] = $file['name'];
if ($volume->commandDisabled('extract')) {
return array('error' => $this->error($error, self::ERROR_ACCESS_DENIED));
}
if (($added = $volume->extract($target)) === false) {
return array('error' => $this->error(self::ERROR_EXTRACT, $file['name'], $volume->error()));
return array('error' => $this->error($error, $volume->error()));
}
return $this->trigger('extract', $volume, array('added' => $added));
@@ -999,6 +1036,10 @@ class elFinder {
return $this->error(self::ERROR_ARCHIVE, self::ERROR_TRGDIR_NOT_FOUND);
}
if ($volume->commandDisabled('archive')) {
return array('error' => $this->error(self::ERROR_ARCHIVE, self::ERROR_ACCESS_DENIED));
}
if (($archive = $volume->archive($targets, $args['type'])) == false) {
return $this->error(self::ERROR_ARCHIVE, $volume->error());
}