From 7599628bf3360deda42793ef2b224efa286974b7 Mon Sep 17 00:00:00 2001 From: Pranav Kant Date: Sun, 20 Nov 2016 19:59:51 +0530 Subject: [PATCH 1/3] Handle case when no group mentioned in testing group exists --- controller/documentcontroller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controller/documentcontroller.php b/controller/documentcontroller.php index 388b3db0..e03ff861 100644 --- a/controller/documentcontroller.php +++ b/controller/documentcontroller.php @@ -165,7 +165,7 @@ class DocumentController extends Controller { ]); foreach ($testgroups as $testgroup) { $test = \OC::$server->getGroupManager()->get($testgroup); - if (sizeof($test->searchUsers($user)) > 0) { + if ($test !== null && sizeof($test->searchUsers($user)) > 0) { \OC::$server->getLogger()->debug('User {user} found in {group}', [ 'app' => $this->appName, 'user' => $user, From d0afe97f13d029a8405885d9490f25c24d9b24b8 Mon Sep 17 00:00:00 2001 From: Pranav Kant Date: Sun, 20 Nov 2016 20:04:50 +0530 Subject: [PATCH 2/3] Handle non-existing edit_groups --- controller/documentcontroller.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/controller/documentcontroller.php b/controller/documentcontroller.php index e03ff861..717d767c 100644 --- a/controller/documentcontroller.php +++ b/controller/documentcontroller.php @@ -483,13 +483,14 @@ class DocumentController extends Controller { $updatable = false; foreach($editGroups as $editGroup) { $editorGroup = \OC::$server->getGroupManager()->get($editGroup); - if (sizeof($editorGroup->searchUsers($editorUid)) > 0) { + if ($editorGroup !== null && sizeof($editorGroup->searchUsers($editorUid)) > 0) { \OC::$server->getLogger()->debug("Editor {editor} is in edit group {group}", [ 'app' => $this->appName, 'editor' => $editorUid, 'group' => $editGroup ]); $updatable = true; + break; } } } From 3bfa02e438296d87ee57eb0ce2f7fad3d0ffb584 Mon Sep 17 00:00:00 2001 From: Pranav Kant Date: Sun, 20 Nov 2016 20:29:25 +0530 Subject: [PATCH 3/3] No need to tear down FS; we do it when logging the user out --- controller/documentcontroller.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/controller/documentcontroller.php b/controller/documentcontroller.php index 717d767c..d9d4ecb3 100644 --- a/controller/documentcontroller.php +++ b/controller/documentcontroller.php @@ -600,8 +600,6 @@ class DocumentController extends Controller { list($ownerid, $filename) = \OCA\Files_Versions\Storage::getUidAndFilename($res['path']); $filename = '/files_versions/' . $filename . '.v' . $version; - - \OC_Util::tearDownFS(); } else { $filename = '/files' . $res['path']; }