From c8719e89fa0e2548edbd5dbfdec6cba8cd9b360a Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Mon, 17 Jul 2017 18:54:06 +0200 Subject: Added phpunit and fixed typo --- config/config.default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.default.php b/config/config.default.php index 8ae01144..263b4605 100644 --- a/config/config.default.php +++ b/config/config.default.php @@ -35,7 +35,7 @@ return [ // Anzahl Stunden bis zum Austragen eigener Schichten 'last_unsubscribe' => 3, - // Setzt den zu verwendenden Crypto-Algorismus (entsprechend der Dokumentation von crypt()). + // Setzt den zu verwendenden Crypto-Algorithmus (entsprechend der Dokumentation von crypt()). // Falls ein Benutzerpasswort in einem anderen Format gespeichert ist, // wird es bei der ersten Benutzung des Klartext-Passworts in das neue Format // konvertiert. -- cgit v1.2.3-70-g09d2 From a2b9edc6a301745a299c8c29cdbbbc795961c9f0 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Mon, 17 Jul 2017 22:17:58 +0200 Subject: Reapplied "Merge pull request #314 from Scriptkiddi/master" --- config/config.default.php | 3 +++ includes/helper/email_helper.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.default.php b/config/config.default.php index 263b4605..e816fe9c 100644 --- a/config/config.default.php +++ b/config/config.default.php @@ -26,6 +26,9 @@ return [ // Contact email address, linked on every page 'contact_email' => 'mailto:ticket@c3heaven.de', + // From address of all emails + 'no_reply_email' => 'noreply@engelsystem.de', + // Default theme of the start page, 1=style1.css 'theme' => 1, diff --git a/includes/helper/email_helper.php b/includes/helper/email_helper.php index a2e25269..dad27b39 100644 --- a/includes/helper/email_helper.php +++ b/includes/helper/email_helper.php @@ -39,7 +39,7 @@ function engelsystem_email($address, $title, $message) $address, $title, $message, - "Content-Type: text/plain; charset=UTF-8\r\nFrom: Engelsystem " + sprintf("Content-Type: text/plain; charset=UTF-8\r\nFrom: Engelsystem <%s>", config('no_reply_email')) ); if ($result === false) { -- cgit v1.2.3-70-g09d2