Initialize router also if ownCloud isn't installed

This commit is contained in:
Lukas Reschke 2013-01-25 14:57:52 +01:00
parent e5cc5a0a2d
commit 0d2a58bc5d
1 changed files with 18 additions and 16 deletions

View File

@ -541,22 +541,6 @@ class OC
*/
public static function handleRequest()
{
if (!OC_Config::getValue('installed', false)) {
require_once 'core/setup.php';
exit();
}
// Handle redirect URL for logged in users
if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) {
$location = OC_Helper::makeURLAbsolute(urldecode($_REQUEST['redirect_url']));
header('Location: ' . $location);
return;
}
// Handle WebDAV
if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') {
header('location: ' . OC_Helper::linkToRemote('webdav'));
return;
}
// load all the classpaths from the enabled apps so they are available
// in the routing files of each app
OC::loadAppClassPaths();
@ -578,6 +562,24 @@ class OC
self::loadCSSFile($param);
return;
}
if (!OC_Config::getValue('installed', false)) {
require_once 'core/setup.php';
exit();
}
// Handle redirect URL for logged in users
if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) {
$location = OC_Helper::makeURLAbsolute(urldecode($_REQUEST['redirect_url']));
header('Location: ' . $location);
return;
}
// Handle WebDAV
if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') {
header('location: ' . OC_Helper::linkToRemote('webdav'));
return;
}
// Someone is logged in :
if (OC_User::isLoggedIn()) {
OC_App::loadApps();