provide early file system when using webdav
This commit is contained in:
parent
b3a974d8bb
commit
6658f51098
|
@ -23,6 +23,7 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
protected function validateUserPass($username, $password){
|
protected function validateUserPass($username, $password){
|
||||||
|
OC_Util::setUpFS();//login hooks may need early access to the filesystem
|
||||||
if(OC_User::login($username,$password)){
|
if(OC_User::login($username,$password)){
|
||||||
OC_Util::setUpFS();
|
OC_Util::setUpFS();
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -8,6 +8,7 @@ class OC_Util {
|
||||||
public static $scripts=array();
|
public static $scripts=array();
|
||||||
public static $styles=array();
|
public static $styles=array();
|
||||||
public static $headers=array();
|
public static $headers=array();
|
||||||
|
private static $rootMounted=false;
|
||||||
private static $fsSetup=false;
|
private static $fsSetup=false;
|
||||||
|
|
||||||
// Can be set up
|
// Can be set up
|
||||||
|
@ -36,7 +37,10 @@ class OC_Util {
|
||||||
}
|
}
|
||||||
|
|
||||||
//first set up the local "root" storage
|
//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
|
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";
|
OC::$CONFIG_DATADIRECTORY = $CONFIG_DATADIRECTORY_ROOT."/$user/$root";
|
||||||
|
|
Loading…
Reference in New Issue