1 files changed, 8 insertions, 4 deletions

diff --git a/remote.php b/remote.php
index e11b72ee8c2..ab5364aad6e 100644
--- a/remote.php
+++ b/remote.php
@@ -2,11 +2,15 @@
 $RUNTIME_NOSETUPFS = true;
 //$RUNTIME_NOAPPS = TRUE;
 require_once('lib/base.php');
-$file = OCP\CONFIG::getAppValue('core', $_GET['service']);
+$path_info = $_SERVER['PATH_INFO'];
+if (!$pos = strpos($path_info, '/', 1)) {
+	$pos = strlen($path_info);
+}
+$service=substr($path_info, 1, $pos-1);
+$file = OCP\CONFIG::getAppValue('core', $service);
 if(is_null($file)){
 	header('HTTP/1.0 404 Not Found');
 	exit;
 }
-$baseuri = OC::$WEBROOT . '/remote.php?service=' . $_GET['service'] . '&p=';
-parse_str($_GET['p'], $_GET);
-require_once(OC::$APPSROOT . $file);
\ No newline at end of file
+$baseuri = '/remote.php/'.$service.'/';
+require_once(OC::$APPSROOT . $file);