diff options
Diffstat (limited to 'apps/files_external/lib/config.php')
| -rw-r--r-- | apps/files_external/lib/config.php | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 5dc6d06ae06..9d8b312e77e 100644 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -124,10 +124,9 @@ class OC_Mount_Config { self::addStorageIdToConfig($data['user']); $user = \OC::$server->getUserManager()->get($data['user']); if (!$user) { - \OCP\Util::writeLog( - 'files_external', + \OC::$server->getLogger()->warning( 'Cannot init external mount points for non-existant user "' . $data['user'] . '".', - \OCP\Util::WARN + ['app' => 'files_external'] ); return; } @@ -161,6 +160,9 @@ class OC_Mount_Config { // Load system mount points $mountConfig = self::readData(); + $userObject = \OC::$server->getUserManager()->get($user); + $groupManager = \OC::$server->getGroupManager(); + // Global mount points (is this redundant?) if (isset($mountConfig[self::MOUNT_TYPE_GLOBAL])) { foreach ($mountConfig[self::MOUNT_TYPE_GLOBAL] as $mountPoint => $options) { @@ -207,7 +209,7 @@ class OC_Mount_Config { // Group mount points if (isset($mountConfig[self::MOUNT_TYPE_GROUP])) { foreach ($mountConfig[self::MOUNT_TYPE_GROUP] as $group => $mounts) { - if (\OC_Group::inGroup($user, $group)) { + if ($groupManager->get($group)->inGroup($userObject)) { foreach ($mounts as $mountPoint => $options) { $mountPoint = self::setUserVars($user, $mountPoint); foreach ($options as &$option) { @@ -581,7 +583,7 @@ class OC_Mount_Config { $result = self::getBackendStatus($class, $classOptions, $isPersonal); if ($result === self::STATUS_SUCCESS && $isNew) { - \OC_Hook::emit( + \OCP\Util::emitHook( \OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_create_mount, array( @@ -627,7 +629,7 @@ class OC_Mount_Config { } } self::writeData($isPersonal ? OCP\User::getUser() : null, $mountPoints); - \OC_Hook::emit( + \OCP\Util::emitHook( \OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_delete_mount, array( @@ -669,10 +671,11 @@ class OC_Mount_Config { */ public static function readData($user = null) { if (isset($user)) { - $jsonFile = OC_User::getHome($user) . '/mount.json'; + $jsonFile = \OC::$server->getUserManager()->get($user)->getHome() . '/mount.json'; } else { - $datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data/'); - $jsonFile = \OC_Config::getValue('mount_file', $datadir . '/mount.json'); + $config = \OC::$server->getConfig(); + $datadir = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data/'); + $jsonFile = $config->getSystemValue('mount_file', $datadir . '/mount.json'); } if (is_file($jsonFile)) { $mountPoints = json_decode(file_get_contents($jsonFile), true); @@ -691,10 +694,11 @@ class OC_Mount_Config { */ public static function writeData($user, $data) { if (isset($user)) { - $file = OC_User::getHome($user) . '/mount.json'; + $file = \OC::$server->getUserManager()->get($user)->getHome() . '/mount.json'; } else { - $datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data/'); - $file = \OC_Config::getValue('mount_file', $datadir . '/mount.json'); + $config = \OC::$server->getConfig(); + $datadir = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data/'); + $file = $config->getSystemValue('mount_file', $datadir . '/mount.json'); } foreach ($data as &$applicables) { @@ -752,7 +756,7 @@ class OC_Mount_Config { } private static function generateDependencyMessage($dependencies) { - $l = new \OC_L10N('files_external'); + $l = \OC::$server->getL10N('files_external'); $dependencyMessage = ''; foreach ($dependencies as $module => $backends) { $dependencyGroup = array(); @@ -789,7 +793,7 @@ class OC_Mount_Config { * @param string $backend * @return string */ - private static function getSingleDependencyMessage(OC_L10N $l, $module, $backend) { + private static function getSingleDependencyMessage(\OCP\IL10N $l, $module, $backend) { switch (strtolower($module)) { case 'curl': return $l->t('<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend); |