Merge pull request #165 from annando/master

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

diff --git a/fbsync/fbsync.php b/fbsync/fbsync.php
index 5ad44a0e917d15882e117dd70c4b5aa9677cb947..d8b1c0c766773cdc8b6b691b4ed0df6bc837e847 100644 (file)
--- a/fbsync/fbsync.php
+++ b/fbsync/fbsync.php
@@ -134,7 +134,7 @@ function fbsync_settings(&$a,&$s) {
 
        /* provide a submit button */
 
-       $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="fbsync-submit" name="fbsync-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+       $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="fbsync-submit" name="fbsync-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
 
 }
 
@@ -209,7 +209,6 @@ function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $cr
 
        $contact_id = 0;
 
-       //if ($post->parent_post_id != "") {
        if (($post->parent_post_id != "") AND ($post->actor_id == $post->source_id)) {
                $pos = strpos($post->parent_post_id, "_");
 
@@ -222,19 +221,21 @@ function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $cr
 
                        $postarray['contact-id'] = $contact_id;
 
-                       $postarray['owner-name'] = $userdata["name"];
-                       $postarray['owner-link'] = $userdata["link"];
-                       $postarray['owner-avatar'] = $userdata["avatar"];
+                       if (array_key_exists("name", $userdata) AND ($userdata["name"] != "") AND !link_compare($userdata["link"], $postarray['author-link'])) {
+                               $postarray['owner-name'] = $userdata["name"];
+                               $postarray['owner-link'] = $userdata["link"];
+                               $postarray['owner-avatar'] = $userdata["avatar"];
 
-                       if (!intval(get_config('system','wall-to-wall_share'))) {
+                               if (!intval(get_config('system','wall-to-wall_share'))) {
 
-                               $prebody = "[share author='".$postarray['author-name'].
-                                       "' profile='".$postarray['author-link'].
-                                       "' avatar='".$postarray['author-avatar']."']".
+                                       $prebody = "[share author='".$postarray['author-name'].
+                                               "' profile='".$postarray['author-link'].
+                                               "' avatar='".$postarray['author-avatar']."']";
 
-                               $postarray['author-name'] = $postarray['owner-name'];
-                               $postarray['author-link'] = $postarray['owner-link'];
-                               $postarray['author-avatar'] = $postarray['owner-avatar'];
+                                       $postarray['author-name'] = $postarray['owner-name'];
+                                       $postarray['author-link'] = $postarray['owner-link'];
+                                       $postarray['author-avatar'] = $postarray['owner-avatar'];
+                               }
                        }
                }
        }
@@ -242,10 +243,14 @@ function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $cr
        if ($contact_id == 0) {
                $contact_id = fbsync_fetch_contact($uid, $contacts[$post->source_id], $create_user);
 
-               if (($contact_id <= 0) AND !$create_user)
+               if (($contact_id <= 0) AND !$create_user) {
+                       logger('fbsync_createpost: No matching contact found. Post not imported '.print_r($post, true), LOGGER_DEBUG);
                        return;
-               elseif ($contact_id == 0)
+               } elseif ($contact_id == 0) {
+                       // This case should never happen
+                       logger('fbsync_createpost: No matching contact found. Using own id. (Should never happen) '.print_r($post, true), LOGGER_DEBUG);
                        $contact_id = $self[0]["id"];
+               }
 
                $postarray['contact-id'] = $contact_id;
        }
@@ -920,6 +925,5 @@ function fbsync_fetchfeed($a, $uid) {
        }
 
        set_pconfig($uid,'fbsync','last_updated', $last_updated);
-
 }
 ?>