Commit 9a5d0f60 authored by Robin Appelman's avatar Robin Appelman Committed by Vincent Petry
Browse files

Fix add/remove mountpoint hooks

parent 12ac3a80
......@@ -463,6 +463,7 @@ class OC_Mount_Config {
$priority = null) {
$backends = self::getBackends();
$mountPoint = OC\Files\Filesystem::normalizePath($mountPoint);
$relMountPoint = $mountPoint;
if ($mountPoint === '' || $mountPoint === '/') {
// can't mount at root folder
return false;
......@@ -520,7 +521,7 @@ class OC_Mount_Config {
\OC\Files\Filesystem::CLASSNAME,
\OC\Files\Filesystem::signal_create_mount,
array(
\OC\Files\Filesystem::signal_param_path => $mountPoint,
\OC\Files\Filesystem::signal_param_path => $relMountPoint,
\OC\Files\Filesystem::signal_param_mount_type => $mountType,
\OC\Files\Filesystem::signal_param_users => $applicable,
)
......@@ -539,6 +540,7 @@ class OC_Mount_Config {
*/
public static function removeMountPoint($mountPoint, $mountType, $applicable, $isPersonal = false) {
// Verify that the mount point applies for the current user
$relMountPoints = $mountPoint;
if ($isPersonal) {
if ($applicable != OCP\User::getUser()) {
return false;
......@@ -563,7 +565,7 @@ class OC_Mount_Config {
\OC\Files\Filesystem::CLASSNAME,
\OC\Files\Filesystem::signal_delete_mount,
array(
\OC\Files\Filesystem::signal_param_path => $mountPoint,
\OC\Files\Filesystem::signal_param_path => $relMountPoints,
\OC\Files\Filesystem::signal_param_mount_type => $mountType,
\OC\Files\Filesystem::signal_param_users => $applicable,
)
......
......@@ -53,7 +53,7 @@ class Test_Mount_Config_Hook_Test {
}
public static function deleteHookCallback($params) {
self::$signal = \OC\Files\Filesystem::signal_create_mount;
self::$signal = \OC\Files\Filesystem::signal_delete_mount;
self::$params = $params;
}
......@@ -416,7 +416,7 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
);
$this->assertEquals(
$applicable,
$params[\OC\Files\Filesystem::signal_param_mount_users]
$params[\OC\Files\Filesystem::signal_param_users]
);
Test_Mount_Config_Hook_Test::clear();
......@@ -445,7 +445,7 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
$this->assertTrue(
OC_Mount_Config::removeMountPoint(
'/ext',
$mountPoint,
$mountType,
$applicable,
$isPersonal
......@@ -467,7 +467,7 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
);
$this->assertEquals(
$applicable,
$params[\OC\Files\Filesystem::signal_param_mount_users]
$params[\OC\Files\Filesystem::signal_param_users]
);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment