From 9b7ef2962eca5db6df9f9d1a7af73ba477d61a1f Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Mon, 26 Sep 2022 21:07:08 +0200 Subject: [PATCH] remove listeners to OC_Filesystem::(write|rename) old style hooks - the events are not emitted anymore - OC_Filesystem::isBlacklisted() is not called from anywhere else Signed-off-by: Arthur Schiwon --- lib/base.php | 10 ---------- lib/private/Files/Filesystem.php | 19 ------------------- 2 files changed, 29 deletions(-) diff --git a/lib/base.php b/lib/base.php index 055cc6786f0..7c6ffe8ae61 100644 --- a/lib/base.php +++ b/lib/base.php @@ -745,7 +745,6 @@ class OC { } self::registerCleanupHooks($systemConfig); - self::registerFilesystemHooks(); self::registerShareHooks($systemConfig); self::registerEncryptionWrapperAndHooks(); self::registerAccountHooks(); @@ -917,15 +916,6 @@ class OC { \OC\Collaboration\Reference\File\FileReferenceEventListener::register(Server::get(IEventDispatcher::class)); } - /** - * register hooks for the filesystem - */ - public static function registerFilesystemHooks() { - // Check for blacklisted files - OC_Hook::connect('OC_Filesystem', 'write', Filesystem::class, 'isBlacklisted'); - OC_Hook::connect('OC_Filesystem', 'rename', Filesystem::class, 'isBlacklisted'); - } - /** * register hooks for sharing */ diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php index 9542666b03c..b9b9534b15f 100644 --- a/lib/private/Files/Filesystem.php +++ b/lib/private/Files/Filesystem.php @@ -488,25 +488,6 @@ class Filesystem { return true; } - /** - * checks if a file is blacklisted for storage in the filesystem - * Listens to write and rename hooks - * - * @param array $data from hook - */ - public static function isBlacklisted($data) { - if (isset($data['path'])) { - $path = $data['path']; - } elseif (isset($data['newpath'])) { - $path = $data['newpath']; - } - if (isset($path)) { - if (self::isFileBlacklisted($path)) { - $data['run'] = false; - } - } - } - /** * @param string $filename * @return bool