open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use constants for priority type and add comments

Browse Source
remotes/origin/ldap_group_count
Robin McCorkell 11 years ago
parent a0ccb060fa
commit 2254678a0c
1 changed files with 16 additions and 13 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 27
      apps/files_external/lib/config.php

27
apps/files_external/lib/config.php vendored
Unescape View File

@ -35,6 +35,7 @@ class OC_Mount_Config {
const MOUNT_TYPE_GLOBAL = 'global'; const MOUNT_TYPE_GLOBAL = 'global';
const MOUNT_TYPE_GROUP = 'group'; const MOUNT_TYPE_GROUP = 'group';
const MOUNT_TYPE_USER = 'user'; const MOUNT_TYPE_USER = 'user';
const MOUNT_TYPE_PERSONAL = 'personal';
// whether to skip backend test (for unit tests, as this static class is not mockable) // whether to skip backend test (for unit tests, as this static class is not mockable)
public static $skipTest = false; public static $skipTest = false;
@ -135,6 +136,8 @@ class OC_Mount_Config {
// Load system mount points // Load system mount points
$mountConfig = self::readData(); $mountConfig = self::readData();
// Global mount points (is this redundant?)
if (isset($mountConfig[self::MOUNT_TYPE_GLOBAL])) { if (isset($mountConfig[self::MOUNT_TYPE_GLOBAL])) {
foreach ($mountConfig[self::MOUNT_TYPE_GLOBAL] as $mountPoint => $options) { foreach ($mountConfig[self::MOUNT_TYPE_GLOBAL] as $mountPoint => $options) {
$options['options'] = self::decryptPasswords($options['options']); $options['options'] = self::decryptPasswords($options['options']);
@ -144,11 +147,12 @@ class OC_Mount_Config {
if ( (!isset($mountPoints[$mountPoint])) if ( (!isset($mountPoints[$mountPoint]))
|| ($options['priority'] >= $mountPoints[$mountPoint]['priority']) ) { || ($options['priority'] >= $mountPoints[$mountPoint]['priority']) ) {
$options['priority_type'] = 'global'; $options['priority_type'] = self::MOUNT_TYPE_GLOBAL;
$mountPoints[$mountPoint] = $options; $mountPoints[$mountPoint] = $options;
} }
} }
} }
// All user mount points
if (isset($mountConfig[self::MOUNT_TYPE_USER]) && isset($mountConfig[self::MOUNT_TYPE_USER]['all'])) { if (isset($mountConfig[self::MOUNT_TYPE_USER]) && isset($mountConfig[self::MOUNT_TYPE_USER]['all'])) {
$mounts = $mountConfig[self::MOUNT_TYPE_USER]['all']; $mounts = $mountConfig[self::MOUNT_TYPE_USER]['all'];
foreach ($mounts as $mountPoint => $options) { foreach ($mounts as $mountPoint => $options) {
@ -162,13 +166,13 @@ class OC_Mount_Config {
} }
if ( (!isset($mountPoints[$mountPoint])) if ( (!isset($mountPoints[$mountPoint]))
|| ($options['priority'] >= $mountPoints[$mountPoint]['priority']) || ($options['priority'] >= $mountPoints[$mountPoint]['priority']) ) {
|| ($mountPoints[$mountPoint]['priority_type'] !== 'global') ) { $options['priority_type'] = self::MOUNT_TYPE_GLOBAL;
$options['priority_type'] = 'global';
$mountPoints[$mountPoint] = $options; $mountPoints[$mountPoint] = $options;
} }
} }
} }
// Group mount points
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)) {
@ -184,14 +188,15 @@ class OC_Mount_Config {
if ( (!isset($mountPoints[$mountPoint])) if ( (!isset($mountPoints[$mountPoint]))
|| ($options['priority'] >= $mountPoints[$mountPoint]['priority']) || ($options['priority'] >= $mountPoints[$mountPoint]['priority'])
|| ($mountPoints[$mountPoint]['priority_type'] !== 'group') ) { || ($mountPoints[$mountPoint]['priority_type'] !== self::MOUNT_TYPE_GROUP) ) {
$options['priority_type'] = 'group'; $options['priority_type'] = self::MOUNT_TYPE_GROUP;
$mountPoints[$mountPoint] = $options; $mountPoints[$mountPoint] = $options;
} }
} }
} }
} }
} }
// User mount points
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 (strtolower($mountUser) === strtolower($user)) { if (strtolower($mountUser) === strtolower($user)) {
@ -207,8 +212,8 @@ class OC_Mount_Config {
if ( (!isset($mountPoints[$mountPoint])) if ( (!isset($mountPoints[$mountPoint]))
|| ($options['priority'] >= $mountPoints[$mountPoint]['priority']) || ($options['priority'] >= $mountPoints[$mountPoint]['priority'])
|| ($mountPoints[$mountPoint]['priority_type'] !== 'user') ) { || ($mountPoints[$mountPoint]['priority_type'] !== self::MOUNT_TYPE_USER) ) {
$options['priority_type'] = 'user'; $options['priority_type'] = self::MOUNT_TYPE_USER;
$mountPoints[$mountPoint] = $options; $mountPoints[$mountPoint] = $options;
} }
} }
@ -222,13 +227,11 @@ class OC_Mount_Config {
foreach ($mountConfig[self::MOUNT_TYPE_USER][$user] as $mountPoint => $options) { foreach ($mountConfig[self::MOUNT_TYPE_USER][$user] as $mountPoint => $options) {
$options['options'] = self::decryptPasswords($options['options']); $options['options'] = self::decryptPasswords($options['options']);
if ( (!isset($mountPoints[$mountPoint])) // Always override previous config
|| ($mountPoints[$mountPoint]['priority_type'] !== 'personal') ) { $options['priority_type'] = self::MOUNT_TYPE_PERSONAL;
$options['priority_type'] = 'personal';
$mountPoints[$mountPoint] = $options; $mountPoints[$mountPoint] = $options;
} }
} }
}
return $mountPoints; return $mountPoints;
} }

Write Preview
Loading…
Cancel
Save