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-74efdcf

Browse Source
This commit is contained in:
nao-pon
2016-10-23 14:58:04 +09:00
parent 01edc68ccd
commit a0eab5a06b
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeGoogleDrive.class.php
+7 -5
View File
@@ -774,22 +774,24 @@ class elFinderVolumeGoogleDrive extends elFinderVolumeDriver
$path = $this->_normpath($path.'/');
$result = [];
$query = '';
$dirs = array_merge([$itemId], $this->getDirectories($itemId));
$query = '(\''.implode('\' in parents or \'', $dirs).'\' in parents)';
if ($itemId !== 'root') {
$dirs = array_merge([$itemId], $this->getDirectories($itemId));
$query = '(\''.implode('\' in parents or \'', $dirs).'\' in parents)';
}
$tmp = [];
if (!$mimes) {
foreach (explode(' ', $q) as $_v) {
$tmp[] = 'fullText contains \''.str_replace('\'', '\\\'', $_v).'\'';
}
$query .= ' and '.implode(' and ', $tmp);
$query .= ($query? ' and ' : '').implode(' and ', $tmp);
} else {
foreach ($mimes as $_v) {
$tmp[] = 'mimeType contains \''.str_replace('\'', '\\\'', $_v).'\'';
}
$query .= ' and ('.implode(' or ', $tmp).')';
$query .= ($query? ' and ' : '').'('.implode(' or ', $tmp).')';
}
$opts = [