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-a778239

Browse Source
This commit is contained in:
nao-pon
2016-03-12 18:04:47 +09:00
parent 34c249c5de
commit 5c2211875d
5 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderConnector.class.php
+23 -11
View File
@@ -93,23 +93,35 @@ class elFinderConnector {
}
// collect required arguments to exec command
$hasFiles = false;
foreach ($this->elFinder->commandArgsList($cmd) as $name => $req) {
$arg = $name == 'FILES'
? $_FILES
: (isset($src[$name]) ? $src[$name] : '');
if (!is_array($arg)) {
$arg = trim($arg);
if ($name === 'FILES') {
if (isset($_FILES)) {
$hasFiles = true;
} elseif ($req) {
$this->output(array('error' => $this->elFinder->error(elFinder::ERROR_INV_PARAMS, $cmd)));
}
} else {
$arg = isset($src[$name])? $src[$name] : '';
if (!is_array($arg)) {
$arg = trim($arg);
}
if ($req && $arg === '') {
$this->output(array('error' => $this->elFinder->error(elFinder::ERROR_INV_PARAMS, $cmd)));
}
$args[$name] = $arg;
}
if ($req && (!isset($arg) || $arg === '')) {
$this->output(array('error' => $this->elFinder->error(elFinder::ERROR_INV_PARAMS, $cmd)));
}
$args[$name] = $arg;
}
$args['debug'] = isset($src['debug']) ? !!$src['debug'] : false;
$this->output($this->elFinder->exec($cmd, $this->input_filter($args)));
$args = $this->input_filter($args);
if ($hasFiles) {
$args['FILES'] = $_FILES;
}
$this->output($this->elFinder->exec($cmd, $args));
}
/**