Merge pull request #22225 from owncloud/sharing-moar-hooks

More sharing hooks for extended auditing

2 files changed, 12 insertions, 1 deletions

diff --git a/lib/private/share20/manager.php b/lib/private/share20/manager.php
index 7cd44a7cb37..3a19bd2dc3a 100644
--- a/lib/private/share20/manager.php
+++ b/lib/private/share20/manager.php
@@ -597,7 +597,7 @@ class Manager implements IManager {
 				}
 			}
 
-			if ($share->getExpirationDate() !== $originalShare->getExpirationDate()) {
+			if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
 				//Verify the expiration date
 				$this->validateExpirationDate($share);
 				$expirationDateUpdated = true;
@@ -619,6 +619,16 @@ class Manager implements IManager {
 			]);
 		}
 
+		if ($share->getPassword() !== $originalShare->getPassword()) {
+			\OC_Hook::emit('OCP\Share', 'post_update_password', [
+				'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
+				'itemSource' => $share->getNode()->getId(),
+				'uidOwner' => $share->getSharedBy(),
+				'token' => $share->getToken(),
+				'disabled' => is_null($share->getPassword()),
+			]);
+		}
+
 		if ($share->getPermissions() !== $originalShare->getPermissions()) {
 			$userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
 			\OC_Hook::emit('OCP\Share', 'post_update_permissions', array(
diff --git a/lib/private/share20/share.php b/lib/private/share20/share.php
index cd30f24c42e..e84d52b63a0 100644
--- a/lib/private/share20/share.php
+++ b/lib/private/share20/share.php
@@ -163,6 +163,7 @@ class Share implements \OCP\Share\IShare {
 		}
 
 		$this->nodeType = $type;
+		return $this;
 	}
 
 	/**