toggle diaspora protocol on a per-channel level in addition to the existing per site setting. Default is enabled if the site setting is enabled.

1 files changed, 19 insertions, 0 deletions

diff --git a/include/diaspora.php b/include/diaspora.php
index 25e0027b2..33ad4211b 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -64,6 +64,15 @@ function diaspora_dispatch($importer,$msg) {
 		return;
 	}
 
+	$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']);
+		return;
+	}
+
 	// php doesn't like dashes in variable names
 
 	$msg['message'] = str_replace(
@@ -169,6 +178,16 @@ 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']);
+		return;
+	}
+
+
 	if($arr['location'])
 		return;