mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7599 from owncloud/public-pathinfo 

Allow using pathinfo based public.php paths
This commit is contained in:
icewind1991 2014-04-07 14:53:44 +02:00
parent 0fe32eee13 0f1374c028
commit d3eee01190
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public.php
View File

@ -5,24 +5,32 @@ try {
require_once 'lib/base.php'; require_once 'lib/base.php';
OC::checkMaintenanceMode(); OC::checkMaintenanceMode();
OC::checkSingleUserMode(); OC::checkSingleUserMode();
if (!isset($_GET['service'])) { $pathInfo = OC_Request::getPathInfo();
if (!$pathInfo && !isset($_GET['service'])) {
header('HTTP/1.0 404 Not Found'); header('HTTP/1.0 404 Not Found');
exit; exit;
} elseif ($_GET['service']) {
$service = $_GET['service'];
} else {
$pathInfo = trim($pathInfo, '/');
list($service) = explode('/', $pathInfo);
} }
$file = OCP\CONFIG::getAppValue('core', 'public_' . strip_tags($_GET['service'])); $file = OCP\CONFIG::getAppValue('core', 'public_' . strip_tags($service));
if(is_null($file)) { if (is_null($file)) {
header('HTTP/1.0 404 Not Found'); header('HTTP/1.0 404 Not Found');
exit; exit;
} }
$parts=explode('/', $file, 2); $parts = explode('/', $file, 2);
$app=$parts[0]; $app = $parts[0];
OC_Util::checkAppEnabled($app); OC_Util::checkAppEnabled($app);
OC_App::loadApp($app); OC_App::loadApp($app);
OC_User::setIncognitoMode(true); OC_User::setIncognitoMode(true);
require_once OC_App::getAppPath($app) .'/'. $parts[1]; $baseuri = OC::$WEBROOT . '/public.php/' . $service . '/';
require_once OC_App::getAppPath($app) . '/' . $parts[1];
} catch (Exception $ex) { } catch (Exception $ex) {
//show the user a detailed error page //show the user a detailed error page