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

Merge pull request #1342 from nextcloud/throw-exceptions-not-printable 

Don't print exception message in HTML
This commit is contained in:
Morris Jobke 2016-09-09 14:57:23 +02:00 committed by GitHub
parent f6c7b4e6eb f715b5ea2e
commit 3fc37b2fc5
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/dav/lib/Files/BrowserErrorPagePlugin.php
View File

@ -31,7 +31,6 @@ use Sabre\DAV\Server;
use Sabre\DAV\ServerPlugin; use Sabre\DAV\ServerPlugin;
class BrowserErrorPagePlugin extends ServerPlugin { class BrowserErrorPagePlugin extends ServerPlugin {
/** @var Server */ /** @var Server */
private $server; private $server;
@ -88,8 +87,7 @@ class BrowserErrorPagePlugin extends ServerPlugin {
/** /**
* @codeCoverageIgnore * @codeCoverageIgnore
* @param \Exception $ex * @param \Exception $exception
* @param int $httpCode
* @return bool|string * @return bool|string
*/ */
public function generateBody(\Exception $exception) { public function generateBody(\Exception $exception) {
@ -109,10 +107,11 @@ class BrowserErrorPagePlugin extends ServerPlugin {
return $content->fetchPage(); return $content->fetchPage();
} }
/* /**
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function sendResponse() { public function sendResponse() {
$this->server->sapi->sendResponse($this->server->httpResponse); $this->server->sapi->sendResponse($this->server->httpResponse);
exit();
} }
} }

5
apps/dav/templates/exception.php
View File

@ -1,7 +1,5 @@
<?php <?php
/** /**
*
* @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Müller <thomas.mueller@tmit.eu>
* *
* @license GNU AGPL version 3 or any later version * @license GNU AGPL version 3 or any later version
@ -21,10 +19,11 @@
* *
*/ */
style('core', ['styles', 'header']); style('core', ['styles', 'header']);
/** @param $_ array */
?> ?>
<span class="error error-wide"> <span class="error error-wide">
<h2><strong><?php p($_['title']) ?></strong></h2> <h2><strong><?php p($_['title']) ?></strong></h2>
<p><?php p($_['message']) ?></p>
<br> <br>
<h2><strong><?php p($l->t('Technical details')) ?></strong></h2> <h2><strong><?php p($l->t('Technical details')) ?></strong></h2>