]> git.mxchange.org Git - friendica.git/blobdiff - include/items.php
Merge pull request #837 from msjoberg/internal-push
[friendica.git] / include / items.php
index fa46fe108433b0985082602fe13b3acd4607ff80..58768414356e4e79766630370e54bfddcac20d8f 100755 (executable)
@@ -5,7 +5,10 @@ require_once('include/oembed.php');
 require_once('include/salmon.php');
 require_once('include/crypto.php');
 require_once('include/Photo.php');
-
+require_once('include/tags.php');
+require_once('include/text.php');
+require_once('include/email.php');
+require_once('include/ostatus_conversation.php');
 
 function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) {
 
@@ -26,7 +29,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
                }
        }
 
-       
+
 
        // default permissions - anonymous user
 
@@ -238,7 +241,7 @@ function construct_activity_object($item) {
                                        $r->link = str_replace('&','&', $r->link);
                                $r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
                                $o .= $r->link;
-                       }                                       
+                       }
                        else
                                $o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />' . "\r\n";
                }
@@ -270,7 +273,7 @@ function construct_activity_target($item) {
                                        $r->link = str_replace('&','&amp;', $r->link);
                                $r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
                                $o .= $r->link;
-                       }                                       
+                       }
                        else
                                $o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />' . "\r\n";
                }
