From 6d3757f8648cb94b2ba04c6a5bfbc9dd1493103b Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 11 Sep 2014 14:14:02 +0200
Subject: Do not show exception to the end-user

Log the error instead of potentially leaking sensitive information
---
 core/templates/error.php     |  4 +++-
 core/templates/exception.php | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 core/templates/exception.php

(limited to 'core')

diff --git a/core/templates/error.php b/core/templates/error.php
index e8b7a49264f..030fbf07fcb 100644
--- a/core/templates/error.php
+++ b/core/templates/error.php
@@ -2,7 +2,9 @@
 	<?php foreach($_["errors"] as $error):?>
 		<li class='error'>
 			<?php p($error['error']) ?><br/>
-			<p class='hint'><?php if(isset($error['hint']))print_unescaped($error['hint']) ?></p>
+			<?php if(isset($error['hint']) && $error['hint']): ?>
+				<p class='hint'><?php print_unescaped($error['hint']) ?></p>
+			<?php endif;?>
 		</li>
 	<?php endforeach ?>
 </ul>
diff --git a/core/templates/exception.php b/core/templates/exception.php
new file mode 100644
index 00000000000..a5944e491cc
--- /dev/null
+++ b/core/templates/exception.php
@@ -0,0 +1,28 @@
+<?php
+	/** @var array $_ */
+	/** @var OC_L10N $l */
+?>
+<span class="error error-wide">
+	<h2><strong><?php p('Internal Server Error') ?></strong></h2><br/>
+		<p><?php p($l->t('The server encountered an internal error and was unable to complete your request.')) ?></p>
+		<p><?php p($l->t('Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.')) ?></p>
+		<p><?php p($l->t('More details can be found in the server log.')) ?></p>
+	<hr/>
+	<h2><strong><?php p($l->t('Technical details')) ?></strong></h2>
+	<ul>
+		<li><?php p($l->t('Remote Address: %s', $_['remoteAddr'])) ?></li>
+		<li><?php p($l->t('Request ID: %s', $_['requestID'])) ?></li>
+		<?php if($_['debugMode']): ?>
+			<li><?php p($l->t('Code: %s', $_['errorCode'])) ?></li>
+			<li><?php p($l->t('Message: %s', $_['errorMsg'])) ?></li>
+			<li><?php p($l->t('File: %s', $_['file'])) ?></li>
+			<li><?php p($l->t('Line: %s', $_['line'])) ?></li>
+		<?php endif; ?>
+	</ul>
+
+	<?php if($_['debugMode']): ?>
+		<hr/>
+		<h2><strong><?php p($l->t('Trace')) ?></strong></h2>
+		<pre><?php p($_['trace']) ?></pre>
+	<?php endif; ?>
+</span>
-- 
cgit v1.2.3


From d66a8daf7ff3a7bb8bbb4183e3f156dfc256e7f8 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 11 Sep 2014 15:27:27 +0200
Subject: replace horizontal rules with whitespace

---
 core/templates/exception.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'core')

diff --git a/core/templates/exception.php b/core/templates/exception.php
index a5944e491cc..cf0e4c74825 100644
--- a/core/templates/exception.php
+++ b/core/templates/exception.php
@@ -3,11 +3,12 @@
 	/** @var OC_L10N $l */
 ?>
 <span class="error error-wide">
-	<h2><strong><?php p('Internal Server Error') ?></strong></h2><br/>
+	<h2><strong><?php p('Internal Server Error') ?></strong></h2>
 		<p><?php p($l->t('The server encountered an internal error and was unable to complete your request.')) ?></p>
 		<p><?php p($l->t('Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.')) ?></p>
 		<p><?php p($l->t('More details can be found in the server log.')) ?></p>
-	<hr/>
+	<br />
+
 	<h2><strong><?php p($l->t('Technical details')) ?></strong></h2>
 	<ul>
 		<li><?php p($l->t('Remote Address: %s', $_['remoteAddr'])) ?></li>
@@ -21,7 +22,7 @@
 	</ul>
 
 	<?php if($_['debugMode']): ?>
-		<hr/>
+		<br />
 		<h2><strong><?php p($l->t('Trace')) ?></strong></h2>
 		<pre><?php p($_['trace']) ?></pre>
 	<?php endif; ?>
-- 
cgit v1.2.3