[Pkg-owncloud-commits] [owncloud] 233/258: Fix add/remove mountpoint hooks

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 0d8d5cb3e6cd1165af91b8490ebee6f8722702e1
Author: Robin Appelman <icewind at owncloud.com>
Date:   Sun Sep 28 16:32:27 2014 +0200

    Fix add/remove mountpoint hooks
---
 apps/files_external/lib/config.php        | 6 ++++--
 apps/files_external/tests/mountconfig.php | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 6d46fd7..c53ac60 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -459,6 +459,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;
@@ -516,7 +517,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,
 				)
@@ -535,6 +536,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;
@@ -559,7 +561,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,
 			)
diff --git a/apps/files_external/tests/mountconfig.php b/apps/files_external/tests/mountconfig.php
index db4fbf5..34d855d 100644
--- a/apps/files_external/tests/mountconfig.php
+++ b/apps/files_external/tests/mountconfig.php
@@ -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;
 	}
 
@@ -406,7 +406,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();
@@ -435,7 +435,7 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 
 		$this->assertTrue(
 			OC_Mount_Config::removeMountPoint(
-				'/ext',
+				$mountPoint,
 				$mountType,
 				$applicable,
 				$isPersonal
@@ -457,7 +457,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]
 		);
 	}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git