Move hook connectors from shared storage to app.php, add post_unshare hook

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index c9237a4b3a495f6f7a7217b8325f41d539d30248..8f9234c8228a1f5e33cea56881c3cafbca9a289c 100644 (file)
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -11,3 +11,8 @@ OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'set
 OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
 OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');
 OCP\Util::addScript('files_sharing', 'share');
+\OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Shared_Updater', 'writeHook');
+\OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook');
+\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook');
+\OC_Hook::connect('OCP\Share', 'post_shared', '\OC\Files\Cache\Shared_Updater', 'shareHook');
+\OC_Hook::connect('OCP\Share', 'post_unshare', '\OC\Files\Cache\Shared_Updater', 'shareHook');
\ No newline at end of file

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index f61a47c1900649e32f8a98e0831d15516718b5c5..f1a371b1238b6a521062e2581a319a4f996cf30a 100644 (file)
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -417,10 +417,6 @@ class Shared extends \OC\Files\Storage\Common {
                        \OC\Files\Filesystem::mount('\OC\Files\Storage\Shared',
                                array('sharedFolder' => '/Shared'),
                                $user_dir.'/Shared/');
-                       \OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Shared_Updater', 'writeHook');
-                       \OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook');
-                       \OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook');
-                       \OC_Hook::connect('OCP\Share', 'post_shared', '\OC\Files\Cache\Shared_Updater', 'shareHook');
                }
        }