aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblizzz <blizzz@arthur-schiwon.de>2022-10-01 16:15:39 +0200
committerGitHub <noreply@github.com>2022-10-01 16:15:39 +0200
commitf323c5b8540bce5687650d980d425f252fcfa110 (patch)
tree30e4c26865e11cfdaef291ead9d652493f070c8b
parentdbd0cf054cad1230b67fa091c4df66aebe24ba19 (diff)
parent9b7ef2962eca5db6df9f9d1a7af73ba477d61a1f (diff)
downloadnextcloud-server-f323c5b8540bce5687650d980d425f252fcfa110.tar.gz
nextcloud-server-f323c5b8540bce5687650d980d425f252fcfa110.zip
Merge pull request #34269 from nextcloud/td/noid/remove-unused-listener
remove listeners to OC_Filesystem::(write|rename) old style hooks
-rw-r--r--lib/base.php10
-rw-r--r--lib/private/Files/Filesystem.php19
2 files changed, 0 insertions, 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();
@@ -918,15 +917,6 @@ class OC {
}
/**
- * 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
*/
public static function registerShareHooks(\OC\SystemConfig $systemConfig) {
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
@@ -489,25 +489,6 @@ class Filesystem {
}
/**
- * 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
*/