summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsquare <msquare@notrademark.de>2017-03-18 15:08:44 +0100
committerGitHub <noreply@github.com>2017-03-18 15:08:44 +0100
commit7bbfe69583200e5cf2def8757a5c7995d1cc6fa2 (patch)
treefb79592a6ffa089e3b17c6cd552a875c25aa85cd
parent4a95dfa171dfc6c0b65f36a0417f687bfd40bc97 (diff)
parent1ca6ed3dafe006035d0afc36b498a6ca42bd57df (diff)
Merge pull request #314 from Scriptkiddi/master
Add config no reply mail
-rw-r--r--config/config.default.php1
-rw-r--r--includes/helper/email_helper.php3
2 files changed, 3 insertions, 1 deletions
diff --git a/config/config.default.php b/config/config.default.php
index 0b268c12..59f7bbc6 100644
--- a/config/config.default.php
+++ b/config/config.default.php
@@ -8,6 +8,7 @@ $faq_url = "https://events.ccc.de/congress/2013/wiki/Static:Volunteers";
// 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;
diff --git a/includes/helper/email_helper.php b/includes/helper/email_helper.php
index 0ef4326a..462b5641 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 <noreply@engelsystem.de>");
+ 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.');
}