Shadow entry mechanism improved

diff --git a/include/items.php b/include/items.php
index 25bae091ec54ff7fc204bf5d2db480f2e58a4071..41d13616ea0e0f5fc79521e2e9946a3a93dff8ae 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -938,7 +938,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
        if ($arr['parent-uri'] === $arr['uri']) {
                add_shadow_thread($current_post);
        } else {
-               add_shadow_entry($arr);
+               add_shadow_entry($current_post);
        }
 
        check_item_notification($current_post, $uid);

diff --git a/include/threads.php b/include/threads.php
index 79340ab2cbe359ab985e26f3fbd636f9129d5adf..8dfb41252573c47f6c45f6a6805a2de722580876 100644 (file)
--- a/include/threads.php
+++ b/include/threads.php
@@ -97,7 +97,15 @@ function add_shadow_thread($itemid) {
                        unset($item[0]['id']);
                        $item[0]['uid'] = 0;
                        $item[0]['origin'] = 0;
+                       $item[0]['wall'] = 0;
                        $item[0]['contact-id'] = get_contact($item[0]['author-link'], 0);
+
+                       if (in_array($item[0]['type'], array("net-comment", "wall-comment"))) {
+                               $item[0]['type'] = 'remote-comment';
+                       } elseif ($item[0]['type'] == 'wall') {
+                               $item[0]['type'] = 'remote';
+                       }
+
                        $public_shadow = item_store($item[0], false, false, true);
 
                        logger("Stored public shadow for thread ".$itemid." under id ".$public_shadow, LOGGER_DEBUG);
@@ -105,7 +113,10 @@ function add_shadow_thread($itemid) {
        }
 }
 
-function add_shadow_entry($item) {
+function add_shadow_entry($itemid) {
+
+       $items = q("SELECT * FROM `item` WHERE `id` = %d", intval($itemid));
+       $item = $items[0];
 
        // Is this a shadow entry?
        if ($item['uid'] == 0)
@@ -127,7 +138,16 @@ function add_shadow_entry($item) {
 
        unset($item['id']);
        $item['uid'] = 0;
+       $item['origin'] = 0;
+       $item['wall'] = 0;
        $item['contact-id'] = get_contact($item['author-link'], 0);
+
+       if (in_array($item['type'], array("net-comment", "wall-comment"))) {
+               $item['type'] = 'remote-comment';
+       } elseif ($item['type'] == 'wall') {
+               $item['type'] = 'remote';
+       }
+
        $public_shadow = item_store($item, false, false, true);
 
        logger("Stored public shadow for comment ".$item['uri']." under id ".$public_shadow, LOGGER_DEBUG);

diff --git a/mod/item.php b/mod/item.php
index dec7cc05bfc9b85ba4375eef495e49a086123609..23bc2d0bb0b1aab3183a4fa8ea45f7389b0285ff 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -1009,50 +1009,22 @@ function item_post(&$a) {
                }
        }
 
-       create_tags_from_item($post_id);
-       create_files_from_item($post_id);
-
        if ($post_id == $parent) {
                add_thread($post_id);
-               q("COMMIT");
-
-               add_shadow_thread($post_id);
        } else {
                update_thread($parent, true);
-               q("COMMIT");
+       }
 
-               // Insert an item entry for UID=0 for global entries
-               // We have to remove or change some data before that,
-               // so that the post appear like a regular received post.
-               // Additionally there is some data that isn't a database field.
-               $arr = $datarray;
-
-               $arr['app'] = $arr['source'];
-               unset($arr['source']);
-
-               unset($arr['self']);
-               unset($arr['wall']);
-               unset($arr['origin']);
-               unset($arr['api_source']);
-               unset($arr['message_id']);
-               unset($arr['profile_uid']);
-               unset($arr['post_id']);
-               unset($arr['dropitems']);
-               unset($arr['commenter']);
-               unset($arr['return']);
-               unset($arr['preview']);
-               unset($arr['post_id_random']);
-               unset($arr['emailcc']);
-               unset($arr['pubmail_enable']);
-               unset($arr['category']);
-               unset($arr['jsreload']);
-
-               if (in_array($arr['type'], array("net-comment", "wall-comment"))) {
-                       $arr['type'] = 'remote-comment';
-               } elseif ($arr['type'] == 'wall') {
-                       $arr['type'] = 'remote';
-               }
-               add_shadow_entry($arr);
+       q("COMMIT");
+
+       create_tags_from_item($post_id);
+       create_files_from_item($post_id);
+
+       // Insert an item entry for UID=0 for global entries
+       if ($post_id != $parent) {
+               add_shadow_thread($post_id);
+       } else {
+               add_shadow_entry($post_id);
        }
 
        // This is a real juggling act on shared hosting services which kill your processes