diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-02-05 23:49:22 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-02-21 20:48:48 +0100 |
| commit | 6658f510986aff0e41fee37319a1b0eefa98a4d0 (patch) | |
| tree | b922c9fe52b1f29695089a8bcf69651a03d627eb | |
| parent | b3a974d8bbcd88602a54cf32cd472802583ab4aa (diff) | |
| download | nextcloud-server-6658f510986aff0e41fee37319a1b0eefa98a4d0.tar.gz nextcloud-server-6658f510986aff0e41fee37319a1b0eefa98a4d0.zip | |
provide early file system when using webdav
| -rw-r--r-- | lib/connector/sabre/auth.php | 1 | ||||
| -rw-r--r-- | lib/util.php | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/connector/sabre/auth.php b/lib/connector/sabre/auth.php index 1e87c7cee08..8964ef7d0de 100644 --- a/lib/connector/sabre/auth.php +++ b/lib/connector/sabre/auth.php @@ -23,6 +23,7 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic { * @return bool */ protected function validateUserPass($username, $password){ + OC_Util::setUpFS();//login hooks may need early access to the filesystem if(OC_User::login($username,$password)){ OC_Util::setUpFS(); return true; diff --git a/lib/util.php b/lib/util.php index 3329789de92..18a5db3e4ee 100644 --- a/lib/util.php +++ b/lib/util.php @@ -8,6 +8,7 @@ class OC_Util { public static $scripts=array(); public static $styles=array(); public static $headers=array(); + private static $rootMounted=false; private static $fsSetup=false; // Can be set up @@ -36,7 +37,10 @@ class OC_Util { } //first set up the local "root" storage - OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$CONFIG_DATADIRECTORY_ROOT),'/'); + if(!self::$rootMounted){ + OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$CONFIG_DATADIRECTORY_ROOT),'/'); + self::$rootMounted=true; + } if( $user != "" ){ //if we aren't logged in, there is no use to set up the filesystem OC::$CONFIG_DATADIRECTORY = $CONFIG_DATADIRECTORY_ROOT."/$user/$root"; |