From 43c1caf3fdefe7e900e6c719c7422c96c87bca42 Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Tue, 18 Jan 2022 21:20:20 +0000
Subject: [PATCH] Email should not be mandatory according to the form text
---
templates/error.twig | 2 +-
www/errorreport.php | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/templates/error.twig b/templates/error.twig
index f3fa941b8..0db609373 100644
--- a/templates/error.twig
+++ b/templates/error.twig
@@ -42,7 +42,7 @@
<form action="{{ errorReportAddress }}" class="pure-form" method="post">
<p>{{ '{errors:report_text}' | trans }}</p>
<label for="email">{{ '{errors:report_email}' | trans }}</label>
- <input type="email" name="email" id="email" class="edge" value="{{ email }}" />
+ <input type="email" name="email" id="email" class="edge" size="50" value="{{ email }}">
<textarea class="text-area edge" name="text" rows="6" cols="50" placeholder="{{ '{errors:report_explain}' | trans }}" required></textarea>
<p class="center">
diff --git a/www/errorreport.php b/www/errorreport.php
index 633da1bbe..4af111475 100644
--- a/www/errorreport.php
+++ b/www/errorreport.php
@@ -51,7 +51,9 @@ $data['directory'] = dirname(dirname(__FILE__));
if ($config->getBoolean('errorreporting', true)) {
$mail = new SimpleSAML\Utils\EMail('SimpleSAMLphp error report from ' . $email);
$mail->setData($data);
- $mail->addReplyTo($email);
+ if ($email) {
+ $mail->addReplyTo($email);
+ }
$mail->setText($text);
$mail->send();
SimpleSAML\Logger::error('Report with id ' . $reportId . ' sent');
--
GitLab