nextcloud / server

lib/public/AppFramework/Http/TemplateResponse.php

Indentation +119 added lines, -119 removed lines

@@ -37,124 +37,124 @@
  */
 class TemplateResponse extends Response {
 
-	/**
-	 * 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') {
-		$this->templateName = $templateName;
-		$this->appName = $appName;
-		$this->params = $params;
-		$this->renderAs = $renderAs;
-	}
-
-
-	/**
-	 * 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();
-	}
+    /**
+     * 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') {
+        $this->templateName = $templateName;
+        $this->appName = $appName;
+        $this->params = $params;
+        $this->renderAs = $renderAs;
+    }
+
+
+    /**
+     * 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();
+    }
 
 }

lib/public/AppFramework/Http/ContentSecurityPolicy.php

Indentation +46 added lines, -46 removed lines

@@ -38,50 +38,50 @@
  * @since 8.1.0
  */
 class ContentSecurityPolicy extends EmptyContentSecurityPolicy {
-	/** @var bool Whether inline JS snippets are allowed */
-	protected $inlineScriptAllowed = false;
-	/**
-	 * @var bool Whether eval in JS scripts is allowed
-	 * TODO: Disallow per default
-	 * @link https://github.com/owncloud/core/issues/11925
-	 */
-	protected $evalScriptAllowed = true;
-	/** @var array Domains from which scripts can get loaded */
-	protected $allowedScriptDomains = [
-		'\'self\'',
-	];
-	/**
-	 * @var bool Whether inline CSS is allowed
-	 * TODO: Disallow per default
-	 * @link https://github.com/owncloud/core/issues/13458
-	 */
-	protected $inlineStyleAllowed = true;
-	/** @var array Domains from which CSS can get loaded */
-	protected $allowedStyleDomains = [
-		'\'self\'',
-	];
-	/** @var array Domains from which images can get loaded */
-	protected $allowedImageDomains = [
-		'\'self\'',
-		'data:',
-		'blob:',
-	];
-	/** @var array Domains to which connections can be done */
-	protected $allowedConnectDomains = [
-		'\'self\'',
-	];
-	/** @var array Domains from which media elements can be loaded */
-	protected $allowedMediaDomains = [
-		'\'self\'',
-	];
-	/** @var array Domains from which object elements can be loaded */
-	protected $allowedObjectDomains = [];
-	/** @var array Domains from which iframes can be loaded */
-	protected $allowedFrameDomains = [];
-	/** @var array Domains from which fonts can be loaded */
-	protected $allowedFontDomains = [
-		'\'self\'',
-	];
-	/** @var array Domains from which web-workers and nested browsing content can load elements */
-	protected $allowedChildSrcDomains = [];
+    /** @var bool Whether inline JS snippets are allowed */
+    protected $inlineScriptAllowed = false;
+    /**
+     * @var bool Whether eval in JS scripts is allowed
+     * TODO: Disallow per default
+     * @link https://github.com/owncloud/core/issues/11925
+     */
+    protected $evalScriptAllowed = true;
+    /** @var array Domains from which scripts can get loaded */
+    protected $allowedScriptDomains = [
+        '\'self\'',
+    ];
+    /**
+     * @var bool Whether inline CSS is allowed
+     * TODO: Disallow per default
+     * @link https://github.com/owncloud/core/issues/13458
+     */
+    protected $inlineStyleAllowed = true;
+    /** @var array Domains from which CSS can get loaded */
+    protected $allowedStyleDomains = [
+        '\'self\'',
+    ];
+    /** @var array Domains from which images can get loaded */
+    protected $allowedImageDomains = [
+        '\'self\'',
+        'data:',
+        'blob:',
+    ];
+    /** @var array Domains to which connections can be done */
+    protected $allowedConnectDomains = [
+        '\'self\'',
+    ];
+    /** @var array Domains from which media elements can be loaded */
+    protected $allowedMediaDomains = [
+        '\'self\'',
+    ];
+    /** @var array Domains from which object elements can be loaded */
+    protected $allowedObjectDomains = [];
+    /** @var array Domains from which iframes can be loaded */
+    protected $allowedFrameDomains = [];
+    /** @var array Domains from which fonts can be loaded */
+    protected $allowedFontDomains = [
+        '\'self\'',
+    ];
+    /** @var array Domains from which web-workers and nested browsing content can load elements */
+    protected $allowedChildSrcDomains = [];
 }

lib/public/AppFramework/Http/IOutput.php

Indentation +38 added lines, -38 removed lines

@@ -32,48 +32,48 @@
  */
 interface IOutput {
 
-	/**
-	 * @param string $out
-	 * @since 8.1.0
-	 */
-	public function setOutput($out);
+    /**
+     * @param string $out
+     * @since 8.1.0
+     */
+    public function setOutput($out);
 
-	/**
-	 * @param string|resource $path or file handle
-	 *
-	 * @return bool false if an error occurred
-	 * @since 8.1.0
-	 */
-	public function setReadfile($path);
+    /**
+     * @param string|resource $path or file handle
+     *
+     * @return bool false if an error occurred
+     * @since 8.1.0
+     */
+    public function setReadfile($path);
 
-	/**
-	 * @param string $header
-	 * @since 8.1.0
-	 */
-	public function setHeader($header);
+    /**
+     * @param string $header
+     * @since 8.1.0
+     */
+    public function setHeader($header);
 
-	/**
-	 * @return int returns the current http response code
-	 * @since 8.1.0
-	 */
-	public function getHttpResponseCode();
+    /**
+     * @return int returns the current http response code
+     * @since 8.1.0
+     */
+    public function getHttpResponseCode();
 
-	/**
-	 * @param int $code sets the http status code
-	 * @since 8.1.0
-	 */
-	public function setHttpResponseCode($code);
+    /**
+     * @param int $code sets the http status code
+     * @since 8.1.0
+     */
+    public function setHttpResponseCode($code);
 
-	/**
-	 * @param string $name
-	 * @param string $value
-	 * @param int $expire
-	 * @param string $path
-	 * @param string $domain
-	 * @param bool $secure
-	 * @param bool $httpOnly
-	 * @since 8.1.0
-	 */
-	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
+    /**
+     * @param string $name
+     * @param string $value
+     * @param int $expire
+     * @param string $path
+     * @param string $domain
+     * @param bool $secure
+     * @param bool $httpOnly
+     * @since 8.1.0
+     */
+    public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
 
 }

lib/public/AppFramework/Http/StreamResponse.php

Indentation +25 added lines, -25 removed lines

@@ -33,33 +33,33 @@
  * @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) {
-		$this->filePath = $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) {
+        $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);
+            }
+        }
+    }
 
 }

