aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-10 18:51:39 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-10 18:51:39 -0700
commitb2c5020af7f85d4fe423cd6284f9ada701eab247 (patch)
treedb81c36fafb3bf0721102729da1fd01a0b9b447f
parentbc1b7afc857aedb11264b3c2f1cad688894b3853 (diff)
downloadvolse-hubzilla-b2c5020af7f85d4fe423cd6284f9ada701eab247.tar.gz
volse-hubzilla-b2c5020af7f85d4fe423cd6284f9ada701eab247.tar.bz2
volse-hubzilla-b2c5020af7f85d4fe423cd6284f9ada701eab247.zip
diaspora disallowed by default
-rwxr-xr-xinclude/diaspora.php4
-rw-r--r--include/follow.php2
-rw-r--r--mod/settings.php2
3 files changed, 0 insertions, 8 deletions
diff --git a/include/diaspora.php b/include/diaspora.php
index f0bd5d813..71425a6f8 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -65,8 +65,6 @@ function diaspora_dispatch($importer,$msg) {
}
$allowed = get_pconfig($importer['channel_id'],'system','diaspora_allowed');
- if($allowed === false)
- $allowed = 1;
if(! intval($allowed)) {
logger('mod-diaspora: disallowed for channel ' . $importer['channel_name']);
@@ -179,8 +177,6 @@ function diaspora_process_outbound($arr) {
$allowed = get_pconfig($arr['channel']['channel_id'],'system','diaspora_allowed');
- if($allowed === false)
- $allowed = 1;
if(! intval($allowed)) {
logger('mod-diaspora: disallowed for channel ' . $arr['channel']['channel_name']);
diff --git a/include/follow.php b/include/follow.php
index 1e5df4cd5..4710f728c 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -137,8 +137,6 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
}
$allowed = get_pconfig($uid,'system','diaspora_allowed');
- if($allowed === false)
- $allowed = 1;
if(! intval($allowed)) {
$result['message'] = t('Protocol blocked for this channel.');
diff --git a/mod/settings.php b/mod/settings.php
index b0ba04dfc..5bae3778a 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -669,8 +669,6 @@ function settings_content(&$a) {
if($diaspora_enabled) {
$dspr_allowed = get_pconfig(local_channel(),'system','diaspora_allowed');
- if($dspr_allowed === false)
- $dspr_allowed = 1;
$pubcomments = get_pconfig(local_channel(),'system','diaspora_public_comments');
if($pubcomments === false)
$pubcomments = 1;