@@ -86,11 +86,11 @@ discard block |
||
86 | 86 | * @throws NotAuthenticated |
87 | 87 | */ |
88 | 88 | protected function initCollections() { |
89 | - if($this->entityTypeCollections !== null) { |
|
89 | + if ($this->entityTypeCollections !== null) { |
|
90 | 90 | return; |
91 | 91 | } |
92 | 92 | $user = $this->userSession->getUser(); |
93 | - if(is_null($user)) { |
|
93 | + if (is_null($user)) { |
|
94 | 94 | throw new NotAuthenticated(); |
95 | 95 | } |
96 | 96 | |
@@ -144,10 +144,10 @@ discard block |
||
144 | 144 | */ |
145 | 145 | function getChild($name) { |
146 | 146 | $this->initCollections(); |
147 | - if(isset($this->entityTypeCollections[$name])) { |
|
147 | + if (isset($this->entityTypeCollections[$name])) { |
|
148 | 148 | return $this->entityTypeCollections[$name]; |
149 | 149 | } |
150 | - throw new NotFound('Entity type "' . $name . '" not found."'); |
|
150 | + throw new NotFound('Entity type "'.$name.'" not found."'); |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | /** |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | */ |
85 | 85 | function initialize(Server $server) { |
86 | 86 | $this->server = $server; |
87 | - if(strpos($this->server->getRequestUri(), 'comments/') !== 0) { |
|
87 | + if (strpos($this->server->getRequestUri(), 'comments/') !== 0) { |
|
88 | 88 | return; |
89 | 89 | } |
90 | 90 | |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | // having their own comments marked as unread |
125 | 125 | $node->setReadMarker(null); |
126 | 126 | |
127 | - $url = rtrim($request->getUrl(), '/') . '/' . urlencode($comment->getId()); |
|
127 | + $url = rtrim($request->getUrl(), '/').'/'.urlencode($comment->getId()); |
|
128 | 128 | |
129 | 129 | $response->setHeader('Content-Location', $url); |
130 | 130 | |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | */ |
158 | 158 | public function onReport($reportName, $report, $uri) { |
159 | 159 | $node = $this->server->tree->getNodeForPath($uri); |
160 | - if(!$node instanceof EntityCollection || $reportName !== self::REPORT_NAME) { |
|
160 | + if (!$node instanceof EntityCollection || $reportName !== self::REPORT_NAME) { |
|
161 | 161 | throw new ReportNotSupported(); |
162 | 162 | } |
163 | 163 | $args = ['limit' => 0, 'offset' => 0, 'datetime' => null]; |
@@ -166,27 +166,27 @@ discard block |
||
166 | 166 | $this::REPORT_PARAM_OFFSET, |
167 | 167 | $this::REPORT_PARAM_TIMESTAMP |
168 | 168 | ]; |
169 | - $ns = '{' . $this::NS_OWNCLOUD . '}'; |
|
170 | - foreach($report as $parameter) { |
|
171 | - if(!in_array($parameter['name'], $acceptableParameters) || empty($parameter['value'])) { |
|
169 | + $ns = '{'.$this::NS_OWNCLOUD.'}'; |
|
170 | + foreach ($report as $parameter) { |
|
171 | + if (!in_array($parameter['name'], $acceptableParameters) || empty($parameter['value'])) { |
|
172 | 172 | continue; |
173 | 173 | } |
174 | 174 | $args[str_replace($ns, '', $parameter['name'])] = $parameter['value']; |
175 | 175 | } |
176 | 176 | |
177 | - if(!is_null($args['datetime'])) { |
|
177 | + if (!is_null($args['datetime'])) { |
|
178 | 178 | $args['datetime'] = new \DateTime($args['datetime']); |
179 | 179 | } |
180 | 180 | |
181 | 181 | $results = $node->findChildren($args['limit'], $args['offset'], $args['datetime']); |
182 | 182 | |
183 | 183 | $responses = []; |
184 | - foreach($results as $node) { |
|
185 | - $nodePath = $this->server->getRequestUri() . '/' . $node->comment->getId(); |
|
184 | + foreach ($results as $node) { |
|
185 | + $nodePath = $this->server->getRequestUri().'/'.$node->comment->getId(); |
|
186 | 186 | $resultSet = $this->server->getPropertiesForPath($nodePath, CommentNode::getPropertyNames()); |
187 | - if(isset($resultSet[0]) && isset($resultSet[0][200])) { |
|
187 | + if (isset($resultSet[0]) && isset($resultSet[0][200])) { |
|
188 | 188 | $responses[] = new Response( |
189 | - $this->server->getBaseUri() . $nodePath, |
|
189 | + $this->server->getBaseUri().$nodePath, |
|
190 | 190 | [200 => $resultSet[0][200]], |
191 | 191 | 200 |
192 | 192 | ); |
@@ -227,14 +227,14 @@ discard block |
||
227 | 227 | |
228 | 228 | $actorType = $data['actorType']; |
229 | 229 | $actorId = null; |
230 | - if($actorType === 'users') { |
|
230 | + if ($actorType === 'users') { |
|
231 | 231 | $user = $this->userSession->getUser(); |
232 | - if(!is_null($user)) { |
|
232 | + if (!is_null($user)) { |
|
233 | 233 | $actorId = $user->getUID(); |
234 | 234 | } |
235 | 235 | } |
236 | - if(is_null($actorId)) { |
|
237 | - throw new BadRequest('Invalid actor "' . $actorType .'"'); |
|
236 | + if (is_null($actorId)) { |
|
237 | + throw new BadRequest('Invalid actor "'.$actorType.'"'); |
|
238 | 238 | } |
239 | 239 | |
240 | 240 | try { |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | throw new BadRequest('Invalid input values', 0, $e); |
248 | 248 | } catch (\OCP\Comments\MessageTooLongException $e) { |
249 | 249 | $msg = 'Message exceeds allowed character limit of '; |
250 | - throw new BadRequest($msg . \OCP\Comments\IComment::MAX_MESSAGE_LENGTH, 0, $e); |
|
250 | + throw new BadRequest($msg.\OCP\Comments\IComment::MAX_MESSAGE_LENGTH, 0, $e); |
|
251 | 251 | } |
252 | 252 | } |
253 | 253 |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * @package OCA\DAV\Comments |
42 | 42 | */ |
43 | 43 | class EntityCollection extends RootCollection implements IProperties { |
44 | - const PROPERTY_NAME_READ_MARKER = '{http://owncloud.org/ns}readMarker'; |
|
44 | + const PROPERTY_NAME_READ_MARKER = '{http://owncloud.org/ns}readMarker'; |
|
45 | 45 | |
46 | 46 | /** @var string */ |
47 | 47 | protected $id; |
@@ -65,10 +65,10 @@ discard block |
||
65 | 65 | IUserSession $userSession, |
66 | 66 | ILogger $logger |
67 | 67 | ) { |
68 | - foreach(['id', 'name'] as $property) { |
|
68 | + foreach (['id', 'name'] as $property) { |
|
69 | 69 | $$property = trim($$property); |
70 | - if(empty($$property) || !is_string($$property)) { |
|
71 | - throw new \InvalidArgumentException('"' . $property . '" parameter must be non-empty string'); |
|
70 | + if (empty($$property) || !is_string($$property)) { |
|
71 | + throw new \InvalidArgumentException('"'.$property.'" parameter must be non-empty string'); |
|
72 | 72 | } |
73 | 73 | } |
74 | 74 | $this->id = $id; |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | function findChildren($limit = 0, $offset = 0, \DateTime $datetime = null) { |
135 | 135 | $comments = $this->commentsManager->getForObject($this->name, $this->id, $limit, $offset, $datetime); |
136 | 136 | $result = []; |
137 | - foreach($comments as $comment) { |
|
137 | + foreach ($comments as $comment) { |
|
138 | 138 | $result[] = new CommentNode( |
139 | 139 | $this->commentsManager, |
140 | 140 | $comment, |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | function getProperties($properties) { |
188 | 188 | $marker = null; |
189 | 189 | $user = $this->userSession->getUser(); |
190 | - if(!is_null($user)) { |
|
190 | + if (!is_null($user)) { |
|
191 | 191 | $marker = $this->commentsManager->getReadMark($this->name, $this->id, $user); |
192 | 192 | } |
193 | 193 | return [self::PROPERTY_NAME_READ_MARKER => $marker]; |
@@ -100,13 +100,13 @@ |
||
100 | 100 | if ($this->shareManager->checkPassword($share, $password)) { |
101 | 101 | return true; |
102 | 102 | } else if ($this->session->exists('public_link_authenticated') |
103 | - && $this->session->get('public_link_authenticated') === (string)$share->getId()) { |
|
103 | + && $this->session->get('public_link_authenticated') === (string) $share->getId()) { |
|
104 | 104 | return true; |
105 | 105 | } else { |
106 | 106 | if (in_array('XMLHttpRequest', explode(',', $this->request->getHeader('X-Requested-With')))) { |
107 | 107 | // do not re-authenticate over ajax, use dummy auth name to prevent browser popup |
108 | 108 | http_response_code(401); |
109 | - header('WWW-Authenticate','DummyBasic realm="' . $this->realm . '"'); |
|
109 | + header('WWW-Authenticate', 'DummyBasic realm="'.$this->realm.'"'); |
|
110 | 110 | throw new \Sabre\DAV\Exception\NotAuthenticated('Cannot authenticate over ajax calls'); |
111 | 111 | } |
112 | 112 | return false; |
@@ -102,11 +102,11 @@ |
||
102 | 102 | * @param array $conditions |
103 | 103 | */ |
104 | 104 | public function validateTokens(RequestInterface $request, &$conditions) { |
105 | - foreach($conditions as &$fileCondition) { |
|
106 | - if(isset($fileCondition['tokens'])) { |
|
107 | - foreach($fileCondition['tokens'] as &$token) { |
|
108 | - if(isset($token['token'])) { |
|
109 | - if(substr($token['token'], 0, 16) === 'opaquelocktoken:') { |
|
105 | + foreach ($conditions as &$fileCondition) { |
|
106 | + if (isset($fileCondition['tokens'])) { |
|
107 | + foreach ($fileCondition['tokens'] as &$token) { |
|
108 | + if (isset($token['token'])) { |
|
109 | + if (substr($token['token'], 0, 16) === 'opaquelocktoken:') { |
|
110 | 110 | $token['validToken'] = true; |
111 | 111 | } |
112 | 112 | } |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | if (isset($info['transferid'])) { |
91 | 91 | // getNodePath is called for multiple nodes within a chunk |
92 | 92 | // upload call |
93 | - $path = $dir . '/' . $info['name']; |
|
93 | + $path = $dir.'/'.$info['name']; |
|
94 | 94 | $path = ltrim($path, '/'); |
95 | 95 | } |
96 | 96 | } |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | } catch (StorageNotAvailableException $e) { |
162 | 162 | throw new \Sabre\DAV\Exception\ServiceUnavailable('Storage is temporarily not available'); |
163 | 163 | } catch (StorageInvalidException $e) { |
164 | - throw new \Sabre\DAV\Exception\NotFound('Storage ' . $path . ' is invalid'); |
|
164 | + throw new \Sabre\DAV\Exception\NotFound('Storage '.$path.' is invalid'); |
|
165 | 165 | } catch (LockedException $e) { |
166 | 166 | throw new \Sabre\DAV\Exception\Locked(); |
167 | 167 | } catch (ForbiddenException $e) { |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | } |
171 | 171 | |
172 | 172 | if (!$info) { |
173 | - throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located'); |
|
173 | + throw new \Sabre\DAV\Exception\NotFound('File with name '.$path.' could not be located'); |
|
174 | 174 | } |
175 | 175 | |
176 | 176 | if ($info->getType() === 'dir') { |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | } else { |
215 | 215 | $destinationPermission = $infoDestination && $infoDestination->isCreatable(); |
216 | 216 | } |
217 | - $sourcePermission = $infoSource && $infoSource->isDeletable(); |
|
217 | + $sourcePermission = $infoSource && $infoSource->isDeletable(); |
|
218 | 218 | } |
219 | 219 | |
220 | 220 | if (!$destinationPermission || !$sourcePermission) { |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | $targetNodeExists = $this->nodeExists($destinationPath); |
225 | 225 | $sourceNode = $this->getNodeForPath($sourcePath); |
226 | 226 | if ($sourceNode instanceof \Sabre\DAV\ICollection && $targetNodeExists) { |
227 | - throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory ' . $sourceNode->getName() . ', target exists'); |
|
227 | + throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory '.$sourceNode->getName().', target exists'); |
|
228 | 228 | } |
229 | 229 | list($sourceDir,) = \Sabre\HTTP\URLUtil::splitPath($sourcePath); |
230 | 230 | list($destinationDir,) = \Sabre\HTTP\URLUtil::splitPath($destinationPath); |
@@ -220,9 +220,9 @@ discard block |
||
220 | 220 | )) { |
221 | 221 | // note: pre-fetching only supported for depth <= 1 |
222 | 222 | $folderContent = $node->getChildren(); |
223 | - $fileIds[] = (int)$node->getId(); |
|
223 | + $fileIds[] = (int) $node->getId(); |
|
224 | 224 | foreach ($folderContent as $info) { |
225 | - $fileIds[] = (int)$info->getId(); |
|
225 | + $fileIds[] = (int) $info->getId(); |
|
226 | 226 | } |
227 | 227 | $tags = $this->getTagger()->getTagsForObjects($fileIds); |
228 | 228 | if ($tags === false) { |
@@ -281,7 +281,7 @@ discard block |
||
281 | 281 | if (is_null($node)) { |
282 | 282 | return 404; |
283 | 283 | } |
284 | - if ((int)$favState === 1 || $favState === 'true') { |
|
284 | + if ((int) $favState === 1 || $favState === 'true') { |
|
285 | 285 | $this->getTagger()->tagAs($node->getId(), self::TAG_FAVORITE); |
286 | 286 | } else { |
287 | 287 | $this->getTagger()->unTag($node->getId(), self::TAG_FAVORITE); |
@@ -172,14 +172,14 @@ discard block |
||
172 | 172 | return; |
173 | 173 | } |
174 | 174 | |
175 | - $ns = '{' . $this::NS_OWNCLOUD . '}'; |
|
175 | + $ns = '{'.$this::NS_OWNCLOUD.'}'; |
|
176 | 176 | $requestedProps = []; |
177 | 177 | $filterRules = []; |
178 | 178 | |
179 | 179 | // parse report properties and gather filter info |
180 | 180 | foreach ($report as $reportProps) { |
181 | 181 | $name = $reportProps['name']; |
182 | - if ($name === $ns . 'filter-rules') { |
|
182 | + if ($name === $ns.'filter-rules') { |
|
183 | 183 | $filterRules = $reportProps['value']; |
184 | 184 | } else if ($name === '{DAV:}prop') { |
185 | 185 | // propfind properties |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | if (empty($filesUri)) { |
241 | 241 | return ''; |
242 | 242 | } |
243 | - return '/' . $filesUri; |
|
243 | + return '/'.$filesUri; |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | /** |
@@ -252,15 +252,15 @@ discard block |
||
252 | 252 | * @throws TagNotFoundException whenever a tag was not found |
253 | 253 | */ |
254 | 254 | protected function processFilterRules($filterRules) { |
255 | - $ns = '{' . $this::NS_OWNCLOUD . '}'; |
|
255 | + $ns = '{'.$this::NS_OWNCLOUD.'}'; |
|
256 | 256 | $resultFileIds = null; |
257 | 257 | $systemTagIds = []; |
258 | 258 | $favoriteFilter = null; |
259 | 259 | foreach ($filterRules as $filterRule) { |
260 | - if ($filterRule['name'] === $ns . 'systemtag') { |
|
260 | + if ($filterRule['name'] === $ns.'systemtag') { |
|
261 | 261 | $systemTagIds[] = $filterRule['value']; |
262 | 262 | } |
263 | - if ($filterRule['name'] === $ns . 'favorite') { |
|
263 | + if ($filterRule['name'] === $ns.'favorite') { |
|
264 | 264 | $favoriteFilter = true; |
265 | 265 | } |
266 | 266 | } |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | } |
300 | 300 | |
301 | 301 | if (!empty($unknownTagIds)) { |
302 | - throw new TagNotFoundException('Tag with ids ' . implode(', ', $unknownTagIds) . ' not found'); |
|
302 | + throw new TagNotFoundException('Tag with ids '.implode(', ', $unknownTagIds).' not found'); |
|
303 | 303 | } |
304 | 304 | } |
305 | 305 | |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | public function prepareResponses($filesUri, $requestedProps, $nodes) { |
340 | 340 | $responses = []; |
341 | 341 | foreach ($nodes as $node) { |
342 | - $propFind = new PropFind($filesUri . $node->getPath(), $requestedProps); |
|
342 | + $propFind = new PropFind($filesUri.$node->getPath(), $requestedProps); |
|
343 | 343 | |
344 | 344 | $this->server->getPropertiesByNode($propFind, $node); |
345 | 345 | // copied from Sabre Server's getPropertiesForPath |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | } |
353 | 353 | |
354 | 354 | $responses[] = new Response( |
355 | - rtrim($this->server->getBaseUri(), '/') . $filesUri . $node->getPath(), |
|
355 | + rtrim($this->server->getBaseUri(), '/').$filesUri.$node->getPath(), |
|
356 | 356 | $result, |
357 | 357 | 200 |
358 | 358 | ); |
@@ -66,7 +66,7 @@ |
||
66 | 66 | function xmlSerialize(Writer $writer) { |
67 | 67 | |
68 | 68 | foreach ($this->checksums as $checksum) { |
69 | - $writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum); |
|
69 | + $writer->writeElement('{'.self::NS_OWNCLOUD.'}checksum', $checksum); |
|
70 | 70 | } |
71 | 71 | } |
72 | 72 | } |