aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2011-12-23 01:38:06 -0800
committerfriendica <info@friendica.com>2011-12-23 01:38:06 -0800
commit949d3f0ff19586897352e158c82eeab7db441437 (patch)
tree8e690f0d8af1746bbcb86bcc4479565f5340d029
parentaea5584bf14387dff2bd2b62335b8b94f939c6ff (diff)
downloadvolse-hubzilla-949d3f0ff19586897352e158c82eeab7db441437.tar.gz
volse-hubzilla-949d3f0ff19586897352e158c82eeab7db441437.tar.bz2
volse-hubzilla-949d3f0ff19586897352e158c82eeab7db441437.zip
preparation for 3rd generation email contacts
-rw-r--r--include/notifier.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/notifier.php b/include/notifier.php
index 2562f09eb..1db1b09da 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -626,7 +626,13 @@ function notifier_run($argv, $argc){
$reply_to = $r1[0]['reply_to'];
$subject = (($it['title']) ? $it['title'] : t("\x28no subject\x29")) ;
- $headers = 'From: ' . $local_user[0]['username'] . ' <' . $local_user[0]['email'] . '>' . "\n";
+
+ // only expose our real email address to true friends
+
+ if($contact['rel'] == CONTACT_IS_FRIEND)
+ $headers = 'From: ' . $local_user[0]['username'] . ' <' . $local_user[0]['email'] . '>' . "\n";
+ else
+ $headers = 'From: ' . $local_user[0]['username'] . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n";
if($reply_to)
$headers .= 'Reply-to: ' . $reply_to . "\n";