From 552d0a6feb137ad1144312c6e6eef1c295e41572 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Thu, 19 Dec 2013 18:40:40 +0100 Subject: [PATCH] check if the old owner and the old path is available --- apps/files_encryption/hooks/hooks.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index 3e453e210f3..09d5687e226 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -484,7 +484,7 @@ class Hooks { /** * @brief mark file as renamed so that we know the original source after the file was renamed - * @param string $path + * @param array $params with the old path and the new path */ public static function preRename($params) { $util = new Util(new \OC_FilesystemView('/'), \OCP\User::getUser()); @@ -516,8 +516,15 @@ class Hooks { $userId = \OCP\User::getUser(); $util = new Util($view, $userId); - $ownerOld = self::$renamedFiles[$params['oldpath']]['uid']; - $pathOld = self::$renamedFiles[$params['oldpath']]['path']; + if (isset(self::$renamedFiles[$params['oldpath']]['uid']) && + isset(self::$renamedFiles[$params['oldpath']]['path'])) { + $ownerOld = self::$renamedFiles[$params['oldpath']]['uid']; + $pathOld = self::$renamedFiles[$params['oldpath']]['path']; + } else { + \OCP\Util::writeLog('Encryption library', "can't get path and owner from the file before it was renamed", \OCP\Util::ERROR); + return false; + } + list($ownerNew, $pathNew) = $util->getUidAndFilename($params['newpath']); // Format paths to be relative to user files dir -- 2.39.5