diff options
Diffstat (limited to 'apps/dav')
| -rw-r--r-- | apps/dav/lib/Files/BrowserErrorPagePlugin.php | 12 | ||||
| -rw-r--r-- | apps/dav/templates/exception.php | 33 |
2 files changed, 9 insertions, 36 deletions
diff --git a/apps/dav/lib/Files/BrowserErrorPagePlugin.php b/apps/dav/lib/Files/BrowserErrorPagePlugin.php index 3502acde974..9bc169601af 100644 --- a/apps/dav/lib/Files/BrowserErrorPagePlugin.php +++ b/apps/dav/lib/Files/BrowserErrorPagePlugin.php @@ -81,7 +81,7 @@ class BrowserErrorPagePlugin extends ServerPlugin { } $this->server->httpResponse->addHeaders($headers); $this->server->httpResponse->setStatus($httpCode); - $body = $this->generateBody(); + $body = $this->generateBody($httpCode); $this->server->httpResponse->setBody($body); $csp = new ContentSecurityPolicy(); $this->server->httpResponse->addHeader('Content-Security-Policy', $csp->buildPolicy()); @@ -92,9 +92,15 @@ class BrowserErrorPagePlugin extends ServerPlugin { * @codeCoverageIgnore * @return bool|string */ - public function generateBody() { + public function generateBody(int $httpCode) { $request = \OC::$server->getRequest(); - $content = new OC_Template('dav', 'exception', 'guest'); + + $templateName = 'exception'; + if($httpCode === 403 || $httpCode === 404) { + $templateName = (string)$httpCode; + } + + $content = new OC_Template('core', $templateName, 'guest'); $content->assign('title', $this->server->httpResponse->getStatusText()); $content->assign('remoteAddr', $request->getRemoteAddress()); $content->assign('requestID', $request->getId()); diff --git a/apps/dav/templates/exception.php b/apps/dav/templates/exception.php deleted file mode 100644 index 8f922e22a38..00000000000 --- a/apps/dav/templates/exception.php +++ /dev/null @@ -1,33 +0,0 @@ -<?php -/** - * @author Thomas Müller <thomas.mueller@tmit.eu> - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -style('core', ['styles', 'header']); - -/** @param $_ array */ -?> -<div class="body-login-container update"> - <h2><?php p($_['title']) ?></h2> - - <h3><strong><?php p($l->t('Technical details')) ?></strong></h3> - <ul class="infogroup"> - <li><?php p($l->t('Remote Address: %s', $_['remoteAddr'])) ?></li> - <li><?php p($l->t('Request ID: %s', $_['requestID'])) ?></li> - </ul> -</div> |