mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

only check for external mount points if the external storage app is enabled

This commit is contained in:
Björn Schießle 2013-06-25 17:46:04 +02:00
parent ae30eb48f2
commit 15cb8e4efd
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/files_encryption/lib/util.php
View File

@ -1027,11 +1027,12 @@ class Util {
} }
// check if it is a group mount // check if it is a group mount
if (\OCP\App::isEnabled("files_external")) {
$mount = \OC_Mount_Config::getSystemMountPoints(); $mount = \OC_Mount_Config::getSystemMountPoints();
foreach ($mount as $mountPoint => $data) { foreach ($mount as $mountPoint => $data) {
if ($mountPoint == substr($ownerPath, 1, strlen($mountPoint))) { if ($mountPoint == substr($ownerPath, 1, strlen($mountPoint))) {
$userIds = array_merge($userIds, $userIds = array_merge($userIds, $this->getUserWithAccessToMountPoint($data['applicable']['users'], $data['applicable']['groups']));
$this->getUserWithAccessToMountPoint($data['applicable']['users'], $data['applicable']['groups'])); }
} }
} }
@ -1567,12 +1568,14 @@ class Util {
* @return boolean * @return boolean
*/ */
public function isSystemWideMountPoint($path) { public function isSystemWideMountPoint($path) {
if (\OCP\App::isEnabled("files_external")) {
$mount = \OC_Mount_Config::getSystemMountPoints(); $mount = \OC_Mount_Config::getSystemMountPoints();
foreach ($mount as $mountPoint => $data) { foreach ($mount as $mountPoint => $data) {
if ($mountPoint == substr($path, 1, strlen($mountPoint))) { if ($mountPoint == substr($path, 1, strlen($mountPoint))) {
return true; return true;
} }
} }
}
return false; return false;
} }