@@ -291,7 +294,7 @@ function construct_activity_target($item) {
 if(! function_exists('limit_body_size')) {
 function limit_body_size($body) {
 
-       logger('limit_body_size: start', LOGGER_DEBUG);
+//     logger('limit_body_size: start', LOGGER_DEBUG);
 
        $maxlen = get_max_import_size();
 
@@ -670,7 +673,7 @@ function get_atom_elements($feed,$item) {
        }
 
        // translate OStatus unfollow to activity streams if it happened to get selected
-               
+
        if((x($res,'verb')) && ($res['verb'] === 'http://ostatus.org/schema/1.0/unfollow'))
                $res['verb'] = ACTIVITY_UNFOLLOW;
 
@@ -721,7 +724,7 @@ function get_atom_elements($feed,$item) {
                if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
                        $res['object-type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
                        $res['object'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
-               }       
+               }
                if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
                        $res['object'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
                if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
@@ -759,7 +762,7 @@ function get_atom_elements($feed,$item) {
                $child = $rawobj[0]['child'];
                if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
                        $res['target'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
-               }       
+               }
                if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
                        $res['target'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
                if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
@@ -808,7 +811,7 @@ function get_atom_elements($feed,$item) {
                if (($name != "") and ($uri != "") and ($avatar != "") and ($message != "")) {
                        logger('get_atom_elements: fixing sender of repeated message.');
 
-                       if (intval(get_config('system','new_share'))) {
+                       if (!intval(get_config('system','wall-to-wall_share'))) {
                                $prefix = "[share author='".str_replace("'", "&#039;",$name).
                                                "' profile='".$uri.
                                                "' avatar='".$avatar.
@@ -829,15 +832,30 @@ function get_atom_elements($feed,$item) {
                }
        }
 
+       // Search for ostatus conversation url
+       $links = $item->feed->data["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["feed"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["entry"][0]["child"]["http://www.w3.org/2005/Atom"]["link"];
+
+       if (is_array($links)) {
+               foreach ($links as $link) {
+                       $conversation = array_shift($link["attribs"]);
+
+                       if ($conversation["rel"] == "ostatus:conversation") {
+                               $res["ostatus_conversation"] = $conversation["href"];
+                               logger('get_atom_elements: found conversation url '.$res["ostatus_conversation"]);
+                       }
+               };
+       }
+
        $arr = array('feed' => $feed, 'item' => $item, 'result' => $res);
 
        call_hooks('parse_atom', $arr);
 
        //if (($res["title"] != "") or (strpos($res["body"], "RT @") > 0)) {
        //if (strpos($res["body"], "RT @") !== false) {
-       //      $debugfile = tempnam("/home/ike/log", "item-res2-");
-       //      file_put_contents($debugfile, serialize($arr));
-       //}
+       /*if (strpos($res["body"], "@") !== false) {
+               $debugfile = tempnam("/var/www/virtual/pirati.ca/phptmp/", "item-res2-");
+               file_put_contents($debugfile, serialize($arr));
+       }*/
 
        return $res;
 }
@@ -876,13 +894,22 @@ function item_store($arr,$force_parent = false) {
                unset($arr['dsprsig']);
        }
 
+       // if an OStatus conversation url was passed in, it is stored and then
+       // removed from the array.
+       $ostatus_conversation = null;
+
+       if (isset($arr["ostatus_conversation"])) {
+               $ostatus_conversation = $arr["ostatus_conversation"];
+               unset($arr["ostatus_conversation"]);
+       }
+
        if(x($arr, 'gravity'))
                $arr['gravity'] = intval($arr['gravity']);
        elseif($arr['parent-uri'] === $arr['uri'])
                $arr['gravity'] = 0;
        elseif(activity_match($arr['verb'],ACTIVITY_POST))
                $arr['gravity'] = 6;
-       else      
+       else
                $arr['gravity'] = 6;   // extensible catchall
 
        if(! x($arr,'type'))
@@ -898,8 +925,23 @@ function item_store($arr,$force_parent = false) {
                require_once('library/langdet/Text/LanguageDetect.php');
                $naked_body = preg_replace('/\[(.+?)\]/','',$arr['body']);
                $l = new Text_LanguageDetect;
-               $lng = $l->detectConfidence($naked_body);
-               $arr['postopts'] = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
+               //$lng = $l->detectConfidence($naked_body);
+               //$arr['postopts'] = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
+               $lng = $l->detect($naked_body, 3);
+
+               if (sizeof($lng) > 0) {
+                       $postopts = "";
+
+                       foreach ($lng as $language => $score) {
+                               if ($postopts == "")
+                                       $postopts = "lang=";
+                               else
+                                       $postopts .= ":";
+
+                               $postopts .= $language.";".$score;
+                       }
+                       $arr['postopts'] = $postopts;
+               }
        }
 
        $arr['wall']          = ((x($arr,'wall'))          ? intval($arr['wall'])                : 0);
@@ -941,7 +983,23 @@ function item_store($arr,$force_parent = false) {
        $arr['app']           = ((x($arr,'app'))           ? notags(trim($arr['app']))           : '');
        $arr['origin']        = ((x($arr,'origin'))        ? intval($arr['origin'])              : 0 );
        $arr['guid']          = ((x($arr,'guid'))          ? notags(trim($arr['guid']))          : get_guid());
+       $arr['network']       = ((x($arr,'network'))       ? trim($arr['network'])               : '');
 
+       if ($arr['network'] == "") {
+               $r = q("SELECT `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       intval($arr['contact-id']),
+                       intval($arr['uid'])
+               );
+
+               if(count($r))
+                       $arr['network'] = $r[0]["network"];
+
+               // Fallback to friendica (why is it empty in some cases?)
+               if ($arr['network'] == "")
+                       $arr['network'] = NETWORK_DFRN;
+
+               logger("item_store: Set network to ".$arr["network"]." for ".$arr["uri"], LOGGER_DEBUG);
+       }
 
        $arr['thr-parent'] = $arr['parent-uri'];
        if($arr['parent-uri'] === $arr['uri']) {
@@ -952,9 +1010,9 @@ function item_store($arr,$force_parent = false) {
                $deny_cid  = $arr['deny_cid'];
                $deny_gid  = $arr['deny_gid'];
        }
-       else { 
+       else {
 
-               // find the parent and snarf the item id and ACL's
+               // find the parent and snarf the item id and ACLs
                // and anything else we need to inherit
 
                $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d ORDER BY `id` ASC LIMIT 1",
@@ -1017,7 +1075,7 @@ function item_store($arr,$force_parent = false) {
                                logger('item_store: item parent was not found - ignoring item');
                                return 0;
                        }
-                       
+
                        $parent_deleted = 0;
                }
        }
@@ -1058,8 +1116,8 @@ function item_store($arr,$force_parent = false) {
        if(count($r)) {
                $current_post = $r[0]['id'];
                logger('item_store: created item ' . $current_post);
-       }
-       else {
+               create_tags_from_item($r[0]['id']);
+       else {
                logger('item_store: could not locate created item');
                return 0;
        }
@@ -1072,7 +1130,7 @@ function item_store($arr,$force_parent = false) {
                );
        }
 
-       if((! $parent_id) || ($arr['parent-uri'] === $arr['uri']))      
+       if((! $parent_id) || ($arr['parent-uri'] === $arr['uri']))
                $parent_id = $current_post;
 
        if(strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid))
@@ -1083,7 +1141,7 @@ function item_store($arr,$force_parent = false) {
        // Set parent id - and also make sure to inherit the parent's ACL's.
 
        $r = q("UPDATE `item` SET `parent` = %d, `allow_cid` = '%s', `allow_gid` = '%s',
-               `deny_cid` = '%s', `deny_gid` = '%s', `private` = %d, `deleted` = %d WHERE `id` = %d LIMIT 1",
+               `deny_cid` = '%s', `deny_gid` = '%s', `private` = %d, `deleted` = %d WHERE `id` = %d",
                intval($parent_id),
                dbesc($allow_cid),
                dbesc($allow_gid),
@@ -1093,6 +1151,11 @@ function item_store($arr,$force_parent = false) {
                intval($parent_deleted),
                intval($current_post)
        );
+       create_tags_from_item($current_post);
+
+       // Complete ostatus threads
+       if ($ostatus_conversation)
+               complete_conversation($current_post, $ostatus_conversation);
 
         $arr['id'] = $current_post;
         $arr['parent'] = $parent_id;
@@ -1102,11 +1165,10 @@ function item_store($arr,$force_parent = false) {
         $arr['deny_gid'] = $deny_gid;
         $arr['private'] = $private;
         $arr['deleted'] = $parent_deleted;
-       call_hooks('post_remote_end',$arr);
 
        // update the commented timestamp on the parent
 
-       q("UPDATE `item` set `commented` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
+       q("UPDATE `item` set `commented` = '%s', `changed` = '%s' WHERE `id` = %d",
                dbesc(datetime_convert()),
                dbesc(datetime_convert()),
                intval($parent_id)
@@ -1134,8 +1196,32 @@ function item_store($arr,$force_parent = false) {
                );
        }
 
-       tag_deliver($arr['uid'],$current_post);
+       $deleted = tag_deliver($arr['uid'],$current_post);
+
+       // current post can be deleted if is for a communuty page and no mention are
+       // in it.
+       if (!$deleted) {
+               
+               // Store the fresh generated item into the cache
+               $cachefile = get_cachefile($arr["guid"]."-".hash("md5", $arr['body']));
 
+               if (($cachefile != '') AND !file_exists($cachefile)) {
+                       $s = prepare_text($arr['body']);
+                       $a = get_app();
+                       $stamp1 = microtime(true);
+                       file_put_contents($cachefile, $s);
+                       $a->save_timestamp($stamp1, "file");
+                       logger('item_store: put item '.$current_post.' into cachefile '.$cachefile);
+               }
+
+        $r = q('SELECT * FROM `item` WHERE id = %d', intval($current_post));
+        if (count($r) == 1) {
+            call_hooks('post_remote_end', $r[0]);
+        }
+        else {
+            logger('item_store: new item not found in DB, id ' . $current_post);
+        }
+       }
        return $current_post;
 }
 
@@ -1151,10 +1237,15 @@ function get_item_contact($item,$contacts) {
        return false;
 }
 
-
+/**
+ * look for mention tags and setup a second delivery chain for forum/community posts if appropriate
+ * @param int $uid
+ * @param int $item_id
+ * @return bool true if item was deleted, else false
+ */
 function tag_deliver($uid,$item_id) {
 
-       // look for mention tags and setup a second delivery chain for forum/community posts if appropriate
+       // 
 
        $a = get_app();
 
@@ -1196,8 +1287,21 @@ function tag_deliver($uid,$item_id) {
                }
        }
 
-       if(! $mention)
+       if(! $mention){
+               if ( ($community_page || $prvgroup) &&
+                         (!$item['wall']) && (!$item['origin']) && ($item['id'] == $item['parent'])){
+                       // mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment)
+                       // delete it!
+                       logger("tag_deliver: no-mention top-level post to communuty or private group. delete.");
+                       q("DELETE FROM item WHERE id = %d and uid = %d",
+                               intval($item_id),
+                               intval($uid)
+                       );
+                       return true;
+               }
                return;
+       }
+
 
        // send a notification
 
@@ -1258,8 +1362,8 @@ function tag_deliver($uid,$item_id) {
 
        $forum_mode = (($prvgroup) ? 2 : 1);
 
-       q("update item set wall = 1, origin = 1, forum_mode = %d, `owner-name` = '%s', `owner-link` = '%s', `owner-avatar` = '%s', 
-               `private` = %d, `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'  where id = %d limit 1",
+       q("update item set wall = 1, origin = 1, forum_mode = %d, `owner-name` = '%s', `owner-link` = '%s', `owner-avatar` = '%s',
+               `private` = %d, `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'  where id = %d",
                intval($forum_mode),
                dbesc($c[0]['name']),
                dbesc($c[0]['url']),
@@ -1272,7 +1376,7 @@ function tag_deliver($uid,$item_id) {
                intval($item_id)
        );
 
-       proc_run('php','include/notifier.php','tgroup',$item_id);                       
+       proc_run('php','include/notifier.php','tgroup',$item_id);
 
 }
 
@@ -1343,7 +1447,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
        if($contact['duplex'] && $contact['dfrn-id'])
                $idtosend = '0:' . $orig_id;
        if($contact['duplex'] && $contact['issued-id'])
-               $idtosend = '1:' . $orig_id;            
+               $idtosend = '1:' . $orig_id;
 
        $rino = ((function_exists('mcrypt_encrypt')) ? 1 : 0);
 
@@ -1361,7 +1465,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
                        break;
                case SSL_POLICY_SELFSIGN:
                        $ssl_policy = 'self';
-                       break;                  
+                       break;
                case SSL_POLICY_NONE:
                default:
                        $ssl_policy = 'none';
@@ -1410,11 +1514,11 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
        if($perm) {
                if((($perm == 'rw') && (! intval($contact['writable']))) 
                || (($perm == 'r') && (intval($contact['writable'])))) {
-                       q("update contact set writable = %d where id = %d limit 1",
+                       q("update contact set writable = %d where id = %d",
                                intval(($perm == 'rw') ? 1 : 0),
                                intval($contact['id'])
                        );
-                       $contact['writable'] = (string) 1 - intval($contact['writable']);                       
+                       $contact['writable'] = (string) 1 - intval($contact['writable']);
                }
        }
 
@@ -1523,6 +1627,26 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 }
 
 
+/*
+  This function returns true if $update has an edited timestamp newer
+  than $existing, i.e. $update contains new data which should override
+  what's already there.  If there is no timestamp yet, the update is
+  assumed to be newer.  If the update has no timestamp, the existing
+  item is assumed to be up-to-date.  If the timestamps are equal it
+  assumes the update has been seen before and should be ignored.
+  */
+function edited_timestamp_is_newer($existing, $update) {
+    if (!x($existing,'edited') || !$existing['edited']) {
+        return true;
+    }
+    if (!x($update,'edited') || !$update['edited']) {
+        return false;
+    }
+    $existing_edited = datetime_convert('UTC', 'UTC', $existing['edited']);
+    $update_edited = datetime_convert('UTC', 'UTC', $update['edited']);
+    return (strcmp($existing_edited, $update_edited) < 0);
+}
+
 /**
  *
  * consume_feed - process atom feed and update anything/everything we might need to update
@@ -1558,7 +1682,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                logger('consume_feed: empty input');
                return;
        }
-               
+
        $feed = new SimplePie();
        $feed->set_raw_data($xml);
        if($datedir)
@@ -1594,7 +1718,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {
                        $name_updated = $elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated'];
                        $new_name = $elems['name'][0]['data'];
-               } 
+               }
                if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
                        $photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
                        $photo_url = $elems['link'][0]['attribs']['']['href'];
@@ -1607,7 +1731,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 
        if((is_array($contact)) && ($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $contact['avatar-date'])) {
                logger('consume_feed: Updating photo for ' . $contact['name']);
-               require_once("Photo.php");
+               require_once("include/Photo.php");
                $photo_failure = false;
                $have_photo = false;
 
@@ -1622,12 +1746,12 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                else {
                        $resource_id = photo_new_resource();
                }
-                       
+
                $img_str = fetch_url($photo_url,true);
                // guess mimetype from headers or filename
                $type = guess_image_type($photo_url,true);
-               
-               
+
+
                $img = new Photo($img_str, $type);
                if($img->is_valid()) {
                        if($have_photo) {
@@ -1637,12 +1761,12 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                        intval($contact['uid'])
                                );
                        }
-                               
+
                        $img->scaleImageSquare(175);
-                               
+
                        $hash = $resource_id;
                        $r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), 'Contact Photos', 4);
-                               
+
                        $img->scaleImage(80);
                        $r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), 'Contact Photos', 5);
 
@@ -1651,8 +1775,8 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 
                        $a = get_app();
 
-                       q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s'  
-                               WHERE `uid` = %d AND `id` = %d LIMIT 1",
+                       q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s'
+                               WHERE `uid` = %d AND `id` = %d",
                                dbesc(datetime_convert()),
                                dbesc($a->get_baseurl() . '/photo/' . $hash . '-4.'.$img->getExt()),
                                dbesc($a->get_baseurl() . '/photo/' . $hash . '-5.'.$img->getExt()),
@@ -1669,7 +1793,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                        intval($contact['id'])
                );
 
-               $x = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+               $x = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `id` = %d",
                        dbesc(notags(trim($new_name))),
                        dbesc(datetime_convert()),
                        intval($contact['uid']),
@@ -1701,7 +1825,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                         * to contain a sparkle link and perhaps a photo. 
                         *
                         */
-                        
+
                        $bdtext = sprintf( t('%s\'s birthday'), $contact['name']);
                        $bdtext2 = sprintf( t('Happy Birthday %s'), ' [url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' ) ;
 
@@ -1718,11 +1842,11 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                dbesc($bdtext2),
                                dbesc('birthday')
                        );
-                       
+
 
                        // update bdyear
 
-                       q("UPDATE `contact` SET `bdyear` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+                       q("UPDATE `contact` SET `bdyear` = '%s' WHERE `uid` = %d AND `id` = %d",
                                dbesc(substr($birthday,0,4)),
                                intval($contact['uid']),
                                intval($contact['id'])
@@ -1743,7 +1867,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                $community_page = intval($rawtags[0]['data']);
        }
        if(is_array($contact) && intval($contact['forum']) != $community_page) {
-               q("update contact set forum = %d where id = %d limit 1",
+               q("update contact set forum = %d where id = %d",
                        intval($community_page),
                        intval($contact['id'])
                );
@@ -1806,10 +1930,11 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                                                                        if(trim($tag) !== trim($xo->body))
                                                                                                $newtags[] = trim($tag);
                                                                        }
-                                                                       q("update item set tag = '%s' where id = %d limit 1",
+                                                                       q("update item set tag = '%s' where id = %d",
                                                                                dbesc(implode(',',$newtags)),
                                                                                intval($i[0]['id'])
                                                                        );
+                                                                       create_tags_from_item($i[0]['id']);
                                                                }
                                                        }
                                                }
@@ -1824,16 +1949,18 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                                        dbesc($item['uri']),
                                                        intval($importer['uid'])
                                                );
+                                               create_tags_from_itemuri($item['uri'], $importer['uid']);
                                        }
                                        else {
                                                $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
                                                        `body` = '', `title` = '' 
-                                                       WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                                       WHERE `uri` = '%s' AND `uid` = %d",
                                                        dbesc($when),
                                                        dbesc(datetime_convert()),
                                                        dbesc($uri),
                                                        intval($importer['uid'])
                                                );
+                                               create_tags_from_itemuri($uri, $importer['uid']);
                                                if($item['last-child']) {
                                                        // ensure that last-child is set in case the comment that had it just got wiped.
                                                        q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
@@ -1841,20 +1968,20 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                                                dbesc($item['parent-uri']),
                                                                intval($item['uid'])
                                                        );
-                                                       // who is the last child now? 
-                                                       $r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `moderated` = 0 AND `uid` = %d 
+                                                       // who is the last child now?
+                                                       $r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `moderated` = 0 AND `uid` = %d
                                                                ORDER BY `created` DESC LIMIT 1",
                                                                        dbesc($item['parent-uri']),
                                                                        intval($importer['uid'])
                                                        );
                                                        if(count($r)) {
-                                                               q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
+                                                               q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
                                                                        intval($r[0]['id'])
                                                                );
                                                        }
-                                               }       
+                                               }
                                        }
-                               }       
+                               }
                        }
                }
        }
@@ -1933,13 +2060,13 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                // Update content if 'updated' changes
 
                                if(count($r)) {
-                                       if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+                                       if (edited_timestamp_is_newer($r[0], $datarray)) {
 
                                                // do not accept (ignore) an earlier edit than one we currently have.
                                                if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
                                                        continue;
 
-                                               $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                               $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
                                                        dbesc($datarray['title']),
                                                        dbesc($datarray['body']),
                                                        dbesc($datarray['tag']),
@@ -1947,6 +2074,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                                        dbesc($item_id),
                                                        intval($importer['uid'])
                                                );
+                                               create_tags_from_itemuri($item_id, $importer['uid']);
                                        }
 
                                        // update last-child if it changes
@@ -1958,7 +2086,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                                        dbesc($parent_uri),
                                                        intval($importer['uid'])
                                                );