lib/public/AppFramework/Http/DownloadResponse.php

Indentation +16 added lines, -16 removed lines

@@ -32,22 +32,22 @@
  */
 class DownloadResponse extends \OCP\AppFramework\Http\Response {
 
-	private $filename;
-	private $contentType;
-
-	/**
-	 * Creates a response that prompts the user to download the file
-	 * @param string $filename the name that the downloaded file should have
-	 * @param string $contentType the mimetype that the downloaded file should have
-	 * @since 7.0.0
-	 */
-	public function __construct($filename, $contentType) {
-		$this->filename = $filename;
-		$this->contentType = $contentType;
-
-		$this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
-		$this->addHeader('Content-Type', $contentType);
-	}
+    private $filename;
+    private $contentType;
+
+    /**
+     * Creates a response that prompts the user to download the file
+     * @param string $filename the name that the downloaded file should have
+     * @param string $contentType the mimetype that the downloaded file should have
+     * @since 7.0.0
+     */
+    public function __construct($filename, $contentType) {
+        $this->filename = $filename;
+        $this->contentType = $contentType;
+
+        $this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
+        $this->addHeader('Content-Type', $contentType);
+    }
 
 
 }

lib/public/AppFramework/App.php

Indentation +84 added lines, -84 removed lines

@@ -45,94 +45,94 @@
 class App {
 
 
-	/**
-	 * Turns an app id into a namespace by convetion. The id is split at the
-	 * underscores, all parts are camelcased and reassembled. e.g.:
-	 * some_app_id -> OCA\SomeAppId
-	 * @param string $appId the app id
-	 * @param string $topNamespace the namespace which should be prepended to
-	 * the transformed app id, defaults to OCA\
-	 * @return string the starting namespace for the app
-	 * @since 8.0.0
-	 */
-	public static function buildAppNamespace($appId, $topNamespace='OCA\\') {
-		return \OC\AppFramework\App::buildAppNamespace($appId, $topNamespace);
-	}
+    /**
+     * Turns an app id into a namespace by convetion. The id is split at the
+     * underscores, all parts are camelcased and reassembled. e.g.:
+     * some_app_id -> OCA\SomeAppId
+     * @param string $appId the app id
+     * @param string $topNamespace the namespace which should be prepended to
+     * the transformed app id, defaults to OCA\
+     * @return string the starting namespace for the app
+     * @since 8.0.0
+     */
+    public static function buildAppNamespace($appId, $topNamespace='OCA\\') {
+        return \OC\AppFramework\App::buildAppNamespace($appId, $topNamespace);
+    }
 
 
-	/**
-	 * @param array $urlParams an array with variables extracted from the routes
-	 * @since 6.0.0
-	 */
-	public function __construct($appName, $urlParams = array()) {
-		$this->container = new \OC\AppFramework\DependencyInjection\DIContainer($appName, $urlParams);
-	}
+    /**
+     * @param array $urlParams an array with variables extracted from the routes
+     * @since 6.0.0
+     */
+    public function __construct($appName, $urlParams = array()) {
+        $this->container = new \OC\AppFramework\DependencyInjection\DIContainer($appName, $urlParams);
+    }
 
-	private $container;
+    private $container;
 
-	/**
-	 * @return IAppContainer
-	 * @since 6.0.0
-	 */
-	public function getContainer() {
-		return $this->container;
-	}
+    /**
+     * @return IAppContainer
+     * @since 6.0.0
+     */
+    public function getContainer() {
+        return $this->container;
+    }
 
-	/**
-	 * This function is to be called to create single routes and restful routes based on the given $routes array.
-	 *
-	 * Example code in routes.php of tasks app (it will register two restful resources):
-	 * $routes = array(
-	 *		'resources' => array(
-	 *		'lists' => array('url' => '/tasklists'),
-	 *		'tasks' => array('url' => '/tasklists/{listId}/tasks')
-	 *	)
-	 *	);
-	 *
-	 * $a = new TasksApp();
-	 * $a->registerRoutes($this, $routes);
-	 *
-	 * @param \OCP\Route\IRouter $router
-	 * @param array $routes
-	 * @since 6.0.0
-	 */
-	public function registerRoutes($router, $routes) {
-		$routeConfig = new RouteConfig($this->container, $router, $routes);
-		$routeConfig->register();
-	}
+    /**
+     * This function is to be called to create single routes and restful routes based on the given $routes array.
+     *
+     * Example code in routes.php of tasks app (it will register two restful resources):
+     * $routes = array(
+     *		'resources' => array(
+     *		'lists' => array('url' => '/tasklists'),
+     *		'tasks' => array('url' => '/tasklists/{listId}/tasks')
+     *	)
+     *	);
+     *
+     * $a = new TasksApp();
+     * $a->registerRoutes($this, $routes);
+     *
+     * @param \OCP\Route\IRouter $router
+     * @param array $routes
+     * @since 6.0.0
+     */
+    public function registerRoutes($router, $routes) {
+        $routeConfig = new RouteConfig($this->container, $router, $routes);
+        $routeConfig->register();
+    }
 
-	/**
-	 * This function is called by the routing component to fire up the frameworks dispatch mechanism.
-	 *
-	 * Example code in routes.php of the task app:
-	 * $this->create('tasks_index', '/')->get()->action(
-	 *		function($params){
-	 *			$app = new TaskApp($params);
-	 *			$app->dispatch('PageController', 'index');
-	 *		}
-	 *	);
-	 *
-	 *
-	 * Example for for TaskApp implementation:
-	 * class TaskApp extends \OCP\AppFramework\App {
-	 *
-	 *		public function __construct($params){
-	 *			parent::__construct('tasks', $params);
-	 *
-	 *			$this->getContainer()->registerService('PageController', function(IAppContainer $c){
-	 *				$a = $c->query('API');
-	 *				$r = $c->query('Request');
-	 *				return new PageController($a, $r);
-	 *			});
-	 *		}
-	 *	}
-	 *
-	 * @param string $controllerName the name of the controller under which it is
-	 *                               stored in the DI container
-	 * @param string $methodName the method that you want to call
-	 * @since 6.0.0
-	 */
-	public function dispatch($controllerName, $methodName) {
-		\OC\AppFramework\App::main($controllerName, $methodName, $this->container);
-	}
+    /**
+     * This function is called by the routing component to fire up the frameworks dispatch mechanism.
+     *
+     * Example code in routes.php of the task app:
+     * $this->create('tasks_index', '/')->get()->action(
+     *		function($params){
+     *			$app = new TaskApp($params);
+     *			$app->dispatch('PageController', 'index');
+     *		}
+     *	);
+     *
+     *
+     * Example for for TaskApp implementation:
+     * class TaskApp extends \OCP\AppFramework\App {
+     *
+     *		public function __construct($params){
+     *			parent::__construct('tasks', $params);
+     *
+     *			$this->getContainer()->registerService('PageController', function(IAppContainer $c){
+     *				$a = $c->query('API');
+     *				$r = $c->query('Request');
+     *				return new PageController($a, $r);
+     *			});
+     *		}
+     *	}
+     *
+     * @param string $controllerName the name of the controller under which it is
+     *                               stored in the DI container
+     * @param string $methodName the method that you want to call
+     * @since 6.0.0
+     */
+    public function dispatch($controllerName, $methodName) {
+        \OC\AppFramework\App::main($controllerName, $methodName, $this->container);
+    }
 }

