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

Remove unneeded check if app is enabled 

App code will not be executable if the app is not enabled, because the autoloader refuses to load that class.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2017-10-23 23:47:06 +02:00
parent db1096bcfd
commit 5987099d2a
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
3 changed files with 34 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/encryption/lib/Hooks/UserHooks.php
View File

@ -170,11 +170,6 @@ class UserHooks implements IHook {
* @return boolean|null
*/
public function login($params) {
if (!App::isEnabled('encryption')) {
return true;
}
// ensure filesystem is loaded
if (!\OC\Files\Filesystem::$loaded) {
$this->setupFS($params['uid']);
@ -200,10 +195,7 @@ class UserHooks implements IHook {
* @param array $params
*/
public function postCreateUser($params) {
if (App::isEnabled('encryption')) {
$this->userSetup->setupUser($params['uid'], $params['password']);
}
$this->userSetup->setupUser($params['uid'], $params['password']);
}
/**
@ -213,17 +205,12 @@ class UserHooks implements IHook {
* @note This method should never be called for users using client side encryption
*/
public function postDeleteUser($params) {
if (App::isEnabled('encryption')) {
$this->keyManager->deletePublicKey($params['uid']);
}
$this->keyManager->deletePublicKey($params['uid']);
}
public function prePasswordReset($params) {
if (App::isEnabled('encryption')) {
$user = $params['uid'];
self::$passwordResetUsers[$user] = true;
}
$user = $params['uid'];
self::$passwordResetUsers[$user] = true;
}
public function postPasswordReset($params) {

6
apps/files_trashbin/lib/Hooks.php
View File

@ -39,10 +39,8 @@ class Hooks {
* to remove the used space for the trash bin stored in the database
*/
public static function deleteUser_hook($params) {
if( \OCP\App::isEnabled('files_trashbin') ) {
$uid = $params['uid'];
Trashbin::deleteUser($uid);
}
$uid = $params['uid'];
Trashbin::deleteUser($uid);
}
public static function post_write_hook($params) {

72
apps/files_versions/lib/Hooks.php
View File

@ -54,12 +54,9 @@ class Hooks {
* listen to write event.
*/
public static function write_hook( $params ) {
if (\OCP\App::isEnabled('files_versions')) {
$path = $params[\OC\Files\Filesystem::signal_param_path];
if($path !== '') {
Storage::store($path);
}
$path = $params[\OC\Files\Filesystem::signal_param_path];
if($path !== '') {
Storage::store($path);
}
}
@ -72,12 +69,9 @@ class Hooks {
* cleanup the versions directory if the actual file gets deleted
*/
public static function remove_hook($params) {
if (\OCP\App::isEnabled('files_versions')) {
$path = $params[\OC\Files\Filesystem::signal_param_path];
if($path !== '') {
Storage::delete($path);
}
$path = $params[\OC\Files\Filesystem::signal_param_path];
if($path !== '') {
Storage::delete($path);
}
}
@ -100,13 +94,10 @@ class Hooks {
* of the stored versions along the actual file
*/
public static function rename_hook($params) {
if (\OCP\App::isEnabled('files_versions')) {
$oldpath = $params['oldpath'];
$newpath = $params['newpath'];
if($oldpath !== '' && $newpath !== '') {
Storage::renameOrCopy($oldpath, $newpath, 'rename');
}
$oldpath = $params['oldpath'];
$newpath = $params['newpath'];
if($oldpath !== '' && $newpath !== '') {
Storage::renameOrCopy($oldpath, $newpath, 'rename');
}
}
@ -118,13 +109,10 @@ class Hooks {
* the stored versions to the new location
*/
public static function copy_hook($params) {
if (\OCP\App::isEnabled('files_versions')) {
$oldpath = $params['oldpath'];
$newpath = $params['newpath'];
if($oldpath !== '' && $newpath !== '') {
Storage::renameOrCopy($oldpath, $newpath, 'copy');
}
$oldpath = $params['oldpath'];
$newpath = $params['newpath'];
if($oldpath !== '' && $newpath !== '') {
Storage::renameOrCopy($oldpath, $newpath, 'copy');
}
}
@ -137,25 +125,21 @@ class Hooks {
*
*/
public static function pre_renameOrCopy_hook($params) {
if (\OCP\App::isEnabled('files_versions')) {
// if we rename a movable mount point, then the versions don't have
// to be renamed
$absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
$manager = \OC\Files\Filesystem::getMountManager();
$mount = $manager->find($absOldPath);
$internalPath = $mount->getInternalPath($absOldPath);
if ($internalPath === '' and $mount instanceof \OC\Files\Mount\MoveableMount) {
return;
}
$view = new \OC\Files\View(\OCP\User::getUser() . '/files');
if ($view->file_exists($params['newpath'])) {
Storage::store($params['newpath']);
} else {
Storage::setSourcePathAndUser($params['oldpath']);
}
// if we rename a movable mount point, then the versions don't have
// to be renamed
$absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
$manager = \OC\Files\Filesystem::getMountManager();
$mount = $manager->find($absOldPath);
$internalPath = $mount->getInternalPath($absOldPath);
if ($internalPath === '' and $mount instanceof \OC\Files\Mount\MoveableMount) {
return;
}
$view = new \OC\Files\View(\OCP\User::getUser() . '/files');
if ($view->file_exists($params['newpath'])) {
Storage::store($params['newpath']);
} else {
Storage::setSourcePathAndUser($params['oldpath']);
}
}