Commit suicide if Pictures is enabled

4 files changed, 36 insertions, 3 deletions

diff --git a/templates/index.php b/templates/index.php
index 15f634d5..c0603a19 100644
--- a/templates/index.php
+++ b/templates/index.php
@@ -9,6 +9,8 @@
 	if (isset($_['code'])) {
 		if ($_['code'] === 404) {
 			print_unescaped($this->inc('part.filenotfounderror'));
+		} elseif ($_['code'] === 500) {
+			print_unescaped($this->inc('part.internalservererror'));
 		} else {
 			print_unescaped($this->inc('part.linkerror'));
 		}
diff --git a/templates/part.filenotfounderror.php b/templates/part.filenotfounderror.php
index 90722768..8cb386c0 100644
--- a/templates/part.filenotfounderror.php
+++ b/templates/part.filenotfounderror.php
@@ -8,13 +8,13 @@
 style(
 	$_['appName'],
 	[
-		'404'
+		'error'
 	]
 );
 ?>
 <ul>
 	<li class="error error-broken-link">
-		<p><?php p($l->t("Sorry, this file could not be found")) ?></p>
+		<p><?php p($l->t("Sorry, this file could not be found.")) ?></p>
 
 		<p><?php p($l->t('Reasons might be:')); ?></p>
 		<ul>
diff --git a/templates/part.internalservererror.php b/templates/part.internalservererror.php
new file mode 100644
index 00000000..142c47a4
--- /dev/null
+++ b/templates/part.internalservererror.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @var $_ array
+ */
+/**
+ * @var $l OC_L10N
+ */
+style(
+	$_['appName'],
+	[
+		'error'
+	]
+);
+?>
+<ul>
+	<li class="error error-broken-link">
+		<p><?php p($l->t("Sorry, but the server could not fulfill your request.")) ?></p>
+
+		<p><?php p($l->t('Possible reasons for the problem:')); ?></p>
+		<ul>
+			<li><?php p($l->t('a conflicting app was installed')); ?></li>
+			<li><?php p($l->t('a required component is missing or was disconnected')); ?></li>
+			<li><?php p($l->t('the filesystem is not readable')); ?></li>
+		</ul>
+		</br>
+		<p><?php p($l->t('Here is the error message returned by the server: ')); ?>
+			<strong><?php p($_['message'] . ' (' . $_['code'] . ')'); ?></strong></p>
+		</br>
+		<p><?php p($l->t('For more information, please contact your friendly ownCloud administrator.')); ?></p>
+	</li>
+</ul>
diff --git a/templates/part.linkerror.php b/templates/part.linkerror.php
index 35308046..d5e8a360 100644
--- a/templates/part.linkerror.php
+++ b/templates/part.linkerror.php
@@ -8,7 +8,7 @@
 style(
 	$_['appName'],
 	[
-		'404'
+		'error'
 	]
 );
 ?>