Just cleaning up the code.

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 0e2fce7bf79c750da6d3d16f5320a92b931fa6ce..a66535d7ded21bb0061690f92d573a6dd9234375 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -90,14 +90,14 @@ function item_post(&$a) {
                        $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
                                intval($parent)
                        );
-               }
-               elseif($parent_uri && local_user()) {
+               } elseif($parent_uri && local_user()) {
                        // This is coming from an API source, and we are logged in
                        $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
                                dbesc($parent_uri),
                                intval(local_user())
                        );
                }
+
                // if this isn't the real parent of the conversation, find it
                if($r !== false && count($r)) {
                        $parid = $r[0]['parent'];
@@ -127,8 +127,27 @@ function item_post(&$a) {
                                intval($parent_item['contact-id']),
                                intval($uid)
                        );
-                       if(count($r))
+                       if(count($r)) {
                                $parent_contact = $r[0];
+
+                               // If the contact id doesn't fit with the contact, then set the contact to null
+                               $thrparent = q("SELECT `author-link`, `network` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($thr_parent));
+                               if (count($thrparent) AND ($thrparent[0]["network"] === NETWORK_OSTATUS)
+                                       AND (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) {
+                                       $parent_contact = null;
+
+                                       require_once("include/Scrape.php");
+                                       $probed_contact = probe_url($thrparent[0]["author-link"]);
+                                       if ($probed_contact["network"] != NETWORK_FEED) {
+                                               $parent_contact = $probed_contact;
+                                               $parent_contact["nurl"] = normalise_link($probed_contact["url"]);
+                                               $parent_contact["thumb"] = $probed_contact["photo"];
+                                               $parent_contact["micro"] = $probed_contact["photo"];
+                                       }
+                                       logger('parent contact: '.print_r($parent_contact, true), LOGGER_DEBUG);
+                               } else
+                                       logger('no contact found: '.print_r($thrparent, true), LOGGER_DEBUG);
+                       }
                }
        }
 
@@ -137,6 +156,7 @@ function item_post(&$a) {
        $profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0);
        $post_id     = ((x($_REQUEST,'post_id'))     ? intval($_REQUEST['post_id'])     : 0);
        $app         = ((x($_REQUEST,'source'))      ? strip_tags($_REQUEST['source'])  : '');
+       $extid       = ((x($_REQUEST,'extid'))       ? strip_tags($_REQUEST['extid'])  : '');
 
        $allow_moderated = false;
 
@@ -200,7 +220,7 @@ function item_post(&$a) {
                $verb              = $orig_post['verb'];
                $objecttype        = $orig_post['object-type'];
                $emailcc           = $orig_post['emailcc'];
-               $app                       = $orig_post['app'];
+               $app               = $orig_post['app'];
                $categories        = $orig_post['file'];
                $title             = notags(trim($_REQUEST['title']));
                $body              = escape_tags(trim($_REQUEST['body']));
@@ -208,6 +228,7 @@ function item_post(&$a) {
                $pubmail_enable    = $orig_post['pubmail'];
                $network           = $orig_post['network'];
                $guid              = $orig_post['guid'];
+               $extid             = $orig_post['extid'];
 
        } else {
 
@@ -652,6 +673,7 @@ function item_post(&$a) {
        $datarray['commented']     = datetime_convert();
        $datarray['received']      = datetime_convert();
        $datarray['changed']       = datetime_convert();
+       $datarray['extid']         = $extid;
        $datarray['guid']          = $guid;
        $datarray['uri']           = $uri;
        $datarray['title']         = $title;
@@ -749,11 +771,12 @@ function item_post(&$a) {
                $post_id = 0;
 
 
-       $r = q("INSERT INTO `item` (`guid`, `uid`,`type`,`wall`,`gravity`, `network`, `contact-id`,`owner-name`,`owner-link`,`owner-avatar`, 
+       $r = q("INSERT INTO `item` (`guid`, `extid`, `uid`,`type`,`wall`,`gravity`, `network`, `contact-id`,`owner-name`,`owner-link`,`owner-avatar`, 
                `author-name`, `author-link`, `author-avatar`, `created`, `edited`, `commented`, `received`, `changed`, `uri`, `thr-parent`, `title`, `body`, `app`, `location`, `coord`, 
                `tag`, `inform`, `verb`, `object-type`, `postopts`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach`, `bookmark`,`origin`, `moderated`, `file` )
-               VALUES( '%s', %d, '%s', %d, %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, '%s' )",
+               VALUES( '%s', '%s', %d, '%s', %d, %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, '%s' )",
                dbesc($datarray['guid']),
+               dbesc($datarray['extid']),
                intval($datarray['uid']),
                dbesc($datarray['type']),
                intval($datarray['wall']),
@@ -807,7 +830,7 @@ function item_post(&$a) {
                file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
 
                // Store the fresh generated item into the cache
-               $cachefile = get_cachefile($datarray["guid"]."-".hash("md5", $datarray['body']));
+               $cachefile = get_cachefile(urlencode($datarray["guid"])."-".hash("md5", $datarray['body']));
 
                if (($cachefile != '') AND !file_exists($cachefile)) {
                        $s = prepare_text($datarray['body']);