[Pkg-owncloud-commits] [owncloud] 59/67: add parameter to specify user for which OC_Filesystem should be initialized. (needed to share files via public links where no user is logged in)

[David Prévot]

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

taffit pushed a commit to annotated tag v4.5.1
in repository owncloud.

commit 366aeb72287a0884258d50db4dd885291aaae0fa
Author: Björn Schießle <schiessle at owncloud.com>
Date:   Mon Oct 22 14:52:59 2012 +0200

    add parameter to specify user for which OC_Filesystem should be initialized.
    (needed to share files via public links where no user is logged in)
---
 lib/filesystem.php |    7 +++++--
 lib/util.php       |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index 8b44ab6..0068257 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -254,14 +254,17 @@ class OC_Filesystem{
 		}		
 	}
 	
-	static public function init($root) {
+	static public function init($root, $user = '') {
 		if(self::$defaultInstance) {
 			return false;
 		}
 		self::$defaultInstance=new OC_FilesystemView($root);
 
 		//load custom mount config
-		self::loadSystemMountPoints(OC_User::getUser());
+		if (!isset($user)) {
+			$user = OC_User::getUser();
+		}
+		self::loadSystemMountPoints($user);
 
 		self::$loaded=true;
 	}
diff --git a/lib/util.php b/lib/util.php
index ecb790f..b068cbb 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -47,7 +47,7 @@ class OC_Util {
 			}
 			//jail the user into his "home" directory
 			OC_Filesystem::mount('OC_Filestorage_Local', array('datadir' => $user_root), $user);
-			OC_Filesystem::init($user_dir);
+			OC_Filesystem::init($user_dir, $user);
 			$quotaProxy=new OC_FileProxy_Quota();
 			$fileOperationProxy = new OC_FileProxy_FileOperations();
 			OC_FileProxy::register($quotaProxy);

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