@@ -22,12 +22,6 @@ | |||
* License along with this library. If not, see <http://www.gnu.org/licenses/>. | |||
* | |||
*/ | |||
// load needed apps | |||
$RUNTIME_APPTYPES = array('filesystem', 'authentication', 'logging'); | |||
OC_App::loadApps($RUNTIME_APPTYPES); | |||
OC_Util::obEnd(); | |||
// Backends | |||
$authBackend = new OC_Connector_Sabre_Auth(); |
@@ -48,7 +48,6 @@ class Report extends Command { | |||
} | |||
private function countUsers() { | |||
\OC_App::loadApps(array('authentication')); | |||
$userManager = \OC::$server->getUserManager(); | |||
return $userManager->countUsers(); | |||
} | |||
@@ -58,4 +57,4 @@ class Report extends Command { | |||
$userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory'); | |||
return count($userDirectories); | |||
} | |||
} | |||
} |
@@ -567,15 +567,9 @@ class OC { | |||
OC_User::logout(); | |||
} | |||
// Load Apps | |||
// This includes plugins for users and filesystems as well | |||
global $RUNTIME_APPTYPES; | |||
// Load minimum set of apps - which is filesystem, authentication and logging | |||
if (!self::checkUpgrade(false)) { | |||
if ($RUNTIME_APPTYPES) { | |||
OC_App::loadApps($RUNTIME_APPTYPES); | |||
} else { | |||
OC_App::loadApps(); | |||
} | |||
OC_App::loadApps(array('filesystem', 'authentication', 'logging')); | |||
} | |||
//setup extra user backends | |||
@@ -866,7 +860,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); | |||
} | |||
@@ -938,7 +932,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(); | |||
@@ -967,4 +961,3 @@ if (!function_exists('get_temp_dir')) { | |||
} | |||
OC::init(); | |||
@@ -317,8 +317,6 @@ class OC_User { | |||
*/ | |||
public static function isLoggedIn() { | |||
if (\OC::$session->get('user_id') && self::$incognitoMode === false) { | |||
OC_App::loadApps(array('authentication')); | |||
self::setupBackends(); | |||
return self::userExists(\OC::$session->get('user_id')); | |||
} | |||
return false; |