@@ -84,7 +84,7 @@ |
||
84 | 84 | */ |
85 | 85 | private function isRequestPublic(RequestInterface $request) { |
86 | 86 | $url = $request->getPath(); |
87 | - $matchingUrls = array_filter($this->publicURLs, function ($publicUrl) use ($url) { |
|
87 | + $matchingUrls = array_filter($this->publicURLs, function($publicUrl) use ($url) { |
|
88 | 88 | return strpos($url, $publicUrl, 0) === 0; |
89 | 89 | }); |
90 | 90 | return !empty($matchingUrls); |
@@ -47,8 +47,8 @@ discard block |
||
47 | 47 | static function xmlDeserialize(Reader $reader) { |
48 | 48 | |
49 | 49 | $elements = $reader->parseInnerTree([ |
50 | - '{' . Plugin::NS_OWNCLOUD. '}set' => 'Sabre\\Xml\\Element\\KeyValue', |
|
51 | - '{' . Plugin::NS_OWNCLOUD . '}remove' => 'Sabre\\Xml\\Element\\KeyValue', |
|
50 | + '{'.Plugin::NS_OWNCLOUD.'}set' => 'Sabre\\Xml\\Element\\KeyValue', |
|
51 | + '{'.Plugin::NS_OWNCLOUD.'}remove' => 'Sabre\\Xml\\Element\\KeyValue', |
|
52 | 52 | ]); |
53 | 53 | |
54 | 54 | $set = []; |
@@ -57,21 +57,21 @@ discard block |
||
57 | 57 | foreach ($elements as $elem) { |
58 | 58 | switch ($elem['name']) { |
59 | 59 | |
60 | - case '{' . Plugin::NS_OWNCLOUD . '}set' : |
|
60 | + case '{'.Plugin::NS_OWNCLOUD.'}set' : |
|
61 | 61 | $sharee = $elem['value']; |
62 | 62 | |
63 | - $sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary'; |
|
64 | - $commonName = '{' . Plugin::NS_OWNCLOUD . '}common-name'; |
|
63 | + $sumElem = '{'.Plugin::NS_OWNCLOUD.'}summary'; |
|
64 | + $commonName = '{'.Plugin::NS_OWNCLOUD.'}common-name'; |
|
65 | 65 | |
66 | 66 | $set[] = [ |
67 | 67 | 'href' => $sharee['{DAV:}href'], |
68 | 68 | 'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null, |
69 | 69 | 'summary' => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null, |
70 | - 'readOnly' => !array_key_exists('{' . Plugin::NS_OWNCLOUD . '}read-write', $sharee), |
|
70 | + 'readOnly' => !array_key_exists('{'.Plugin::NS_OWNCLOUD.'}read-write', $sharee), |
|
71 | 71 | ]; |
72 | 72 | break; |
73 | 73 | |
74 | - case '{' . Plugin::NS_OWNCLOUD . '}remove' : |
|
74 | + case '{'.Plugin::NS_OWNCLOUD.'}remove' : |
|
75 | 75 | $remove[] = $elem['value']['{DAV:}href']; |
76 | 76 | break; |
77 | 77 |
@@ -121,21 +121,21 @@ discard block |
||
121 | 121 | */ |
122 | 122 | function xmlSerialize(Writer $writer) { |
123 | 123 | |
124 | - $cs = '{' . Plugin::NS_OWNCLOUD . '}'; |
|
124 | + $cs = '{'.Plugin::NS_OWNCLOUD.'}'; |
|
125 | 125 | |
126 | 126 | if (!is_null($this->organizer)) { |
127 | 127 | |
128 | - $writer->startElement($cs . 'organizer'); |
|
128 | + $writer->startElement($cs.'organizer'); |
|
129 | 129 | $writer->writeElement('{DAV:}href', $this->organizer['href']); |
130 | 130 | |
131 | 131 | if (isset($this->organizer['commonName']) && $this->organizer['commonName']) { |
132 | - $writer->writeElement($cs . 'common-name', $this->organizer['commonName']); |
|
132 | + $writer->writeElement($cs.'common-name', $this->organizer['commonName']); |
|
133 | 133 | } |
134 | 134 | if (isset($this->organizer['firstName']) && $this->organizer['firstName']) { |
135 | - $writer->writeElement($cs . 'first-name', $this->organizer['firstName']); |
|
135 | + $writer->writeElement($cs.'first-name', $this->organizer['firstName']); |
|
136 | 136 | } |
137 | 137 | if (isset($this->organizer['lastName']) && $this->organizer['lastName']) { |
138 | - $writer->writeElement($cs . 'last-name', $this->organizer['lastName']); |
|
138 | + $writer->writeElement($cs.'last-name', $this->organizer['lastName']); |
|
139 | 139 | } |
140 | 140 | $writer->endElement(); // organizer |
141 | 141 | |
@@ -143,23 +143,23 @@ discard block |
||
143 | 143 | |
144 | 144 | foreach ($this->users as $user) { |
145 | 145 | |
146 | - $writer->startElement($cs . 'user'); |
|
146 | + $writer->startElement($cs.'user'); |
|
147 | 147 | $writer->writeElement('{DAV:}href', $user['href']); |
148 | 148 | if (isset($user['commonName']) && $user['commonName']) { |
149 | - $writer->writeElement($cs . 'common-name', $user['commonName']); |
|
149 | + $writer->writeElement($cs.'common-name', $user['commonName']); |
|
150 | 150 | } |
151 | - $writer->writeElement($cs . 'invite-accepted'); |
|
151 | + $writer->writeElement($cs.'invite-accepted'); |
|
152 | 152 | |
153 | - $writer->startElement($cs . 'access'); |
|
153 | + $writer->startElement($cs.'access'); |
|
154 | 154 | if ($user['readOnly']) { |
155 | - $writer->writeElement($cs . 'read'); |
|
155 | + $writer->writeElement($cs.'read'); |
|
156 | 156 | } else { |
157 | - $writer->writeElement($cs . 'read-write'); |
|
157 | + $writer->writeElement($cs.'read-write'); |
|
158 | 158 | } |
159 | 159 | $writer->endElement(); // access |
160 | 160 | |
161 | 161 | if (isset($user['summary']) && $user['summary']) { |
162 | - $writer->writeElement($cs . 'summary', $user['summary']); |
|
162 | + $writer->writeElement($cs.'summary', $user['summary']); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | $writer->endElement(); //user |
@@ -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 | } |
@@ -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 | } |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | */ |
65 | 65 | public function beforeHandler(RequestInterface $request) { |
66 | 66 | $userAgent = $request->getHeader('User-Agent'); |
67 | - if($userAgent === null) { |
|
67 | + if ($userAgent === null) { |
|
68 | 68 | return; |
69 | 69 | } |
70 | 70 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | // Match on the mirall version which is in scheme "Mozilla/5.0 (%1) mirall/%2" or |
74 | 74 | // "mirall/%1" for older releases |
75 | 75 | preg_match("/(?:mirall\\/)([\d.]+)/i", $userAgent, $versionMatches); |
76 | - if(isset($versionMatches[1]) && |
|
76 | + if (isset($versionMatches[1]) && |
|
77 | 77 | version_compare($versionMatches[1], $minimumSupportedDesktopVersion) === -1) { |
78 | 78 | throw new \Sabre\DAV\Exception\Forbidden('Unsupported client version.'); |
79 | 79 | } |
@@ -71,8 +71,8 @@ discard block |
||
71 | 71 | return null; |
72 | 72 | } |
73 | 73 | foreach ($tree as $elem) { |
74 | - if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}share-type') { |
|
75 | - $shareTypes[] = (int)$elem['value']; |
|
74 | + if ($elem['name'] === '{'.self::NS_OWNCLOUD.'}share-type') { |
|
75 | + $shareTypes[] = (int) $elem['value']; |
|
76 | 76 | } |
77 | 77 | } |
78 | 78 | return new self($shareTypes); |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | */ |
87 | 87 | function xmlSerialize(Writer $writer) { |
88 | 88 | foreach ($this->shareTypes as $shareType) { |
89 | - $writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType); |
|
89 | + $writer->writeElement('{'.self::NS_OWNCLOUD.'}share-type', $shareType); |
|
90 | 90 | } |
91 | 91 | } |
92 | 92 | } |