fix for autoloader while user logged in and system is in maintenance
This commit is contained in:
parent
bd7771867b
commit
4f9cbadfa4
|
@ -10,21 +10,22 @@ OC::$CLASSPATH['OCA\Encryption\Session'] = 'files_encryption/lib/session.php';
|
||||||
OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'files_encryption/lib/capabilities.php';
|
OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'files_encryption/lib/capabilities.php';
|
||||||
OC::$CLASSPATH['OCA\Encryption\Helper'] = 'files_encryption/lib/helper.php';
|
OC::$CLASSPATH['OCA\Encryption\Helper'] = 'files_encryption/lib/helper.php';
|
||||||
|
|
||||||
OC_FileProxy::register(new OCA\Encryption\Proxy());
|
if(!OC_Config::getValue('maintenance', false)) {
|
||||||
|
OC_FileProxy::register(new OCA\Encryption\Proxy());
|
||||||
|
|
||||||
// User related hooks
|
// User related hooks
|
||||||
OCA\Encryption\Helper::registerUserHooks();
|
OCA\Encryption\Helper::registerUserHooks();
|
||||||
|
|
||||||
// Sharing related hooks
|
// Sharing related hooks
|
||||||
OCA\Encryption\Helper::registerShareHooks();
|
OCA\Encryption\Helper::registerShareHooks();
|
||||||
|
|
||||||
// Filesystem related hooks
|
// Filesystem related hooks
|
||||||
OCA\Encryption\Helper::registerFilesystemHooks();
|
OCA\Encryption\Helper::registerFilesystemHooks();
|
||||||
|
|
||||||
stream_wrapper_register('crypt', 'OCA\Encryption\Stream');
|
stream_wrapper_register('crypt', 'OCA\Encryption\Stream');
|
||||||
|
|
||||||
// check if we are logged in
|
// check if we are logged in
|
||||||
if (OCP\User::isLoggedIn()) {
|
if (OCP\User::isLoggedIn()) {
|
||||||
$view = new OC_FilesystemView('/');
|
$view = new OC_FilesystemView('/');
|
||||||
$session = new \OCA\Encryption\Session($view);
|
$session = new \OCA\Encryption\Session($view);
|
||||||
|
|
||||||
|
@ -43,6 +44,10 @@ if (OCP\User::isLoggedIn()) {
|
||||||
|
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// logout user if we are in maintenance to force re-login
|
||||||
|
OCP\User::logout();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Register settings scripts
|
// Register settings scripts
|
||||||
|
|
Loading…
Reference in New Issue