lib/public/AppFramework/Middleware.php

Indentation +57 added lines, -57 removed lines

@@ -44,69 +44,69 @@
 abstract class Middleware {
 
 
-	/**
-	 * This is being run in normal order before the controller is being
-	 * called which allows several modifications and checks
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @since 6.0.0
-	 */
-	public function beforeController($controller, $methodName){
+    /**
+     * This is being run in normal order before the controller is being
+     * called which allows several modifications and checks
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @since 6.0.0
+     */
+    public function beforeController($controller, $methodName){
 
-	}
+    }
 
 
-	/**
-	 * This is being run when either the beforeController method or the
-	 * controller method itself is throwing an exception. The middleware is
-	 * asked in reverse order to handle the exception and to return a response.
-	 * If the response is null, it is assumed that the exception could not be
-	 * handled and the error will be thrown again
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @param \Exception $exception the thrown exception
-	 * @throws \Exception the passed in exception if it can't handle it
-	 * @return Response a Response object in case that the exception was handled
-	 * @since 6.0.0
-	 */
-	public function afterException($controller, $methodName, \Exception $exception){
-		throw $exception;
-	}
+    /**
+     * This is being run when either the beforeController method or the
+     * controller method itself is throwing an exception. The middleware is
+     * asked in reverse order to handle the exception and to return a response.
+     * If the response is null, it is assumed that the exception could not be
+     * handled and the error will be thrown again
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @param \Exception $exception the thrown exception
+     * @throws \Exception the passed in exception if it can't handle it
+     * @return Response a Response object in case that the exception was handled
+     * @since 6.0.0
+     */
+    public function afterException($controller, $methodName, \Exception $exception){
+        throw $exception;
+    }
 
 
-	/**
-	 * This is being run after a successful controllermethod call and allows
-	 * the manipulation of a Response object. The middleware is run in reverse order
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @param Response $response the generated response from the controller
-	 * @return Response a Response object
-	 * @since 6.0.0
-	 */
-	public function afterController($controller, $methodName, Response $response){
-		return $response;
-	}
+    /**
+     * This is being run after a successful controllermethod call and allows
+     * the manipulation of a Response object. The middleware is run in reverse order
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @param Response $response the generated response from the controller
+     * @return Response a Response object
+     * @since 6.0.0
+     */
+    public function afterController($controller, $methodName, Response $response){
+        return $response;
+    }
 
 
-	/**
-	 * This is being run after the response object has been rendered and
-	 * allows the manipulation of the output. The middleware is run in reverse order
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @param string $output the generated output from a response
-	 * @return string the output that should be printed
-	 * @since 6.0.0
-	 */
-	public function beforeOutput($controller, $methodName, $output){
-		return $output;
-	}
+    /**
+     * This is being run after the response object has been rendered and
+     * allows the manipulation of the output. The middleware is run in reverse order
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @param string $output the generated output from a response
+     * @return string the output that should be printed
+     * @since 6.0.0
+     */
+    public function beforeOutput($controller, $methodName, $output){
+        return $output;
+    }
 
 }

