aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public/AppFramework/Http
diff options
context:
space:
mode:
Diffstat (limited to 'lib/public/AppFramework/Http')
-rw-r--r--lib/public/AppFramework/Http/DataDisplayResponse.php1
-rw-r--r--lib/public/AppFramework/Http/DataResponse.php2
-rw-r--r--lib/public/AppFramework/Http/DownloadResponse.php3
-rw-r--r--lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php34
-rw-r--r--lib/public/AppFramework/Http/ICallbackResponse.php1
-rw-r--r--lib/public/AppFramework/Http/IOutput.php1
-rw-r--r--lib/public/AppFramework/Http/JSONResponse.php3
-rw-r--r--lib/public/AppFramework/Http/OCSResponse.php3
-rw-r--r--lib/public/AppFramework/Http/RedirectResponse.php3
-rw-r--r--lib/public/AppFramework/Http/RedirectToDefaultAppResponse.php1
-rw-r--r--lib/public/AppFramework/Http/Response.php14
-rw-r--r--lib/public/AppFramework/Http/StandaloneTemplateResponse.php1
-rw-r--r--lib/public/AppFramework/Http/StreamResponse.php1
-rw-r--r--lib/public/AppFramework/Http/Template/IMenuAction.php1
-rw-r--r--lib/public/AppFramework/Http/Template/PublicTemplateResponse.php2
-rw-r--r--lib/public/AppFramework/Http/Template/SimpleMenuAction.php1
-rw-r--r--lib/public/AppFramework/Http/TemplateResponse.php4
17 files changed, 26 insertions, 50 deletions
diff --git a/lib/public/AppFramework/Http/DataDisplayResponse.php b/lib/public/AppFramework/Http/DataDisplayResponse.php
index 8e14b231522..a000f919960 100644
--- a/lib/public/AppFramework/Http/DataDisplayResponse.php
+++ b/lib/public/AppFramework/Http/DataDisplayResponse.php
@@ -88,5 +88,4 @@ class DataDisplayResponse extends Response {
public function getData() {
return $this->data;
}
-
}
diff --git a/lib/public/AppFramework/Http/DataResponse.php b/lib/public/AppFramework/Http/DataResponse.php
index a978df49010..483b46ba5ab 100644
--- a/lib/public/AppFramework/Http/DataResponse.php
+++ b/lib/public/AppFramework/Http/DataResponse.php
@@ -83,6 +83,4 @@ class DataResponse extends Response {
public function getData() {
return $this->data;
}
-
-
}
diff --git a/lib/public/AppFramework/Http/DownloadResponse.php b/lib/public/AppFramework/Http/DownloadResponse.php
index c28550a0bbd..78381f0f08f 100644
--- a/lib/public/AppFramework/Http/DownloadResponse.php
+++ b/lib/public/AppFramework/Http/DownloadResponse.php
@@ -30,7 +30,6 @@ namespace OCP\AppFramework\Http;
* @since 7.0.0
*/
class DownloadResponse extends Response {
-
private $filename;
private $contentType;
@@ -49,6 +48,4 @@ class DownloadResponse extends Response {
$this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
$this->addHeader('Content-Type', $contentType);
}
-
-
}
diff --git a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php
index 01336088895..fc32a024592 100644
--- a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php
+++ b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php
@@ -436,77 +436,77 @@ class EmptyContentSecurityPolicy {
$policy .= "base-uri 'none';";
$policy .= "manifest-src 'self';";
- if(!empty($this->allowedScriptDomains) || $this->inlineScriptAllowed || $this->evalScriptAllowed) {
+ if (!empty($this->allowedScriptDomains) || $this->inlineScriptAllowed || $this->evalScriptAllowed) {
$policy .= 'script-src ';
- if(is_string($this->useJsNonce)) {
+ if (is_string($this->useJsNonce)) {
$policy .= '\'nonce-'.base64_encode($this->useJsNonce).'\'';
$allowedScriptDomains = array_flip($this->allowedScriptDomains);
unset($allowedScriptDomains['\'self\'']);
$this->allowedScriptDomains = array_flip($allowedScriptDomains);
- if(count($allowedScriptDomains) !== 0) {
+ if (count($allowedScriptDomains) !== 0) {
$policy .= ' ';
}
}
- if(is_array($this->allowedScriptDomains)) {
+ if (is_array($this->allowedScriptDomains)) {
$policy .= implode(' ', $this->allowedScriptDomains);
}
- if($this->inlineScriptAllowed) {
+ if ($this->inlineScriptAllowed) {
$policy .= ' \'unsafe-inline\'';
}
- if($this->evalScriptAllowed) {
+ if ($this->evalScriptAllowed) {
$policy .= ' \'unsafe-eval\'';
}
$policy .= ';';
}
- if(!empty($this->allowedStyleDomains) || $this->inlineStyleAllowed) {
+ if (!empty($this->allowedStyleDomains) || $this->inlineStyleAllowed) {
$policy .= 'style-src ';
- if(is_array($this->allowedStyleDomains)) {
+ if (is_array($this->allowedStyleDomains)) {
$policy .= implode(' ', $this->allowedStyleDomains);
}
- if($this->inlineStyleAllowed) {
+ if ($this->inlineStyleAllowed) {
$policy .= ' \'unsafe-inline\'';
}
$policy .= ';';
}
- if(!empty($this->allowedImageDomains)) {
+ if (!empty($this->allowedImageDomains)) {
$policy .= 'img-src ' . implode(' ', $this->allowedImageDomains);
$policy .= ';';
}
- if(!empty($this->allowedFontDomains)) {
+ if (!empty($this->allowedFontDomains)) {
$policy .= 'font-src ' . implode(' ', $this->allowedFontDomains);
$policy .= ';';
}
- if(!empty($this->allowedConnectDomains)) {
+ if (!empty($this->allowedConnectDomains)) {
$policy .= 'connect-src ' . implode(' ', $this->allowedConnectDomains);
$policy .= ';';
}
- if(!empty($this->allowedMediaDomains)) {
+ if (!empty($this->allowedMediaDomains)) {
$policy .= 'media-src ' . implode(' ', $this->allowedMediaDomains);
$policy .= ';';
}
- if(!empty($this->allowedObjectDomains)) {
+ if (!empty($this->allowedObjectDomains)) {
$policy .= 'object-src ' . implode(' ', $this->allowedObjectDomains);
$policy .= ';';
}
- if(!empty($this->allowedFrameDomains)) {
+ if (!empty($this->allowedFrameDomains)) {
$policy .= 'frame-src ';
$policy .= implode(' ', $this->allowedFrameDomains);
$policy .= ';';
}
- if(!empty($this->allowedChildSrcDomains)) {
+ if (!empty($this->allowedChildSrcDomains)) {
$policy .= 'child-src ' . implode(' ', $this->allowedChildSrcDomains);
$policy .= ';';
}
- if(!empty($this->allowedFrameAncestors)) {
+ if (!empty($this->allowedFrameAncestors)) {
$policy .= 'frame-ancestors ' . implode(' ', $this->allowedFrameAncestors);
$policy .= ';';
}
diff --git a/lib/public/AppFramework/Http/ICallbackResponse.php b/lib/public/AppFramework/Http/ICallbackResponse.php
index ca2f5f424ff..44be69548ca 100644
--- a/lib/public/AppFramework/Http/ICallbackResponse.php
+++ b/lib/public/AppFramework/Http/ICallbackResponse.php
@@ -40,5 +40,4 @@ interface ICallbackResponse {
* @since 8.1.0
*/
public function callback(IOutput $output);
-
}
diff --git a/lib/public/AppFramework/Http/IOutput.php b/lib/public/AppFramework/Http/IOutput.php
index 83d65857c16..888c9f45b23 100644
--- a/lib/public/AppFramework/Http/IOutput.php
+++ b/lib/public/AppFramework/Http/IOutput.php
@@ -75,5 +75,4 @@ interface IOutput {
* @since 8.1.0
*/
public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
-
}
diff --git a/lib/public/AppFramework/Http/JSONResponse.php b/lib/public/AppFramework/Http/JSONResponse.php
index 1d7a626d5cd..2827cd964ec 100644
--- a/lib/public/AppFramework/Http/JSONResponse.php
+++ b/lib/public/AppFramework/Http/JSONResponse.php
@@ -71,7 +71,7 @@ class JSONResponse extends Response {
*/
public function render() {
$response = json_encode($this->data, JSON_HEX_TAG);
- if($response === false) {
+ if ($response === false) {
throw new \Exception(sprintf('Could not json_encode due to invalid ' .
'non UTF-8 characters in the array: %s', var_export($this->data, true)));
}
@@ -101,5 +101,4 @@ class JSONResponse extends Response {
public function getData() {
return $this->data;
}
-
}
diff --git a/lib/public/AppFramework/Http/OCSResponse.php b/lib/public/AppFramework/Http/OCSResponse.php
index c80a300ca4f..39c3ad98819 100644
--- a/lib/public/AppFramework/Http/OCSResponse.php
+++ b/lib/public/AppFramework/Http/OCSResponse.php
@@ -37,7 +37,6 @@ namespace OCP\AppFramework\Http;
* @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
*/
class OCSResponse extends Response {
-
private $data;
private $format;
private $statuscode;
@@ -93,6 +92,4 @@ class OCSResponse extends Response {
return \OC_API::renderResult($this->format, $r->getMeta(), $r->getData());
}
-
-
}
diff --git a/lib/public/AppFramework/Http/RedirectResponse.php b/lib/public/AppFramework/Http/RedirectResponse.php
index dda90440d6d..28344866c03 100644
--- a/lib/public/AppFramework/Http/RedirectResponse.php
+++ b/lib/public/AppFramework/Http/RedirectResponse.php
@@ -33,7 +33,6 @@ use OCP\AppFramework\Http;
* @since 7.0.0
*/
class RedirectResponse extends Response {
-
private $redirectURL;
/**
@@ -57,6 +56,4 @@ class RedirectResponse extends Response {
public function getRedirectURL() {
return $this->redirectURL;
}
-
-
}
diff --git a/lib/public/AppFramework/Http/RedirectToDefaultAppResponse.php b/lib/public/AppFramework/Http/RedirectToDefaultAppResponse.php
index 9072ca8a059..f4b8f54f892 100644
--- a/lib/public/AppFramework/Http/RedirectToDefaultAppResponse.php
+++ b/lib/public/AppFramework/Http/RedirectToDefaultAppResponse.php
@@ -41,5 +41,4 @@ class RedirectToDefaultAppResponse extends RedirectResponse {
public function __construct() {
parent::__construct(\OC_Util::getDefaultPageUrl());
}
-
}
diff --git a/lib/public/AppFramework/Http/Response.php b/lib/public/AppFramework/Http/Response.php
index 0aacc2f3a58..a48580c789d 100644
--- a/lib/public/AppFramework/Http/Response.php
+++ b/lib/public/AppFramework/Http/Response.php
@@ -106,7 +106,7 @@ class Response {
* @since 6.0.0 - return value was added in 7.0.0
*/
public function cacheFor(int $cacheSeconds) {
- if($cacheSeconds > 0) {
+ if ($cacheSeconds > 0) {
$this->addHeader('Cache-Control', 'max-age=' . $cacheSeconds . ', must-revalidate');
// Old scool prama caching
@@ -173,7 +173,7 @@ class Response {
* @since 8.0.0
*/
public function invalidateCookies(array $cookieNames) {
- foreach($cookieNames as $cookieName) {
+ foreach ($cookieNames as $cookieName) {
$this->invalidateCookie($cookieName);
}
return $this;
@@ -198,10 +198,10 @@ class Response {
*/
public function addHeader($name, $value) {
$name = trim($name); // always remove leading and trailing whitespace
- // to be able to reliably check for security
- // headers
+ // to be able to reliably check for security
+ // headers
- if(is_null($value)) {
+ if (is_null($value)) {
unset($this->headers[$name]);
} else {
$this->headers[$name] = $value;
@@ -232,7 +232,7 @@ class Response {
public function getHeaders() {
$mergeWith = [];
- if($this->lastModified) {
+ if ($this->lastModified) {
$mergeWith['Last-Modified'] =
$this->lastModified->format(\DateTime::RFC2822);
}
@@ -240,7 +240,7 @@ class Response {
$this->headers['Content-Security-Policy'] = $this->getContentSecurityPolicy()->buildPolicy();
$this->headers['Feature-Policy'] = $this->getFeaturePolicy()->buildPolicy();
- if($this->ETag) {
+ if ($this->ETag) {
$mergeWith['ETag'] = '"' . $this->ETag . '"';
}
diff --git a/lib/public/AppFramework/Http/StandaloneTemplateResponse.php b/lib/public/AppFramework/Http/StandaloneTemplateResponse.php
index 544ad31f0d6..f07e82fc928 100644
--- a/lib/public/AppFramework/Http/StandaloneTemplateResponse.php
+++ b/lib/public/AppFramework/Http/StandaloneTemplateResponse.php
@@ -35,5 +35,4 @@ namespace OCP\AppFramework\Http;
* @since 16.0.0
*/
class StandaloneTemplateResponse extends TemplateResponse {
-
}
diff --git a/lib/public/AppFramework/Http/StreamResponse.php b/lib/public/AppFramework/Http/StreamResponse.php
index a228ed5566c..4deb4b4a859 100644
--- a/lib/public/AppFramework/Http/StreamResponse.php
+++ b/lib/public/AppFramework/Http/StreamResponse.php
@@ -65,5 +65,4 @@ class StreamResponse extends Response implements ICallbackResponse {
}
}
}
-
}
diff --git a/lib/public/AppFramework/Http/Template/IMenuAction.php b/lib/public/AppFramework/Http/Template/IMenuAction.php
index 703befd3e34..e2ab005a050 100644
--- a/lib/public/AppFramework/Http/Template/IMenuAction.php
+++ b/lib/public/AppFramework/Http/Template/IMenuAction.php
@@ -61,5 +61,4 @@ interface IMenuAction {
* @return string
*/
public function render(): string;
-
}
diff --git a/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php b/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php
index 67fe6165eef..8a8ac4242ce 100644
--- a/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php
+++ b/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php
@@ -35,7 +35,6 @@ use OCP\AppFramework\Http\TemplateResponse;
* @since 14.0.0
*/
class PublicTemplateResponse extends TemplateResponse {
-
private $headerTitle = '';
private $headerDetails = '';
private $headerActions = [];
@@ -156,5 +155,4 @@ class PublicTemplateResponse extends TemplateResponse {
$this->setParams($params);
return parent::render();
}
-
}
diff --git a/lib/public/AppFramework/Http/Template/SimpleMenuAction.php b/lib/public/AppFramework/Http/Template/SimpleMenuAction.php
index 6c45d9e4d9d..65880857bb6 100644
--- a/lib/public/AppFramework/Http/Template/SimpleMenuAction.php
+++ b/lib/public/AppFramework/Http/Template/SimpleMenuAction.php
@@ -123,5 +123,4 @@ class SimpleMenuAction implements IMenuAction {
Util::sanitizeHTML($this->id), Util::sanitizeHTML($this->link), Util::sanitizeHTML($this->icon), Util::sanitizeHTML($this->label), $detailContent
);
}
-
}
diff --git a/lib/public/AppFramework/Http/TemplateResponse.php b/lib/public/AppFramework/Http/TemplateResponse.php
index 504b4af93ff..283189a774a 100644
--- a/lib/public/AppFramework/Http/TemplateResponse.php
+++ b/lib/public/AppFramework/Http/TemplateResponse.php
@@ -38,7 +38,6 @@ namespace OCP\AppFramework\Http;
* @since 6.0.0
*/
class TemplateResponse extends Response {
-
const EVENT_LOAD_ADDITIONAL_SCRIPTS = self::class . '::loadAdditionalScripts';
const EVENT_LOAD_ADDITIONAL_SCRIPTS_LOGGEDIN = self::class . '::loadAdditionalScriptsLoggedIn';
@@ -160,11 +159,10 @@ class TemplateResponse extends Response {
$template = new \OCP\Template($this->appName, $this->templateName, $renderAs);
- foreach($this->params as $key => $value){
+ foreach ($this->params as $key => $value) {
$template->assign($key, $value);
}
return $template->fetchPage($this->params);
}
-
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-28 04:42:41 +0000