From ceb65fe29fa496266ca14ba310cdaa69b84cbf89 Mon Sep 17 00:00:00 2001
From: Miroslav Bauer <mirekys@users.noreply.github.com>
Date: Mon, 7 Jun 2021 13:01:16 +0200
Subject: [PATCH] error pages

---
 appinfo/info.xml                |  2 +-
 core/css/styles.css             |  6 +++++-
 core/templates/403.php          | 21 +++++++++++++++++++++
 core/templates/404.php          | 25 +++++++++++++++++++++++++
 core/templates/error.php        | 12 ++++++++++++
 core/templates/exception.php    | 33 +++++++++++++++++++++++++++++++++
 core/templates/layout.guest.php |  2 +-
 7 files changed, 98 insertions(+), 3 deletions(-)
 create mode 100644 core/templates/403.php
 create mode 100644 core/templates/404.php
 create mode 100644 core/templates/error.php
 create mode 100644 core/templates/exception.php

diff --git a/appinfo/info.xml b/appinfo/info.xml
index e27f344..649aefd 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<description>Custom theme for the ownCloud@CESNET server.</description>
 	<licence>AGPL</licence>
 	<author>Miroslav Bauer @ CESNET</author>
-	<version>2.0.0a14</version>
+	<version>2.0.0a15</version>
 	<types>
 		<theme/>
 	</types>
diff --git a/core/css/styles.css b/core/css/styles.css
index e9fc52e..43ffb91 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -106,7 +106,7 @@ button.primary:focus,
 }
 
 .is-xsmall {
-	font-size: 0.65rem !important;
+	font-size: 0.75rem !important;
 }
 
 .message {
@@ -118,6 +118,10 @@ button.primary:focus,
 	color: white !important;
 }
 
+.message.is-danger .message-body {
+	border-color: #E60000 !important;
+}
+
 .hero-title {
 	font-size: 6rem !important;
 }
diff --git a/core/templates/403.php b/core/templates/403.php
new file mode 100644
index 0000000..37ea015
--- /dev/null
+++ b/core/templates/403.php
@@ -0,0 +1,21 @@
+<?php
+// @codeCoverageIgnoreStart
+if (!isset($_)) {//also provide standalone error page
+	require_once '../../lib/base.php';
+
+	$tmpl = new OC_Template('', '403', 'guest');
+	$tmpl->printPage();
+	exit;
+}
+// @codeCoverageIgnoreEnd
+?>
+<h1 class="title is-1"><?php p($l->t('Access forbidden')); ?></h1>
+<ul class="message is-danger">
+	<li class='message-body'>
+		<br>
+		<p class='hint'><?php if (isset($_['file'])) {
+				p($_['file']);
+			}?></p>
+	</li>
+</ul>
+<a class="button" <?php print_unescaped(\OC_User::getLogoutAttribute()); ?>"><?php p($l->t('Return to login page')); ?></a>
diff --git a/core/templates/404.php b/core/templates/404.php
new file mode 100644
index 0000000..dde88d9
--- /dev/null
+++ b/core/templates/404.php
@@ -0,0 +1,25 @@
+<?php
+/** @var $_ array */
+/** @var $l \OCP\IL10N */
+/** @var $theme OC_Theme */
+// @codeCoverageIgnoreStart
+if (!isset($_)) {//also provide standalone error page
+	require_once '../../lib/base.php';
+
+	$tmpl = new OC_Template('', '404', 'guest');
+	$tmpl->printPage();
+	exit;
+}
+// @codeCoverageIgnoreEnd
+?>
+<?php if (isset($_['content'])): ?>
+	<?php print_unescaped($_['content']) ?>
+<?php else: ?>
+	<h1 class="title is-1"><?php p($l->t('File not found')); ?></h1>
+	<ul class="message is-danger">
+		<li class="message-body">
+			<p class="hint"><?php p($l->t('The specified document has not been found on the server.')); ?></p>
+			<p class="hint"><a href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>"><?php p($l->t('You can click here to return to %s.', [$theme->getName()])); ?></a></p>
+		</li>
+	</ul>
+<?php endif; ?>
\ No newline at end of file
diff --git a/core/templates/error.php b/core/templates/error.php
new file mode 100644
index 0000000..27a5131
--- /dev/null
+++ b/core/templates/error.php
@@ -0,0 +1,12 @@
+<h1 class="title is-1">Error</h1>
+<ul class="message is-danger">
+	<?php foreach ($_["errors"] as $error):?>
+        <li class='message-body'>
+			<?php p($error['error']) ?><br>
+			<?php if (isset($error['hint']) && $error['hint']): ?>
+                <p class='hint'><?php p($error['hint']) ?></p>
+			<?php endif;?>
+        </li>
+	<?php endforeach ?>
+</ul>
+<a class="button" <?php print_unescaped(\OC_User::getLogoutAttribute()); ?>"><?php p($l->t('Return to login page')); ?></a>
diff --git a/core/templates/exception.php b/core/templates/exception.php
new file mode 100644
index 0000000..fe3cd65
--- /dev/null
+++ b/core/templates/exception.php
@@ -0,0 +1,33 @@
+<?php
+/** @var array $_ */
+/** @var \OCP\IL10N $l */
+
+style('core', ['styles', 'header']);
+?>
+	<h2 class="title is-1"><?php p($l->t('Internal Server Error')) ?></h2>
+	</div>
+	<p class="subtitle is-4"><?php p($l->t('The server encountered an internal error and was unable to complete your request.')) ?></p>
+	<p class="subtitle is-6"><?php p($l->t('Please contact the server administrator if this error reappears multiple times and include the technical details below in your report.')) ?></p>
+	<p><?php print_unescaped($l->t('More details can be found in the <a target="_blank" rel="noreferrer" href="%s">server log</a>.', [link_to_docs('admin-logfiles')])); ?></p>
+	<br>
+	<h2 class="title is-3"><strong><?php p($l->t('Technical details')) ?></strong></h2>
+	<div class="message is-danger">
+		<ul class="message-body">
+			<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('Type: %s', $_['errorClass'])) ?></li>
+				<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>
+	</div>
+
+<?php if ($_['debugMode']): ?>
+	<br />
+	<h2><strong><?php p($l->t('Trace')) ?></strong></h2>
+	<pre><?php p($_['trace']) ?></pre>
+<?php endif; ?>
+	</span>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 7ec112b..03766c8 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -113,7 +113,7 @@ class="button is-primary is-inverted">
     </div>
     <footer class="hero-foot" role="contentinfo">
         <div class="content has-text-weight-light has-text-centered">
-            <p>
+            <p class="is-xsmall">
 				<?php print_unescaped($theme->getLongFooter()); ?>
             </p>
         </div>