lib/public/AppFramework/IApi.php

Indentation +56 added lines, -56 removed lines

@@ -38,61 +38,61 @@
 interface IApi {
 
 
-	/**
-	 * Gets the userid of the current user
-	 * @return string the user id of the current user
-	 * @deprecated 8.0.0 Use \OC::$server->getUserSession()->getUser()->getUID()
-	 */
-	function getUserId();
-
-
-	/**
-	 * Adds a new javascript file
-	 * @deprecated 8.0.0 include javascript and css in template files
-	 * @param string $scriptName the name of the javascript in js/ without the suffix
-	 * @param string $appName the name of the app, defaults to the current one
-	 * @return void
-	 */
-	function addScript($scriptName, $appName = null);
-
-
-	/**
-	 * Adds a new css file
-	 * @deprecated 8.0.0 include javascript and css in template files
-	 * @param string $styleName the name of the css file in css/without the suffix
-	 * @param string $appName the name of the app, defaults to the current one
-	 * @return void
-	 */
-	function addStyle($styleName, $appName = null);
-
-
-	/**
-	 * @deprecated 8.0.0 include javascript and css in template files
-	 * shorthand for addScript for files in the 3rdparty directory
-	 * @param string $name the name of the file without the suffix
-	 * @return void
-	 */
-	function add3rdPartyScript($name);
-
-
-	/**
-	 * @deprecated 8.0.0 include javascript and css in template files
-	 * shorthand for addStyle for files in the 3rdparty directory
-	 * @param string $name the name of the file without the suffix
-	 * @return void
-	 */
-	function add3rdPartyStyle($name);
-
-
-	/**
-	 * Checks if an app is enabled
-	 * @deprecated 8.0.0 communication between apps should happen over built in
-	 * callbacks or interfaces (check the contacts and calendar managers)
-	 * Checks if an app is enabled
-	 * also use \OC::$server->getAppManager()->isEnabledForUser($appName)
-	 * @param string $appName the name of an app
-	 * @return bool true if app is enabled
-	 */
-	public function isAppEnabled($appName);
+    /**
+     * Gets the userid of the current user
+     * @return string the user id of the current user
+     * @deprecated 8.0.0 Use \OC::$server->getUserSession()->getUser()->getUID()
+     */
+    function getUserId();
+
+
+    /**
+     * Adds a new javascript file
+     * @deprecated 8.0.0 include javascript and css in template files
+     * @param string $scriptName the name of the javascript in js/ without the suffix
+     * @param string $appName the name of the app, defaults to the current one
+     * @return void
+     */
+    function addScript($scriptName, $appName = null);
+
+
+    /**
+     * Adds a new css file
+     * @deprecated 8.0.0 include javascript and css in template files
+     * @param string $styleName the name of the css file in css/without the suffix
+     * @param string $appName the name of the app, defaults to the current one
+     * @return void
+     */
+    function addStyle($styleName, $appName = null);
+
+
+    /**
+     * @deprecated 8.0.0 include javascript and css in template files
+     * shorthand for addScript for files in the 3rdparty directory
+     * @param string $name the name of the file without the suffix
+     * @return void
+     */
+    function add3rdPartyScript($name);
+
+
+    /**
+     * @deprecated 8.0.0 include javascript and css in template files
+     * shorthand for addStyle for files in the 3rdparty directory
+     * @param string $name the name of the file without the suffix
+     * @return void
+     */
+    function add3rdPartyStyle($name);
+
+
+    /**
+     * Checks if an app is enabled
+     * @deprecated 8.0.0 communication between apps should happen over built in
+     * callbacks or interfaces (check the contacts and calendar managers)
+     * Checks if an app is enabled
+     * also use \OC::$server->getAppManager()->isEnabledForUser($appName)
+     * @param string $appName the name of an app
+     * @return bool true if app is enabled
+     */
+    public function isAppEnabled($appName);
 
 }

