nextcloud / server

lib/public/AppFramework/Http/NotFoundResponse.php

Indentation +15 added lines, -15 removed lines

@@ -31,21 +31,21 @@
  */
 class NotFoundResponse extends Response {
 
-	/**
-	 * @since 8.1.0
-	 */
-	public function __construct() {
-		parent::__construct();
+    /**
+     * @since 8.1.0
+     */
+    public function __construct() {
+        parent::__construct();
 
-		$this->setStatus(404);
-	}
+        $this->setStatus(404);
+    }
 
-	/**
-	 * @return string
-	 * @since 8.1.0
-	 */
-	public function render() {
-		$template = new Template('core', '404', 'guest');
-		return $template->fetchPage();
-	}
+    /**
+     * @return string
+     * @since 8.1.0
+     */
+    public function render() {
+        $template = new Template('core', '404', 'guest');
+        return $template->fetchPage();
+    }
 }

lib/public/AppFramework/Http/OCSResponse.php

Indentation +50 added lines, -50 removed lines

@@ -38,61 +38,61 @@
  */
 class OCSResponse extends Response {
 
-	private $data;
-	private $format;
-	private $statuscode;
-	private $message;
-	private $itemscount;
-	private $itemsperpage;
+    private $data;
+    private $format;
+    private $statuscode;
+    private $message;
+    private $itemscount;
+    private $itemsperpage;
 
-	/**
-	 * generates the xml or json response for the API call from an multidimenional data array.
-	 * @param string $format
-	 * @param int $statuscode
-	 * @param string $message
-	 * @param array $data
-	 * @param int|string $itemscount
-	 * @param int|string $itemsperpage
-	 * @since 8.1.0
-	 * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
-	 */
-	public function __construct($format, $statuscode, $message,
-								$data=[], $itemscount='',
-								$itemsperpage='') {
-		parent::__construct();
+    /**
+     * generates the xml or json response for the API call from an multidimenional data array.
+     * @param string $format
+     * @param int $statuscode
+     * @param string $message
+     * @param array $data
+     * @param int|string $itemscount
+     * @param int|string $itemsperpage
+     * @since 8.1.0
+     * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
+     */
+    public function __construct($format, $statuscode, $message,
+                                $data=[], $itemscount='',
+                                $itemsperpage='') {
+        parent::__construct();
 
-		$this->format = $format;
-		$this->statuscode = $statuscode;
-		$this->message = $message;
-		$this->data = $data;
-		$this->itemscount = $itemscount;
-		$this->itemsperpage = $itemsperpage;
+        $this->format = $format;
+        $this->statuscode = $statuscode;
+        $this->message = $message;
+        $this->data = $data;
+        $this->itemscount = $itemscount;
+        $this->itemsperpage = $itemsperpage;
 
-		// set the correct header based on the format parameter
-		if ($format === 'json') {
-			$this->addHeader(
-				'Content-Type', 'application/json; charset=utf-8'
-			);
-		} else {
-			$this->addHeader(
-				'Content-Type', 'application/xml; charset=utf-8'
-			);
-		}
-	}
+        // set the correct header based on the format parameter
+        if ($format === 'json') {
+            $this->addHeader(
+                'Content-Type', 'application/json; charset=utf-8'
+            );
+        } else {
+            $this->addHeader(
+                'Content-Type', 'application/xml; charset=utf-8'
+            );
+        }
+    }
 
-	/**
-	 * @return string
-	 * @since 8.1.0
-	 * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
-	 * @suppress PhanDeprecatedClass
-	 */
-	public function render() {
-		$r = new \OC\OCS\Result($this->data, $this->statuscode, $this->message);
-		$r->setTotalItems($this->itemscount);
-		$r->setItemsPerPage($this->itemsperpage);
+    /**
+     * @return string
+     * @since 8.1.0
+     * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
+     * @suppress PhanDeprecatedClass
+     */
+    public function render() {
+        $r = new \OC\OCS\Result($this->data, $this->statuscode, $this->message);
+        $r->setTotalItems($this->itemscount);
+        $r->setItemsPerPage($this->itemsperpage);
 
-		return \OC_API::renderResult($this->format, $r->getMeta(), $r->getData());
-	}
+        return \OC_API::renderResult($this->format, $r->getMeta(), $r->getData());
+    }
 
 
 }

Spacing +2 added lines, -2 removed lines

