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)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index 8b44ab6e6c6a8ce848cb00a3f09ee3fc783aea4a..00682573dd9e8694d32aa53f0d7626e2d69b3e2c 100644 (file)
--- 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 eb0e5e8ec406a59612fe75123b33cf7ec623e820..a847c02872e77c3aaf1dd161821dcb2403d03dca 100755 (executable)
--- 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);