backport of https://github.com/owncloud/core/pull/5513

2 files changed, 48 insertions, 21 deletions

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 6e2d360917b..35574b8e5b9 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -35,6 +35,12 @@ class Hooks {
 	 * @note This method should never be called for users using client side encryption

 	 */

 	public static function login($params) {

+

+		if (\OCP\App::isEnabled('files_encryption') === false) {

+			return true;

+		}

+

+

 		$l = new \OC_L10N('files_encryption');

 

 		$view = new \OC_FilesystemView('/');

@@ -117,11 +123,12 @@ class Hooks {
 	 * @note This method should never be called for users using client side encryption

 	 */

 	public static function postCreateUser($params) {

-		$view = new \OC_FilesystemView('/');

-

-		$util = new Util($view, $params['uid']);

 

-		Helper::setupUser($util, $params['password']);

+		if (\OCP\App::isEnabled('files_encryption')) {

+			$view = new \OC_FilesystemView('/');

+			$util = new Util($view, $params['uid']);

+			Helper::setupUser($util, $params['password']);

+		}

 	}

 

 	/**

@@ -129,26 +136,31 @@ class Hooks {
 	 * @note This method should never be called for users using client side encryption

 	 */

 	public static function postDeleteUser($params) {

-		$view = new \OC_FilesystemView('/');

 

-		// cleanup public key

-		$publicKey = '/public-keys/' . $params['uid'] . '.public.key';

+		if (\OCP\App::isEnabled('files_encryption')) {

+			$view = new \OC_FilesystemView('/');

 

-		// Disable encryption proxy to prevent recursive calls

-		$proxyStatus = \OC_FileProxy::$enabled;

-		\OC_FileProxy::$enabled = false;

+			// cleanup public key

+			$publicKey = '/public-keys/' . $params['uid'] . '.public.key';

 

-		$view->unlink($publicKey);

+			// Disable encryption proxy to prevent recursive calls

+			$proxyStatus = \OC_FileProxy::$enabled;

+			\OC_FileProxy::$enabled = false;

 

-		\OC_FileProxy::$enabled = $proxyStatus;

+			$view->unlink($publicKey);

+

+			\OC_FileProxy::$enabled = $proxyStatus;

+		}

 	}

 

 	/**

 	 * @brief If the password can't be changed within ownCloud, than update the key password in advance.

 	 */

 	public static function preSetPassphrase($params) {

-		if ( ! \OC_User::canUserChangePassword($params['uid']) ) {

-			self::setPassphrase($params);

+		if (\OCP\App::isEnabled('files_encryption')) {

+			if ( ! \OC_User::canUserChangePassword($params['uid']) ) {

+				self::setPassphrase($params);

+			}

 		}

 	}

 

@@ -157,6 +169,11 @@ class Hooks {
 	 * @param array $params keys: uid, password

 	 */

 	public static function setPassphrase($params) {

+

+		if (\OCP\App::isEnabled('files_encryption') === false) {

+			return true;

+		}

+

 		// Only attempt to change passphrase if server-side encryption

 		// is in use (client-side encryption does not have access to

 		// the necessary keys)

@@ -227,6 +244,10 @@ class Hooks {
 	 */

 	public static function preShared($params) {

 

+		if (\OCP\App::isEnabled('files_encryption') === false) {

+			return true;

+		}

+

 		$l = new \OC_L10N('files_encryption');

 		$users = array();

 		$view = new \OC\Files\View('/public-keys/');

@@ -278,6 +299,10 @@ class Hooks {
 		// [run] => whether emitting script should continue to run

 		// TODO: Should other kinds of item be encrypted too?

 

+		if (\OCP\App::isEnabled('files_encryption') === false) {

+			return true;

+		}

+

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

 

 			$view = new \OC_FilesystemView('/');

@@ -372,6 +397,10 @@ class Hooks {
 		// [shareWith] => test1

 		// [itemParent] =>

 

+		if (\OCP\App::isEnabled('files_encryption') === false) {

+			return true;

+		}

+

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

 

 			$view = new \OC_FilesystemView('/');

@@ -453,6 +482,11 @@ class Hooks {
 	 * of the stored versions along the actual file

 	 */

 	public static function postRename($params) {

+

+		if (\OCP\App::isEnabled('files_encryption') === false) {

+			return true;

+		}

+

 		// Disable encryption proxy to prevent recursive calls

 		$proxyStatus = \OC_FileProxy::$enabled;

 		\OC_FileProxy::$enabled = false;

diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php
index 3381f75f16d..171999ea652 100644
--- a/apps/files_sharing/lib/updater.php
+++ b/apps/files_sharing/lib/updater.php
@@ -49,13 +49,6 @@ class Shared_Updater {
 				}
 				$users = $reshareUsers;
 			}
-			// Correct folders of shared file owner
-			$target = substr($target, 8);
-			if ($uidOwner !== $uid && $source = \OC_Share_Backend_File::getSource($target)) {
-				\OC\Files\Filesystem::initMountPoints($uidOwner);
-				$source = '/'.$uidOwner.'/'.$source['path'];
-				\OC\Files\Cache\Updater::correctFolder($source, $info['mtime']);
-			}
 		}
 	}