-                                               $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s'  WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                               $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s'  WHERE `uri` = '%s' AND `uid` = %d",
                                                        intval($allow[0]['data']),
                                                        dbesc(datetime_convert()),
                                                        dbesc($item_id),
@@ -1988,7 +2116,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                                dbesc($parent_uri)
                                        );
                                        if($r && count($r))
-                                               continue; 
+                                               continue;
                                }
 
                                if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
@@ -2007,10 +2135,11 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                                if($xo->id && $xo->content) {
                                                        $newtag = '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
                                                        if(! (stristr($r[0]['tag'],$newtag))) {
-                                                               q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1",
+                                                               q("UPDATE item SET tag = '%s' WHERE id = %d",
                                                                        dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . $newtag),
                                                                        intval($r[0]['id'])
                                                                );
+                                                               create_tags_from_item($r[0]['id']);
                                                        }
                                                }
                                        }
@@ -2080,13 +2209,13 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                // Update content if 'updated' changes
 
                                if(count($r)) {
-                                       if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+                                       if (edited_timestamp_is_newer($r[0], $datarray)) {  
 
                                                // do not accept (ignore) an earlier edit than one we currently have.
                                                if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
                                                        continue;
 
-                                               $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                               $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
                                                        dbesc($datarray['title']),
                                                        dbesc($datarray['body']),
                                                        dbesc($datarray['tag']),
@@ -2094,13 +2223,14 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                                        dbesc($item_id),
                                                        intval($importer['uid'])
                                                );
+                                               create_tags_from_itemuri($item_id, $importer['uid']);
                                        }
 
                                        // update last-child if it changes
 
                                        $allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
                                        if($allow && $allow[0]['data'] != $r[0]['last-child']) {
-                                               $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                               $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
                                                        intval($allow[0]['data']),
                                                        dbesc(datetime_convert()),
                                                        dbesc($item_id),
@@ -2231,7 +2361,7 @@ function local_delivery($importer,$data) {
                if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {
                        $name_updated = $elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated'];
                        $new_name = $elems['name'][0]['data'];
-               } 
+               }
                if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
                        $photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
                        $photo_url = $elems['link'][0]['attribs']['']['href'];
@@ -2240,7 +2370,7 @@ function local_delivery($importer,$data) {
 
        if(($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $importer['avatar-date'])) {
                logger('local_delivery: Updating photo for ' . $importer['name']);
-               require_once("Photo.php");
+               require_once("include/Photo.php");
                $photo_failure = false;
                $have_photo = false;
 
@@ -2255,12 +2385,12 @@ function local_delivery($importer,$data) {
                else {
                        $resource_id = photo_new_resource();
                }
-                       
+
                $img_str = fetch_url($photo_url,true);
                // guess mimetype from headers or filename
                $type = guess_image_type($photo_url,true);
-               
-               
+
+
                $img = new Photo($img_str, $type);
                if($img->is_valid()) {
                        if($have_photo) {
@@ -2270,12 +2400,12 @@ function local_delivery($importer,$data) {
                                        intval($importer['importer_uid'])
                                );
                        }
-                               
+
                        $img->scaleImageSquare(175);
-                               
+
                        $hash = $resource_id;
                        $r = $img->store($importer['importer_uid'], $importer['id'], $hash, basename($photo_url), 'Contact Photos', 4);
-                               
+
                        $img->scaleImage(80);
                        $r = $img->store($importer['importer_uid'], $importer['id'], $hash, basename($photo_url), 'Contact Photos', 5);
 
@@ -2284,8 +2414,8 @@ function local_delivery($importer,$data) {
 
                        $a = get_app();
 
-                       q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s'  
-                               WHERE `uid` = %d AND `id` = %d LIMIT 1",
+                       q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s'
+                               WHERE `uid` = %d AND `id` = %d",
                                dbesc(datetime_convert()),
                                dbesc($a->get_baseurl() . '/photo/' . $hash . '-4.'.$img->getExt()),
                                dbesc($a->get_baseurl() . '/photo/' . $hash . '-5.'.$img->getExt()),
@@ -2302,7 +2432,7 @@ function local_delivery($importer,$data) {
                        intval($importer['id'])
                );
 
-               $x = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+               $x = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `id` = %d",
                        dbesc(notags(trim($new_name))),
                        dbesc(datetime_convert()),
                        intval($importer['importer_uid']),
@@ -2343,17 +2473,17 @@ function local_delivery($importer,$data) {
                /** relocated user must have original key pair */
                /*$newloc['pubkey'] = notags(unxmlify($base['pubkey'][0]['data']));
                $newloc['prvkey'] = notags(unxmlify($base['prvkey'][0]['data']));*/
-               
+
         logger("items:relocate contact ".print_r($newloc, true).print_r($importer, true), LOGGER_DEBUG);
-        
+
         // update contact
         $r = q("SELECT photo, url FROM contact WHERE id=%d AND uid=%d;",
                     intval($importer['id']),
                                        intval($importer['importer_uid']));
-               if ($r === false) 
+               if ($r === false)
                        return 1;
         $old = $r[0];
-        
+
         $x = q("UPDATE contact SET
                         name = '%s',
                         photo = '%s',
@@ -2396,7 +2526,7 @@ function local_delivery($importer,$data) {
                        if ($x === false)
                                return 1;
                }
-               
+
                // TODO
                // merge with current record, current contents have priority
                // update record, set url-updated
@@ -2470,7 +2600,7 @@ function local_delivery($importer,$data) {
 
 
                $hash = random_string();
+
                $r = q("INSERT INTO `intro` ( `uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked` )
                        VALUES( %d, %d, %d, '%s', '%s', '%s', %d )",
                        intval($fsugg['uid']),
@@ -2524,7 +2654,7 @@ function local_delivery($importer,$data) {
                $msg['uri'] = notags(unxmlify($base['id'][0]['data']));
                $msg['parent-uri'] = notags(unxmlify($base['in-reply-to'][0]['data']));
                $msg['created'] = datetime_convert(notags(unxmlify('UTC','UTC',$base['sentdate'][0]['data'])));
-               
+
                dbesc_array($msg);
 
                $r = dbq("INSERT INTO `mail` (`" . implode("`, `", array_keys($msg)) 
@@ -2548,12 +2678,12 @@ function local_delivery($importer,$data) {
                        'verb' => ACTIVITY_POST,
                        'otype' => 'mail'
                );
-                       
+
                notification($notif_params);
                return 0;
 
                // NOTREACHED
-       }       
+       }
 
        $community_page = 0;
        $rawtags = $feed->get_feed_tags( NAMESPACE_DFRN, 'community');
@@ -2561,13 +2691,13 @@ function local_delivery($importer,$data) {
                $community_page = intval($rawtags[0]['data']);
        }
        if(intval($importer['forum']) != $community_page) {
-               q("update contact set forum = %d where id = %d limit 1",
+               q("update contact set forum = %d where id = %d",
                        intval($community_page),
                        intval($importer['id'])
                );
                $importer['forum'] = (string) $community_page;
        }
-       
+
        logger('local_delivery: feed item count = ' . $feed->get_item_quantity());
 
        // process any deleted entries
@@ -2590,7 +2720,7 @@ function local_delivery($importer,$data) {
 
                                // check for relayed deletes to our conversation
 
-                               $is_reply = false;              
+                               $is_reply = false;
                                $r = q("select * from item where uri = '%s' and uid = %d limit 1",
                                        dbesc($uri),
                                        intval($importer['importer_uid'])
@@ -2599,7 +2729,7 @@ function local_delivery($importer,$data) {
                                        $parent_uri = $r[0]['parent-uri'];
                                        if($r[0]['id'] != $r[0]['parent'])
                                                $is_reply = true;
-                               }                               
+                               }
 
                                if($is_reply) {
                                        $community = false;
@@ -2677,14 +2807,14 @@ function local_delivery($importer,$data) {
                                                        if(count($i)) {
 
                                                                // For tags, the owner cannot remove the tag on the author's copy of the post.
-                                                               
+
                                                                $owner_remove = (($item['contact-id'] == $i[0]['contact-id']) ? true: false);
                                                                $author_remove = (($item['origin'] && $item['self']) ? true : false);
-                                                               $author_copy = (($item['origin']) ? true : false); 
+                                                               $author_copy = (($item['origin']) ? true : false);
 
                                                                if($owner_remove && $author_copy)
                                                                        continue;
-                                                               if($author_remove || $owner_remove) {                                                           
+                                                               if($author_remove || $owner_remove) {
                                                                        $tags = explode(',',$i[0]['tag']);
                                                                        $newtags = array();
                                                                        if(count($tags)) {
@@ -2692,10 +2822,11 @@ function local_delivery($importer,$data) {
                                                                                        if(trim($tag) !== trim($xo->body))
                                                                                                $newtags[] = trim($tag);
                                                                        }
-                                                                       q("update item set tag = '%s' where id = %d limit 1",
+                                                                       q("update item set tag = '%s' where id = %d",
                                                                                dbesc(implode(',',$newtags)),
                                                                                intval($i[0]['id'])
                                                                        );
+                                                                       create_tags_from_item($i[0]['id']);
                                                                }
                                                        }
                                                }
@@ -2710,16 +2841,18 @@ function local_delivery($importer,$data) {
                                                        dbesc($item['uri']),
                                                        intval($importer['importer_uid'])
                                                );
+                                               create_tags_from_itemuri($item['uri'], $importer['importer_uid']);
                                        }
                                        else {
                                                $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
                                                        `body` = '', `title` = ''
-                                                       WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                                       WHERE `uri` = '%s' AND `uid` = %d",
                                                        dbesc($when),
                                                        dbesc(datetime_convert()),
                                                        dbesc($uri),
                                                        intval($importer['importer_uid'])
                                                );
+                                               create_tags_from_itemuri($uri, $importer['importer_uid']);
                                                if($item['last-child']) {
                                                        // ensure that last-child is set in case the comment that had it just got wiped.
                                                        q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
@@ -2727,17 +2860,17 @@ function local_delivery($importer,$data) {
                                                                dbesc($item['parent-uri']),
                                                                intval($item['uid'])
                                                        );
-                                                       // who is the last child now? 
+                                                       // who is the last child now?
                                                        $r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d
                                                                ORDER BY `created` DESC LIMIT 1",
                                                                        dbesc($item['parent-uri']),
                                                                        intval($importer['importer_uid'])
                                                        );
                                                        if(count($r)) {
-                                                               q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
+                                                               q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
                                                                        intval($r[0]['id'])
                                                                );
-                                                       }       
+                                                       }
                                                }
                                                // if this is a relayed delete, propagate it to other recipients
 
@@ -2770,13 +2903,13 @@ function local_delivery($importer,$data) {
                        }
                        else
                                $sql_extra = " and contact.self = 1 and item.wall = 1 ";
-                       // was the top-level post for this reply written by somebody on this site? 
-                       // Specifically, the recipient? 
+
+                       // was the top-level post for this reply written by somebody on this site?
+                       // Specifically, the recipient?
 
                        $is_a_remote_comment = false;
                        $top_uri = $parent_uri;
-                       
+
                        $r = q("select `item`.`parent-uri` from `item`
                                WHERE `item`.`uri` = '%s'
                                LIMIT 1",
@@ -2786,11 +2919,11 @@ function local_delivery($importer,$data) {
                                $top_uri = $r[0]['parent-uri'];
 
                                // POSSIBLE CLEANUP --> Why select so many fields when only forum_mode and wall are used?
-                               $r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `item`.`forum_mode`,`item`.`origin`,`item`.`wall`, 
-                                       `contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` 
-                                       LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` 
+                               $r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `item`.`forum_mode`,`item`.`origin`,`item`.`wall`,
+                                       `contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item`
+                                       LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                                        WHERE `item`.`uri` = '%s' AND (`item`.`parent-uri` = '%s' or `item`.`thr-parent` = '%s')
-                                       AND `item`.`uid` = %d 
+                                       AND `item`.`uid` = %d
                                        $sql_extra
                                        LIMIT 1",
                                        dbesc($top_uri),
@@ -2830,14 +2963,14 @@ function local_delivery($importer,$data) {
 
                                if(count($r)) {
                                        $iid = $r[0]['id'];
-                                       if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {
-                                       
+                                       if (edited_timestamp_is_newer($r[0], $datarray)) {
+
                                                // do not accept (ignore) an earlier edit than one we currently have.
                                                if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
                                                        continue;
-  
+
                                                logger('received updated comment' , LOGGER_DEBUG);
-                                               $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                               $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
                                                        dbesc($datarray['title']),
                                                        dbesc($datarray['body']),
                                                        dbesc($datarray['tag']),
@@ -2845,6 +2978,7 @@ function local_delivery($importer,$data) {
                                                        dbesc($item_id),
                                                        intval($importer['importer_uid'])
                                                );
+                                               create_tags_from_itemuri($item_id, $importer['importer_uid']);
 
                                                proc_run('php',"include/notifier.php","comment-import",$iid);
 
@@ -2881,14 +3015,14 @@ function local_delivery($importer,$data) {
                                                dbesc($datarray['verb']),
                                                dbesc($datarray['parent-uri']),
                                                dbesc($datarray['parent-uri'])
-               
+
                                        );
                                        if($r && count($r))
-                                               continue; 
+                                               continue;
                                }
 
                                if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
-                                       
+
                                        $xo = parse_xml_string($datarray['object'],false);
                                        $xt = parse_xml_string($datarray['target'],false);
 
@@ -2901,9 +3035,9 @@ function local_delivery($importer,$data) {
                                                        intval($importer['importer_uid'])
                                                );
                                                if(! count($tagp))
-                                                       continue;       
+                                                       continue;
 
-                                               // extract tag, if not duplicate, and this user allows tags, add to parent item                                         
+                                               // extract tag, if not duplicate, and this user allows tags, add to parent item
 
                                                if($xo->id && $xo->content) {
                                                        $newtag = '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
@@ -2912,14 +3046,15 @@ function local_delivery($importer,$data) {
                                                                        intval($importer['importer_uid'])
                                                                );
                                                                if(count($i) && ! intval($i[0]['blocktags'])) {
-                                                                       q("UPDATE item SET tag = '%s', `edited` = '%s' WHERE id = %d LIMIT 1",
+                                                                       q("UPDATE item SET tag = '%s', `edited` = '%s' WHERE id = %d",
                                                                                dbesc($tagp[0]['tag'] . (strlen($tagp[0]['tag']) ? ',' : '') . $newtag),
                                                                                intval($tagp[0]['id']),
                                                                                dbesc(datetime_convert())
                                                                        );
+                                                                       create_tags_from_item($tagp[0]['id']);
                                                                }
                                                        }
-                                               }                                                                                                       
+                                               }
                                        }
                                }
 
@@ -2936,7 +3071,7 @@ function local_delivery($importer,$data) {
                                                $parent = $r[0]['parent'];
                                                $parent_uri = $r[0]['parent-uri'];
                                        }
-                       
+
                                        if(! $is_like) {
                                                $r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
                                                        dbesc(datetime_convert()),
@@ -2944,7 +3079,7 @@ function local_delivery($importer,$data) {
                                                        intval($r[0]['parent'])
                                                );
 
-                                               $r2 = q("UPDATE `item` SET `last-child` = 1, `changed` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+                                               $r2 = q("UPDATE `item` SET `last-child` = 1, `changed` = '%s' WHERE `uid` = %d AND `id` = %d",
                                                        dbesc(datetime_convert()),
                                                        intval($importer['importer_uid']),
                                                        intval($posted_id)
@@ -2954,7 +3089,7 @@ function local_delivery($importer,$data) {
                                        if($posted_id && $parent) {
 
                                                proc_run('php',"include/notifier.php","comment-import","$posted_id");
-                                       
+
                                                if((! $is_like) && (! $importer['self'])) {
 
                                                        require_once('include/enotify.php');
@@ -3003,13 +3138,13 @@ function local_delivery($importer,$data) {
                                // Update content if 'updated' changes
 
                                if(count($r)) {
-                                       if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+                                       if (edited_timestamp_is_newer($r[0], $datarray)) {
 
                                                // do not accept (ignore) an earlier edit than one we currently have.
                                                if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
                                                        continue;
 
-                                               $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                               $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
                                                        dbesc($datarray['title']),
                                                        dbesc($datarray['body']),
                                                        dbesc($datarray['tag']),
@@ -3017,6 +3152,7 @@ function local_delivery($importer,$data) {
                                                        dbesc($item_id),
                                                        intval($importer['importer_uid'])
                                                );
+                                               create_tags_from_itemuri($item_id, $importer['importer_uid']);
                                        }
 
                                        // update last-child if it changes
@@ -3028,7 +3164,7 @@ function local_delivery($importer,$data) {
                                                        dbesc($parent_uri),
                                                        intval($importer['importer_uid'])
                                                );
-                                               $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s'  WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                               $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s'  WHERE `uri` = '%s' AND `uid` = %d",
                                                        intval($allow[0]['data']),
                                                        dbesc(datetime_convert()),
                                                        dbesc($item_id),
@@ -3053,7 +3189,7 @@ function local_delivery($importer,$data) {
                                                dbesc($parent_uri)
                                        );
                                        if($r && count($r))
-                                               continue; 
+                                               continue;
 
                                }
 
@@ -3068,24 +3204,25 @@ function local_delivery($importer,$data) {
                                                        intval($importer['importer_uid'])
                                                );
                                                if(! count($r))
-                                                       continue;                               
+                                                       continue;
 
-                                               // extract tag, if not duplicate, add to parent item                                            
+                                               // extract tag, if not duplicate, add to parent item
                                                if($xo->content) {
                                                        if(! (stristr($r[0]['tag'],trim($xo->content)))) {
-                                                               q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1",
+                                                               q("UPDATE item SET tag = '%s' WHERE id = %d",
                                                                        dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
                                                                        intval($r[0]['id'])
                                                                );
+                                                               create_tags_from_item($r[0]['id']);
                                                        }
-                                               }                                                                                                       
+                                               }
                                        }
                                }
 
                                $posted_id = item_store($datarray);
 
                                // find out if our user is involved in this conversation and wants to be notified.
-                       
+
                                if(!x($datarray['type']) || $datarray['type'] != 'activity') {
 
                                        $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
@@ -3099,11 +3236,11 @@ function local_delivery($importer,$data) {
                                                // first make sure this isn't our own post coming back to us from a wall-to-wall event
                                                if(! link_compare($datarray['author-link'],$importer_url)) {
 
-                                                       
+
                                                        foreach($myconv as $conv) {
 
                                                                // now if we find a match, it means we're in this conversation
-       
+
                                                                if(! link_compare($conv['author-link'],$importer_url))
                                                                        continue;
 
@@ -3177,13 +3314,13 @@ function local_delivery($importer,$data) {
                        // Update content if 'updated' changes
 
                        if(count($r)) {
-                               if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+                               if (edited_timestamp_is_newer($r[0], $datarray)) {
 
                                        // do not accept (ignore) an earlier edit than one we currently have.
                                        if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
                                                continue;
 
-                                       $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                       $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
                                                dbesc($datarray['title']),
                                                dbesc($datarray['body']),
                                                dbesc($datarray['tag']),
@@ -3191,13 +3328,14 @@ function local_delivery($importer,$data) {
                                                dbesc($item_id),
                                                intval($importer['importer_uid'])
                                        );
+                                       create_tags_from_itemuri($item_id, $importer['importer_uid']);
                                }
 
                                // update last-child if it changes
 
                                $allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
                                if($allow && $allow[0]['data'] != $r[0]['last-child']) {
-                                       $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                       $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
                                                intval($allow[0]['data']),
                                                dbesc(datetime_convert()),
                                                dbesc($item_id),
@@ -3305,7 +3443,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
        if(is_array($contact)) {
                if(($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING)
                        || ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) {
-                       $r = q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       $r = q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
                                intval(CONTACT_IS_FRIEND),
                                intval($contact['id']),
                                intval($importer['uid'])
@@ -3314,7 +3452,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
                // send email notification to owner?
        }
        else {
-       
+
                // create contact record
 
                $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`, 
@@ -3337,7 +3475,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
                if(count($r))
                                $contact_record = $r[0];
 
-               // create notification  
+               // create notification
                $hash = random_string();
 
                if(is_array($contact_record)) {
@@ -3370,12 +3508,12 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
                                        '$sitename' => $a->config['sitename']
                                ));
                                $res = mail($r[0]['email'], 
-                                       (($sharing) ? t('A new person is sharing with you at ') : t("You have a new follower at ")) . $a->config['sitename'],
+                                       email_header_encode((($sharing) ? t('A new person is sharing with you at ') : t("You have a new follower at ")) . $a->config['sitename'],'UTF-8'),
                                        $email,
-                                       'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+                                       'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
                                        . 'Content-type: text/plain; charset=UTF-8' . "\n"
                                        . 'Content-transfer-encoding: 8bit' );
-                       
+
                        }
                }
        }
@@ -3384,7 +3522,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
 function lose_follower($importer,$contact,$datarray,$item) {
 
        if(($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) {
-               q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d LIMIT 1",
+               q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d",
                        intval(CONTACT_IS_SHARING),
                        intval($contact['id'])
                );
@@ -3397,7 +3535,7 @@ function lose_follower($importer,$contact,$datarray,$item) {
 function lose_sharer($importer,$contact,$datarray,$item) {
 
        if(($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) {
-               q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d LIMIT 1",
+               q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d",
                        intval(CONTACT_IS_FOLLOWER),
                        intval($contact['id'])
                );
@@ -3436,7 +3574,7 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
        logger('subscribe_to_hub: ' . $hubmode . ' ' . $contact['name'] . ' to hub ' . $url . ' endpoint: '  . $push_url . ' with verifier ' . $verify_token);
 
        if(! strlen($contact['hub-verify'])) {
-               $r = q("UPDATE `contact` SET `hub-verify` = '%s' WHERE `id` = %d LIMIT 1",
+               $r = q("UPDATE `contact` SET `hub-verify` = '%s' WHERE `id` = %d",
                        dbesc($verify_token),
                        intval($contact['id'])
                );
@@ -3445,7 +3583,7 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
        post_url($url,$params);
 
        logger('subscribe_to_hub: returns: ' . $a->get_curl_code(), LOGGER_DEBUG);
-                       
+
        return;
 
 }
@@ -3571,9 +3709,13 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
 }
 
 function fix_private_photos($s, $uid, $item = null, $cid = 0) {
+
+       if(get_config('system','disable_embedded'))
+               return $s;
+
        $a = get_app();
 
-       logger('fix_private_photos', LOGGER_DEBUG);
+       logger('fix_private_photos: check for photos', LOGGER_DEBUG);
        $site = substr($a->get_baseurl(),strpos($a->get_baseurl(),'://'));
 
        $orig_body = $s;
@@ -3594,7 +3736,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
                        // Only embed locally hosted photos
                        $replace = false;
                        $i = basename($image);
-                       $i = str_replace(array('.jpg','.png'),array('',''),$i);
+                       $i = str_replace(array('.jpg','.png','.gif'),array('','',''),$i);
                        $x = strpos($i,'-');
 
                        if($x) {
@@ -3605,7 +3747,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
                                        intval($res),
                                        intval($uid)
                                );
-                               if(count($r)) {
+                               if($r) {
 
                                        // Check to see if we should replace this photo link with an embedded image
                                        // 1. No need to do so if the photo is public
@@ -3732,11 +3874,11 @@ function item_getfeedtags($item) {
 
 function item_getfeedattach($item) {
        $ret = '';
-       $arr = explode(',',$item['attach']);
+       $arr = explode('[/attach],',$item['attach']);
        if(count($arr)) {
                foreach($arr as $r) {
                        $matches = false;
-                       $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches);
+                       $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches);
                        if($cnt) {
                                $ret .= '<link rel="enclosure" href="' . xmlify($matches[1]) . '" type="' . xmlify($matches[3]) . '" ';
                                if(intval($matches[2]))
@@ -3778,16 +3920,16 @@ function item_expire($uid,$days) {
 
        $expire_items = get_pconfig($uid, 'expire','items');
        $expire_items = (($expire_items===false)?1:intval($expire_items)); // default if not set: 1
-       
+
        $expire_notes = get_pconfig($uid, 'expire','notes');
        $expire_notes = (($expire_notes===false)?1:intval($expire_notes)); // default if not set: 1
 
        $expire_starred = get_pconfig($uid, 'expire','starred');
        $expire_starred = (($expire_starred===false)?1:intval($expire_starred)); // default if not set: 1
-       
+
        $expire_photos = get_pconfig($uid, 'expire','photos');
        $expire_photos = (($expire_photos===false)?0:intval($expire_photos)); // default if not set: 0
+
        logger('expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
 
        foreach($r as $item) {
@@ -3874,14 +4016,43 @@ function drop_item($id,$interactive = true) {
 
        if((local_user() == $item['uid']) || ($cid) || (! $interactive)) {
 
+               // Check if we should do HTML-based delete confirmation
+               if($_REQUEST['confirm']) {
+                       // <form> can't take arguments in its "action" parameter
+                       // so add any arguments as hidden inputs
+                       $query = explode_querystring($a->query_string);
+                       $inputs = array();
+                       foreach($query['args'] as $arg) {
+                               if(strpos($arg, 'confirm=') === false) {
+                                       $arg_parts = explode('=', $arg);
+                                       $inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
+                               }
+                       }
+
+                       return replace_macros(get_markup_template('confirm.tpl'), array(
+                               '$method' => 'get',
+                               '$message' => t('Do you really want to delete this item?'),
+                               '$extra_inputs' => $inputs,
+                               '$confirm' => t('Yes'),
+                               '$confirm_url' => $query['base'],
+                               '$confirm_name' => 'confirmed',
+                               '$cancel' => t('Cancel'),
+                       ));
+               }
+               // Now check how the user responded to the confirmation query
+               if($_REQUEST['canceled']) {
+                       goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+               }
+
                logger('delete item: ' . $item['id'], LOGGER_DEBUG);
                // delete the item
 
-               $r = q("UPDATE `item` SET `deleted` = 1, `title` = '', `body` = '', `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
+               $r = q("UPDATE `item` SET `deleted` = 1, `title` = '', `body` = '', `edited` = '%s', `changed` = '%s' WHERE `id` = %d",
                        dbesc(datetime_convert()),
                        dbesc(datetime_convert()),
                        intval($item['id'])
                );
+               create_tags_from_item($item['id']);
 
                // clean up categories and tags so they don't end up as orphans
 
@@ -3918,7 +4089,7 @@ function drop_item($id,$interactive = true) {
                // If item is a link to an event, nuke the event record.
 
                if(intval($item['event-id'])) {
-                       q("DELETE FROM `event` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       q("DELETE FROM `event` WHERE `id` = %d AND `uid` = %d",
                                intval($item['event-id']),
                                intval($item['uid'])
                        );
@@ -3927,6 +4098,9 @@ function drop_item($id,$interactive = true) {
 
                // clean up item_id and sign meta-data tables
 
+               /*
+               // Old code - caused very long queries and warning entries in the mysql logfiles:
+
                $r = q("DELETE FROM item_id where iid in (select id from item where parent = %d and uid = %d)",
                        intval($item['id']),
                        intval($item['uid'])
@@ -3936,6 +4110,31 @@ function drop_item($id,$interactive = true) {
                        intval($item['id']),
                        intval($item['uid'])
                );
+               */
+
+               // The new code splits the queries since the mysql optimizer really has bad problems with subqueries
+
+               // Creating list of parents
+               $r = q("select id from item where parent = %d and uid = %d",
+                       intval($item['id']),
+                       intval($item['uid'])
+               );
+
+               $parentid = "";
+
+               foreach ($r AS $row) {
+                       if ($parentid != "")
+                               $parentid .= ", ";
+
+                       $parentid .= $row["id"];
+               }
+
+               // Now delete them
+               if ($parentid != "") {
+                       $r = q("DELETE FROM item_id where iid in (%s)", dbesc($parentid));
+
+                       $r = q("DELETE FROM sign where iid in (%s)", dbesc($parentid));
+               }
 
                // If it's the parent of a comment thread, kill all the kids
 
@@ -3947,6 +4146,7 @@ function drop_item($id,$interactive = true) {
                                dbesc($item['parent-uri']),
                                intval($item['uid'])
                        );
+                       create_tags_from_item($item['parent-uri'], $item['uid']);
                        // ignore the result
                }
                else {
@@ -3956,13 +4156,13 @@ function drop_item($id,$interactive = true) {
                                dbesc($item['parent-uri']),
                                intval($item['uid'])
                        );
-                       // who is the last child now? 
+                       // who is the last child now?
                        $r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d ORDER BY `edited` DESC LIMIT 1",
                                dbesc($item['parent-uri']),
                                intval($item['uid'])
                        );
                        if(count($r)) {
-                               q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
+                               q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
                                        intval($r[0]['id'])
                                );
                        }
@@ -3988,7 +4188,7 @@ function drop_item($id,$interactive = true) {
                goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
                //NOTREACHED
        }
-       
+
 }