@@ -57,8 +57,8 @@
 	 * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
 	 */
 	public function __construct($format, $statuscode, $message,
-								$data=[], $itemscount='',
-								$itemsperpage='') {
+								$data = [], $itemscount = '',
+								$itemsperpage = '') {
 		parent::__construct();
 
 		$this->format = $format;

lib/public/AppFramework/Http/DataResponse.php

Indentation +36 added lines, -36 removed lines

@@ -37,50 +37,50 @@
  */
 class DataResponse extends Response {
 
-	/**
-	 * response data
-	 * @var array|object
-	 */
-	protected $data;
+    /**
+     * response data
+     * @var array|object
+     */
+    protected $data;
 
 
-	/**
-	 * @param array|object $data the object or array that should be transformed
-	 * @param int $statusCode the Http status code, defaults to 200
-	 * @param array $headers additional key value based headers
-	 * @since 8.0.0
-	 */
-	public function __construct($data=array(), $statusCode=Http::STATUS_OK,
-	                            array $headers=array()) {
-		parent::__construct();
+    /**
+     * @param array|object $data the object or array that should be transformed
+     * @param int $statusCode the Http status code, defaults to 200
+     * @param array $headers additional key value based headers
+     * @since 8.0.0
+     */
+    public function __construct($data=array(), $statusCode=Http::STATUS_OK,
+                                array $headers=array()) {
+        parent::__construct();
 
-		$this->data = $data;
-		$this->setStatus($statusCode);
-		$this->setHeaders(array_merge($this->getHeaders(), $headers));
-	}
+        $this->data = $data;
+        $this->setStatus($statusCode);
+        $this->setHeaders(array_merge($this->getHeaders(), $headers));
+    }
 
 
-	/**
-	 * Sets values in the data json array
-	 * @param array|object $data an array or object which will be transformed
-	 * @return DataResponse Reference to this object
-	 * @since 8.0.0
-	 */
-	public function setData($data){
-		$this->data = $data;
+    /**
+     * Sets values in the data json array
+     * @param array|object $data an array or object which will be transformed
+     * @return DataResponse Reference to this object
+     * @since 8.0.0
+     */
+    public function setData($data){
+        $this->data = $data;
 
-		return $this;
-	}
+        return $this;
+    }
 
 
-	/**
-	 * Used to get the set parameters
-	 * @return array the data
-	 * @since 8.0.0
-	 */
-	public function getData(){
-		return $this->data;
-	}
+    /**
+     * Used to get the set parameters
+     * @return array the data
+     * @since 8.0.0
+     */
+    public function getData(){
+        return $this->data;
+    }
 
 
 }

Spacing +4 added lines, -4 removed lines

@@ -50,8 +50,8 @@ 
 	 * @param array $headers additional key value based headers
 	 * @since 8.0.0
 	 */
-	public function __construct($data=array(), $statusCode=Http::STATUS_OK,
-	                            array $headers=array()) {
+	public function __construct($data = array(), $statusCode = Http::STATUS_OK,
+	                            array $headers = array()) {
 		parent::__construct();
 
 		$this->data = $data;
@@ -66,7 +66,7 @@ 
 	 * @return DataResponse Reference to this object
 	 * @since 8.0.0
 	 */
-	public function setData($data){
+	public function setData($data) {
 		$this->data = $data;
 
 		return $this;
@@ -78,7 +78,7 @@ 
 	 * @return array the data
 	 * @since 8.0.0
 	 */
-	public function getData(){
+	public function getData() {
 		return $this->data;
 	}
 

lib/public/AppFramework/Http/JSONResponse.php

Indentation +60 added lines, -60 removed lines

@@ -39,65 +39,65 @@
  */
 class JSONResponse extends Response {
 
-	/**
-	 * response data
-	 * @var array|object
-	 */
-	protected $data;
-
-
-	/**
-	 * constructor of JSONResponse
-	 * @param array|object $data the object or array that should be transformed
-	 * @param int $statusCode the Http status code, defaults to 200
-	 * @since 6.0.0
-	 */
-	public function __construct($data=array(), $statusCode=Http::STATUS_OK) {
-		parent::__construct();
-
-		$this->data = $data;
-		$this->setStatus($statusCode);
-		$this->addHeader('Content-Type', 'application/json; charset=utf-8');
-	}
-
-
-	/**
-	 * Returns the rendered json
-	 * @return string the rendered json
-	 * @since 6.0.0
-	 * @throws \Exception If data could not get encoded
-	 */
-	public function render() {
-		$response = json_encode($this->data, JSON_HEX_TAG);
-		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)));
-		}
-
-		return $response;
-	}
-
-	/**
-	 * Sets values in the data json array
-	 * @param array|object $data an array or object which will be transformed
-	 *                             to JSON
-	 * @return JSONResponse Reference to this object
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function setData($data){
-		$this->data = $data;
-
-		return $this;
-	}
-
-
-	/**
-	 * Used to get the set parameters
-	 * @return array the data
-	 * @since 6.0.0
-	 */
-	public function getData(){
-		return $this->data;
-	}
+    /**
+     * response data
+     * @var array|object
+     */
+    protected $data;
+
+
+    /**
+     * constructor of JSONResponse
+     * @param array|object $data the object or array that should be transformed
+     * @param int $statusCode the Http status code, defaults to 200
+     * @since 6.0.0
+     */
+    public function __construct($data=array(), $statusCode=Http::STATUS_OK) {
+        parent::__construct();
+
+        $this->data = $data;
+        $this->setStatus($statusCode);
+        $this->addHeader('Content-Type', 'application/json; charset=utf-8');
+    }
+
+
+    /**
+     * Returns the rendered json
+     * @return string the rendered json
+     * @since 6.0.0
+     * @throws \Exception If data could not get encoded
+     */
+    public function render() {
+        $response = json_encode($this->data, JSON_HEX_TAG);
+        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)));
+        }
+
+        return $response;
+    }
+
+    /**
+     * Sets values in the data json array
+     * @param array|object $data an array or object which will be transformed
+     *                             to JSON
+     * @return JSONResponse Reference to this object
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function setData($data){
+        $this->data = $data;
+
+        return $this;
+    }
+
+
+    /**
+     * Used to get the set parameters
+     * @return array the data
+     * @since 6.0.0
+     */
+    public function getData(){
+        return $this->data;
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -52,7 +52,7 @@ 
 	 * @param int $statusCode the Http status code, defaults to 200
 	 * @since 6.0.0
 	 */
-	public function __construct($data=array(), $statusCode=Http::STATUS_OK) {
+	public function __construct($data = array(), $statusCode = Http::STATUS_OK) {
 		parent::__construct();
 
 		$this->data = $data;
@@ -69,8 +69,8 @@ 
 	 */
 	public function render() {
 		$response = json_encode($this->data, JSON_HEX_TAG);
-		if($response === false) {
-			throw new \Exception(sprintf('Could not json_encode due to invalid ' .
+		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)));
 		}
 
@@ -84,7 +84,7 @@ 
 	 * @return JSONResponse Reference to this object
 	 * @since 6.0.0 - return value was added in 7.0.0
 	 */
-	public function setData($data){
+	public function setData($data) {
 		$this->data = $data;
 
 		return $this;
@@ -96,7 +96,7 @@ 
 	 * @return array the data
 	 * @since 6.0.0
 	 */
-	public function getData(){
+	public function getData() {
 		return $this->data;
 	}
 

lib/public/AppFramework/Http/RedirectResponse.php

Indentation +23 added lines, -23 removed lines

@@ -35,29 +35,29 @@
  */
 class RedirectResponse extends Response {
 
-	private $redirectURL;
-
-	/**
-	 * Creates a response that redirects to a url
-	 * @param string $redirectURL the url to redirect to
-	 * @since 7.0.0
-	 */
-	public function __construct($redirectURL) {
-		parent::__construct();
-
-		$this->redirectURL = $redirectURL;
-		$this->setStatus(Http::STATUS_SEE_OTHER);
-		$this->addHeader('Location', $redirectURL);
-	}
-
-
-	/**
-	 * @return string the url to redirect
-	 * @since 7.0.0
-	 */
-	public function getRedirectURL() {
-		return $this->redirectURL;
-	}
+    private $redirectURL;
+
+    /**
+     * Creates a response that redirects to a url
+     * @param string $redirectURL the url to redirect to
+     * @since 7.0.0
+     */
+    public function __construct($redirectURL) {
+        parent::__construct();
+
+        $this->redirectURL = $redirectURL;
+        $this->setStatus(Http::STATUS_SEE_OTHER);
+        $this->addHeader('Location', $redirectURL);
+    }
+
+
+    /**
+     * @return string the url to redirect
+     * @since 7.0.0
+     */
+    public function getRedirectURL() {
+        return $this->redirectURL;
+    }
 
 
 }

lib/public/AppFramework/Http/TemplateResponse.php

Indentation +126 added lines, -126 removed lines

@@ -37,131 +37,131 @@
  */
 class TemplateResponse extends Response {
 
-	const EVENT_LOAD_ADDITIONAL_SCRIPTS = self::class . '::loadAdditionalScripts';
-	const EVENT_LOAD_ADDITIONAL_SCRIPTS_LOGGEDIN = self::class . '::loadAdditionalScriptsLoggedIn';
-
-	/**
-	 * name of the template
-	 * @var string
-	 */
-	protected $templateName;
-
-	/**
-	 * parameters
-	 * @var array
-	 */
-	protected $params;
-
-	/**
-	 * rendering type (admin, user, blank)
-	 * @var string
-	 */
-	protected $renderAs;
-
-	/**
-	 * app name
-	 * @var string
-	 */
-	protected $appName;
-
-	/**
-	 * constructor of TemplateResponse
-	 * @param string $appName the name of the app to load the template from
-	 * @param string $templateName the name of the template
-	 * @param array $params an array of parameters which should be passed to the
-	 * template
-	 * @param string $renderAs how the page should be rendered, defaults to user
-	 * @since 6.0.0 - parameters $params and $renderAs were added in 7.0.0
-	 */
-	public function __construct($appName, $templateName, array $params=array(),
-	                            $renderAs='user') {
-		parent::__construct();
-
-		$this->templateName = $templateName;
-		$this->appName = $appName;
-		$this->params = $params;
-		$this->renderAs = $renderAs;
-
-		$this->setContentSecurityPolicy(new ContentSecurityPolicy());
-	}
-
-
-	/**
-	 * Sets template parameters
-	 * @param array $params an array with key => value structure which sets template
-	 *                      variables
-	 * @return TemplateResponse Reference to this object
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function setParams(array $params){
-		$this->params = $params;
-
-		return $this;
-	}
-
-
-	/**
-	 * Used for accessing the set parameters
-	 * @return array the params
-	 * @since 6.0.0
-	 */
-	public function getParams(){
-		return $this->params;
-	}
-
-
-	/**
-	 * Used for accessing the name of the set template
-	 * @return string the name of the used template
-	 * @since 6.0.0
-	 */
-	public function getTemplateName(){
-		return $this->templateName;
-	}
-
-
-	/**
-	 * Sets the template page
-	 * @param string $renderAs admin, user or blank. Admin also prints the admin
-	 *                         settings header and footer, user renders the normal
-	 *                         normal page including footer and header and blank
-	 *                         just renders the plain template
-	 * @return TemplateResponse Reference to this object
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function renderAs($renderAs){
-		$this->renderAs = $renderAs;
-
-		return $this;
-	}
-
-
-	/**
-	 * Returns the set renderAs
-	 * @return string the renderAs value
-	 * @since 6.0.0
-	 */
-	public function getRenderAs(){
-		return $this->renderAs;
-	}
-
-
-	/**
-	 * Returns the rendered html
-	 * @return string the rendered html
-	 * @since 6.0.0
-	 */
-	public function render(){
-		// \OCP\Template needs an empty string instead of 'blank' for an unwrapped response
-		$renderAs = $this->renderAs === 'blank' ? '' : $this->renderAs;
-
-		$template = new \OCP\Template($this->appName, $this->templateName, $renderAs);
-
-		foreach($this->params as $key => $value){
-			$template->assign($key, $value);
-		}
-
-		return $template->fetchPage($this->params);
-	}
+    const EVENT_LOAD_ADDITIONAL_SCRIPTS = self::class . '::loadAdditionalScripts';
+    const EVENT_LOAD_ADDITIONAL_SCRIPTS_LOGGEDIN = self::class . '::loadAdditionalScriptsLoggedIn';
+
+    /**
+     * name of the template
+     * @var string
+     */
+    protected $templateName;
+
+    /**
+     * parameters
+     * @var array
+     */
+    protected $params;
+
+    /**
+     * rendering type (admin, user, blank)
+     * @var string
+     */
+    protected $renderAs;
+
+    /**
+     * app name
+     * @var string
+     */
+    protected $appName;
+
+    /**
+     * constructor of TemplateResponse
+     * @param string $appName the name of the app to load the template from
+     * @param string $templateName the name of the template
+     * @param array $params an array of parameters which should be passed to the
+     * template
+     * @param string $renderAs how the page should be rendered, defaults to user
+     * @since 6.0.0 - parameters $params and $renderAs were added in 7.0.0
+     */
+    public function __construct($appName, $templateName, array $params=array(),
+                                $renderAs='user') {
+        parent::__construct();
+
+        $this->templateName = $templateName;
+        $this->appName = $appName;
+        $this->params = $params;
+        $this->renderAs = $renderAs;
+
+        $this->setContentSecurityPolicy(new ContentSecurityPolicy());
+    }
+
+
+    /**
+     * Sets template parameters
+     * @param array $params an array with key => value structure which sets template
+     *                      variables
+     * @return TemplateResponse Reference to this object
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function setParams(array $params){
+        $this->params = $params;
+
+        return $this;
+    }
+
+
+    /**
+     * Used for accessing the set parameters
+     * @return array the params
+     * @since 6.0.0
+     */
+    public function getParams(){
+        return $this->params;
+    }
+
+
+    /**
+     * Used for accessing the name of the set template
+     * @return string the name of the used template
+     * @since 6.0.0
+     */
+    public function getTemplateName(){
+        return $this->templateName;
+    }
+
+
+    /**
+     * Sets the template page
+     * @param string $renderAs admin, user or blank. Admin also prints the admin
+     *                         settings header and footer, user renders the normal
+     *                         normal page including footer and header and blank
+     *                         just renders the plain template
+     * @return TemplateResponse Reference to this object
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function renderAs($renderAs){
+        $this->renderAs = $renderAs;
+
+        return $this;
+    }
+
+
+    /**
+     * Returns the set renderAs
+     * @return string the renderAs value
+     * @since 6.0.0
+     */
+    public function getRenderAs(){
+        return $this->renderAs;
+    }
+
+
+    /**
+     * Returns the rendered html
+     * @return string the rendered html
+     * @since 6.0.0
+     */
+    public function render(){
+        // \OCP\Template needs an empty string instead of 'blank' for an unwrapped response
+        $renderAs = $this->renderAs === 'blank' ? '' : $this->renderAs;
+
+        $template = new \OCP\Template($this->appName, $this->templateName, $renderAs);
+
+        foreach($this->params as $key => $value){
+            $template->assign($key, $value);
+        }
+
+        return $template->fetchPage($this->params);
+    }
 
 }

Spacing +11 added lines, -11 removed lines

@@ -37,8 +37,8 @@ 
  */
 class TemplateResponse extends Response {
 
-	const EVENT_LOAD_ADDITIONAL_SCRIPTS = self::class . '::loadAdditionalScripts';
-	const EVENT_LOAD_ADDITIONAL_SCRIPTS_LOGGEDIN = self::class . '::loadAdditionalScriptsLoggedIn';
+	const EVENT_LOAD_ADDITIONAL_SCRIPTS = self::class.'::loadAdditionalScripts';
+	const EVENT_LOAD_ADDITIONAL_SCRIPTS_LOGGEDIN = self::class.'::loadAdditionalScriptsLoggedIn';
 
 	/**
 	 * name of the template
@@ -73,8 +73,8 @@ 
 	 * @param string $renderAs how the page should be rendered, defaults to user
 	 * @since 6.0.0 - parameters $params and $renderAs were added in 7.0.0
 	 */
-	public function __construct($appName, $templateName, array $params=array(),
-	                            $renderAs='user') {
+	public function __construct($appName, $templateName, array $params = array(),
+	                            $renderAs = 'user') {
 		parent::__construct();
 
 		$this->templateName = $templateName;
@@ -93,7 +93,7 @@ 
 	 * @return TemplateResponse Reference to this object
 	 * @since 6.0.0 - return value was added in 7.0.0
 	 */
-	public function setParams(array $params){
+	public function setParams(array $params) {
 		$this->params = $params;
 
 		return $this;
@@ -105,7 +105,7 @@ 
 	 * @return array the params
 	 * @since 6.0.0
 	 */
-	public function getParams(){
+	public function getParams() {
 		return $this->params;
 	}
 
@@ -115,7 +115,7 @@ 
 	 * @return string the name of the used template
 	 * @since 6.0.0
 	 */
-	public function getTemplateName(){
+	public function getTemplateName() {
 		return $this->templateName;
 	}
 
@@ -129,7 +129,7 @@ 
 	 * @return TemplateResponse Reference to this object
 	 * @since 6.0.0 - return value was added in 7.0.0
 	 */
-	public function renderAs($renderAs){
+	public function renderAs($renderAs) {
 		$this->renderAs = $renderAs;
 
 		return $this;
@@ -141,7 +141,7 @@ 
 	 * @return string the renderAs value
 	 * @since 6.0.0
 	 */
-	public function getRenderAs(){
+	public function getRenderAs() {
 		return $this->renderAs;
 	}
 
@@ -151,13 +151,13 @@ 
 	 * @return string the rendered html
 	 * @since 6.0.0
 	 */
-	public function render(){
+	public function render() {
 		// \OCP\Template needs an empty string instead of 'blank' for an unwrapped response
 		$renderAs = $this->renderAs === 'blank' ? '' : $this->renderAs;
 
 		$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);
 		}
 

lib/public/AppFramework/Http/StreamResponse.php

Indentation +26 added lines, -26 removed lines

@@ -34,35 +34,35 @@
  * @since 8.1.0
  */
 class StreamResponse extends Response implements ICallbackResponse {
-	/** @var string */
-	private $filePath;
+    /** @var string */
+    private $filePath;
 
-	/**
-	 * @param string|resource $filePath the path to the file or a file handle which should be streamed
-	 * @since 8.1.0
-	 */
-	public function __construct ($filePath) {
-		parent::__construct();
+    /**
+     * @param string|resource $filePath the path to the file or a file handle which should be streamed
+     * @since 8.1.0
+     */
+    public function __construct ($filePath) {
+        parent::__construct();
 
-		$this->filePath = $filePath;
-	}
+        $this->filePath = $filePath;
+    }
 
 
-	/**
-	 * Streams the file using readfile
-	 *
-	 * @param IOutput $output a small wrapper that handles output
-	 * @since 8.1.0
-	 */
-	public function callback (IOutput $output) {
-		// handle caching
-		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
-			if (!(is_resource($this->filePath) || file_exists($this->filePath))) {
-				$output->setHttpResponseCode(Http::STATUS_NOT_FOUND);
-			} elseif ($output->setReadfile($this->filePath) === false) {
-				$output->setHttpResponseCode(Http::STATUS_BAD_REQUEST);
-			}
-		}
-	}
+    /**
+     * Streams the file using readfile
+     *
+     * @param IOutput $output a small wrapper that handles output
+     * @since 8.1.0
+     */
+    public function callback (IOutput $output) {
+        // handle caching
+        if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
+            if (!(is_resource($this->filePath) || file_exists($this->filePath))) {
+                $output->setHttpResponseCode(Http::STATUS_NOT_FOUND);
+            } elseif ($output->setReadfile($this->filePath) === false) {
+                $output->setHttpResponseCode(Http::STATUS_BAD_REQUEST);
+            }
+        }
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 	 * @param string|resource $filePath the path to the file or a file handle which should be streamed
 	 * @since 8.1.0
 	 */
-	public function __construct ($filePath) {
+	public function __construct($filePath) {
 		parent::__construct();
 
 		$this->filePath = $filePath;
@@ -54,7 +54,7 @@ 
 	 * @param IOutput $output a small wrapper that handles output
 	 * @since 8.1.0
 	 */
-	public function callback (IOutput $output) {
+	public function callback(IOutput $output) {
 		// handle caching
 		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
 			if (!(is_resource($this->filePath) || file_exists($this->filePath))) {

lib/public/AppFramework/Http/DataDisplayResponse.php

Indentation +45 added lines, -45 removed lines

@@ -34,59 +34,59 @@
  */
 class DataDisplayResponse extends Response {
 
-	/**
-	 * response data
-	 * @var string
-	 */
-	protected $data;
+    /**
+     * response data
+     * @var string
+     */
+    protected $data;
 
 
-	/**
-	 * @param string $data the data to display
-	 * @param int $statusCode the Http status code, defaults to 200
-	 * @param array $headers additional key value based headers
-	 * @since 8.1.0
-	 */
-	public function __construct($data='', $statusCode=Http::STATUS_OK,
-	                            $headers=[]) {
-		parent::__construct();
+    /**
+     * @param string $data the data to display
+     * @param int $statusCode the Http status code, defaults to 200
+     * @param array $headers additional key value based headers
+     * @since 8.1.0
+     */
+    public function __construct($data='', $statusCode=Http::STATUS_OK,
+                                $headers=[]) {
+        parent::__construct();
 
-		$this->data = $data;
-		$this->setStatus($statusCode);
-		$this->setHeaders(array_merge($this->getHeaders(), $headers));
-		$this->addHeader('Content-Disposition', 'inline; filename=""');
-	}
+        $this->data = $data;
+        $this->setStatus($statusCode);
+        $this->setHeaders(array_merge($this->getHeaders(), $headers));
+        $this->addHeader('Content-Disposition', 'inline; filename=""');
+    }
 
-	/**
-	 * Outputs data. No processing is done.
-	 * @return string
-	 * @since 8.1.0
-	 */
-	public function render() {
-		return $this->data;
-	}
+    /**
+     * Outputs data. No processing is done.
+     * @return string
+     * @since 8.1.0
+     */
+    public function render() {
+        return $this->data;
+    }
 
 
-	/**
-	 * Sets values in the data
-	 * @param string $data the data to display
-	 * @return DataDisplayResponse Reference to this object
-	 * @since 8.1.0
-	 */
-	public function setData($data){
-		$this->data = $data;
+    /**
+     * Sets values in the data
+     * @param string $data the data to display
+     * @return DataDisplayResponse Reference to this object
+     * @since 8.1.0
+     */
+    public function setData($data){
+        $this->data = $data;
 
-		return $this;
-	}
+        return $this;
+    }
 
 
-	/**
-	 * Used to get the set parameters
-	 * @return string the data
-	 * @since 8.1.0
-	 */
-	public function getData(){
-		return $this->data;
-	}
+    /**
+     * Used to get the set parameters
+     * @return string the data
+     * @since 8.1.0
+     */
+    public function getData(){
+        return $this->data;
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -47,8 +47,8 @@ 
 	 * @param array $headers additional key value based headers
 	 * @since 8.1.0
 	 */
-	public function __construct($data='', $statusCode=Http::STATUS_OK,
-	                            $headers=[]) {
+	public function __construct($data = '', $statusCode = Http::STATUS_OK,
+	                            $headers = []) {
 		parent::__construct();
 
 		$this->data = $data;
@@ -73,7 +73,7 @@ 
 	 * @return DataDisplayResponse Reference to this object
 	 * @since 8.1.0
 	 */
-	public function setData($data){
+	public function setData($data) {
 		$this->data = $data;
 
 		return $this;
@@ -85,7 +85,7 @@ 
 	 * @return string the data
 	 * @since 8.1.0
 	 */
-	public function getData(){
+	public function getData() {
 		return $this->data;
 	}
 

lib/public/AppFramework/Http/Response.php

Indentation +334 added lines, -334 removed lines

@@ -45,338 +45,338 @@
  */
 class Response {
 
-	/**
-	 * Headers - defaults to ['Cache-Control' => 'no-cache, no-store, must-revalidate']
-	 * @var array
-	 */
-	private $headers = array(
-		'Cache-Control' => 'no-cache, no-store, must-revalidate'
-	);
-
-
-	/**
-	 * Cookies that will be need to be constructed as header
-	 * @var array
-	 */
-	private $cookies = array();
-
-
-	/**
-	 * HTTP status code - defaults to STATUS OK
-	 * @var int
-	 */
-	private $status = Http::STATUS_OK;
-
-
-	/**
-	 * Last modified date
-	 * @var \DateTime
-	 */
-	private $lastModified;
-
-
-	/**
-	 * ETag
-	 * @var string
-	 */
-	private $ETag;
-
-	/** @var ContentSecurityPolicy|null Used Content-Security-Policy */
-	private $contentSecurityPolicy = null;
-
-	/** @var bool */
-	private $throttled = false;
-	/** @var array */
-	private $throttleMetadata = [];
-
-	/**
-	 * Response constructor.
-	 *
-	 * @since 17.0.0
-	 */
-	public function __construct() {
-		$this->setContentSecurityPolicy(new EmptyContentSecurityPolicy());
-	}
-
-	/**
-	 * Caches the response
-	 * @param int $cacheSeconds the amount of seconds that should be cached
-	 * if 0 then caching will be disabled
-	 * @return $this
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function cacheFor(int $cacheSeconds) {
-		if($cacheSeconds > 0) {
-			$this->addHeader('Cache-Control', 'max-age=' . $cacheSeconds . ', must-revalidate');
-
-			// Old scool prama caching
-			$this->addHeader('Pragma', 'public');
-
-			// Set expires header
-			$expires = new \DateTime();
-			/** @var ITimeFactory $time */
-			$time = \OC::$server->query(ITimeFactory::class);
-			$expires->setTimestamp($time->getTime());
-			$expires->add(new \DateInterval('PT'.$cacheSeconds.'S'));
-			$this->addHeader('Expires', $expires->format(\DateTime::RFC2822));
-		} else {
-			$this->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
-			unset($this->headers['Expires'], $this->headers['Pragma']);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Adds a new cookie to the response
-	 * @param string $name The name of the cookie
-	 * @param string $value The value of the cookie
-	 * @param \DateTime|null $expireDate Date on that the cookie should expire, if set
-	 * 									to null cookie will be considered as session
-	 * 									cookie.
-	 * @return $this
-	 * @since 8.0.0
-	 */
-	public function addCookie($name, $value, \DateTime $expireDate = null) {
-		$this->cookies[$name] = array('value' => $value, 'expireDate' => $expireDate);
-		return $this;
-	}
-
-
-	/**
-	 * Set the specified cookies
-	 * @param array $cookies array('foo' => array('value' => 'bar', 'expire' => null))
-	 * @return $this
-	 * @since 8.0.0
-	 */
-	public function setCookies(array $cookies) {
-		$this->cookies = $cookies;
-		return $this;
-	}
-
-
-	/**
-	 * Invalidates the specified cookie
-	 * @param string $name
-	 * @return $this
-	 * @since 8.0.0
-	 */
-	public function invalidateCookie($name) {
-		$this->addCookie($name, 'expired', new \DateTime('1971-01-01 00:00'));
-		return $this;
-	}
-
-	/**
-	 * Invalidates the specified cookies
-	 * @param array $cookieNames array('foo', 'bar')
-	 * @return $this
-	 * @since 8.0.0
-	 */
-	public function invalidateCookies(array $cookieNames) {
-		foreach($cookieNames as $cookieName) {
-			$this->invalidateCookie($cookieName);
-		}
-		return $this;
-	}
-
-	/**
-	 * Returns the cookies
-	 * @return array
-	 * @since 8.0.0
-	 */
-	public function getCookies() {
-		return $this->cookies;
-	}
-
-	/**
-	 * Adds a new header to the response that will be called before the render
-	 * function
-	 * @param string $name The name of the HTTP header
-	 * @param string $value The value, null will delete it
-	 * @return $this
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function addHeader($name, $value) {
-		$name = trim($name);  // always remove leading and trailing whitespace
-		                      // to be able to reliably check for security
-		                      // headers
-
-		if(is_null($value)) {
-			unset($this->headers[$name]);
-		} else {
-			$this->headers[$name] = $value;
-		}
-
-		return $this;
-	}
-
-
-	/**
-	 * Set the headers
-	 * @param array $headers value header pairs
-	 * @return $this
-	 * @since 8.0.0
-	 */
-	public function setHeaders(array $headers) {
-		$this->headers = $headers;
-
-		return $this;
-	}
-
-
-	/**
-	 * Returns the set headers
-	 * @return array the headers
-	 * @since 6.0.0
-	 */
-	public function getHeaders() {
-		$mergeWith = [];
-
-		if($this->lastModified) {
-			$mergeWith['Last-Modified'] =
-				$this->lastModified->format(\DateTime::RFC2822);
-		}
-
-		// Build Content-Security-Policy and use default if none has been specified
-		if(is_null($this->contentSecurityPolicy)) {
-			$this->setContentSecurityPolicy(new ContentSecurityPolicy());
-		}
-		$this->headers['Content-Security-Policy'] = $this->contentSecurityPolicy->buildPolicy();
-
-		if($this->ETag) {
-			$mergeWith['ETag'] = '"' . $this->ETag . '"';
-		}
-
-		return array_merge($mergeWith, $this->headers);
-	}
-
-
-	/**
-	 * By default renders no output
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function render() {
-		return '';
-	}
-
-
-	/**
-	 * Set response status
-	 * @param int $status a HTTP status code, see also the STATUS constants
-	 * @return Response Reference to this object
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function setStatus($status) {
-		$this->status = $status;
-
-		return $this;
-	}
-
-	/**
-	 * Set a Content-Security-Policy
-	 * @param EmptyContentSecurityPolicy $csp Policy to set for the response object
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function setContentSecurityPolicy(EmptyContentSecurityPolicy $csp) {
-		$this->contentSecurityPolicy = $csp;
-		return $this;
-	}
-
-	/**
-	 * Get the currently used Content-Security-Policy
-	 * @return EmptyContentSecurityPolicy|null Used Content-Security-Policy or null if
-	 *                                    none specified.
-	 * @since 8.1.0
-	 */
-	public function getContentSecurityPolicy() {
-		return $this->contentSecurityPolicy;
-	}
-
-
-	/**
-	 * Get response status
-	 * @since 6.0.0
-	 */
-	public function getStatus() {
-		return $this->status;
-	}
-
-
-	/**
-	 * Get the ETag
-	 * @return string the etag
-	 * @since 6.0.0
-	 */
-	public function getETag() {
-		return $this->ETag;
-	}
-
-
-	/**
-	 * Get "last modified" date
-	 * @return \DateTime RFC2822 formatted last modified date
-	 * @since 6.0.0
-	 */
-	public function getLastModified() {
-		return $this->lastModified;
-	}
-
-
-	/**
-	 * Set the ETag
-	 * @param string $ETag
-	 * @return Response Reference to this object
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function setETag($ETag) {
-		$this->ETag = $ETag;
-
-		return $this;
-	}
-
-
-	/**
-	 * Set "last modified" date
-	 * @param \DateTime $lastModified
-	 * @return Response Reference to this object
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function setLastModified($lastModified) {
-		$this->lastModified = $lastModified;
-
-		return $this;
-	}
-
-	/**
-	 * Marks the response as to throttle. Will be throttled when the
-	 * @BruteForceProtection annotation is added.
-	 *
-	 * @param array $metadata
-	 * @since 12.0.0
-	 */
-	public function throttle(array $metadata = []) {
-		$this->throttled = true;
-		$this->throttleMetadata = $metadata;
-	}
-
-	/**
-	 * Returns the throttle metadata, defaults to empty array
-	 *
-	 * @return array
-	 * @since 13.0.0
-	 */
-	public function getThrottleMetadata() {
-		return $this->throttleMetadata;
-	}
-
-	/**
-	 * Whether the current response is throttled.
-	 *
-	 * @since 12.0.0
-	 */
-	public function isThrottled() {
-		return $this->throttled;
-	}
+    /**
+     * Headers - defaults to ['Cache-Control' => 'no-cache, no-store, must-revalidate']
+     * @var array
+     */
+    private $headers = array(
+        'Cache-Control' => 'no-cache, no-store, must-revalidate'
+    );
+
+
+    /**
+     * Cookies that will be need to be constructed as header
+     * @var array
+     */
+    private $cookies = array();
+
+
+    /**
+     * HTTP status code - defaults to STATUS OK
+     * @var int
+     */
+    private $status = Http::STATUS_OK;
+
+
+    /**
+     * Last modified date
+     * @var \DateTime
+     */
+    private $lastModified;
+
+
+    /**
+     * ETag
+     * @var string
+     */
+    private $ETag;
+
+    /** @var ContentSecurityPolicy|null Used Content-Security-Policy */
+    private $contentSecurityPolicy = null;
+
+    /** @var bool */
+    private $throttled = false;
+    /** @var array */
+    private $throttleMetadata = [];
+
+    /**
+     * Response constructor.
+     *
+     * @since 17.0.0
+     */
+    public function __construct() {
+        $this->setContentSecurityPolicy(new EmptyContentSecurityPolicy());
+    }
+
+    /**
+     * Caches the response
+     * @param int $cacheSeconds the amount of seconds that should be cached
+     * if 0 then caching will be disabled
+     * @return $this
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function cacheFor(int $cacheSeconds) {
+        if($cacheSeconds > 0) {
+            $this->addHeader('Cache-Control', 'max-age=' . $cacheSeconds . ', must-revalidate');
+
+            // Old scool prama caching
+            $this->addHeader('Pragma', 'public');
+
+            // Set expires header
+            $expires = new \DateTime();
+            /** @var ITimeFactory $time */
+            $time = \OC::$server->query(ITimeFactory::class);
+            $expires->setTimestamp($time->getTime());
+            $expires->add(new \DateInterval('PT'.$cacheSeconds.'S'));
+            $this->addHeader('Expires', $expires->format(\DateTime::RFC2822));
+        } else {
+            $this->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
+            unset($this->headers['Expires'], $this->headers['Pragma']);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Adds a new cookie to the response
+     * @param string $name The name of the cookie
+     * @param string $value The value of the cookie
+     * @param \DateTime|null $expireDate Date on that the cookie should expire, if set
+     * 									to null cookie will be considered as session
+     * 									cookie.
+     * @return $this
+     * @since 8.0.0
+     */
+    public function addCookie($name, $value, \DateTime $expireDate = null) {
+        $this->cookies[$name] = array('value' => $value, 'expireDate' => $expireDate);
+        return $this;
+    }
+
+
+    /**
+     * Set the specified cookies
+     * @param array $cookies array('foo' => array('value' => 'bar', 'expire' => null))
+     * @return $this
+     * @since 8.0.0
+     */
+    public function setCookies(array $cookies) {
+        $this->cookies = $cookies;
+        return $this;
+    }
+
+
+    /**
+     * Invalidates the specified cookie
+     * @param string $name
+     * @return $this
+     * @since 8.0.0
+     */
+    public function invalidateCookie($name) {
+        $this->addCookie($name, 'expired', new \DateTime('1971-01-01 00:00'));
+        return $this;
+    }
+
+    /**
+     * Invalidates the specified cookies
+     * @param array $cookieNames array('foo', 'bar')
+     * @return $this
+     * @since 8.0.0
+     */
+    public function invalidateCookies(array $cookieNames) {
+        foreach($cookieNames as $cookieName) {
+            $this->invalidateCookie($cookieName);
+        }
+        return $this;
+    }
+
+    /**
+     * Returns the cookies
+     * @return array
+     * @since 8.0.0
+     */
+    public function getCookies() {
+        return $this->cookies;
+    }
+
+    /**
+     * Adds a new header to the response that will be called before the render
+     * function
+     * @param string $name The name of the HTTP header
+     * @param string $value The value, null will delete it
+     * @return $this
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function addHeader($name, $value) {
+        $name = trim($name);  // always remove leading and trailing whitespace
+                                // to be able to reliably check for security
+                                // headers
+
+        if(is_null($value)) {
+            unset($this->headers[$name]);
+        } else {
+            $this->headers[$name] = $value;
+        }
+
+        return $this;
+    }
+
+
+    /**
+     * Set the headers
+     * @param array $headers value header pairs
+     * @return $this
+     * @since 8.0.0
+     */
+    public function setHeaders(array $headers) {
+        $this->headers = $headers;
+
+        return $this;
+    }
+
+
+    /**
+     * Returns the set headers
+     * @return array the headers
+     * @since 6.0.0
+     */
+    public function getHeaders() {
+        $mergeWith = [];
+
+        if($this->lastModified) {
+            $mergeWith['Last-Modified'] =
+                $this->lastModified->format(\DateTime::RFC2822);
+        }
+
+        // Build Content-Security-Policy and use default if none has been specified
+        if(is_null($this->contentSecurityPolicy)) {
+            $this->setContentSecurityPolicy(new ContentSecurityPolicy());
+        }
+        $this->headers['Content-Security-Policy'] = $this->contentSecurityPolicy->buildPolicy();
+
+        if($this->ETag) {
+            $mergeWith['ETag'] = '"' . $this->ETag . '"';
+        }
+
+        return array_merge($mergeWith, $this->headers);
+    }
+
+
+    /**
+     * By default renders no output
+     * @return string
+     * @since 6.0.0
+     */
+    public function render() {
+        return '';
+    }
+
+
+    /**
+     * Set response status
+     * @param int $status a HTTP status code, see also the STATUS constants
+     * @return Response Reference to this object
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function setStatus($status) {
+        $this->status = $status;
+
+        return $this;
+    }
+
+    /**
+     * Set a Content-Security-Policy
+     * @param EmptyContentSecurityPolicy $csp Policy to set for the response object
+     * @return $this
+     * @since 8.1.0
+     */
+    public function setContentSecurityPolicy(EmptyContentSecurityPolicy $csp) {
+        $this->contentSecurityPolicy = $csp;
+        return $this;
+    }
+
+    /**
+     * Get the currently used Content-Security-Policy
+     * @return EmptyContentSecurityPolicy|null Used Content-Security-Policy or null if
+     *                                    none specified.
+     * @since 8.1.0
+     */
+    public function getContentSecurityPolicy() {
+        return $this->contentSecurityPolicy;
+    }
+
+
+    /**
+     * Get response status
+     * @since 6.0.0
+     */
+    public function getStatus() {
+        return $this->status;
+    }
+
+
+    /**
+     * Get the ETag
+     * @return string the etag
+     * @since 6.0.0
+     */
+    public function getETag() {
+        return $this->ETag;
+    }
+
+
+    /**
+     * Get "last modified" date
+     * @return \DateTime RFC2822 formatted last modified date
+     * @since 6.0.0
+     */
+    public function getLastModified() {
+        return $this->lastModified;
+    }
+
+
+    /**
+     * Set the ETag
+     * @param string $ETag
+     * @return Response Reference to this object
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function setETag($ETag) {
+        $this->ETag = $ETag;
+
+        return $this;
+    }
+
+
+    /**
+     * Set "last modified" date
+     * @param \DateTime $lastModified
+     * @return Response Reference to this object
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function setLastModified($lastModified) {
+        $this->lastModified = $lastModified;
+
+        return $this;
+    }
+
+    /**
+     * Marks the response as to throttle. Will be throttled when the
+     * @BruteForceProtection annotation is added.
+     *
+     * @param array $metadata
+     * @since 12.0.0
+     */
+    public function throttle(array $metadata = []) {
+        $this->throttled = true;
+        $this->throttleMetadata = $metadata;
+    }
+
+    /**
+     * Returns the throttle metadata, defaults to empty array
+     *
+     * @return array
+     * @since 13.0.0
+     */
+    public function getThrottleMetadata() {
+        return $this->throttleMetadata;
+    }
+
+    /**
+     * Whether the current response is throttled.
+     *
+     * @since 12.0.0
+     */
+    public function isThrottled() {
+        return $this->throttled;
+    }
 }