Fixed bugs with pre_share hook usage

Made sure new user being shared to is added to array of sharing users

1 files changed, 14 insertions, 4 deletions

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 1f642f48415..e8cd4ade713 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -277,21 +277,28 @@ class Hooks {
 

 			// if a folder was shared, get a list if all (sub-)folders

 			if ( $params['itemType'] === 'folder' ) {

-				$allFiles = $util->getAllFiles($path);

+			

+				$allFiles = $util->getAllFiles( $path );

+				

 			} else {

 			

 				$allFiles = array( $path );

 				

 			}

+			

+			// Set array for collecting paths which can't be shared

+			$failed = array();

 

 			foreach ( $allFiles as $path ) {

 			

 				$usersSharing = $util->getSharingUsersArray( $sharingEnabled, $path );

-

-				$failed = array();

+				

+				// Because this is a pre_share hook, the user 

+				// being shared to is not yet included; add them

+				$usersSharing[] = $params['shareWith'];

 

 				// Attempt to set shareKey

- 				if ( !$util->setSharedFileKeyfiles( $session, $usersSharing, $path ) ) {

+ 				if ( ! $util->setSharedFileKeyfiles( $session, $usersSharing, $path ) ) {

 

 					$failed[] = $path;

 				}

@@ -304,6 +311,9 @@ class Hooks {
 				// script that hook execution failed

 				$params['run']->run = false;

 				

+				// TODO: Make sure files_sharing provides user 

+				// feedback on failed share

+				

 			}

 		}

 	}