Try to fix the remote pbm. fix oc-1090

This commit is contained in:
Brice Maron 2012-06-24 08:06:42 +00:00
parent ca5de26bac
commit 0ab6e2ee3d
1 changed files with 9 additions and 6 deletions

View File

@ -20,16 +20,19 @@ if(is_null($file)){
OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
exit; exit;
} }
if(count(explode('/',$file)) == 3) {
$file = ltrim ($file, '/');
if(count(explode('/',$file)) == 2) {
$parts=explode('/',$file); $parts=explode('/',$file);
$app=$parts[2]; $app=$parts[1];
OC_App::loadApp($app); OC_App::loadApp($app);
$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/'; $baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
require_once( OC::$SERVERROOT.$file); require_once( OC::$SERVERROOT.'/'.$file);
} else { } else {
$parts=explode('/', $file, 4); $parts=explode('/', $file, 2);
$app=$parts[2]; $app=$parts[0];
OC_App::loadApp($app); OC_App::loadApp($app);
$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/'; $baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
require_once(OC_App::getAppPath($app) .'/'. $parts[3]); require_once(OC_App::getAppPath($app) .'/'. $parts[1]);
} }