X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=diaspora%2Fdiaspora.php;h=3c4a30d2f7f5c77d9db6a8b5f51041175a08dfbf;hb=27b60e003f92dd9f3aebbeddb34ebb905488ca82;hp=64388bbd225eba760ef1673c1e5cf79852d0a6f0;hpb=42eefed6e68d241bd8bdf9eceea96abc445a9cac;p=friendica-addons.git

diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
old mode 100755
new mode 100644
index 64388bbd..3c4a30d2
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -275,14 +275,24 @@ function diaspora_send(&$a,&$b) {
 
 	logger('diaspora_send: invoked');
 
-	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
+	}
+
+	if(! strstr($b['postopts'],'diaspora')) {
+		return;
+	}
 
-	if(! strstr($b['postopts'],'diaspora'))
+	if($b['parent'] != $b['id']) {
 		return;
+	}
 
-	if($b['parent'] != $b['id'])
+	// Dont't post if the post doesn't belong to us.
+	// This is a check for forum postings
+	$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+	if ($b['contact-id'] != $self['id']) {
 		return;
+	}
 
 	logger('diaspora_send: prepare posting', LOGGER_DEBUG);
 
@@ -295,7 +305,7 @@ function diaspora_send(&$a,&$b) {
 		logger('diaspora_send: all values seem to be okay', LOGGER_DEBUG);
 
 		require_once('include/bb2diaspora.php');
-		$tag_arr = array();
+		$tag_arr = [];
 		$tags = '';
 		$x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
 
@@ -354,7 +364,7 @@ function diaspora_send(&$a,&$b) {
 			if (count($r))
 				$a->contact = $r[0]["id"];
 
-			$s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $body));
+			$s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $body]);
 			require_once('include/queue_fn.php');
 			add_to_queue($a->contact,NETWORK_DIASPORA2,$s);
 			notice(t('Diaspora post failed. Queued for retry.').EOL);