@@ -36,27 +36,27 @@ |
||
| 36 | 36 | */ |
| 37 | 37 | class RedirectResponse extends Response { |
| 38 | 38 | |
| 39 | - private $redirectURL; |
|
| 40 | - |
|
| 41 | - /** |
|
| 42 | - * Creates a response that redirects to a url |
|
| 43 | - * @param string $redirectURL the url to redirect to |
|
| 44 | - * @since 7.0.0 |
|
| 45 | - */ |
|
| 46 | - public function __construct($redirectURL) { |
|
| 47 | - $this->redirectURL = $redirectURL; |
|
| 48 | - $this->setStatus(Http::STATUS_SEE_OTHER); |
|
| 49 | - $this->addHeader('Location', $redirectURL); |
|
| 50 | - } |
|
| 51 | - |
|
| 52 | - |
|
| 53 | - /** |
|
| 54 | - * @return string the url to redirect |
|
| 55 | - * @since 7.0.0 |
|
| 56 | - */ |
|
| 57 | - public function getRedirectURL() { |
|
| 58 | - return $this->redirectURL; |
|
| 59 | - } |
|
| 39 | + private $redirectURL; |
|
| 40 | + |
|
| 41 | + /** |
|
| 42 | + * Creates a response that redirects to a url |
|
| 43 | + * @param string $redirectURL the url to redirect to |
|
| 44 | + * @since 7.0.0 |
|
| 45 | + */ |
|
| 46 | + public function __construct($redirectURL) { |
|
| 47 | + $this->redirectURL = $redirectURL; |
|
| 48 | + $this->setStatus(Http::STATUS_SEE_OTHER); |
|
| 49 | + $this->addHeader('Location', $redirectURL); |
|
| 50 | + } |
|
| 51 | + |
|
| 52 | + |
|
| 53 | + /** |
|
| 54 | + * @return string the url to redirect |
|
| 55 | + * @since 7.0.0 |
|
| 56 | + */ |
|
| 57 | + public function getRedirectURL() { |
|
| 58 | + return $this->redirectURL; |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | 61 | |
| 62 | 62 | } |
@@ -39,63 +39,63 @@ |
||
| 39 | 39 | */ |
| 40 | 40 | class JSONResponse extends Response { |
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * response data |
|
| 44 | - * @var array|object |
|
| 45 | - */ |
|
| 46 | - protected $data; |
|
| 42 | + /** |
|
| 43 | + * response data |
|
| 44 | + * @var array|object |
|
| 45 | + */ |
|
| 46 | + protected $data; |
|
| 47 | 47 | |
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * constructor of JSONResponse |
|
| 51 | - * @param array|object $data the object or array that should be transformed |
|
| 52 | - * @param int $statusCode the Http status code, defaults to 200 |
|
| 53 | - * @since 6.0.0 |
|
| 54 | - */ |
|
| 55 | - public function __construct($data=array(), $statusCode=Http::STATUS_OK) { |
|
| 56 | - $this->data = $data; |
|
| 57 | - $this->setStatus($statusCode); |
|
| 58 | - $this->addHeader('Content-Type', 'application/json; charset=utf-8'); |
|
| 59 | - } |
|
| 49 | + /** |
|
| 50 | + * constructor of JSONResponse |
|
| 51 | + * @param array|object $data the object or array that should be transformed |
|
| 52 | + * @param int $statusCode the Http status code, defaults to 200 |
|
| 53 | + * @since 6.0.0 |
|
| 54 | + */ |
|
| 55 | + public function __construct($data=array(), $statusCode=Http::STATUS_OK) { |
|
| 56 | + $this->data = $data; |
|
| 57 | + $this->setStatus($statusCode); |
|
| 58 | + $this->addHeader('Content-Type', 'application/json; charset=utf-8'); |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | 61 | |
| 62 | - /** |
|
| 63 | - * Returns the rendered json |
|
| 64 | - * @return string the rendered json |
|
| 65 | - * @since 6.0.0 |
|
| 66 | - * @throws \Exception If data could not get encoded |
|
| 67 | - */ |
|
| 68 | - public function render() { |
|
| 69 | - $response = json_encode($this->data, JSON_HEX_TAG); |
|
| 70 | - if($response === false) { |
|
| 71 | - throw new \Exception(sprintf('Could not json_encode due to invalid ' . |
|
| 72 | - 'non UTF-8 characters in the array: %s', var_export($this->data, true))); |
|
| 73 | - } |
|
| 62 | + /** |
|
| 63 | + * Returns the rendered json |
|
| 64 | + * @return string the rendered json |
|
| 65 | + * @since 6.0.0 |
|
| 66 | + * @throws \Exception If data could not get encoded |
|
| 67 | + */ |
|
| 68 | + public function render() { |
|
| 69 | + $response = json_encode($this->data, JSON_HEX_TAG); |
|
| 70 | + if($response === false) { |
|
| 71 | + throw new \Exception(sprintf('Could not json_encode due to invalid ' . |
|
| 72 | + 'non UTF-8 characters in the array: %s', var_export($this->data, true))); |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | - return $response; |
|
| 76 | - } |
|
| 75 | + return $response; |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | - /** |
|
| 79 | - * Sets values in the data json array |
|
| 80 | - * @param array|object $data an array or object which will be transformed |
|
| 81 | - * to JSON |
|
| 82 | - * @return JSONResponse Reference to this object |
|
| 83 | - * @since 6.0.0 - return value was added in 7.0.0 |
|
| 84 | - */ |
|
| 85 | - public function setData($data){ |
|
| 86 | - $this->data = $data; |
|
| 78 | + /** |
|
| 79 | + * Sets values in the data json array |
|
| 80 | + * @param array|object $data an array or object which will be transformed |
|
| 81 | + * to JSON |
|
| 82 | + * @return JSONResponse Reference to this object |
|
| 83 | + * @since 6.0.0 - return value was added in 7.0.0 |
|
| 84 | + */ |
|
| 85 | + public function setData($data){ |
|
| 86 | + $this->data = $data; |
|
| 87 | 87 | |
| 88 | - return $this; |
|
| 89 | - } |
|
| 88 | + return $this; |
|
| 89 | + } |
|
| 90 | 90 | |
| 91 | 91 | |
| 92 | - /** |
|
| 93 | - * Used to get the set parameters |
|
| 94 | - * @return array the data |
|
| 95 | - * @since 6.0.0 |
|
| 96 | - */ |
|
| 97 | - public function getData(){ |
|
| 98 | - return $this->data; |
|
| 99 | - } |
|
| 92 | + /** |
|
| 93 | + * Used to get the set parameters |
|
| 94 | + * @return array the data |
|
| 95 | + * @since 6.0.0 |
|
| 96 | + */ |
|
| 97 | + public function getData(){ |
|
| 98 | + return $this->data; |
|
| 99 | + } |
|
| 100 | 100 | |
| 101 | 101 | } |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | * @param int $statusCode the Http status code, defaults to 200 |
| 53 | 53 | * @since 6.0.0 |
| 54 | 54 | */ |
| 55 | - public function __construct($data=array(), $statusCode=Http::STATUS_OK) { |
|
| 55 | + public function __construct($data = array(), $statusCode = Http::STATUS_OK) { |
|
| 56 | 56 | $this->data = $data; |
| 57 | 57 | $this->setStatus($statusCode); |
| 58 | 58 | $this->addHeader('Content-Type', 'application/json; charset=utf-8'); |
@@ -67,8 +67,8 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | public function render() { |
| 69 | 69 | $response = json_encode($this->data, JSON_HEX_TAG); |
| 70 | - if($response === false) { |
|
| 71 | - throw new \Exception(sprintf('Could not json_encode due to invalid ' . |
|
| 70 | + if ($response === false) { |
|
| 71 | + throw new \Exception(sprintf('Could not json_encode due to invalid '. |
|
| 72 | 72 | 'non UTF-8 characters in the array: %s', var_export($this->data, true))); |
| 73 | 73 | } |
| 74 | 74 | |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | * @return JSONResponse Reference to this object |
| 83 | 83 | * @since 6.0.0 - return value was added in 7.0.0 |
| 84 | 84 | */ |
| 85 | - public function setData($data){ |
|
| 85 | + public function setData($data) { |
|
| 86 | 86 | $this->data = $data; |
| 87 | 87 | |
| 88 | 88 | return $this; |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | * @return array the data |
| 95 | 95 | * @since 6.0.0 |
| 96 | 96 | */ |
| 97 | - public function getData(){ |
|
| 97 | + public function getData() { |
|
| 98 | 98 | return $this->data; |
| 99 | 99 | } |
| 100 | 100 | |
@@ -37,48 +37,48 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | class DataResponse extends Response { |
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * response data |
|
| 42 | - * @var array|object |
|
| 43 | - */ |
|
| 44 | - protected $data; |
|
| 40 | + /** |
|
| 41 | + * response data |
|
| 42 | + * @var array|object |
|
| 43 | + */ |
|
| 44 | + protected $data; |
|
| 45 | 45 | |
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * @param array|object $data the object or array that should be transformed |
|
| 49 | - * @param int $statusCode the Http status code, defaults to 200 |
|
| 50 | - * @param array $headers additional key value based headers |
|
| 51 | - * @since 8.0.0 |
|
| 52 | - */ |
|
| 53 | - public function __construct($data=array(), $statusCode=Http::STATUS_OK, |
|
| 54 | - array $headers=array()) { |
|
| 55 | - $this->data = $data; |
|
| 56 | - $this->setStatus($statusCode); |
|
| 57 | - $this->setHeaders(array_merge($this->getHeaders(), $headers)); |
|
| 58 | - } |
|
| 47 | + /** |
|
| 48 | + * @param array|object $data the object or array that should be transformed |
|
| 49 | + * @param int $statusCode the Http status code, defaults to 200 |
|
| 50 | + * @param array $headers additional key value based headers |
|
| 51 | + * @since 8.0.0 |
|
| 52 | + */ |
|
| 53 | + public function __construct($data=array(), $statusCode=Http::STATUS_OK, |
|
| 54 | + array $headers=array()) { |
|
| 55 | + $this->data = $data; |
|
| 56 | + $this->setStatus($statusCode); |
|
| 57 | + $this->setHeaders(array_merge($this->getHeaders(), $headers)); |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | 60 | |
| 61 | - /** |
|
| 62 | - * Sets values in the data json array |
|
| 63 | - * @param array|object $data an array or object which will be transformed |
|
| 64 | - * @return DataResponse Reference to this object |
|
| 65 | - * @since 8.0.0 |
|
| 66 | - */ |
|
| 67 | - public function setData($data){ |
|
| 68 | - $this->data = $data; |
|
| 61 | + /** |
|
| 62 | + * Sets values in the data json array |
|
| 63 | + * @param array|object $data an array or object which will be transformed |
|
| 64 | + * @return DataResponse Reference to this object |
|
| 65 | + * @since 8.0.0 |
|
| 66 | + */ |
|
| 67 | + public function setData($data){ |
|
| 68 | + $this->data = $data; |
|
| 69 | 69 | |
| 70 | - return $this; |
|
| 71 | - } |
|
| 70 | + return $this; |
|
| 71 | + } |
|
| 72 | 72 | |
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * Used to get the set parameters |
|
| 76 | - * @return array the data |
|
| 77 | - * @since 8.0.0 |
|
| 78 | - */ |
|
| 79 | - public function getData(){ |
|
| 80 | - return $this->data; |
|
| 81 | - } |
|
| 74 | + /** |
|
| 75 | + * Used to get the set parameters |
|
| 76 | + * @return array the data |
|
| 77 | + * @since 8.0.0 |
|
| 78 | + */ |
|
| 79 | + public function getData(){ |
|
| 80 | + return $this->data; |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | 83 | |
| 84 | 84 | } |
@@ -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); |
@@ -261,7 +261,7 @@ |
||
| 261 | 261 | |
| 262 | 262 | /** |
| 263 | 263 | * Get the currently used Content-Security-Policy |
| 264 | - * @return EmptyContentSecurityPolicy|null Used Content-Security-Policy or null if |
|
| 264 | + * @return ContentSecurityPolicy|null Used Content-Security-Policy or null if |
|
| 265 | 265 | * none specified. |
| 266 | 266 | * @since 8.1.0 |
| 267 | 267 | */ |
@@ -44,318 +44,318 @@ |
||
| 44 | 44 | */ |
| 45 | 45 | class Response { |
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * Headers - defaults to ['Cache-Control' => 'no-cache, no-store, must-revalidate'] |
|
| 49 | - * @var array |
|
| 50 | - */ |
|
| 51 | - private $headers = array( |
|
| 52 | - 'Cache-Control' => 'no-cache, no-store, must-revalidate' |
|
| 53 | - ); |
|
| 54 | - |
|
| 55 | - |
|
| 56 | - /** |
|
| 57 | - * Cookies that will be need to be constructed as header |
|
| 58 | - * @var array |
|
| 59 | - */ |
|
| 60 | - private $cookies = array(); |
|
| 61 | - |
|
| 62 | - |
|
| 63 | - /** |
|
| 64 | - * HTTP status code - defaults to STATUS OK |
|
| 65 | - * @var int |
|
| 66 | - */ |
|
| 67 | - private $status = Http::STATUS_OK; |
|
| 68 | - |
|
| 69 | - |
|
| 70 | - /** |
|
| 71 | - * Last modified date |
|
| 72 | - * @var \DateTime |
|
| 73 | - */ |
|
| 74 | - private $lastModified; |
|
| 75 | - |
|
| 76 | - |
|
| 77 | - /** |
|
| 78 | - * ETag |
|
| 79 | - * @var string |
|
| 80 | - */ |
|
| 81 | - private $ETag; |
|
| 82 | - |
|
| 83 | - /** @var ContentSecurityPolicy|null Used Content-Security-Policy */ |
|
| 84 | - private $contentSecurityPolicy = null; |
|
| 85 | - |
|
| 86 | - /** @var bool */ |
|
| 87 | - private $throttled = false; |
|
| 88 | - /** @var array */ |
|
| 89 | - private $throttleMetadata = []; |
|
| 90 | - |
|
| 91 | - /** |
|
| 92 | - * Caches the response |
|
| 93 | - * @param int $cacheSeconds the amount of seconds that should be cached |
|
| 94 | - * if 0 then caching will be disabled |
|
| 95 | - * @return $this |
|
| 96 | - * @since 6.0.0 - return value was added in 7.0.0 |
|
| 97 | - */ |
|
| 98 | - public function cacheFor($cacheSeconds) { |
|
| 99 | - |
|
| 100 | - if($cacheSeconds > 0) { |
|
| 101 | - $this->addHeader('Cache-Control', 'max-age=' . $cacheSeconds . ', must-revalidate'); |
|
| 102 | - } else { |
|
| 103 | - $this->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate'); |
|
| 104 | - } |
|
| 105 | - |
|
| 106 | - return $this; |
|
| 107 | - } |
|
| 108 | - |
|
| 109 | - /** |
|
| 110 | - * Adds a new cookie to the response |
|
| 111 | - * @param string $name The name of the cookie |
|
| 112 | - * @param string $value The value of the cookie |
|
| 113 | - * @param \DateTime|null $expireDate Date on that the cookie should expire, if set |
|
| 114 | - * to null cookie will be considered as session |
|
| 115 | - * cookie. |
|
| 116 | - * @return $this |
|
| 117 | - * @since 8.0.0 |
|
| 118 | - */ |
|
| 119 | - public function addCookie($name, $value, \DateTime $expireDate = null) { |
|
| 120 | - $this->cookies[$name] = array('value' => $value, 'expireDate' => $expireDate); |
|
| 121 | - return $this; |
|
| 122 | - } |
|
| 123 | - |
|
| 124 | - |
|
| 125 | - /** |
|
| 126 | - * Set the specified cookies |
|
| 127 | - * @param array $cookies array('foo' => array('value' => 'bar', 'expire' => null)) |
|
| 128 | - * @return $this |
|
| 129 | - * @since 8.0.0 |
|
| 130 | - */ |
|
| 131 | - public function setCookies(array $cookies) { |
|
| 132 | - $this->cookies = $cookies; |
|
| 133 | - return $this; |
|
| 134 | - } |
|
| 135 | - |
|
| 136 | - |
|
| 137 | - /** |
|
| 138 | - * Invalidates the specified cookie |
|
| 139 | - * @param string $name |
|
| 140 | - * @return $this |
|
| 141 | - * @since 8.0.0 |
|
| 142 | - */ |
|
| 143 | - public function invalidateCookie($name) { |
|
| 144 | - $this->addCookie($name, 'expired', new \DateTime('1971-01-01 00:00')); |
|
| 145 | - return $this; |
|
| 146 | - } |
|
| 147 | - |
|
| 148 | - /** |
|
| 149 | - * Invalidates the specified cookies |
|
| 150 | - * @param array $cookieNames array('foo', 'bar') |
|
| 151 | - * @return $this |
|
| 152 | - * @since 8.0.0 |
|
| 153 | - */ |
|
| 154 | - public function invalidateCookies(array $cookieNames) { |
|
| 155 | - foreach($cookieNames as $cookieName) { |
|
| 156 | - $this->invalidateCookie($cookieName); |
|
| 157 | - } |
|
| 158 | - return $this; |
|
| 159 | - } |
|
| 160 | - |
|
| 161 | - /** |
|
| 162 | - * Returns the cookies |
|
| 163 | - * @return array |
|
| 164 | - * @since 8.0.0 |
|
| 165 | - */ |
|
| 166 | - public function getCookies() { |
|
| 167 | - return $this->cookies; |
|
| 168 | - } |
|
| 169 | - |
|
| 170 | - /** |
|
| 171 | - * Adds a new header to the response that will be called before the render |
|
| 172 | - * function |
|
| 173 | - * @param string $name The name of the HTTP header |
|
| 174 | - * @param string $value The value, null will delete it |
|
| 175 | - * @return $this |
|
| 176 | - * @since 6.0.0 - return value was added in 7.0.0 |
|
| 177 | - */ |
|
| 178 | - public function addHeader($name, $value) { |
|
| 179 | - $name = trim($name); // always remove leading and trailing whitespace |
|
| 180 | - // to be able to reliably check for security |
|
| 181 | - // headers |
|
| 182 | - |
|
| 183 | - if(is_null($value)) { |
|
| 184 | - unset($this->headers[$name]); |
|
| 185 | - } else { |
|
| 186 | - $this->headers[$name] = $value; |
|
| 187 | - } |
|
| 188 | - |
|
| 189 | - return $this; |
|
| 190 | - } |
|
| 191 | - |
|
| 192 | - |
|
| 193 | - /** |
|
| 194 | - * Set the headers |
|
| 195 | - * @param array $headers value header pairs |
|
| 196 | - * @return $this |
|
| 197 | - * @since 8.0.0 |
|
| 198 | - */ |
|
| 199 | - public function setHeaders(array $headers) { |
|
| 200 | - $this->headers = $headers; |
|
| 201 | - |
|
| 202 | - return $this; |
|
| 203 | - } |
|
| 204 | - |
|
| 205 | - |
|
| 206 | - /** |
|
| 207 | - * Returns the set headers |
|
| 208 | - * @return array the headers |
|
| 209 | - * @since 6.0.0 |
|
| 210 | - */ |
|
| 211 | - public function getHeaders() { |
|
| 212 | - $mergeWith = []; |
|
| 213 | - |
|
| 214 | - if($this->lastModified) { |
|
| 215 | - $mergeWith['Last-Modified'] = |
|
| 216 | - $this->lastModified->format(\DateTime::RFC2822); |
|
| 217 | - } |
|
| 218 | - |
|
| 219 | - // Build Content-Security-Policy and use default if none has been specified |
|
| 220 | - if(is_null($this->contentSecurityPolicy)) { |
|
| 221 | - $this->setContentSecurityPolicy(new ContentSecurityPolicy()); |
|
| 222 | - } |
|
| 223 | - $this->headers['Content-Security-Policy'] = $this->contentSecurityPolicy->buildPolicy(); |
|
| 224 | - |
|
| 225 | - if($this->ETag) { |
|
| 226 | - $mergeWith['ETag'] = '"' . $this->ETag . '"'; |
|
| 227 | - } |
|
| 228 | - |
|
| 229 | - return array_merge($mergeWith, $this->headers); |
|
| 230 | - } |
|
| 231 | - |
|
| 232 | - |
|
| 233 | - /** |
|
| 234 | - * By default renders no output |
|
| 235 | - * @return string |
|
| 236 | - * @since 6.0.0 |
|
| 237 | - */ |
|
| 238 | - public function render() { |
|
| 239 | - return ''; |
|
| 240 | - } |
|
| 241 | - |
|
| 242 | - |
|
| 243 | - /** |
|
| 244 | - * Set response status |
|
| 245 | - * @param int $status a HTTP status code, see also the STATUS constants |
|
| 246 | - * @return Response Reference to this object |
|
| 247 | - * @since 6.0.0 - return value was added in 7.0.0 |
|
| 248 | - */ |
|
| 249 | - public function setStatus($status) { |
|
| 250 | - $this->status = $status; |
|
| 251 | - |
|
| 252 | - return $this; |
|
| 253 | - } |
|
| 254 | - |
|
| 255 | - /** |
|
| 256 | - * Set a Content-Security-Policy |
|
| 257 | - * @param EmptyContentSecurityPolicy $csp Policy to set for the response object |
|
| 258 | - * @return $this |
|
| 259 | - * @since 8.1.0 |
|
| 260 | - */ |
|
| 261 | - public function setContentSecurityPolicy(EmptyContentSecurityPolicy $csp) { |
|
| 262 | - $this->contentSecurityPolicy = $csp; |
|
| 263 | - return $this; |
|
| 264 | - } |
|
| 265 | - |
|
| 266 | - /** |
|
| 267 | - * Get the currently used Content-Security-Policy |
|
| 268 | - * @return EmptyContentSecurityPolicy|null Used Content-Security-Policy or null if |
|
| 269 | - * none specified. |
|
| 270 | - * @since 8.1.0 |
|
| 271 | - */ |
|
| 272 | - public function getContentSecurityPolicy() { |
|
| 273 | - return $this->contentSecurityPolicy; |
|
| 274 | - } |
|
| 275 | - |
|
| 276 | - |
|
| 277 | - /** |
|
| 278 | - * Get response status |
|
| 279 | - * @since 6.0.0 |
|
| 280 | - */ |
|
| 281 | - public function getStatus() { |
|
| 282 | - return $this->status; |
|
| 283 | - } |
|
| 284 | - |
|
| 285 | - |
|
| 286 | - /** |
|
| 287 | - * Get the ETag |
|
| 288 | - * @return string the etag |
|
| 289 | - * @since 6.0.0 |
|
| 290 | - */ |
|
| 291 | - public function getETag() { |
|
| 292 | - return $this->ETag; |
|
| 293 | - } |
|
| 294 | - |
|
| 295 | - |
|
| 296 | - /** |
|
| 297 | - * Get "last modified" date |
|
| 298 | - * @return \DateTime RFC2822 formatted last modified date |
|
| 299 | - * @since 6.0.0 |
|
| 300 | - */ |
|
| 301 | - public function getLastModified() { |
|
| 302 | - return $this->lastModified; |
|
| 303 | - } |
|
| 304 | - |
|
| 305 | - |
|
| 306 | - /** |
|
| 307 | - * Set the ETag |
|
| 308 | - * @param string $ETag |
|
| 309 | - * @return Response Reference to this object |
|
| 310 | - * @since 6.0.0 - return value was added in 7.0.0 |
|
| 311 | - */ |
|
| 312 | - public function setETag($ETag) { |
|
| 313 | - $this->ETag = $ETag; |
|
| 314 | - |
|
| 315 | - return $this; |
|
| 316 | - } |
|
| 317 | - |
|
| 318 | - |
|
| 319 | - /** |
|
| 320 | - * Set "last modified" date |
|
| 321 | - * @param \DateTime $lastModified |
|
| 322 | - * @return Response Reference to this object |
|
| 323 | - * @since 6.0.0 - return value was added in 7.0.0 |
|
| 324 | - */ |
|
| 325 | - public function setLastModified($lastModified) { |
|
| 326 | - $this->lastModified = $lastModified; |
|
| 327 | - |
|
| 328 | - return $this; |
|
| 329 | - } |
|
| 330 | - |
|
| 331 | - /** |
|
| 332 | - * Marks the response as to throttle. Will be throttled when the |
|
| 333 | - * @BruteForceProtection annotation is added. |
|
| 334 | - * |
|
| 335 | - * @param array $metadata |
|
| 336 | - * @since 12.0.0 |
|
| 337 | - */ |
|
| 338 | - public function throttle(array $metadata = []) { |
|
| 339 | - $this->throttled = true; |
|
| 340 | - $this->throttleMetadata = $metadata; |
|
| 341 | - } |
|
| 342 | - |
|
| 343 | - /** |
|
| 344 | - * Returns the throttle metadata, defaults to empty array |
|
| 345 | - * |
|
| 346 | - * @return array |
|
| 347 | - * @since 13.0.0 |
|
| 348 | - */ |
|
| 349 | - public function getThrottleMetadata() { |
|
| 350 | - return $this->throttleMetadata; |
|
| 351 | - } |
|
| 352 | - |
|
| 353 | - /** |
|
| 354 | - * Whether the current response is throttled. |
|
| 355 | - * |
|
| 356 | - * @since 12.0.0 |
|
| 357 | - */ |
|
| 358 | - public function isThrottled() { |
|
| 359 | - return $this->throttled; |
|
| 360 | - } |
|
| 47 | + /** |
|
| 48 | + * Headers - defaults to ['Cache-Control' => 'no-cache, no-store, must-revalidate'] |
|
| 49 | + * @var array |
|
| 50 | + */ |
|
| 51 | + private $headers = array( |
|
| 52 | + 'Cache-Control' => 'no-cache, no-store, must-revalidate' |
|
| 53 | + ); |
|
| 54 | + |
|
| 55 | + |
|
| 56 | + /** |
|
| 57 | + * Cookies that will be need to be constructed as header |
|
| 58 | + * @var array |
|
| 59 | + */ |
|
| 60 | + private $cookies = array(); |
|
| 61 | + |
|
| 62 | + |
|
| 63 | + /** |
|
| 64 | + * HTTP status code - defaults to STATUS OK |
|
| 65 | + * @var int |
|
| 66 | + */ |
|
| 67 | + private $status = Http::STATUS_OK; |
|
| 68 | + |
|
| 69 | + |
|
| 70 | + /** |
|
| 71 | + * Last modified date |
|
| 72 | + * @var \DateTime |
|
| 73 | + */ |
|
| 74 | + private $lastModified; |
|
| 75 | + |
|
| 76 | + |
|
| 77 | + /** |
|
| 78 | + * ETag |
|
| 79 | + * @var string |
|
| 80 | + */ |
|
| 81 | + private $ETag; |
|
| 82 | + |
|
| 83 | + /** @var ContentSecurityPolicy|null Used Content-Security-Policy */ |
|
| 84 | + private $contentSecurityPolicy = null; |
|
| 85 | + |
|
| 86 | + /** @var bool */ |
|
| 87 | + private $throttled = false; |
|
| 88 | + /** @var array */ |
|
| 89 | + private $throttleMetadata = []; |
|
| 90 | + |
|
| 91 | + /** |
|
| 92 | + * Caches the response |
|
| 93 | + * @param int $cacheSeconds the amount of seconds that should be cached |
|
| 94 | + * if 0 then caching will be disabled |
|
| 95 | + * @return $this |
|
| 96 | + * @since 6.0.0 - return value was added in 7.0.0 |
|
| 97 | + */ |
|
| 98 | + public function cacheFor($cacheSeconds) { |
|
| 99 | + |
|
| 100 | + if($cacheSeconds > 0) { |
|
| 101 | + $this->addHeader('Cache-Control', 'max-age=' . $cacheSeconds . ', must-revalidate'); |
|
| 102 | + } else { |
|
| 103 | + $this->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate'); |
|
| 104 | + } |
|
| 105 | + |
|
| 106 | + return $this; |
|
| 107 | + } |
|
| 108 | + |
|
| 109 | + /** |
|
| 110 | + * Adds a new cookie to the response |
|
| 111 | + * @param string $name The name of the cookie |
|
| 112 | + * @param string $value The value of the cookie |
|
| 113 | + * @param \DateTime|null $expireDate Date on that the cookie should expire, if set |
|
| 114 | + * to null cookie will be considered as session |
|
| 115 | + * cookie. |
|
| 116 | + * @return $this |
|
| 117 | + * @since 8.0.0 |
|
| 118 | + */ |
|
| 119 | + public function addCookie($name, $value, \DateTime $expireDate = null) { |
|
| 120 | + $this->cookies[$name] = array('value' => $value, 'expireDate' => $expireDate); |
|
| 121 | + return $this; |
|
| 122 | + } |
|
| 123 | + |
|
| 124 | + |
|
| 125 | + /** |
|
| 126 | + * Set the specified cookies |
|
| 127 | + * @param array $cookies array('foo' => array('value' => 'bar', 'expire' => null)) |
|
| 128 | + * @return $this |
|
| 129 | + * @since 8.0.0 |
|
| 130 | + */ |
|
| 131 | + public function setCookies(array $cookies) { |
|
| 132 | + $this->cookies = $cookies; |
|
| 133 | + return $this; |
|
| 134 | + } |
|
| 135 | + |
|
| 136 | + |
|
| 137 | + /** |
|
| 138 | + * Invalidates the specified cookie |
|
| 139 | + * @param string $name |
|
| 140 | + * @return $this |
|
| 141 | + * @since 8.0.0 |
|
| 142 | + */ |
|
| 143 | + public function invalidateCookie($name) { |
|
| 144 | + $this->addCookie($name, 'expired', new \DateTime('1971-01-01 00:00')); |
|
| 145 | + return $this; |
|
| 146 | + } |
|
| 147 | + |
|
| 148 | + /** |
|
| 149 | + * Invalidates the specified cookies |
|
| 150 | + * @param array $cookieNames array('foo', 'bar') |
|
| 151 | + * @return $this |
|
| 152 | + * @since 8.0.0 |
|
| 153 | + */ |
|
| 154 | + public function invalidateCookies(array $cookieNames) { |
|
| 155 | + foreach($cookieNames as $cookieName) { |
|
| 156 | + $this->invalidateCookie($cookieName); |
|
| 157 | + } |
|
| 158 | + return $this; |
|
| 159 | + } |
|
| 160 | + |
|
| 161 | + /** |
|
| 162 | + * Returns the cookies |
|
| 163 | + * @return array |
|
| 164 | + * @since 8.0.0 |
|
| 165 | + */ |
|
| 166 | + public function getCookies() { |
|
| 167 | + return $this->cookies; |
|
| 168 | + } |
|
| 169 | + |
|
| 170 | + /** |
|
| 171 | + * Adds a new header to the response that will be called before the render |
|
| 172 | + * function |
|
| 173 | + * @param string $name The name of the HTTP header |
|
| 174 | + * @param string $value The value, null will delete it |
|
| 175 | + * @return $this |
|
| 176 | + * @since 6.0.0 - return value was added in 7.0.0 |
|
| 177 | + */ |
|
| 178 | + public function addHeader($name, $value) { |
|
| 179 | + $name = trim($name); // always remove leading and trailing whitespace |
|
| 180 | + // to be able to reliably check for security |
|
| 181 | + // headers |
|
| 182 | + |
|
| 183 | + if(is_null($value)) { |
|
| 184 | + unset($this->headers[$name]); |
|
| 185 | + } else { |
|
| 186 | + $this->headers[$name] = $value; |
|
| 187 | + } |
|
| 188 | + |
|
| 189 | + return $this; |
|
| 190 | + } |
|
| 191 | + |
|
| 192 | + |
|
| 193 | + /** |
|
| 194 | + * Set the headers |
|
| 195 | + * @param array $headers value header pairs |
|
| 196 | + * @return $this |
|
| 197 | + * @since 8.0.0 |
|
| 198 | + */ |
|
| 199 | + public function setHeaders(array $headers) { |
|
| 200 | + $this->headers = $headers; |
|
| 201 | + |
|
| 202 | + return $this; |
|
| 203 | + } |
|
| 204 | + |
|
| 205 | + |
|
| 206 | + /** |
|
| 207 | + * Returns the set headers |
|
| 208 | + * @return array the headers |
|
| 209 | + * @since 6.0.0 |
|
| 210 | + */ |
|
| 211 | + public function getHeaders() { |
|
| 212 | + $mergeWith = []; |
|
| 213 | + |
|
| 214 | + if($this->lastModified) { |
|
| 215 | + $mergeWith['Last-Modified'] = |
|
| 216 | + $this->lastModified->format(\DateTime::RFC2822); |
|
| 217 | + } |
|
| 218 | + |
|
| 219 | + // Build Content-Security-Policy and use default if none has been specified |
|
| 220 | + if(is_null($this->contentSecurityPolicy)) { |
|
| 221 | + $this->setContentSecurityPolicy(new ContentSecurityPolicy()); |
|
| 222 | + } |
|
| 223 | + $this->headers['Content-Security-Policy'] = $this->contentSecurityPolicy->buildPolicy(); |
|
| 224 | + |
|
| 225 | + if($this->ETag) { |
|
| 226 | + $mergeWith['ETag'] = '"' . $this->ETag . '"'; |
|
| 227 | + } |
|
| 228 | + |
|
| 229 | + return array_merge($mergeWith, $this->headers); |
|
| 230 | + } |
|
| 231 | + |
|
| 232 | + |
|
| 233 | + /** |
|
| 234 | + * By default renders no output |
|
| 235 | + * @return string |
|
| 236 | + * @since 6.0.0 |
|
| 237 | + */ |
|
| 238 | + public function render() { |
|
| 239 | + return ''; |
|
| 240 | + } |
|
| 241 | + |
|
| 242 | + |
|
| 243 | + /** |
|
| 244 | + * Set response status |
|
| 245 | + * @param int $status a HTTP status code, see also the STATUS constants |
|
| 246 | + * @return Response Reference to this object |
|
| 247 | + * @since 6.0.0 - return value was added in 7.0.0 |
|
| 248 | + */ |
|
| 249 | + public function setStatus($status) { |
|
| 250 | + $this->status = $status; |
|
| 251 | + |
|
| 252 | + return $this; |
|
| 253 | + } |
|
| 254 | + |
|
| 255 | + /** |
|
| 256 | + * Set a Content-Security-Policy |
|
| 257 | + * @param EmptyContentSecurityPolicy $csp Policy to set for the response object |
|
| 258 | + * @return $this |
|
| 259 | + * @since 8.1.0 |
|
| 260 | + */ |
|
| 261 | + public function setContentSecurityPolicy(EmptyContentSecurityPolicy $csp) { |
|
| 262 | + $this->contentSecurityPolicy = $csp; |
|
| 263 | + return $this; |
|
| 264 | + } |
|
| 265 | + |
|
| 266 | + /** |
|
| 267 | + * Get the currently used Content-Security-Policy |
|
| 268 | + * @return EmptyContentSecurityPolicy|null Used Content-Security-Policy or null if |
|
| 269 | + * none specified. |
|
| 270 | + * @since 8.1.0 |
|
| 271 | + */ |
|
| 272 | + public function getContentSecurityPolicy() { |
|
| 273 | + return $this->contentSecurityPolicy; |
|
| 274 | + } |
|
| 275 | + |
|
| 276 | + |
|
| 277 | + /** |
|
| 278 | + * Get response status |
|
| 279 | + * @since 6.0.0 |
|
| 280 | + */ |
|
| 281 | + public function getStatus() { |
|
| 282 | + return $this->status; |
|
| 283 | + } |
|
| 284 | + |
|
| 285 | + |
|
| 286 | + /** |
|
| 287 | + * Get the ETag |
|
| 288 | + * @return string the etag |
|
| 289 | + * @since 6.0.0 |
|
| 290 | + */ |
|
| 291 | + public function getETag() { |
|
| 292 | + return $this->ETag; |
|
| 293 | + } |
|
| 294 | + |
|
| 295 | + |
|
| 296 | + /** |
|
| 297 | + * Get "last modified" date |
|
| 298 | + * @return \DateTime RFC2822 formatted last modified date |
|
| 299 | + * @since 6.0.0 |
|
| 300 | + */ |
|
| 301 | + public function getLastModified() { |
|
| 302 | + return $this->lastModified; |
|
| 303 | + } |
|
| 304 | + |
|
| 305 | + |
|
| 306 | + /** |
|
| 307 | + * Set the ETag |
|
| 308 | + * @param string $ETag |
|
| 309 | + * @return Response Reference to this object |
|
| 310 | + * @since 6.0.0 - return value was added in 7.0.0 |
|
| 311 | + */ |
|
| 312 | + public function setETag($ETag) { |
|
| 313 | + $this->ETag = $ETag; |
|
| 314 | + |
|
| 315 | + return $this; |
|
| 316 | + } |
|
| 317 | + |
|
| 318 | + |
|
| 319 | + /** |
|
| 320 | + * Set "last modified" date |
|
| 321 | + * @param \DateTime $lastModified |
|
| 322 | + * @return Response Reference to this object |
|
| 323 | + * @since 6.0.0 - return value was added in 7.0.0 |
|
| 324 | + */ |
|
| 325 | + public function setLastModified($lastModified) { |
|
| 326 | + $this->lastModified = $lastModified; |
|
| 327 | + |
|
| 328 | + return $this; |
|
| 329 | + } |
|
| 330 | + |
|
| 331 | + /** |
|
| 332 | + * Marks the response as to throttle. Will be throttled when the |
|
| 333 | + * @BruteForceProtection annotation is added. |
|
| 334 | + * |
|
| 335 | + * @param array $metadata |
|
| 336 | + * @since 12.0.0 |
|
| 337 | + */ |
|
| 338 | + public function throttle(array $metadata = []) { |
|
| 339 | + $this->throttled = true; |
|
| 340 | + $this->throttleMetadata = $metadata; |
|
| 341 | + } |
|
| 342 | + |
|
| 343 | + /** |
|
| 344 | + * Returns the throttle metadata, defaults to empty array |
|
| 345 | + * |
|
| 346 | + * @return array |
|
| 347 | + * @since 13.0.0 |
|
| 348 | + */ |
|
| 349 | + public function getThrottleMetadata() { |
|
| 350 | + return $this->throttleMetadata; |
|
| 351 | + } |
|
| 352 | + |
|
| 353 | + /** |
|
| 354 | + * Whether the current response is throttled. |
|
| 355 | + * |
|
| 356 | + * @since 12.0.0 |
|
| 357 | + */ |
|
| 358 | + public function isThrottled() { |
|
| 359 | + return $this->throttled; |
|
| 360 | + } |
|
| 361 | 361 | } |
@@ -29,36 +29,36 @@ |
||
| 29 | 29 | * @since 8.0.0 |
| 30 | 30 | */ |
| 31 | 31 | class DataDownloadResponse extends DownloadResponse { |
| 32 | - /** |
|
| 33 | - * @var string |
|
| 34 | - */ |
|
| 35 | - private $data; |
|
| 32 | + /** |
|
| 33 | + * @var string |
|
| 34 | + */ |
|
| 35 | + private $data; |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * Creates a response that prompts the user to download the text |
|
| 39 | - * @param string $data text to be downloaded |
|
| 40 | - * @param string $filename the name that the downloaded file should have |
|
| 41 | - * @param string $contentType the mimetype that the downloaded file should have |
|
| 42 | - * @since 8.0.0 |
|
| 43 | - */ |
|
| 44 | - public function __construct($data, $filename, $contentType) { |
|
| 45 | - $this->data = $data; |
|
| 46 | - parent::__construct($filename, $contentType); |
|
| 47 | - } |
|
| 37 | + /** |
|
| 38 | + * Creates a response that prompts the user to download the text |
|
| 39 | + * @param string $data text to be downloaded |
|
| 40 | + * @param string $filename the name that the downloaded file should have |
|
| 41 | + * @param string $contentType the mimetype that the downloaded file should have |
|
| 42 | + * @since 8.0.0 |
|
| 43 | + */ |
|
| 44 | + public function __construct($data, $filename, $contentType) { |
|
| 45 | + $this->data = $data; |
|
| 46 | + parent::__construct($filename, $contentType); |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * @param string $data |
|
| 51 | - * @since 8.0.0 |
|
| 52 | - */ |
|
| 53 | - public function setData($data) { |
|
| 54 | - $this->data = $data; |
|
| 55 | - } |
|
| 49 | + /** |
|
| 50 | + * @param string $data |
|
| 51 | + * @since 8.0.0 |
|
| 52 | + */ |
|
| 53 | + public function setData($data) { |
|
| 54 | + $this->data = $data; |
|
| 55 | + } |
|
| 56 | 56 | |
| 57 | - /** |
|
| 58 | - * @return string |
|
| 59 | - * @since 8.0.0 |
|
| 60 | - */ |
|
| 61 | - public function render() { |
|
| 62 | - return $this->data; |
|
| 63 | - } |
|
| 57 | + /** |
|
| 58 | + * @return string |
|
| 59 | + * @since 8.0.0 |
|
| 60 | + */ |
|
| 61 | + public function render() { |
|
| 62 | + return $this->data; |
|
| 63 | + } |
|
| 64 | 64 | } |
@@ -32,38 +32,38 @@ |
||
| 32 | 32 | */ |
| 33 | 33 | class FileDisplayResponse extends Response implements ICallbackResponse { |
| 34 | 34 | |
| 35 | - /** @var \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile */ |
|
| 36 | - private $file; |
|
| 35 | + /** @var \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile */ |
|
| 36 | + private $file; |
|
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * FileDisplayResponse constructor. |
|
| 40 | - * |
|
| 41 | - * @param \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile $file |
|
| 42 | - * @param int $statusCode |
|
| 43 | - * @param array $headers |
|
| 44 | - * @since 11.0.0 |
|
| 45 | - */ |
|
| 46 | - public function __construct($file, $statusCode=Http::STATUS_OK, |
|
| 47 | - $headers=[]) { |
|
| 48 | - $this->file = $file; |
|
| 49 | - $this->setStatus($statusCode); |
|
| 50 | - $this->setHeaders(array_merge($this->getHeaders(), $headers)); |
|
| 51 | - $this->addHeader('Content-Disposition', 'inline; filename="' . rawurldecode($file->getName()) . '"'); |
|
| 38 | + /** |
|
| 39 | + * FileDisplayResponse constructor. |
|
| 40 | + * |
|
| 41 | + * @param \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile $file |
|
| 42 | + * @param int $statusCode |
|
| 43 | + * @param array $headers |
|
| 44 | + * @since 11.0.0 |
|
| 45 | + */ |
|
| 46 | + public function __construct($file, $statusCode=Http::STATUS_OK, |
|
| 47 | + $headers=[]) { |
|
| 48 | + $this->file = $file; |
|
| 49 | + $this->setStatus($statusCode); |
|
| 50 | + $this->setHeaders(array_merge($this->getHeaders(), $headers)); |
|
| 51 | + $this->addHeader('Content-Disposition', 'inline; filename="' . rawurldecode($file->getName()) . '"'); |
|
| 52 | 52 | |
| 53 | - $this->setETag($file->getEtag()); |
|
| 54 | - $lastModified = new \DateTime(); |
|
| 55 | - $lastModified->setTimestamp($file->getMTime()); |
|
| 56 | - $this->setLastModified($lastModified); |
|
| 57 | - } |
|
| 53 | + $this->setETag($file->getEtag()); |
|
| 54 | + $lastModified = new \DateTime(); |
|
| 55 | + $lastModified->setTimestamp($file->getMTime()); |
|
| 56 | + $this->setLastModified($lastModified); |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | - /** |
|
| 60 | - * @param IOutput $output |
|
| 61 | - * @since 11.0.0 |
|
| 62 | - */ |
|
| 63 | - public function callback(IOutput $output) { |
|
| 64 | - if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) { |
|
| 65 | - $output->setHeader('Content-Length: ' . $this->file->getSize()); |
|
| 66 | - $output->setOutput($this->file->getContent()); |
|
| 67 | - } |
|
| 68 | - } |
|
| 59 | + /** |
|
| 60 | + * @param IOutput $output |
|
| 61 | + * @since 11.0.0 |
|
| 62 | + */ |
|
| 63 | + public function callback(IOutput $output) { |
|
| 64 | + if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) { |
|
| 65 | + $output->setHeader('Content-Length: ' . $this->file->getSize()); |
|
| 66 | + $output->setOutput($this->file->getContent()); |
|
| 67 | + } |
|
| 68 | + } |
|
| 69 | 69 | } |
@@ -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 | } |
@@ -32,19 +32,19 @@ |
||
| 32 | 32 | */ |
| 33 | 33 | class NotFoundResponse extends Response { |
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * @since 8.1.0 |
|
| 37 | - */ |
|
| 38 | - public function __construct() { |
|
| 39 | - $this->setStatus(404); |
|
| 40 | - } |
|
| 35 | + /** |
|
| 36 | + * @since 8.1.0 |
|
| 37 | + */ |
|
| 38 | + public function __construct() { |
|
| 39 | + $this->setStatus(404); |
|
| 40 | + } |
|
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @return string |
|
| 44 | - * @since 8.1.0 |
|
| 45 | - */ |
|
| 46 | - public function render() { |
|
| 47 | - $template = new Template('core', '404', 'guest'); |
|
| 48 | - return $template->fetchPage(); |
|
| 49 | - } |
|
| 42 | + /** |
|
| 43 | + * @return string |
|
| 44 | + * @since 8.1.0 |
|
| 45 | + */ |
|
| 46 | + public function render() { |
|
| 47 | + $template = new Template('core', '404', 'guest'); |
|
| 48 | + return $template->fetchPage(); |
|
| 49 | + } |
|
| 50 | 50 | } |
@@ -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 | |
@@ -37,124 +37,124 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | class TemplateResponse extends Response { |
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * name of the template |
|
| 42 | - * @var string |
|
| 43 | - */ |
|
| 44 | - protected $templateName; |
|
| 45 | - |
|
| 46 | - /** |
|
| 47 | - * parameters |
|
| 48 | - * @var array |
|
| 49 | - */ |
|
| 50 | - protected $params; |
|
| 51 | - |
|
| 52 | - /** |
|
| 53 | - * rendering type (admin, user, blank) |
|
| 54 | - * @var string |
|
| 55 | - */ |
|
| 56 | - protected $renderAs; |
|
| 57 | - |
|
| 58 | - /** |
|
| 59 | - * app name |
|
| 60 | - * @var string |
|
| 61 | - */ |
|
| 62 | - protected $appName; |
|
| 63 | - |
|
| 64 | - /** |
|
| 65 | - * constructor of TemplateResponse |
|
| 66 | - * @param string $appName the name of the app to load the template from |
|
| 67 | - * @param string $templateName the name of the template |
|
| 68 | - * @param array $params an array of parameters which should be passed to the |
|
| 69 | - * template |
|
| 70 | - * @param string $renderAs how the page should be rendered, defaults to user |
|
| 71 | - * @since 6.0.0 - parameters $params and $renderAs were added in 7.0.0 |
|
| 72 | - */ |
|
| 73 | - public function __construct($appName, $templateName, array $params=array(), |
|
| 74 | - $renderAs='user') { |
|
| 75 | - $this->templateName = $templateName; |
|
| 76 | - $this->appName = $appName; |
|
| 77 | - $this->params = $params; |
|
| 78 | - $this->renderAs = $renderAs; |
|
| 79 | - } |
|
| 80 | - |
|
| 81 | - |
|
| 82 | - /** |
|
| 83 | - * Sets template parameters |
|
| 84 | - * @param array $params an array with key => value structure which sets template |
|
| 85 | - * variables |
|
| 86 | - * @return TemplateResponse Reference to this object |
|
| 87 | - * @since 6.0.0 - return value was added in 7.0.0 |
|
| 88 | - */ |
|
| 89 | - public function setParams(array $params){ |
|
| 90 | - $this->params = $params; |
|
| 91 | - |
|
| 92 | - return $this; |
|
| 93 | - } |
|
| 94 | - |
|
| 95 | - |
|
| 96 | - /** |
|
| 97 | - * Used for accessing the set parameters |
|
| 98 | - * @return array the params |
|
| 99 | - * @since 6.0.0 |
|
| 100 | - */ |
|
| 101 | - public function getParams(){ |
|
| 102 | - return $this->params; |
|
| 103 | - } |
|
| 104 | - |
|
| 105 | - |
|
| 106 | - /** |
|
| 107 | - * Used for accessing the name of the set template |
|
| 108 | - * @return string the name of the used template |
|
| 109 | - * @since 6.0.0 |
|
| 110 | - */ |
|
| 111 | - public function getTemplateName(){ |
|
| 112 | - return $this->templateName; |
|
| 113 | - } |
|
| 114 | - |
|
| 115 | - |
|
| 116 | - /** |
|
| 117 | - * Sets the template page |
|
| 118 | - * @param string $renderAs admin, user or blank. Admin also prints the admin |
|
| 119 | - * settings header and footer, user renders the normal |
|
| 120 | - * normal page including footer and header and blank |
|
| 121 | - * just renders the plain template |
|
| 122 | - * @return TemplateResponse Reference to this object |
|
| 123 | - * @since 6.0.0 - return value was added in 7.0.0 |
|
| 124 | - */ |
|
| 125 | - public function renderAs($renderAs){ |
|
| 126 | - $this->renderAs = $renderAs; |
|
| 127 | - |
|
| 128 | - return $this; |
|
| 129 | - } |
|
| 130 | - |
|
| 131 | - |
|
| 132 | - /** |
|
| 133 | - * Returns the set renderAs |
|
| 134 | - * @return string the renderAs value |
|
| 135 | - * @since 6.0.0 |
|
| 136 | - */ |
|
| 137 | - public function getRenderAs(){ |
|
| 138 | - return $this->renderAs; |
|
| 139 | - } |
|
| 140 | - |
|
| 141 | - |
|
| 142 | - /** |
|
| 143 | - * Returns the rendered html |
|
| 144 | - * @return string the rendered html |
|
| 145 | - * @since 6.0.0 |
|
| 146 | - */ |
|
| 147 | - public function render(){ |
|
| 148 | - // \OCP\Template needs an empty string instead of 'blank' for an unwrapped response |
|
| 149 | - $renderAs = $this->renderAs === 'blank' ? '' : $this->renderAs; |
|
| 150 | - |
|
| 151 | - $template = new \OCP\Template($this->appName, $this->templateName, $renderAs); |
|
| 152 | - |
|
| 153 | - foreach($this->params as $key => $value){ |
|
| 154 | - $template->assign($key, $value); |
|
| 155 | - } |
|
| 156 | - |
|
| 157 | - return $template->fetchPage($this->params); |
|
| 158 | - } |
|
| 40 | + /** |
|
| 41 | + * name of the template |
|
| 42 | + * @var string |
|
| 43 | + */ |
|
| 44 | + protected $templateName; |
|
| 45 | + |
|
| 46 | + /** |
|
| 47 | + * parameters |
|
| 48 | + * @var array |
|
| 49 | + */ |
|
| 50 | + protected $params; |
|
| 51 | + |
|
| 52 | + /** |
|
| 53 | + * rendering type (admin, user, blank) |
|
| 54 | + * @var string |
|
| 55 | + */ |
|
| 56 | + protected $renderAs; |
|
| 57 | + |
|
| 58 | + /** |
|
| 59 | + * app name |
|
| 60 | + * @var string |
|
| 61 | + */ |
|
| 62 | + protected $appName; |
|
| 63 | + |
|
| 64 | + /** |
|
| 65 | + * constructor of TemplateResponse |
|
| 66 | + * @param string $appName the name of the app to load the template from |
|
| 67 | + * @param string $templateName the name of the template |
|
| 68 | + * @param array $params an array of parameters which should be passed to the |
|
| 69 | + * template |
|
| 70 | + * @param string $renderAs how the page should be rendered, defaults to user |
|
| 71 | + * @since 6.0.0 - parameters $params and $renderAs were added in 7.0.0 |
|
| 72 | + */ |
|
| 73 | + public function __construct($appName, $templateName, array $params=array(), |
|
| 74 | + $renderAs='user') { |
|
| 75 | + $this->templateName = $templateName; |
|
| 76 | + $this->appName = $appName; |
|
| 77 | + $this->params = $params; |
|
| 78 | + $this->renderAs = $renderAs; |
|
| 79 | + } |
|
| 80 | + |
|
| 81 | + |
|
| 82 | + /** |
|
| 83 | + * Sets template parameters |
|
| 84 | + * @param array $params an array with key => value structure which sets template |
|
| 85 | + * variables |
|
| 86 | + * @return TemplateResponse Reference to this object |
|
| 87 | + * @since 6.0.0 - return value was added in 7.0.0 |
|
| 88 | + */ |
|
| 89 | + public function setParams(array $params){ |
|
| 90 | + $this->params = $params; |
|
| 91 | + |
|
| 92 | + return $this; |
|
| 93 | + } |
|
| 94 | + |
|
| 95 | + |
|
| 96 | + /** |
|
| 97 | + * Used for accessing the set parameters |
|
| 98 | + * @return array the params |
|
| 99 | + * @since 6.0.0 |
|
| 100 | + */ |
|
| 101 | + public function getParams(){ |
|
| 102 | + return $this->params; |
|
| 103 | + } |
|
| 104 | + |
|
| 105 | + |
|
| 106 | + /** |
|
| 107 | + * Used for accessing the name of the set template |
|
| 108 | + * @return string the name of the used template |
|
| 109 | + * @since 6.0.0 |
|
| 110 | + */ |
|
| 111 | + public function getTemplateName(){ |
|
| 112 | + return $this->templateName; |
|
| 113 | + } |
|
| 114 | + |
|
| 115 | + |
|
| 116 | + /** |
|
| 117 | + * Sets the template page |
|
| 118 | + * @param string $renderAs admin, user or blank. Admin also prints the admin |
|
| 119 | + * settings header and footer, user renders the normal |
|
| 120 | + * normal page including footer and header and blank |
|
| 121 | + * just renders the plain template |
|
| 122 | + * @return TemplateResponse Reference to this object |
|
| 123 | + * @since 6.0.0 - return value was added in 7.0.0 |
|
| 124 | + */ |
|
| 125 | + public function renderAs($renderAs){ |
|
| 126 | + $this->renderAs = $renderAs; |
|
| 127 | + |
|
| 128 | + return $this; |
|
| 129 | + } |
|
| 130 | + |
|
| 131 | + |
|
| 132 | + /** |
|
| 133 | + * Returns the set renderAs |
|
| 134 | + * @return string the renderAs value |
|
| 135 | + * @since 6.0.0 |
|
| 136 | + */ |
|
| 137 | + public function getRenderAs(){ |
|
| 138 | + return $this->renderAs; |
|
| 139 | + } |
|
| 140 | + |
|
| 141 | + |
|
| 142 | + /** |
|
| 143 | + * Returns the rendered html |
|
| 144 | + * @return string the rendered html |
|
| 145 | + * @since 6.0.0 |
|
| 146 | + */ |
|
| 147 | + public function render(){ |
|
| 148 | + // \OCP\Template needs an empty string instead of 'blank' for an unwrapped response |
|
| 149 | + $renderAs = $this->renderAs === 'blank' ? '' : $this->renderAs; |
|
| 150 | + |
|
| 151 | + $template = new \OCP\Template($this->appName, $this->templateName, $renderAs); |
|
| 152 | + |
|
| 153 | + foreach($this->params as $key => $value){ |
|
| 154 | + $template->assign($key, $value); |
|
| 155 | + } |
|
| 156 | + |
|
| 157 | + return $template->fetchPage($this->params); |
|
| 158 | + } |
|
| 159 | 159 | |
| 160 | 160 | } |
@@ -32,48 +32,48 @@ |
||
| 32 | 32 | */ |
| 33 | 33 | interface IOutput { |
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * @param string $out |
|
| 37 | - * @since 8.1.0 |
|
| 38 | - */ |
|
| 39 | - public function setOutput($out); |
|
| 35 | + /** |
|
| 36 | + * @param string $out |
|
| 37 | + * @since 8.1.0 |
|
| 38 | + */ |
|
| 39 | + public function setOutput($out); |
|
| 40 | 40 | |
| 41 | - /** |
|
| 42 | - * @param string|resource $path or file handle |
|
| 43 | - * |
|
| 44 | - * @return bool false if an error occurred |
|
| 45 | - * @since 8.1.0 |
|
| 46 | - */ |
|
| 47 | - public function setReadfile($path); |
|
| 41 | + /** |
|
| 42 | + * @param string|resource $path or file handle |
|
| 43 | + * |
|
| 44 | + * @return bool false if an error occurred |
|
| 45 | + * @since 8.1.0 |
|
| 46 | + */ |
|
| 47 | + public function setReadfile($path); |
|
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * @param string $header |
|
| 51 | - * @since 8.1.0 |
|
| 52 | - */ |
|
| 53 | - public function setHeader($header); |
|
| 49 | + /** |
|
| 50 | + * @param string $header |
|
| 51 | + * @since 8.1.0 |
|
| 52 | + */ |
|
| 53 | + public function setHeader($header); |
|
| 54 | 54 | |
| 55 | - /** |
|
| 56 | - * @return int returns the current http response code |
|
| 57 | - * @since 8.1.0 |
|
| 58 | - */ |
|
| 59 | - public function getHttpResponseCode(); |
|
| 55 | + /** |
|
| 56 | + * @return int returns the current http response code |
|
| 57 | + * @since 8.1.0 |
|
| 58 | + */ |
|
| 59 | + public function getHttpResponseCode(); |
|
| 60 | 60 | |
| 61 | - /** |
|
| 62 | - * @param int $code sets the http status code |
|
| 63 | - * @since 8.1.0 |
|
| 64 | - */ |
|
| 65 | - public function setHttpResponseCode($code); |
|
| 61 | + /** |
|
| 62 | + * @param int $code sets the http status code |
|
| 63 | + * @since 8.1.0 |
|
| 64 | + */ |
|
| 65 | + public function setHttpResponseCode($code); |
|
| 66 | 66 | |
| 67 | - /** |
|
| 68 | - * @param string $name |
|
| 69 | - * @param string $value |
|
| 70 | - * @param int $expire |
|
| 71 | - * @param string $path |
|
| 72 | - * @param string $domain |
|
| 73 | - * @param bool $secure |
|
| 74 | - * @param bool $httpOnly |
|
| 75 | - * @since 8.1.0 |
|
| 76 | - */ |
|
| 77 | - public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly); |
|
| 67 | + /** |
|
| 68 | + * @param string $name |
|
| 69 | + * @param string $value |
|
| 70 | + * @param int $expire |
|
| 71 | + * @param string $path |
|
| 72 | + * @param string $domain |
|
| 73 | + * @param bool $secure |
|
| 74 | + * @param bool $httpOnly |
|
| 75 | + * @since 8.1.0 |
|
| 76 | + */ |
|
| 77 | + public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly); |
|
| 78 | 78 | |
| 79 | 79 | } |