|
|
|
@ -549,16 +549,10 @@ class OC {
|
|
|
|
|
OC_User::logout();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Load Apps
|
|
|
|
|
// This includes plugins for users and filesystems as well
|
|
|
|
|
global $RUNTIME_NOAPPS;
|
|
|
|
|
global $RUNTIME_APPTYPES;
|
|
|
|
|
if (!$RUNTIME_NOAPPS && !self::checkUpgrade(false)) {
|
|
|
|
|
if ($RUNTIME_APPTYPES) {
|
|
|
|
|
OC_App::loadApps($RUNTIME_APPTYPES);
|
|
|
|
|
} else {
|
|
|
|
|
OC_App::loadApps();
|
|
|
|
|
}
|
|
|
|
|
// Load minimum set of apps - which is filesystem, authentication and logging
|
|
|
|
|
if (!self::checkUpgrade(false)) {
|
|
|
|
|
OC_App::loadApps(array('authentication'));
|
|
|
|
|
OC_App::loadApps(array('filesystem', 'logging'));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//setup extra user backends
|
|
|
|
@ -851,7 +845,7 @@ class OC {
|
|
|
|
|
) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
OC_App::loadApps(array('authentication'));
|
|
|
|
|
|
|
|
|
|
if (defined("DEBUG") && DEBUG) {
|
|
|
|
|
OC_Log::write('core', 'Trying to login from cookie', OC_Log::DEBUG);
|
|
|
|
|
}
|
|
|
|
@ -923,7 +917,7 @@ class OC {
|
|
|
|
|
) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
OC_App::loadApps(array('authentication'));
|
|
|
|
|
|
|
|
|
|
if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
|
|
|
|
|
//OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
|
|
|
|
|
OC_User::unsetMagicInCookie();
|
|
|
|
@ -934,11 +928,6 @@ class OC {
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// define runtime variables - unless this already has been done
|
|
|
|
|
if (!isset($RUNTIME_NOAPPS)) {
|
|
|
|
|
$RUNTIME_NOAPPS = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!function_exists('get_temp_dir')) {
|
|
|
|
|
function get_temp_dir() {
|
|
|
|
|
if ($temp = ini_get('upload_tmp_dir')) return $temp;
|
|
|
|
@ -957,4 +946,3 @@ if (!function_exists('get_temp_dir')) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
OC::init();
|
|
|
|
|
|
|
|
|
|