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

Browse Source
This commit is contained in:
nao-pon
2016-01-25 23:32:13 +09:00
parent ea86bd1fd2
commit fa5a78047d
5 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeDriver.class.php
+17 -2
View File
@@ -635,6 +635,18 @@ abstract class elFinderVolumeDriver {
$this->imgLib = function_exists('gd_info') ? 'gd' : '';
}
// check archivers
if (empty($this->archivers['create'])) {
$this->disabled[] ='archive';
}
if (empty($this->archivers['extract'])) {
$this->disabled[] ='extract';
}
$_arc = $this->getArchivers();
if (empty($_arc['create'])) {
$this->disabled[] ='zipdl';
}
// check 'statOwner' for command `chmod`
if (empty($this->options['statOwner'])) {
$this->disabled[] ='chmod';
@@ -1027,6 +1039,9 @@ abstract class elFinderVolumeDriver {
$this->configure();
// Normarize disabled (array_merge`for type array of JSON)
$this->disabled = array_merge(array_unique($this->disabled));
// fix sync interval
if ($this->options['syncMinMs'] !== 0) {
$this->options['syncMinMs'] = max($this->options[$this->options['syncChkAsTs']? 'tsPlSleep' : 'lsPlSleep'] * 1000, intval($this->options['syncMinMs']));
@@ -1142,7 +1157,7 @@ abstract class elFinderVolumeDriver {
'path' => $this->path($hash),
'url' => $this->URL,
'tmbUrl' => $this->tmbURL,
'disabled' => array_merge(array_unique($this->disabled)), // `array_merge` for type array of JSON
'disabled' => $this->disabled,
'separator' => $this->separator,
'copyOverwrite' => intval($this->options['copyOverwrite']),
'uploadOverwrite' => intval($this->options['uploadOverwrite']),
@@ -3048,7 +3063,7 @@ abstract class elFinderVolumeDriver {
$stat['tmbUrl'] = $this->tmbURL;
}
$stat['uiCmdMap'] = (isset($this->options['uiCmdMap']) && is_array($this->options['uiCmdMap']))? $this->options['uiCmdMap'] : array();
$stat['disabled'] = array_merge(array_unique($this->disabled)); // `array_merge` for type array of JSON
$stat['disabled'] = $this->disabled;
if (isset($this->options['netkey'])) {
$stat['netkey'] = $this->options['netkey'];
}