aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/dfrn_request.php8
-rw-r--r--mod/follow.php3
-rw-r--r--mod/salmon.php5
3 files changed, 3 insertions, 13 deletions
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 338dc9cf1..c9811fa60 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -626,11 +626,9 @@ function dfrn_request_content(&$a) {
else
$tpl = get_markup_template('auto_request.tpl');
- $prv = get_config('system','strict_privacy');
-
$o .= replace_macros($tpl,array(
'$header' => t('Friend/Connection Request'),
- '$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo') . (($prv) ? ', testuser@identi.ca' : ''),
+ '$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'),
'$pls_answer' => t('Please answer the following:'),
'$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']),
'$yes' => t('Yes'),
@@ -638,9 +636,9 @@ function dfrn_request_content(&$a) {
'$add_note' => t('Add a personal note:'),
'$page_desc' => t("Please enter your 'Identity Address' from one of the following supported social networks:"),
'$friendika' => t('Friendika'),
- '$statusnet' => (($prv) ? t('StatusNet/Federated Social Web') : ''),
+ '$statusnet' => t('StatusNet/Federated Social Web'),
'$private_net' => t("Private \x28secure\x29 network"),
- '$public_net' => (($prv) ? t("Public \x28insecure\x29 network") : ''),
+ '$public_net' => t("Public \x28insecure\x29 network"),
'$your_address' => t('Your Identity Address:'),
'$submit' => t('Submit Request'),
'$cancel' => t('Cancel'),
diff --git a/mod/follow.php b/mod/follow.php
index 31cfcfb64..a354b3457 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -34,9 +34,6 @@ function follow_post(&$a) {
// NOTREACHED
}
- elseif(get_config('system','strict_privacy')) {
- unset($ret['notify']);
- }
// do we have enough information?
diff --git a/mod/salmon.php b/mod/salmon.php
index bf33033d8..c2f76aa0a 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -192,11 +192,6 @@ 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