Merge pull request #453 from annando/forumposts

Public forum posts aren't transmitted via the connectors anymore

buffer/buffer.php

@@ -247,6 +247,13 @@ function buffer_send(&$a,&$b) {
 	if($b['parent'] != $b['id'])
 		return;
 
+	// Dont't post if the post doesn't belong to us.
+	// This is a check for forum postings
+	$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+	if ($b['contact-id'] != $self['id']) {
+		return;
+	}
+
 	// if post comes from buffer don't send it back
 	//if($b['app'] == "Buffer")
 	//	return;

diaspora/diaspora.php

@@ -284,6 +284,13 @@ function diaspora_send(&$a,&$b) {
 	if($b['parent'] != $b['id'])
 		return;
 
+	// Dont't post if the post doesn't belong to us.
+	// This is a check for forum postings
+	$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+	if ($b['contact-id'] != $self['id']) {
+		return;
+	}
+
 	logger('diaspora_send: prepare posting', LOGGER_DEBUG);
 
 	$handle = PConfig::get($b['uid'],'diaspora','handle');

libertree/libertree.php

@@ -155,15 +155,21 @@ function libertree_send(&$a,&$b) {
 
 	logger('libertree_send: invoked');
 
-    if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
-        return;
+	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+		return;
 
-    if(! strstr($b['postopts'],'libertree'))
-        return;
+	if (! strstr($b['postopts'],'libertree'))
+		return;
 
-    if($b['parent'] != $b['id'])
-        return;
+	if ($b['parent'] != $b['id'])
+		return;
 
+	// Dont't post if the post doesn't belong to us.
+	// This is a check for forum postings
+	$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+	if ($b['contact-id'] != $self['id']) {
+		return;
+	}
 
 	$ltree_api_token = PConfig::get($b['uid'],'libertree','libertree_api_token');
 	$ltree_url = PConfig::get($b['uid'],'libertree','libertree_url');

pumpio/pumpio.php

@@ -415,6 +415,13 @@ function pumpio_send(&$a,&$b) {
 
 		if (!count($receiver) && ($b['private'] || !strstr($b['postopts'],'pumpio')))
 			return;
+
+		// Dont't post if the post doesn't belong to us.
+		// This is a check for forum postings
+		$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+		if ($b['contact-id'] != $self['id']) {
+			return;
+		}
 	}
 
 	if($b['verb'] == ACTIVITY_LIKE) {

statusnet/statusnet.php

@@ -541,6 +541,13 @@ function statusnet_post_hook(&$a,&$b) {
 
 		if($b['private'] || !strstr($b['postopts'],'statusnet'))
 			return;
+
+		// Dont't post if the post doesn't belong to us.
+		// This is a check for forum postings
+		$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+		if ($b['contact-id'] != $self['id']) {
+			return;
+		}
 	}
 
 	if (($b['verb'] == ACTIVITY_POST) && $b['deleted'])

tumblr/tumblr.php

@@ -325,6 +325,13 @@ function tumblr_send(&$a,&$b) {
 	if($b['parent'] != $b['id'])
 		return;
 
+	// Dont't post if the post doesn't belong to us.
+	// This is a check for forum postings
+	$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+	if ($b['contact-id'] != $self['id']) {
+		return;
+	}
+
 	$oauth_token = PConfig::get($b['uid'], "tumblr", "oauth_token");
 	$oauth_token_secret = PConfig::get($b['uid'], "tumblr", "oauth_token_secret");
 	$page = PConfig::get($b['uid'], "tumblr", "page");

twitter/twitter.php

@@ -171,7 +171,7 @@ function twitter_jot_nets(&$a,&$b) {
 	}
 }
 
-function twitter_settings_post ($a,$post) {
+function twitter_settings_post($a,$post) {
 	if(! local_user())
 		return;
 	// don't check twitter settings if twitter submit button is not clicked
@@ -412,7 +412,7 @@ function twitter_post_hook(&$a,&$b) {
 			return;
 	}
 
-	if($b['parent'] != $b['id']) {
+	if ($b['parent'] != $b['id']) {
 		logger("twitter_post_hook: parameter ".print_r($b, true), LOGGER_DATA);
 
 		// Looking if its a reply to a twitter post
@@ -446,8 +446,16 @@ function twitter_post_hook(&$a,&$b) {
 	} else {
 		$iscomment = false;
 
-		if($b['private'] || !strstr($b['postopts'],'twitter'))
+		if ($b['private'] || !strstr($b['postopts'],'twitter')) {
 			return;
+		}
+
+		// Dont't post if the post doesn't belong to us.
+		// This is a check for forum postings
+		$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+		if ($b['contact-id'] != $self['id']) {
+			return;
+		}
 	}
 
 	if (($b['verb'] == ACTIVITY_POST) && $b['deleted'])

wppost/wppost.php

@@ -200,6 +200,12 @@ function wppost_send(&$a,&$b) {
 	if($b['parent'] != $b['id'])
 		return;
 
+	// Dont't post if the post doesn't belong to us.
+	// This is a check for forum postings
+	$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+	if ($b['contact-id'] != $self['id']) {
+		return;
+	}
 
 	$wp_username = xmlify(PConfig::get($b['uid'],'wppost','wp_username'));
 	$wp_password = xmlify(PConfig::get($b['uid'],'wppost','wp_password'));