lib/public/AppFramework/Http.php

Indentation +59 added lines, -59 removed lines

@@ -35,63 +35,63 @@
  */
 class Http {
 
-	const STATUS_CONTINUE = 100;
-	const STATUS_SWITCHING_PROTOCOLS = 101;
-	const STATUS_PROCESSING = 102;
-	const STATUS_OK = 200;
-	const STATUS_CREATED = 201;
-	const STATUS_ACCEPTED = 202;
-	const STATUS_NON_AUTHORATIVE_INFORMATION = 203;
-	const STATUS_NO_CONTENT = 204;
-	const STATUS_RESET_CONTENT = 205;
-	const STATUS_PARTIAL_CONTENT = 206;
-	const STATUS_MULTI_STATUS = 207;
-	const STATUS_ALREADY_REPORTED = 208;
-	const STATUS_IM_USED = 226;
-	const STATUS_MULTIPLE_CHOICES = 300;
-	const STATUS_MOVED_PERMANENTLY = 301;
-	const STATUS_FOUND = 302;
-	const STATUS_SEE_OTHER = 303;
-	const STATUS_NOT_MODIFIED = 304;
-	const STATUS_USE_PROXY = 305;
-	const STATUS_RESERVED = 306;
-	const STATUS_TEMPORARY_REDIRECT = 307;
-	const STATUS_BAD_REQUEST = 400;
-	const STATUS_UNAUTHORIZED = 401;
-	const STATUS_PAYMENT_REQUIRED = 402;
-	const STATUS_FORBIDDEN = 403;
-	const STATUS_NOT_FOUND = 404;
-	const STATUS_METHOD_NOT_ALLOWED = 405;
-	const STATUS_NOT_ACCEPTABLE = 406;
-	const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407;
-	const STATUS_REQUEST_TIMEOUT = 408;
-	const STATUS_CONFLICT = 409;
-	const STATUS_GONE = 410;
-	const STATUS_LENGTH_REQUIRED = 411;
-	const STATUS_PRECONDITION_FAILED = 412;
-	const STATUS_REQUEST_ENTITY_TOO_LARGE = 413;
-	const STATUS_REQUEST_URI_TOO_LONG = 414;
-	const STATUS_UNSUPPORTED_MEDIA_TYPE = 415;
-	const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416;
-	const STATUS_EXPECTATION_FAILED = 417;
-	const STATUS_IM_A_TEAPOT = 418;
-	const STATUS_UNPROCESSABLE_ENTITY = 422;
-	const STATUS_LOCKED = 423;
-	const STATUS_FAILED_DEPENDENCY = 424;
-	const STATUS_UPGRADE_REQUIRED = 426;
-	const STATUS_PRECONDITION_REQUIRED = 428;
-	const STATUS_TOO_MANY_REQUESTS = 429;
-	const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
-	const STATUS_INTERNAL_SERVER_ERROR = 500;
-	const STATUS_NOT_IMPLEMENTED = 501;
-	const STATUS_BAD_GATEWAY = 502;
-	const STATUS_SERVICE_UNAVAILABLE = 503;
-	const STATUS_GATEWAY_TIMEOUT = 504;
-	const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505;
-	const STATUS_VARIANT_ALSO_NEGOTIATES = 506;
-	const STATUS_INSUFFICIENT_STORAGE = 507;
-	const STATUS_LOOP_DETECTED = 508;
-	const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509;
-	const STATUS_NOT_EXTENDED = 510;
-	const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511;
+    const STATUS_CONTINUE = 100;
+    const STATUS_SWITCHING_PROTOCOLS = 101;
+    const STATUS_PROCESSING = 102;
+    const STATUS_OK = 200;
+    const STATUS_CREATED = 201;
+    const STATUS_ACCEPTED = 202;
+    const STATUS_NON_AUTHORATIVE_INFORMATION = 203;
+    const STATUS_NO_CONTENT = 204;
+    const STATUS_RESET_CONTENT = 205;
+    const STATUS_PARTIAL_CONTENT = 206;
+    const STATUS_MULTI_STATUS = 207;
+    const STATUS_ALREADY_REPORTED = 208;
+    const STATUS_IM_USED = 226;
+    const STATUS_MULTIPLE_CHOICES = 300;
+    const STATUS_MOVED_PERMANENTLY = 301;
+    const STATUS_FOUND = 302;
+    const STATUS_SEE_OTHER = 303;
+    const STATUS_NOT_MODIFIED = 304;
+    const STATUS_USE_PROXY = 305;
+    const STATUS_RESERVED = 306;
+    const STATUS_TEMPORARY_REDIRECT = 307;
+    const STATUS_BAD_REQUEST = 400;
+    const STATUS_UNAUTHORIZED = 401;
+    const STATUS_PAYMENT_REQUIRED = 402;
+    const STATUS_FORBIDDEN = 403;
+    const STATUS_NOT_FOUND = 404;
+    const STATUS_METHOD_NOT_ALLOWED = 405;
+    const STATUS_NOT_ACCEPTABLE = 406;
+    const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407;
+    const STATUS_REQUEST_TIMEOUT = 408;
+    const STATUS_CONFLICT = 409;
+    const STATUS_GONE = 410;
+    const STATUS_LENGTH_REQUIRED = 411;
+    const STATUS_PRECONDITION_FAILED = 412;
+    const STATUS_REQUEST_ENTITY_TOO_LARGE = 413;
+    const STATUS_REQUEST_URI_TOO_LONG = 414;
+    const STATUS_UNSUPPORTED_MEDIA_TYPE = 415;
+    const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416;
+    const STATUS_EXPECTATION_FAILED = 417;
+    const STATUS_IM_A_TEAPOT = 418;
+    const STATUS_UNPROCESSABLE_ENTITY = 422;
+    const STATUS_LOCKED = 423;
+    const STATUS_FAILED_DEPENDENCY = 424;
+    const STATUS_UPGRADE_REQUIRED = 426;
+    const STATUS_PRECONDITION_REQUIRED = 428;
+    const STATUS_TOO_MANY_REQUESTS = 429;
+    const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
+    const STATUS_INTERNAL_SERVER_ERROR = 500;
+    const STATUS_NOT_IMPLEMENTED = 501;
+    const STATUS_BAD_GATEWAY = 502;
+    const STATUS_SERVICE_UNAVAILABLE = 503;
+    const STATUS_GATEWAY_TIMEOUT = 504;
+    const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505;
+    const STATUS_VARIANT_ALSO_NEGOTIATES = 506;
+    const STATUS_INSUFFICIENT_STORAGE = 507;
+    const STATUS_LOOP_DETECTED = 508;
+    const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509;
+    const STATUS_NOT_EXTENDED = 510;
+    const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511;
 }