From 6ebbd9f17be8607839fabd710919aa77c349be69 Mon Sep 17 00:00:00 2001 From: Fritz Otlinghaus Date: Fri, 3 Feb 2017 17:00:58 +0100 Subject: [PATCH 1/5] Update config.default.php --- config/config.default.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/config.default.php b/config/config.default.php index 0b268c12..79bc2bf4 100644 --- a/config/config.default.php +++ b/config/config.default.php @@ -5,6 +5,7 @@ $maintenance_mode = false; // URL to the angel faq and job description $faq_url = "https://events.ccc.de/congress/2013/wiki/Static:Volunteers"; +$base_url = "https://events.ccc.de/"; // contact email address, linked on every page $contact_email = "mailto:ticket@c3heaven.de"; From 3502eba04832425b3d20b401844e550e0a317080 Mon Sep 17 00:00:00 2001 From: Fritz Otlinghaus Date: Fri, 3 Feb 2017 17:01:32 +0100 Subject: [PATCH 2/5] Update config.default.php --- config/config.default.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/config.default.php b/config/config.default.php index 79bc2bf4..9d522197 100644 --- a/config/config.default.php +++ b/config/config.default.php @@ -9,6 +9,7 @@ $base_url = "https://events.ccc.de/"; // contact email address, linked on every page $contact_email = "mailto:ticket@c3heaven.de"; +$no_reply_email = "noreply@engelsystem.de"; // Default-Theme auf der Startseite, 1=style1.css usw. $default_theme = 1; From 6f367eefe06c4ec016207a152c2f31e4a15ec805 Mon Sep 17 00:00:00 2001 From: Fritz Otlinghaus Date: Fri, 3 Feb 2017 17:14:46 +0100 Subject: [PATCH 3/5] Update email_helper.php --- includes/helper/email_helper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/helper/email_helper.php b/includes/helper/email_helper.php index 0ef4326a..97e85296 100644 --- a/includes/helper/email_helper.php +++ b/includes/helper/email_helper.php @@ -16,7 +16,8 @@ function engelsystem_email_to_user($recipient_user, $title, $message, $not_if_it } function engelsystem_email($address, $title, $message) { - $result = mail($address, $title, $message, "Content-Type: text/plain; charset=UTF-8\r\nFrom: Engelsystem "); + global $no_reply_email; + $result = mail($address, $title, $message, sprintf("Content-Type: text/plain; charset=UTF-8\r\nFrom: Engelsystem <%s>", $no_reply_email); if ($result === false) { engelsystem_error('Unable to send email.'); } From c9336840ff02be4e586c5fee8dd43ea07855eb49 Mon Sep 17 00:00:00 2001 From: Fritz Otlinghaus Date: Fri, 3 Feb 2017 17:23:06 +0100 Subject: [PATCH 4/5] Update email_helper.php --- includes/helper/email_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/helper/email_helper.php b/includes/helper/email_helper.php index 97e85296..462b5641 100644 --- a/includes/helper/email_helper.php +++ b/includes/helper/email_helper.php @@ -17,7 +17,7 @@ function engelsystem_email_to_user($recipient_user, $title, $message, $not_if_it function engelsystem_email($address, $title, $message) { global $no_reply_email; - $result = mail($address, $title, $message, sprintf("Content-Type: text/plain; charset=UTF-8\r\nFrom: Engelsystem <%s>", $no_reply_email); + $result = mail($address, $title, $message, sprintf("Content-Type: text/plain; charset=UTF-8\r\nFrom: Engelsystem <%s>", $no_reply_email)); if ($result === false) { engelsystem_error('Unable to send email.'); } From 1ca6ed3dafe006035d0afc36b498a6ca42bd57df Mon Sep 17 00:00:00 2001 From: Fritz Otlinghaus Date: Sat, 18 Mar 2017 15:04:47 +0100 Subject: [PATCH 5/5] Update config.default.php removed base_url since it was unused --- config/config.default.php | 1 - 1 file changed, 1 deletion(-) diff --git a/config/config.default.php b/config/config.default.php index 9d522197..59f7bbc6 100644 --- a/config/config.default.php +++ b/config/config.default.php @@ -5,7 +5,6 @@ $maintenance_mode = false; // URL to the angel faq and job description $faq_url = "https://events.ccc.de/congress/2013/wiki/Static:Volunteers"; -$base_url = "https://events.ccc.de/"; // contact email address, linked on every page $contact_email = "mailto:ticket@c3heaven.de";