@@ -50,8 +50,8 @@ discard block |
||
50 | 50 | * @param array $headers additional key value based headers |
51 | 51 | * @since 8.0.0 |
52 | 52 | */ |
53 | - public function __construct($data=array(), $statusCode=Http::STATUS_OK, |
|
54 | - array $headers=array()) { |
|
53 | + public function __construct($data = array(), $statusCode = Http::STATUS_OK, |
|
54 | + array $headers = array()) { |
|
55 | 55 | $this->data = $data; |
56 | 56 | $this->setStatus($statusCode); |
57 | 57 | $this->setHeaders(array_merge($this->getHeaders(), $headers)); |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | * @return DataResponse Reference to this object |
65 | 65 | * @since 8.0.0 |
66 | 66 | */ |
67 | - public function setData($data){ |
|
67 | + public function setData($data) { |
|
68 | 68 | $this->data = $data; |
69 | 69 | |
70 | 70 | return $this; |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | * @return array the data |
77 | 77 | * @since 8.0.0 |
78 | 78 | */ |
79 | - public function getData(){ |
|
79 | + public function getData() { |
|
80 | 80 | return $this->data; |
81 | 81 | } |
82 | 82 |
@@ -91,8 +91,8 @@ discard block |
||
91 | 91 | */ |
92 | 92 | public function cacheFor($cacheSeconds) { |
93 | 93 | |
94 | - if($cacheSeconds > 0) { |
|
95 | - $this->addHeader('Cache-Control', 'max-age=' . $cacheSeconds . ', must-revalidate'); |
|
94 | + if ($cacheSeconds > 0) { |
|
95 | + $this->addHeader('Cache-Control', 'max-age='.$cacheSeconds.', must-revalidate'); |
|
96 | 96 | } else { |
97 | 97 | $this->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate'); |
98 | 98 | } |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | * @since 8.0.0 |
147 | 147 | */ |
148 | 148 | public function invalidateCookies(array $cookieNames) { |
149 | - foreach($cookieNames as $cookieName) { |
|
149 | + foreach ($cookieNames as $cookieName) { |
|
150 | 150 | $this->invalidateCookie($cookieName); |
151 | 151 | } |
152 | 152 | return $this; |
@@ -170,11 +170,11 @@ discard block |
||
170 | 170 | * @since 6.0.0 - return value was added in 7.0.0 |
171 | 171 | */ |
172 | 172 | public function addHeader($name, $value) { |
173 | - $name = trim($name); // always remove leading and trailing whitespace |
|
173 | + $name = trim($name); // always remove leading and trailing whitespace |
|
174 | 174 | // to be able to reliably check for security |
175 | 175 | // headers |
176 | 176 | |
177 | - if(is_null($value)) { |
|
177 | + if (is_null($value)) { |
|
178 | 178 | unset($this->headers[$name]); |
179 | 179 | } else { |
180 | 180 | $this->headers[$name] = $value; |
@@ -205,19 +205,19 @@ discard block |
||
205 | 205 | public function getHeaders() { |
206 | 206 | $mergeWith = []; |
207 | 207 | |
208 | - if($this->lastModified) { |
|
208 | + if ($this->lastModified) { |
|
209 | 209 | $mergeWith['Last-Modified'] = |
210 | 210 | $this->lastModified->format(\DateTime::RFC2822); |
211 | 211 | } |
212 | 212 | |
213 | 213 | // Build Content-Security-Policy and use default if none has been specified |
214 | - if(is_null($this->contentSecurityPolicy)) { |
|
214 | + if (is_null($this->contentSecurityPolicy)) { |
|
215 | 215 | $this->setContentSecurityPolicy(new ContentSecurityPolicy()); |
216 | 216 | } |
217 | 217 | $this->headers['Content-Security-Policy'] = $this->contentSecurityPolicy->buildPolicy(); |
218 | 218 | |
219 | - if($this->ETag) { |
|
220 | - $mergeWith['ETag'] = '"' . $this->ETag . '"'; |
|
219 | + if ($this->ETag) { |
|
220 | + $mergeWith['ETag'] = '"'.$this->ETag.'"'; |
|
221 | 221 | } |
222 | 222 | |
223 | 223 | return array_merge($mergeWith, $this->headers); |
@@ -46,8 +46,8 @@ discard block |
||
46 | 46 | * @param array $headers additional key value based headers |
47 | 47 | * @since 8.1.0 |
48 | 48 | */ |
49 | - public function __construct($data="", $statusCode=Http::STATUS_OK, |
|
50 | - $headers=[]) { |
|
49 | + public function __construct($data = "", $statusCode = Http::STATUS_OK, |
|
50 | + $headers = []) { |
|
51 | 51 | $this->data = $data; |
52 | 52 | $this->setStatus($statusCode); |
53 | 53 | $this->setHeaders(array_merge($this->getHeaders(), $headers)); |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | * @return DataDisplayResponse Reference to this object |
71 | 71 | * @since 8.1.0 |
72 | 72 | */ |
73 | - public function setData($data){ |
|
73 | + public function setData($data) { |
|
74 | 74 | $this->data = $data; |
75 | 75 | |
76 | 76 | return $this; |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | * @return string the data |
83 | 83 | * @since 8.1.0 |
84 | 84 | */ |
85 | - public function getData(){ |
|
85 | + public function getData() { |
|
86 | 86 | return $this->data; |
87 | 87 | } |
88 | 88 |
@@ -43,12 +43,12 @@ discard block |
||
43 | 43 | * @param array $headers |
44 | 44 | * @since 11.0.0 |
45 | 45 | */ |
46 | - public function __construct($file, $statusCode=Http::STATUS_OK, |
|
47 | - $headers=[]) { |
|
46 | + public function __construct($file, $statusCode = Http::STATUS_OK, |
|
47 | + $headers = []) { |
|
48 | 48 | $this->file = $file; |
49 | 49 | $this->setStatus($statusCode); |
50 | 50 | $this->setHeaders(array_merge($this->getHeaders(), $headers)); |
51 | - $this->addHeader('Content-Disposition', 'inline; filename="' . rawurldecode($file->getName()) . '"'); |
|
51 | + $this->addHeader('Content-Disposition', 'inline; filename="'.rawurldecode($file->getName()).'"'); |
|
52 | 52 | |
53 | 53 | $this->setETag($file->getEtag()); |
54 | 54 | $lastModified = new \DateTime(); |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | */ |
63 | 63 | public function callback(IOutput $output) { |
64 | 64 | if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) { |
65 | - $output->setHeader('Content-Length: ' . $this->file->getSize()); |
|
65 | + $output->setHeader('Content-Length: '.$this->file->getSize()); |
|
66 | 66 | $output->setOutput($this->file->getContent()); |
67 | 67 | } |
68 | 68 | } |
@@ -70,8 +70,8 @@ discard block |
||
70 | 70 | * @param string $renderAs how the page should be rendered, defaults to user |
71 | 71 | * @since 6.0.0 - parameters $params and $renderAs were added in 7.0.0 |
72 | 72 | */ |
73 | - public function __construct($appName, $templateName, array $params=array(), |
|
74 | - $renderAs='user') { |
|
73 | + public function __construct($appName, $templateName, array $params = array(), |
|
74 | + $renderAs = 'user') { |
|
75 | 75 | $this->templateName = $templateName; |
76 | 76 | $this->appName = $appName; |
77 | 77 | $this->params = $params; |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | * @return TemplateResponse Reference to this object |
87 | 87 | * @since 6.0.0 - return value was added in 7.0.0 |
88 | 88 | */ |
89 | - public function setParams(array $params){ |
|
89 | + public function setParams(array $params) { |
|
90 | 90 | $this->params = $params; |
91 | 91 | |
92 | 92 | return $this; |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | * @return array the params |
99 | 99 | * @since 6.0.0 |
100 | 100 | */ |
101 | - public function getParams(){ |
|
101 | + public function getParams() { |
|
102 | 102 | return $this->params; |
103 | 103 | } |
104 | 104 | |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | * @return string the name of the used template |
109 | 109 | * @since 6.0.0 |
110 | 110 | */ |
111 | - public function getTemplateName(){ |
|
111 | + public function getTemplateName() { |
|
112 | 112 | return $this->templateName; |
113 | 113 | } |
114 | 114 | |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | * @return TemplateResponse Reference to this object |
123 | 123 | * @since 6.0.0 - return value was added in 7.0.0 |
124 | 124 | */ |
125 | - public function renderAs($renderAs){ |
|
125 | + public function renderAs($renderAs) { |
|
126 | 126 | $this->renderAs = $renderAs; |
127 | 127 | |
128 | 128 | return $this; |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | * @return string the renderAs value |
135 | 135 | * @since 6.0.0 |
136 | 136 | */ |
137 | - public function getRenderAs(){ |
|
137 | + public function getRenderAs() { |
|
138 | 138 | return $this->renderAs; |
139 | 139 | } |
140 | 140 | |
@@ -144,13 +144,13 @@ discard block |
||
144 | 144 | * @return string the rendered html |
145 | 145 | * @since 6.0.0 |
146 | 146 | */ |
147 | - public function render(){ |
|
147 | + public function render() { |
|
148 | 148 | // \OCP\Template needs an empty string instead of 'blank' for an unwrapped response |
149 | 149 | $renderAs = $this->renderAs === 'blank' ? '' : $this->renderAs; |
150 | 150 | |
151 | 151 | $template = new \OCP\Template($this->appName, $this->templateName, $renderAs); |
152 | 152 | |
153 | - foreach($this->params as $key => $value){ |
|
153 | + foreach ($this->params as $key => $value) { |
|
154 | 154 | $template->assign($key, $value); |
155 | 155 | } |
156 | 156 |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | * @param string|resource $filePath the path to the file or a file handle which should be streamed |
41 | 41 | * @since 8.1.0 |
42 | 42 | */ |
43 | - public function __construct ($filePath) { |
|
43 | + public function __construct($filePath) { |
|
44 | 44 | $this->filePath = $filePath; |
45 | 45 | } |
46 | 46 | |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | * @param IOutput $output a small wrapper that handles output |
52 | 52 | * @since 8.1.0 |
53 | 53 | */ |
54 | - public function callback (IOutput $output) { |
|
54 | + public function callback(IOutput $output) { |
|
55 | 55 | // handle caching |
56 | 56 | if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) { |
57 | 57 | if (!(is_resource($this->filePath) || file_exists($this->filePath))) { |
@@ -45,7 +45,7 @@ |
||
45 | 45 | $this->filename = $filename; |
46 | 46 | $this->contentType = $contentType; |
47 | 47 | |
48 | - $this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"'); |
|
48 | + $this->addHeader('Content-Disposition', 'attachment; filename="'.$filename.'"'); |
|
49 | 49 | $this->addHeader('Content-Type', $contentType); |
50 | 50 | } |
51 | 51 |
@@ -336,72 +336,72 @@ |
||
336 | 336 | public function buildPolicy() { |
337 | 337 | $policy = "default-src 'none';"; |
338 | 338 | |
339 | - if(!empty($this->allowedScriptDomains) || $this->inlineScriptAllowed || $this->evalScriptAllowed) { |
|
339 | + if (!empty($this->allowedScriptDomains) || $this->inlineScriptAllowed || $this->evalScriptAllowed) { |
|
340 | 340 | $policy .= 'script-src '; |
341 | - if(is_string($this->useJsNonce)) { |
|
341 | + if (is_string($this->useJsNonce)) { |
|
342 | 342 | $policy .= '\'nonce-'.base64_encode($this->useJsNonce).'\''; |
343 | 343 | $allowedScriptDomains = array_flip($this->allowedScriptDomains); |
344 | 344 | unset($allowedScriptDomains['\'self\'']); |
345 | 345 | $this->allowedScriptDomains = array_flip($allowedScriptDomains); |
346 | - if(count($allowedScriptDomains) !== 0) { |
|
346 | + if (count($allowedScriptDomains) !== 0) { |
|
347 | 347 | $policy .= ' '; |
348 | 348 | } |
349 | 349 | } |
350 | - if(is_array($this->allowedScriptDomains)) { |
|
350 | + if (is_array($this->allowedScriptDomains)) { |
|
351 | 351 | $policy .= implode(' ', $this->allowedScriptDomains); |
352 | 352 | } |
353 | - if($this->inlineScriptAllowed) { |
|
353 | + if ($this->inlineScriptAllowed) { |
|
354 | 354 | $policy .= ' \'unsafe-inline\''; |
355 | 355 | } |
356 | - if($this->evalScriptAllowed) { |
|
356 | + if ($this->evalScriptAllowed) { |
|
357 | 357 | $policy .= ' \'unsafe-eval\''; |
358 | 358 | } |
359 | 359 | $policy .= ';'; |
360 | 360 | } |
361 | 361 | |
362 | - if(!empty($this->allowedStyleDomains) || $this->inlineStyleAllowed) { |
|
362 | + if (!empty($this->allowedStyleDomains) || $this->inlineStyleAllowed) { |
|
363 | 363 | $policy .= 'style-src '; |
364 | - if(is_array($this->allowedStyleDomains)) { |
|
364 | + if (is_array($this->allowedStyleDomains)) { |
|
365 | 365 | $policy .= implode(' ', $this->allowedStyleDomains); |
366 | 366 | } |
367 | - if($this->inlineStyleAllowed) { |
|
367 | + if ($this->inlineStyleAllowed) { |
|
368 | 368 | $policy .= ' \'unsafe-inline\''; |
369 | 369 | } |
370 | 370 | $policy .= ';'; |
371 | 371 | } |
372 | 372 | |
373 | - if(!empty($this->allowedImageDomains)) { |
|
374 | - $policy .= 'img-src ' . implode(' ', $this->allowedImageDomains); |
|
373 | + if (!empty($this->allowedImageDomains)) { |
|
374 | + $policy .= 'img-src '.implode(' ', $this->allowedImageDomains); |
|
375 | 375 | $policy .= ';'; |
376 | 376 | } |
377 | 377 | |
378 | - if(!empty($this->allowedFontDomains)) { |
|
379 | - $policy .= 'font-src ' . implode(' ', $this->allowedFontDomains); |
|
378 | + if (!empty($this->allowedFontDomains)) { |
|
379 | + $policy .= 'font-src '.implode(' ', $this->allowedFontDomains); |
|
380 | 380 | $policy .= ';'; |
381 | 381 | } |
382 | 382 | |
383 | - if(!empty($this->allowedConnectDomains)) { |
|
384 | - $policy .= 'connect-src ' . implode(' ', $this->allowedConnectDomains); |
|
383 | + if (!empty($this->allowedConnectDomains)) { |
|
384 | + $policy .= 'connect-src '.implode(' ', $this->allowedConnectDomains); |
|
385 | 385 | $policy .= ';'; |
386 | 386 | } |
387 | 387 | |
388 | - if(!empty($this->allowedMediaDomains)) { |
|
389 | - $policy .= 'media-src ' . implode(' ', $this->allowedMediaDomains); |
|
388 | + if (!empty($this->allowedMediaDomains)) { |
|
389 | + $policy .= 'media-src '.implode(' ', $this->allowedMediaDomains); |
|
390 | 390 | $policy .= ';'; |
391 | 391 | } |
392 | 392 | |
393 | - if(!empty($this->allowedObjectDomains)) { |
|
394 | - $policy .= 'object-src ' . implode(' ', $this->allowedObjectDomains); |
|
393 | + if (!empty($this->allowedObjectDomains)) { |
|
394 | + $policy .= 'object-src '.implode(' ', $this->allowedObjectDomains); |
|
395 | 395 | $policy .= ';'; |
396 | 396 | } |
397 | 397 | |
398 | - if(!empty($this->allowedFrameDomains)) { |
|
399 | - $policy .= 'frame-src ' . implode(' ', $this->allowedFrameDomains); |
|
398 | + if (!empty($this->allowedFrameDomains)) { |
|
399 | + $policy .= 'frame-src '.implode(' ', $this->allowedFrameDomains); |
|
400 | 400 | $policy .= ';'; |
401 | 401 | } |
402 | 402 | |
403 | - if(!empty($this->allowedChildSrcDomains)) { |
|
404 | - $policy .= 'child-src ' . implode(' ', $this->allowedChildSrcDomains); |
|
403 | + if (!empty($this->allowedChildSrcDomains)) { |
|
404 | + $policy .= 'child-src '.implode(' ', $this->allowedChildSrcDomains); |
|
405 | 405 | $policy .= ';'; |
406 | 406 | } |
407 | 407 |
@@ -55,7 +55,7 @@ |
||
55 | 55 | * @return string the starting namespace for the app |
56 | 56 | * @since 8.0.0 |
57 | 57 | */ |
58 | - public static function buildAppNamespace($appId, $topNamespace='OCA\\') { |
|
58 | + public static function buildAppNamespace($appId, $topNamespace = 'OCA\\') { |
|
59 | 59 | return \OC\AppFramework\App::buildAppNamespace($appId, $topNamespace); |
60 | 60 | } |
61 | 61 |