aboutsummaryrefslogtreecommitdiffstats
path: root/mod/salmon.php
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-07 20:03:58 +0200
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-07 20:03:58 +0200
commite036434b8a2dbd8594c0ac5ac7233f4700e4e475 (patch)
tree0d37048ec06d603e45fd9852f208478a89e84476 /mod/salmon.php
parent0e8b2092a0c30a8eb898a8f0e7130251300e8d47 (diff)
parentc1b2e90e3720961c280f6378e48fda7bad7c3ad0 (diff)
downloadvolse-hubzilla-e036434b8a2dbd8594c0ac5ac7233f4700e4e475.tar.gz
volse-hubzilla-e036434b8a2dbd8594c0ac5ac7233f4700e4e475.tar.bz2
volse-hubzilla-e036434b8a2dbd8594c0ac5ac7233f4700e4e475.zip
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/salmon.php')
-rw-r--r--mod/salmon.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/mod/salmon.php b/mod/salmon.php
index c2f76aa0a..bf33033d8 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -192,6 +192,11 @@ function salmon_post(&$a) {
// NOTREACHED
}
+ // Check if we're allowed to talk to insecure networks
+
+ if(get_config('system','strict_privacy'))
+ salmon_return(400);
+
require_once('include/items.php');
// Placeholder for hub discovery. We shouldn't find any hubs