aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-10 21:46:19 -0700
committerFriendika <info@friendika.com>2011-08-10 21:46:19 -0700
commitac4ce27e88fa8d5c5298e2a35538215fed596dd4 (patch)
tree0e7bb5c4f8f3cf4e3abbddefb77c8c3bf7e888ed
parent684ebd2ed8a2b225860b59256bf81146b1867d6a (diff)
downloadvolse-hubzilla-ac4ce27e88fa8d5c5298e2a35538215fed596dd4.tar.gz
volse-hubzilla-ac4ce27e88fa8d5c5298e2a35538215fed596dd4.tar.bz2
volse-hubzilla-ac4ce27e88fa8d5c5298e2a35538215fed596dd4.zip
keep private emails out of any offsite feeds
-rw-r--r--include/items.php3
-rw-r--r--include/notifier.php5
2 files changed, 8 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php
index a378a632c..be231f34d 100644
--- a/include/items.php
+++ b/include/items.php
@@ -153,6 +153,9 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
if($dfrn_id === '') {
$type = 'html';
+ // catch any email that's in a public conversation and make sure it doesn't leak
+ if($item['private'])
+ continue;
}
else {
$type = 'text';
diff --git a/include/notifier.php b/include/notifier.php
index e1bb29eaf..bd78d7560 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -289,6 +289,11 @@ function notifier_run($argv, $argc){
if(! $item['parent'])
continue;
+ // private emails may be in included in public conversations. Filter them.
+
+ if(($notify_hub) && $item['private'])
+ continue;
+
$contact = get_item_contact($item,$contacts);
if(! $contact)
continue;