mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #21987 from nextcloud/techdebt/notfoundresponse-template 

Move NotFoundResponse to a proper TemplateResponse
This commit is contained in:
Morris Jobke 2020-07-24 12:20:27 +02:00 committed by GitHub
parent c4a6666e6c e1b696929f
commit 6ef029d6f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/private/AppFramework/Middleware/AdditionalScriptsMiddleware.php
View File

@ -53,16 +53,15 @@ class AdditionalScriptsMiddleware extends Middleware {
} }
public function afterController($controller, $methodName, Response $response): Response { public function afterController($controller, $methodName, Response $response): Response {
/*
* There is no need to emit these signals on a public share page
* There is a separate event for that already
*/
if ($controller instanceof PublicShareController) {
return $response;
}
if ($response instanceof TemplateResponse) { if ($response instanceof TemplateResponse) {
$this->legacyDispatcher->dispatch(TemplateResponse::EVENT_LOAD_ADDITIONAL_SCRIPTS, new GenericEvent()); if (!$controller instanceof PublicShareController) {
/*
* The old event was not dispatched on the public share controller as there was
* OCA\Files_Sharing::loadAdditionalScripts for that. This is kept for compatibility reasons
* only for the old event as this is now also included in BeforeTemplateRenderedEvent
*/
$this->legacyDispatcher->dispatch(TemplateResponse::EVENT_LOAD_ADDITIONAL_SCRIPTS, new GenericEvent());
}
if (!($response instanceof StandaloneTemplateResponse) && $this->userSession->isLoggedIn()) { if (!($response instanceof StandaloneTemplateResponse) && $this->userSession->isLoggedIn()) {
$this->legacyDispatcher->dispatch(TemplateResponse::EVENT_LOAD_ADDITIONAL_SCRIPTS_LOGGEDIN, new GenericEvent()); $this->legacyDispatcher->dispatch(TemplateResponse::EVENT_LOAD_ADDITIONAL_SCRIPTS_LOGGEDIN, new GenericEvent());

15
lib/public/AppFramework/Http/NotFoundResponse.php
View File

@ -24,30 +24,19 @@
namespace OCP\AppFramework\Http; namespace OCP\AppFramework\Http;
use OCP\Template;
/** /**
* A generic 404 response showing an 404 error page as well to the end-user * A generic 404 response showing an 404 error page as well to the end-user
* @since 8.1.0 * @since 8.1.0
*/ */
class NotFoundResponse extends Response { class NotFoundResponse extends TemplateResponse {
/** /**
* @since 8.1.0 * @since 8.1.0
*/ */
public function __construct() { public function __construct() {
parent::__construct(); parent::__construct('core', '404', [], 'guest');
$this->setContentSecurityPolicy(new ContentSecurityPolicy()); $this->setContentSecurityPolicy(new ContentSecurityPolicy());
$this->setStatus(404); $this->setStatus(404);
} }
/**
* @return string
* @since 8.1.0
*/
public function render() {
$template = new Template('core', '404', 'guest');
return $template->fetchPage();
}
} }