Merge pull request #486 from MrPetovan/task/fix-scrutinizer-issues

[friendica-addons.git] / diaspora / diaspora.php

diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
old mode 100755 (executable)
new mode 100644 (file)
index 9675d7a..db4cc46
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -10,6 +10,7 @@
 require_once("addon/diaspora/Diaspora_Connection.php");
 
 use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
 
 function diaspora_install() {
        register_hook('post_local',           'addon/diaspora/diaspora.php', 'diaspora_post_local');
@@ -136,7 +137,7 @@ function diaspora_settings(&$a,&$s) {
        $status = "";
 
        $r = q("SELECT `addr` FROM `contact` WHERE `self` AND `uid` = %d", intval(local_user()));
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                $status = sprintf(t("Please remember: You can always be reached from Diaspora with your Friendica handle %s. "), $r[0]['addr']);
                $status .= t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
                $status .= sprintf(t('However, it is preferred that you tell your Diaspora contacts the new handle %s instead.'), $r[0]['addr']);
@@ -274,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);