@@ -39,169 +39,169 @@ |
||
39 | 39 | */ |
40 | 40 | class SystemTagsObjectMappingCollection implements ICollection { |
41 | 41 | |
42 | - /** |
|
43 | - * @var string |
|
44 | - */ |
|
45 | - private $objectId; |
|
46 | - |
|
47 | - /** |
|
48 | - * @var string |
|
49 | - */ |
|
50 | - private $objectType; |
|
51 | - |
|
52 | - /** |
|
53 | - * @var ISystemTagManager |
|
54 | - */ |
|
55 | - private $tagManager; |
|
56 | - |
|
57 | - /** |
|
58 | - * @var ISystemTagObjectMapper |
|
59 | - */ |
|
60 | - private $tagMapper; |
|
61 | - |
|
62 | - /** |
|
63 | - * User |
|
64 | - * |
|
65 | - * @var IUser |
|
66 | - */ |
|
67 | - private $user; |
|
68 | - |
|
69 | - |
|
70 | - /** |
|
71 | - * Constructor |
|
72 | - * |
|
73 | - * @param string $objectId object id |
|
74 | - * @param string $objectType object type |
|
75 | - * @param IUser $user user |
|
76 | - * @param ISystemTagManager $tagManager tag manager |
|
77 | - * @param ISystemTagObjectMapper $tagMapper tag mapper |
|
78 | - */ |
|
79 | - public function __construct( |
|
80 | - $objectId, |
|
81 | - $objectType, |
|
82 | - IUser $user, |
|
83 | - ISystemTagManager $tagManager, |
|
84 | - ISystemTagObjectMapper $tagMapper |
|
85 | - ) { |
|
86 | - $this->tagManager = $tagManager; |
|
87 | - $this->tagMapper = $tagMapper; |
|
88 | - $this->objectId = $objectId; |
|
89 | - $this->objectType = $objectType; |
|
90 | - $this->user = $user; |
|
91 | - } |
|
92 | - |
|
93 | - function createFile($tagId, $data = null) { |
|
94 | - try { |
|
95 | - $tags = $this->tagManager->getTagsByIds([$tagId]); |
|
96 | - $tag = current($tags); |
|
97 | - if (!$this->tagManager->canUserSeeTag($tag, $this->user)) { |
|
98 | - throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign'); |
|
99 | - } |
|
100 | - if (!$this->tagManager->canUserAssignTag($tag, $this->user)) { |
|
101 | - throw new Forbidden('No permission to assign tag ' . $tagId); |
|
102 | - } |
|
103 | - |
|
104 | - $this->tagMapper->assignTags($this->objectId, $this->objectType, $tagId); |
|
105 | - } catch (TagNotFoundException $e) { |
|
106 | - throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign'); |
|
107 | - } |
|
108 | - } |
|
109 | - |
|
110 | - function createDirectory($name) { |
|
111 | - throw new Forbidden('Permission denied to create collections'); |
|
112 | - } |
|
113 | - |
|
114 | - function getChild($tagId) { |
|
115 | - try { |
|
116 | - if ($this->tagMapper->haveTag([$this->objectId], $this->objectType, $tagId, true)) { |
|
117 | - $tag = $this->tagManager->getTagsByIds([$tagId]); |
|
118 | - $tag = current($tag); |
|
119 | - if ($this->tagManager->canUserSeeTag($tag, $this->user)) { |
|
120 | - return $this->makeNode($tag); |
|
121 | - } |
|
122 | - } |
|
123 | - throw new NotFound('Tag with id ' . $tagId . ' not present for object ' . $this->objectId); |
|
124 | - } catch (\InvalidArgumentException $e) { |
|
125 | - throw new BadRequest('Invalid tag id', 0, $e); |
|
126 | - } catch (TagNotFoundException $e) { |
|
127 | - throw new NotFound('Tag with id ' . $tagId . ' not found', 0, $e); |
|
128 | - } |
|
129 | - } |
|
130 | - |
|
131 | - function getChildren() { |
|
132 | - $tagIds = current($this->tagMapper->getTagIdsForObjects([$this->objectId], $this->objectType)); |
|
133 | - if (empty($tagIds)) { |
|
134 | - return []; |
|
135 | - } |
|
136 | - $tags = $this->tagManager->getTagsByIds($tagIds); |
|
137 | - |
|
138 | - // filter out non-visible tags |
|
139 | - $tags = array_filter($tags, function($tag) { |
|
140 | - return $this->tagManager->canUserSeeTag($tag, $this->user); |
|
141 | - }); |
|
142 | - |
|
143 | - return array_values(array_map(function($tag) { |
|
144 | - return $this->makeNode($tag); |
|
145 | - }, $tags)); |
|
146 | - } |
|
147 | - |
|
148 | - function childExists($tagId) { |
|
149 | - try { |
|
150 | - $result = ($this->tagMapper->haveTag([$this->objectId], $this->objectType, $tagId, true)); |
|
151 | - |
|
152 | - if ($result) { |
|
153 | - $tags = $this->tagManager->getTagsByIds([$tagId]); |
|
154 | - $tag = current($tags); |
|
155 | - if (!$this->tagManager->canUserSeeTag($tag, $this->user)) { |
|
156 | - return false; |
|
157 | - } |
|
158 | - } |
|
159 | - |
|
160 | - return $result; |
|
161 | - } catch (\InvalidArgumentException $e) { |
|
162 | - throw new BadRequest('Invalid tag id', 0, $e); |
|
163 | - } catch (TagNotFoundException $e) { |
|
164 | - return false; |
|
165 | - } |
|
166 | - } |
|
167 | - |
|
168 | - function delete() { |
|
169 | - throw new Forbidden('Permission denied to delete this collection'); |
|
170 | - } |
|
171 | - |
|
172 | - function getName() { |
|
173 | - return $this->objectId; |
|
174 | - } |
|
175 | - |
|
176 | - function setName($name) { |
|
177 | - throw new Forbidden('Permission denied to rename this collection'); |
|
178 | - } |
|
179 | - |
|
180 | - /** |
|
181 | - * Returns the last modification time, as a unix timestamp |
|
182 | - * |
|
183 | - * @return int |
|
184 | - */ |
|
185 | - function getLastModified() { |
|
186 | - return null; |
|
187 | - } |
|
188 | - |
|
189 | - /** |
|
190 | - * Create a sabre node for the mapping of the |
|
191 | - * given system tag to the collection's object |
|
192 | - * |
|
193 | - * @param ISystemTag $tag |
|
194 | - * |
|
195 | - * @return SystemTagMappingNode |
|
196 | - */ |
|
197 | - private function makeNode(ISystemTag $tag) { |
|
198 | - return new SystemTagMappingNode( |
|
199 | - $tag, |
|
200 | - $this->objectId, |
|
201 | - $this->objectType, |
|
202 | - $this->user, |
|
203 | - $this->tagManager, |
|
204 | - $this->tagMapper |
|
205 | - ); |
|
206 | - } |
|
42 | + /** |
|
43 | + * @var string |
|
44 | + */ |
|
45 | + private $objectId; |
|
46 | + |
|
47 | + /** |
|
48 | + * @var string |
|
49 | + */ |
|
50 | + private $objectType; |
|
51 | + |
|
52 | + /** |
|
53 | + * @var ISystemTagManager |
|
54 | + */ |
|
55 | + private $tagManager; |
|
56 | + |
|
57 | + /** |
|
58 | + * @var ISystemTagObjectMapper |
|
59 | + */ |
|
60 | + private $tagMapper; |
|
61 | + |
|
62 | + /** |
|
63 | + * User |
|
64 | + * |
|
65 | + * @var IUser |
|
66 | + */ |
|
67 | + private $user; |
|
68 | + |
|
69 | + |
|
70 | + /** |
|
71 | + * Constructor |
|
72 | + * |
|
73 | + * @param string $objectId object id |
|
74 | + * @param string $objectType object type |
|
75 | + * @param IUser $user user |
|
76 | + * @param ISystemTagManager $tagManager tag manager |
|
77 | + * @param ISystemTagObjectMapper $tagMapper tag mapper |
|
78 | + */ |
|
79 | + public function __construct( |
|
80 | + $objectId, |
|
81 | + $objectType, |
|
82 | + IUser $user, |
|
83 | + ISystemTagManager $tagManager, |
|
84 | + ISystemTagObjectMapper $tagMapper |
|
85 | + ) { |
|
86 | + $this->tagManager = $tagManager; |
|
87 | + $this->tagMapper = $tagMapper; |
|
88 | + $this->objectId = $objectId; |
|
89 | + $this->objectType = $objectType; |
|
90 | + $this->user = $user; |
|
91 | + } |
|
92 | + |
|
93 | + function createFile($tagId, $data = null) { |
|
94 | + try { |
|
95 | + $tags = $this->tagManager->getTagsByIds([$tagId]); |
|
96 | + $tag = current($tags); |
|
97 | + if (!$this->tagManager->canUserSeeTag($tag, $this->user)) { |
|
98 | + throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign'); |
|
99 | + } |
|
100 | + if (!$this->tagManager->canUserAssignTag($tag, $this->user)) { |
|
101 | + throw new Forbidden('No permission to assign tag ' . $tagId); |
|
102 | + } |
|
103 | + |
|
104 | + $this->tagMapper->assignTags($this->objectId, $this->objectType, $tagId); |
|
105 | + } catch (TagNotFoundException $e) { |
|
106 | + throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign'); |
|
107 | + } |
|
108 | + } |
|
109 | + |
|
110 | + function createDirectory($name) { |
|
111 | + throw new Forbidden('Permission denied to create collections'); |
|
112 | + } |
|
113 | + |
|
114 | + function getChild($tagId) { |
|
115 | + try { |
|
116 | + if ($this->tagMapper->haveTag([$this->objectId], $this->objectType, $tagId, true)) { |
|
117 | + $tag = $this->tagManager->getTagsByIds([$tagId]); |
|
118 | + $tag = current($tag); |
|
119 | + if ($this->tagManager->canUserSeeTag($tag, $this->user)) { |
|
120 | + return $this->makeNode($tag); |
|
121 | + } |
|
122 | + } |
|
123 | + throw new NotFound('Tag with id ' . $tagId . ' not present for object ' . $this->objectId); |
|
124 | + } catch (\InvalidArgumentException $e) { |
|
125 | + throw new BadRequest('Invalid tag id', 0, $e); |
|
126 | + } catch (TagNotFoundException $e) { |
|
127 | + throw new NotFound('Tag with id ' . $tagId . ' not found', 0, $e); |
|
128 | + } |
|
129 | + } |
|
130 | + |
|
131 | + function getChildren() { |
|
132 | + $tagIds = current($this->tagMapper->getTagIdsForObjects([$this->objectId], $this->objectType)); |
|
133 | + if (empty($tagIds)) { |
|
134 | + return []; |
|
135 | + } |
|
136 | + $tags = $this->tagManager->getTagsByIds($tagIds); |
|
137 | + |
|
138 | + // filter out non-visible tags |
|
139 | + $tags = array_filter($tags, function($tag) { |
|
140 | + return $this->tagManager->canUserSeeTag($tag, $this->user); |
|
141 | + }); |
|
142 | + |
|
143 | + return array_values(array_map(function($tag) { |
|
144 | + return $this->makeNode($tag); |
|
145 | + }, $tags)); |
|
146 | + } |
|
147 | + |
|
148 | + function childExists($tagId) { |
|
149 | + try { |
|
150 | + $result = ($this->tagMapper->haveTag([$this->objectId], $this->objectType, $tagId, true)); |
|
151 | + |
|
152 | + if ($result) { |
|
153 | + $tags = $this->tagManager->getTagsByIds([$tagId]); |
|
154 | + $tag = current($tags); |
|
155 | + if (!$this->tagManager->canUserSeeTag($tag, $this->user)) { |
|
156 | + return false; |
|
157 | + } |
|
158 | + } |
|
159 | + |
|
160 | + return $result; |
|
161 | + } catch (\InvalidArgumentException $e) { |
|
162 | + throw new BadRequest('Invalid tag id', 0, $e); |
|
163 | + } catch (TagNotFoundException $e) { |
|
164 | + return false; |
|
165 | + } |
|
166 | + } |
|
167 | + |
|
168 | + function delete() { |
|
169 | + throw new Forbidden('Permission denied to delete this collection'); |
|
170 | + } |
|
171 | + |
|
172 | + function getName() { |
|
173 | + return $this->objectId; |
|
174 | + } |
|
175 | + |
|
176 | + function setName($name) { |
|
177 | + throw new Forbidden('Permission denied to rename this collection'); |
|
178 | + } |
|
179 | + |
|
180 | + /** |
|
181 | + * Returns the last modification time, as a unix timestamp |
|
182 | + * |
|
183 | + * @return int |
|
184 | + */ |
|
185 | + function getLastModified() { |
|
186 | + return null; |
|
187 | + } |
|
188 | + |
|
189 | + /** |
|
190 | + * Create a sabre node for the mapping of the |
|
191 | + * given system tag to the collection's object |
|
192 | + * |
|
193 | + * @param ISystemTag $tag |
|
194 | + * |
|
195 | + * @return SystemTagMappingNode |
|
196 | + */ |
|
197 | + private function makeNode(ISystemTag $tag) { |
|
198 | + return new SystemTagMappingNode( |
|
199 | + $tag, |
|
200 | + $this->objectId, |
|
201 | + $this->objectType, |
|
202 | + $this->user, |
|
203 | + $this->tagManager, |
|
204 | + $this->tagMapper |
|
205 | + ); |
|
206 | + } |
|
207 | 207 | } |
@@ -36,59 +36,59 @@ |
||
36 | 36 | |
37 | 37 | class SystemTagsRelationsCollection extends SimpleCollection { |
38 | 38 | |
39 | - /** |
|
40 | - * SystemTagsRelationsCollection constructor. |
|
41 | - * |
|
42 | - * @param ISystemTagManager $tagManager |
|
43 | - * @param ISystemTagObjectMapper $tagMapper |
|
44 | - * @param IUserSession $userSession |
|
45 | - * @param IGroupManager $groupManager |
|
46 | - * @param EventDispatcherInterface $dispatcher |
|
47 | - */ |
|
48 | - public function __construct( |
|
49 | - ISystemTagManager $tagManager, |
|
50 | - ISystemTagObjectMapper $tagMapper, |
|
51 | - IUserSession $userSession, |
|
52 | - IGroupManager $groupManager, |
|
53 | - EventDispatcherInterface $dispatcher |
|
54 | - ) { |
|
55 | - $children = [ |
|
56 | - new SystemTagsObjectTypeCollection( |
|
57 | - 'files', |
|
58 | - $tagManager, |
|
59 | - $tagMapper, |
|
60 | - $userSession, |
|
61 | - $groupManager, |
|
62 | - function($name) { |
|
63 | - $nodes = \OC::$server->getUserFolder()->getById(intval($name)); |
|
64 | - return !empty($nodes); |
|
65 | - } |
|
66 | - ), |
|
67 | - ]; |
|
39 | + /** |
|
40 | + * SystemTagsRelationsCollection constructor. |
|
41 | + * |
|
42 | + * @param ISystemTagManager $tagManager |
|
43 | + * @param ISystemTagObjectMapper $tagMapper |
|
44 | + * @param IUserSession $userSession |
|
45 | + * @param IGroupManager $groupManager |
|
46 | + * @param EventDispatcherInterface $dispatcher |
|
47 | + */ |
|
48 | + public function __construct( |
|
49 | + ISystemTagManager $tagManager, |
|
50 | + ISystemTagObjectMapper $tagMapper, |
|
51 | + IUserSession $userSession, |
|
52 | + IGroupManager $groupManager, |
|
53 | + EventDispatcherInterface $dispatcher |
|
54 | + ) { |
|
55 | + $children = [ |
|
56 | + new SystemTagsObjectTypeCollection( |
|
57 | + 'files', |
|
58 | + $tagManager, |
|
59 | + $tagMapper, |
|
60 | + $userSession, |
|
61 | + $groupManager, |
|
62 | + function($name) { |
|
63 | + $nodes = \OC::$server->getUserFolder()->getById(intval($name)); |
|
64 | + return !empty($nodes); |
|
65 | + } |
|
66 | + ), |
|
67 | + ]; |
|
68 | 68 | |
69 | - $event = new SystemTagsEntityEvent(SystemTagsEntityEvent::EVENT_ENTITY); |
|
70 | - $dispatcher->dispatch(SystemTagsEntityEvent::EVENT_ENTITY, $event); |
|
69 | + $event = new SystemTagsEntityEvent(SystemTagsEntityEvent::EVENT_ENTITY); |
|
70 | + $dispatcher->dispatch(SystemTagsEntityEvent::EVENT_ENTITY, $event); |
|
71 | 71 | |
72 | - foreach ($event->getEntityCollections() as $entity => $entityExistsFunction) { |
|
73 | - $children[] = new SystemTagsObjectTypeCollection( |
|
74 | - $entity, |
|
75 | - $tagManager, |
|
76 | - $tagMapper, |
|
77 | - $userSession, |
|
78 | - $groupManager, |
|
79 | - $entityExistsFunction |
|
80 | - ); |
|
81 | - } |
|
72 | + foreach ($event->getEntityCollections() as $entity => $entityExistsFunction) { |
|
73 | + $children[] = new SystemTagsObjectTypeCollection( |
|
74 | + $entity, |
|
75 | + $tagManager, |
|
76 | + $tagMapper, |
|
77 | + $userSession, |
|
78 | + $groupManager, |
|
79 | + $entityExistsFunction |
|
80 | + ); |
|
81 | + } |
|
82 | 82 | |
83 | - parent::__construct('root', $children); |
|
84 | - } |
|
83 | + parent::__construct('root', $children); |
|
84 | + } |
|
85 | 85 | |
86 | - function getName() { |
|
87 | - return 'systemtags-relations'; |
|
88 | - } |
|
86 | + function getName() { |
|
87 | + return 'systemtags-relations'; |
|
88 | + } |
|
89 | 89 | |
90 | - function setName($name) { |
|
91 | - throw new Forbidden('Permission denied to rename this collection'); |
|
92 | - } |
|
90 | + function setName($name) { |
|
91 | + throw new Forbidden('Permission denied to rename this collection'); |
|
92 | + } |
|
93 | 93 | |
94 | 94 | } |
@@ -33,17 +33,17 @@ discard block |
||
33 | 33 | use OCA\DAV\Connector\Sabre\Principal; |
34 | 34 | |
35 | 35 | $authBackend = new Auth( |
36 | - \OC::$server->getSession(), |
|
37 | - \OC::$server->getUserSession(), |
|
38 | - \OC::$server->getRequest(), |
|
39 | - \OC::$server->getTwoFactorAuthManager(), |
|
40 | - \OC::$server->getBruteForceThrottler(), |
|
41 | - 'principals/' |
|
36 | + \OC::$server->getSession(), |
|
37 | + \OC::$server->getUserSession(), |
|
38 | + \OC::$server->getRequest(), |
|
39 | + \OC::$server->getTwoFactorAuthManager(), |
|
40 | + \OC::$server->getBruteForceThrottler(), |
|
41 | + 'principals/' |
|
42 | 42 | ); |
43 | 43 | $principalBackend = new Principal( |
44 | - \OC::$server->getUserManager(), |
|
45 | - \OC::$server->getGroupManager(), |
|
46 | - 'principals/' |
|
44 | + \OC::$server->getUserManager(), |
|
45 | + \OC::$server->getGroupManager(), |
|
46 | + 'principals/' |
|
47 | 47 | ); |
48 | 48 | $db = \OC::$server->getDatabaseConnection(); |
49 | 49 | $userManager = \OC::$server->getUserManager(); |
@@ -61,8 +61,8 @@ discard block |
||
61 | 61 | $addressBookRoot->disableListing = !$debugging; // Disable listing |
62 | 62 | |
63 | 63 | $nodes = array( |
64 | - $principalCollection, |
|
65 | - $addressBookRoot, |
|
64 | + $principalCollection, |
|
65 | + $addressBookRoot, |
|
66 | 66 | ); |
67 | 67 | |
68 | 68 | // Fire up server |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | |
79 | 79 | $server->addPlugin(new LegacyDAVACL()); |
80 | 80 | if ($debugging) { |
81 | - $server->addPlugin(new Sabre\DAV\Browser\Plugin()); |
|
81 | + $server->addPlugin(new Sabre\DAV\Browser\Plugin()); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | $server->addPlugin(new \Sabre\DAV\Sync\Plugin()); |
@@ -23,8 +23,8 @@ discard block |
||
23 | 23 | require '../../../../3rdparty/autoload.php'; |
24 | 24 | |
25 | 25 | if ($argc !== 6) { |
26 | - echo "Invalid number of arguments" . PHP_EOL; |
|
27 | - exit; |
|
26 | + echo "Invalid number of arguments" . PHP_EOL; |
|
27 | + exit; |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
@@ -33,15 +33,15 @@ discard block |
||
33 | 33 | * @return mixed |
34 | 34 | */ |
35 | 35 | function request($client, $method, $uploadUrl, $data = null, $headers = []) { |
36 | - echo "$method $uploadUrl ... "; |
|
37 | - $t0 = microtime(true); |
|
38 | - $result = $client->request($method, $uploadUrl, $data, $headers); |
|
39 | - $t1 = microtime(true); |
|
40 | - echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL; |
|
41 | - if (!in_array($result['statusCode'], [200, 201])) { |
|
42 | - echo $result['body'] . PHP_EOL; |
|
43 | - } |
|
44 | - return $result; |
|
36 | + echo "$method $uploadUrl ... "; |
|
37 | + $t0 = microtime(true); |
|
38 | + $result = $client->request($method, $uploadUrl, $data, $headers); |
|
39 | + $t1 = microtime(true); |
|
40 | + echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL; |
|
41 | + if (!in_array($result['statusCode'], [200, 201])) { |
|
42 | + echo $result['body'] . PHP_EOL; |
|
43 | + } |
|
44 | + return $result; |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | $baseUri = $argv[1]; |
@@ -51,9 +51,9 @@ discard block |
||
51 | 51 | $chunkSize = $argv[5] * 1024 * 1024; |
52 | 52 | |
53 | 53 | $client = new \Sabre\DAV\Client([ |
54 | - 'baseUri' => $baseUri, |
|
55 | - 'userName' => $userName, |
|
56 | - 'password' => $password |
|
54 | + 'baseUri' => $baseUri, |
|
55 | + 'userName' => $userName, |
|
56 | + 'password' => $password |
|
57 | 57 | ]); |
58 | 58 | |
59 | 59 | $transfer = uniqid('transfer', true); |
@@ -66,12 +66,12 @@ discard block |
||
66 | 66 | |
67 | 67 | $index = 0; |
68 | 68 | while(!feof($stream)) { |
69 | - request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize)); |
|
70 | - $index++; |
|
69 | + request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize)); |
|
70 | + $index++; |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | $destination = pathinfo($file, PATHINFO_BASENAME); |
74 | 74 | //echo "Moving $uploadUrl/.file to it's final destination $baseUri/files/$userName/$destination" . PHP_EOL; |
75 | 75 | request($client, 'MOVE', "$uploadUrl/.file", null, [ |
76 | - 'Destination' => "$baseUri/files/$userName/$destination" |
|
76 | + 'Destination' => "$baseUri/files/$userName/$destination" |
|
77 | 77 | ]); |
@@ -35,22 +35,22 @@ |
||
35 | 35 | $versions = OCA\Files_Versions\Storage::getVersions($uid, $filename, $source); |
36 | 36 | if( $versions ) { |
37 | 37 | |
38 | - $endReached = false; |
|
39 | - if (count($versions) <= $start+$count) { |
|
40 | - $endReached = true; |
|
41 | - } |
|
38 | + $endReached = false; |
|
39 | + if (count($versions) <= $start+$count) { |
|
40 | + $endReached = true; |
|
41 | + } |
|
42 | 42 | |
43 | - $versions = array_slice($versions, $start, $count); |
|
43 | + $versions = array_slice($versions, $start, $count); |
|
44 | 44 | |
45 | - // remove owner path from request to not disclose it to the recipient |
|
46 | - foreach ($versions as $version) { |
|
47 | - unset($version['path']); |
|
48 | - } |
|
45 | + // remove owner path from request to not disclose it to the recipient |
|
46 | + foreach ($versions as $version) { |
|
47 | + unset($version['path']); |
|
48 | + } |
|
49 | 49 | |
50 | - \OCP\JSON::success(array('data' => array('versions' => $versions, 'endReached' => $endReached))); |
|
50 | + \OCP\JSON::success(array('data' => array('versions' => $versions, 'endReached' => $endReached))); |
|
51 | 51 | |
52 | 52 | } else { |
53 | 53 | |
54 | - \OCP\JSON::success(array('data' => array('versions' => [], 'endReached' => true))); |
|
54 | + \OCP\JSON::success(array('data' => array('versions' => [], 'endReached' => true))); |
|
55 | 55 | |
56 | 56 | } |
@@ -34,8 +34,8 @@ |
||
34 | 34 | $revision=(int)$_GET['revision']; |
35 | 35 | |
36 | 36 | if(OCA\Files_Versions\Storage::rollback( $file, $revision )) { |
37 | - OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file ))); |
|
37 | + OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file ))); |
|
38 | 38 | }else{ |
39 | - $l = \OC::$server->getL10N('files_versions'); |
|
40 | - OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) )))); |
|
39 | + $l = \OC::$server->getL10N('files_versions'); |
|
40 | + OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) )))); |
|
41 | 41 | } |
@@ -27,24 +27,24 @@ |
||
27 | 27 | use OCA\Files_Versions\Expiration; |
28 | 28 | |
29 | 29 | class Application extends App { |
30 | - public function __construct(array $urlParams = array()) { |
|
31 | - parent::__construct('files_versions', $urlParams); |
|
30 | + public function __construct(array $urlParams = array()) { |
|
31 | + parent::__construct('files_versions', $urlParams); |
|
32 | 32 | |
33 | - $container = $this->getContainer(); |
|
33 | + $container = $this->getContainer(); |
|
34 | 34 | |
35 | - /* |
|
35 | + /* |
|
36 | 36 | * Register capabilities |
37 | 37 | */ |
38 | - $container->registerCapability('OCA\Files_Versions\Capabilities'); |
|
38 | + $container->registerCapability('OCA\Files_Versions\Capabilities'); |
|
39 | 39 | |
40 | - /* |
|
40 | + /* |
|
41 | 41 | * Register expiration |
42 | 42 | */ |
43 | - $container->registerService('Expiration', function($c) { |
|
44 | - return new Expiration( |
|
45 | - $c->query('ServerContainer')->getConfig(), |
|
46 | - $c->query('OCP\AppFramework\Utility\ITimeFactory') |
|
47 | - ); |
|
48 | - }); |
|
49 | - } |
|
43 | + $container->registerService('Expiration', function($c) { |
|
44 | + return new Expiration( |
|
45 | + $c->query('ServerContainer')->getConfig(), |
|
46 | + $c->query('OCP\AppFramework\Utility\ITimeFactory') |
|
47 | + ); |
|
48 | + }); |
|
49 | + } |
|
50 | 50 | } |
@@ -33,93 +33,93 @@ |
||
33 | 33 | |
34 | 34 | class ExpireVersions extends Command { |
35 | 35 | |
36 | - /** |
|
37 | - * @var Expiration |
|
38 | - */ |
|
39 | - private $expiration; |
|
36 | + /** |
|
37 | + * @var Expiration |
|
38 | + */ |
|
39 | + private $expiration; |
|
40 | 40 | |
41 | - /** |
|
42 | - * @var IUserManager |
|
43 | - */ |
|
44 | - private $userManager; |
|
41 | + /** |
|
42 | + * @var IUserManager |
|
43 | + */ |
|
44 | + private $userManager; |
|
45 | 45 | |
46 | - /** |
|
47 | - * @param IUserManager|null $userManager |
|
48 | - * @param Expiration|null $expiration |
|
49 | - */ |
|
50 | - public function __construct(IUserManager $userManager = null, |
|
51 | - Expiration $expiration = null) { |
|
52 | - parent::__construct(); |
|
46 | + /** |
|
47 | + * @param IUserManager|null $userManager |
|
48 | + * @param Expiration|null $expiration |
|
49 | + */ |
|
50 | + public function __construct(IUserManager $userManager = null, |
|
51 | + Expiration $expiration = null) { |
|
52 | + parent::__construct(); |
|
53 | 53 | |
54 | - $this->userManager = $userManager; |
|
55 | - $this->expiration = $expiration; |
|
56 | - } |
|
54 | + $this->userManager = $userManager; |
|
55 | + $this->expiration = $expiration; |
|
56 | + } |
|
57 | 57 | |
58 | - protected function configure() { |
|
59 | - $this |
|
60 | - ->setName('versions:expire') |
|
61 | - ->setDescription('Expires the users file versions') |
|
62 | - ->addArgument( |
|
63 | - 'user_id', |
|
64 | - InputArgument::OPTIONAL | InputArgument::IS_ARRAY, |
|
65 | - 'expire file versions of the given user(s), if no user is given file versions for all users will be expired.' |
|
66 | - ); |
|
67 | - } |
|
58 | + protected function configure() { |
|
59 | + $this |
|
60 | + ->setName('versions:expire') |
|
61 | + ->setDescription('Expires the users file versions') |
|
62 | + ->addArgument( |
|
63 | + 'user_id', |
|
64 | + InputArgument::OPTIONAL | InputArgument::IS_ARRAY, |
|
65 | + 'expire file versions of the given user(s), if no user is given file versions for all users will be expired.' |
|
66 | + ); |
|
67 | + } |
|
68 | 68 | |
69 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
69 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
70 | 70 | |
71 | - $maxAge = $this->expiration->getMaxAgeAsTimestamp(); |
|
72 | - if (!$maxAge) { |
|
73 | - $output->writeln("No expiry configured."); |
|
74 | - return; |
|
75 | - } |
|
71 | + $maxAge = $this->expiration->getMaxAgeAsTimestamp(); |
|
72 | + if (!$maxAge) { |
|
73 | + $output->writeln("No expiry configured."); |
|
74 | + return; |
|
75 | + } |
|
76 | 76 | |
77 | - $users = $input->getArgument('user_id'); |
|
78 | - if (!empty($users)) { |
|
79 | - foreach ($users as $user) { |
|
80 | - if ($this->userManager->userExists($user)) { |
|
81 | - $output->writeln("Remove deleted files of <info>$user</info>"); |
|
82 | - $userObject = $this->userManager->get($user); |
|
83 | - $this->expireVersionsForUser($userObject); |
|
84 | - } else { |
|
85 | - $output->writeln("<error>Unknown user $user</error>"); |
|
86 | - } |
|
87 | - } |
|
88 | - } else { |
|
89 | - $p = new ProgressBar($output); |
|
90 | - $p->start(); |
|
91 | - $this->userManager->callForSeenUsers(function(IUser $user) use ($p) { |
|
92 | - $p->advance(); |
|
93 | - $this->expireVersionsForUser($user); |
|
94 | - }); |
|
95 | - $p->finish(); |
|
96 | - $output->writeln(''); |
|
97 | - } |
|
98 | - } |
|
77 | + $users = $input->getArgument('user_id'); |
|
78 | + if (!empty($users)) { |
|
79 | + foreach ($users as $user) { |
|
80 | + if ($this->userManager->userExists($user)) { |
|
81 | + $output->writeln("Remove deleted files of <info>$user</info>"); |
|
82 | + $userObject = $this->userManager->get($user); |
|
83 | + $this->expireVersionsForUser($userObject); |
|
84 | + } else { |
|
85 | + $output->writeln("<error>Unknown user $user</error>"); |
|
86 | + } |
|
87 | + } |
|
88 | + } else { |
|
89 | + $p = new ProgressBar($output); |
|
90 | + $p->start(); |
|
91 | + $this->userManager->callForSeenUsers(function(IUser $user) use ($p) { |
|
92 | + $p->advance(); |
|
93 | + $this->expireVersionsForUser($user); |
|
94 | + }); |
|
95 | + $p->finish(); |
|
96 | + $output->writeln(''); |
|
97 | + } |
|
98 | + } |
|
99 | 99 | |
100 | - function expireVersionsForUser(IUser $user) { |
|
101 | - $uid = $user->getUID(); |
|
102 | - if (!$this->setupFS($uid)) { |
|
103 | - return; |
|
104 | - } |
|
105 | - Storage::expireOlderThanMaxForUser($uid); |
|
106 | - } |
|
100 | + function expireVersionsForUser(IUser $user) { |
|
101 | + $uid = $user->getUID(); |
|
102 | + if (!$this->setupFS($uid)) { |
|
103 | + return; |
|
104 | + } |
|
105 | + Storage::expireOlderThanMaxForUser($uid); |
|
106 | + } |
|
107 | 107 | |
108 | - /** |
|
109 | - * Act on behalf on versions item owner |
|
110 | - * @param string $user |
|
111 | - * @return boolean |
|
112 | - */ |
|
113 | - protected function setupFS($user) { |
|
114 | - \OC_Util::tearDownFS(); |
|
115 | - \OC_Util::setupFS($user); |
|
108 | + /** |
|
109 | + * Act on behalf on versions item owner |
|
110 | + * @param string $user |
|
111 | + * @return boolean |
|
112 | + */ |
|
113 | + protected function setupFS($user) { |
|
114 | + \OC_Util::tearDownFS(); |
|
115 | + \OC_Util::setupFS($user); |
|
116 | 116 | |
117 | - // Check if this user has a version directory |
|
118 | - $view = new \OC\Files\View('/' . $user); |
|
119 | - if (!$view->is_dir('/files_versions')) { |
|
120 | - return false; |
|
121 | - } |
|
117 | + // Check if this user has a version directory |
|
118 | + $view = new \OC\Files\View('/' . $user); |
|
119 | + if (!$view->is_dir('/files_versions')) { |
|
120 | + return false; |
|
121 | + } |
|
122 | 122 | |
123 | - return true; |
|
124 | - } |
|
123 | + return true; |
|
124 | + } |
|
125 | 125 | } |
@@ -33,83 +33,83 @@ |
||
33 | 33 | |
34 | 34 | class CleanUp extends Command { |
35 | 35 | |
36 | - /** @var IUserManager */ |
|
37 | - protected $userManager; |
|
38 | - |
|
39 | - /** @var IRootFolder */ |
|
40 | - protected $rootFolder; |
|
41 | - |
|
42 | - /** |
|
43 | - * @param IRootFolder $rootFolder |
|
44 | - * @param IUserManager $userManager |
|
45 | - */ |
|
46 | - function __construct(IRootFolder $rootFolder, IUserManager $userManager) { |
|
47 | - parent::__construct(); |
|
48 | - $this->userManager = $userManager; |
|
49 | - $this->rootFolder = $rootFolder; |
|
50 | - } |
|
51 | - |
|
52 | - protected function configure() { |
|
53 | - $this |
|
54 | - ->setName('versions:cleanup') |
|
55 | - ->setDescription('Delete versions') |
|
56 | - ->addArgument( |
|
57 | - 'user_id', |
|
58 | - InputArgument::OPTIONAL | InputArgument::IS_ARRAY, |
|
59 | - 'delete versions of the given user(s), if no user is given all versions will be deleted' |
|
60 | - ); |
|
61 | - } |
|
62 | - |
|
63 | - |
|
64 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
65 | - |
|
66 | - $users = $input->getArgument('user_id'); |
|
67 | - if (!empty($users)) { |
|
68 | - foreach ($users as $user) { |
|
69 | - if ($this->userManager->userExists($user)) { |
|
70 | - $output->writeln("Delete versions of <info>$user</info>"); |
|
71 | - $this->deleteVersions($user); |
|
72 | - } else { |
|
73 | - $output->writeln("<error>Unknown user $user</error>"); |
|
74 | - } |
|
75 | - } |
|
76 | - } else { |
|
77 | - $output->writeln('Delete all versions'); |
|
78 | - foreach ($this->userManager->getBackends() as $backend) { |
|
79 | - $name = get_class($backend); |
|
80 | - |
|
81 | - if ($backend instanceof IUserBackend) { |
|
82 | - $name = $backend->getBackendName(); |
|
83 | - } |
|
84 | - |
|
85 | - $output->writeln("Delete versions for users on backend <info>$name</info>"); |
|
86 | - |
|
87 | - $limit = 500; |
|
88 | - $offset = 0; |
|
89 | - do { |
|
90 | - $users = $backend->getUsers('', $limit, $offset); |
|
91 | - foreach ($users as $user) { |
|
92 | - $output->writeln(" <info>$user</info>"); |
|
93 | - $this->deleteVersions($user); |
|
94 | - } |
|
95 | - $offset += $limit; |
|
96 | - } while (count($users) >= $limit); |
|
97 | - } |
|
98 | - } |
|
99 | - } |
|
100 | - |
|
101 | - |
|
102 | - /** |
|
103 | - * delete versions for the given user |
|
104 | - * |
|
105 | - * @param string $user |
|
106 | - */ |
|
107 | - protected function deleteVersions($user) { |
|
108 | - \OC_Util::tearDownFS(); |
|
109 | - \OC_Util::setupFS($user); |
|
110 | - if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) { |
|
111 | - $this->rootFolder->get('/' . $user . '/files_versions')->delete(); |
|
112 | - } |
|
113 | - } |
|
36 | + /** @var IUserManager */ |
|
37 | + protected $userManager; |
|
38 | + |
|
39 | + /** @var IRootFolder */ |
|
40 | + protected $rootFolder; |
|
41 | + |
|
42 | + /** |
|
43 | + * @param IRootFolder $rootFolder |
|
44 | + * @param IUserManager $userManager |
|
45 | + */ |
|
46 | + function __construct(IRootFolder $rootFolder, IUserManager $userManager) { |
|
47 | + parent::__construct(); |
|
48 | + $this->userManager = $userManager; |
|
49 | + $this->rootFolder = $rootFolder; |
|
50 | + } |
|
51 | + |
|
52 | + protected function configure() { |
|
53 | + $this |
|
54 | + ->setName('versions:cleanup') |
|
55 | + ->setDescription('Delete versions') |
|
56 | + ->addArgument( |
|
57 | + 'user_id', |
|
58 | + InputArgument::OPTIONAL | InputArgument::IS_ARRAY, |
|
59 | + 'delete versions of the given user(s), if no user is given all versions will be deleted' |
|
60 | + ); |
|
61 | + } |
|
62 | + |
|
63 | + |
|
64 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
65 | + |
|
66 | + $users = $input->getArgument('user_id'); |
|
67 | + if (!empty($users)) { |
|
68 | + foreach ($users as $user) { |
|
69 | + if ($this->userManager->userExists($user)) { |
|
70 | + $output->writeln("Delete versions of <info>$user</info>"); |
|
71 | + $this->deleteVersions($user); |
|
72 | + } else { |
|
73 | + $output->writeln("<error>Unknown user $user</error>"); |
|
74 | + } |
|
75 | + } |
|
76 | + } else { |
|
77 | + $output->writeln('Delete all versions'); |
|
78 | + foreach ($this->userManager->getBackends() as $backend) { |
|
79 | + $name = get_class($backend); |
|
80 | + |
|
81 | + if ($backend instanceof IUserBackend) { |
|
82 | + $name = $backend->getBackendName(); |
|
83 | + } |
|
84 | + |
|
85 | + $output->writeln("Delete versions for users on backend <info>$name</info>"); |
|
86 | + |
|
87 | + $limit = 500; |
|
88 | + $offset = 0; |
|
89 | + do { |
|
90 | + $users = $backend->getUsers('', $limit, $offset); |
|
91 | + foreach ($users as $user) { |
|
92 | + $output->writeln(" <info>$user</info>"); |
|
93 | + $this->deleteVersions($user); |
|
94 | + } |
|
95 | + $offset += $limit; |
|
96 | + } while (count($users) >= $limit); |
|
97 | + } |
|
98 | + } |
|
99 | + } |
|
100 | + |
|
101 | + |
|
102 | + /** |
|
103 | + * delete versions for the given user |
|
104 | + * |
|
105 | + * @param string $user |
|
106 | + */ |
|
107 | + protected function deleteVersions($user) { |
|
108 | + \OC_Util::tearDownFS(); |
|
109 | + \OC_Util::setupFS($user); |
|
110 | + if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) { |
|
111 | + $this->rootFolder->get('/' . $user . '/files_versions')->delete(); |
|
112 | + } |
|
113 | + } |
|
114 | 114 | |
115 | 115 | } |