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

Treat 'all users' as 'global' 

A mount applicable to all users is as good a definition of global as can be
This commit is contained in:
Robin McCorkell 2014-03-28 15:22:35 +00:00
parent 05642733a3
commit 9151d72507
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/files_external/lib/config.php
View File

@ -149,6 +149,26 @@ class OC_Mount_Config {
} }
} }
} }
if (isset($mountConfig[self::MOUNT_TYPE_USER]) && isset($mountConfig[self::MOUNT_TYPE_USER]['all'])) {
$mounts = $mountConfig[self::MOUNT_TYPE_USER]['all'];
foreach ($mounts as $mountPoint => $options) {
$mountPoint = self::setUserVars($user, $mountPoint);
foreach ($options as &$option) {
$option = self::setUserVars($user, $option);
}
$options['options'] = self::decryptPasswords($options['options']);
if (!isset($options['priority'])) {
$options['priority'] = $backends[$options['class']]['priority'];
}
if ( (!isset($mountPoints[$mountPoint]))
|| ($options['priority'] >= $mountPoints[$mountPoint]['priority'])
|| ($mountPoints[$mountPoint]['priority_type'] != 'global') ) {
$options['priority_type'] = 'global';
$mountPoints[$mountPoint] = $options;
}
}
}
if (isset($mountConfig[self::MOUNT_TYPE_GROUP])) { if (isset($mountConfig[self::MOUNT_TYPE_GROUP])) {
foreach ($mountConfig[self::MOUNT_TYPE_GROUP] as $group => $mounts) { foreach ($mountConfig[self::MOUNT_TYPE_GROUP] as $group => $mounts) {
if (\OC_Group::inGroup($user, $group)) { if (\OC_Group::inGroup($user, $group)) {
@ -174,7 +194,7 @@ class OC_Mount_Config {
} }
if (isset($mountConfig[self::MOUNT_TYPE_USER])) { if (isset($mountConfig[self::MOUNT_TYPE_USER])) {
foreach ($mountConfig[self::MOUNT_TYPE_USER] as $mountUser => $mounts) { foreach ($mountConfig[self::MOUNT_TYPE_USER] as $mountUser => $mounts) {
if ($mountUser === 'all' or strtolower($mountUser) === strtolower($user)) { if (strtolower($mountUser) === strtolower($user)) {
foreach ($mounts as $mountPoint => $options) { foreach ($mounts as $mountPoint => $options) {
$mountPoint = self::setUserVars($user, $mountPoint); $mountPoint = self::setUserVars($user, $mountPoint);
foreach ($options as &$option) { foreach ($options as &$option) {