]> git.mxchange.org Git - friendica.git/blobdiff - mod/item.php
Merge commit 'mike/master'
[friendica.git] / mod / item.php
index cc743b77fbbe54d33169f61c2e1194b40fd33753..8c6b181c0d557dfdbd4631e45fb09359d0375877 100644 (file)
@@ -1,5 +1,18 @@
 <?php
 
+/**
+ *
+ * This is the POST destination for most all locally posted
+ * text stuff. This function handles status, wall-to-wall status, 
+ * local comments, and remote coments - that are posted on this site 
+ * (as opposed to being delivered in a feed).
+ * All of these become an "item" which is our basic unit of 
+ * information.
+ * Posts that originate externally or do not fall into the above 
+ * posting categories go through item_store() instead of this function. 
+ *
+ */  
+
 function item_post(&$a) {
 
        if((! local_user()) && (! remote_user()))
@@ -7,12 +20,14 @@ function item_post(&$a) {
 
        require_once('include/security.php');
 
-       $uid = $_SESSION['uid'];
+       $uid = local_user();
 
+       call_hooks('post_local_start', $_POST);
 
        $parent = ((x($_POST,'parent')) ? intval($_POST['parent']) : 0);
 
        $parent_item = null;
+       $parent_contact = null;
 
        if($parent) {
                $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
@@ -20,176 +35,487 @@ function item_post(&$a) {
                );
                if(! count($r)) {
                        notice( t('Unable to locate original post.') . EOL);
-                       goaway($a->get_baseurl() . "/" . $_POST['return'] );
+                       if(x($_POST,'return')) 
+                               goaway($a->get_baseurl() . "/" . $_POST['return'] );
+                       killme();
                }
                $parent_item = $r[0];
+               if($parent_item['contact-id'] && $uid) {
+                       $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                               intval($parent_item['contact-id']),
+                               intval($uid)
+                       );
+                       if(count($r))
+                               $parent_contact = $r[0];
+               }
        }
 
        $profile_uid = ((x($_POST,'profile_uid')) ? intval($_POST['profile_uid']) : 0);
 
+
        if(! can_write_wall($a,$profile_uid)) {
-               notice("Permission denied." . EOL) ;
-               return;
-       }
-       
-       $str_group_allow = '';
-       $group_allow = $_POST['group_allow'];
-       if(is_array($group_allow)) {
-               array_walk($group_allow,'sanitise_acl');
-               $str_group_allow = implode('',$group_allow);
+               notice( t('Permission denied.') . EOL) ;
+               if(x($_POST,'return')) 
+                       goaway($a->get_baseurl() . "/" . $_POST['return'] );
+               killme();
        }
 
-       $str_contact_allow = '';
-       $contact_allow = $_POST['contact_allow'];
-       if(is_array($contact_allow)) {
-               array_walk($contact_allow,'sanitise_acl');
-               $str_contact_allow = implode('',$contact_allow);
-       }
+       $user = null;
 
-       $str_group_deny = '';
-       $group_deny = $_POST['group_deny'];
-       if(is_array($group_deny)) {
-               array_walk($group_deny,'sanitise_acl');
-               $str_group_deny = implode('',$group_deny);
-       }
+       $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+               intval($profile_uid)
+       );
+       if(count($r))
+               $user = $r[0];
+       
 
-       $str_contact_deny = '';
-       $contact_deny = $_POST['contact_deny'];
-       if(is_array($contact_deny)) {
-               array_walk($contact_deny,'sanitise_acl');
-               $str_contact_deny = implode('',$contact_deny);
+       $str_group_allow   = perms2str($_POST['group_allow']);
+       $str_contact_allow = perms2str($_POST['contact_allow']);
+       $str_group_deny    = perms2str($_POST['group_deny']);
+       $str_contact_deny  = perms2str($_POST['contact_deny']);
+
+       $private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
+
+       if(($parent_item) && 
+               (($parent_item['private']) 
+                       || strlen($parent_item['allow_cid']) 
+                       || strlen($parent_item['allow_gid']) 
+                       || strlen($parent_item['deny_cid']) 
+                       || strlen($parent_item['deny_gid'])
+               )
+       ) {
+               $private = 1;
        }
 
-       $title = notags(trim($_POST['title']));
-       $body = escape_tags(trim($_POST['body']));
+       $title             = notags(trim($_POST['title']));
+       $body              = escape_tags(trim($_POST['body']));
+       $location          = notags(trim($_POST['location']));
+       $coord             = notags(trim($_POST['coord']));
+       $verb              = notags(trim($_POST['verb']));
+       $emailcc           = notags(trim($_POST['emailcc']));
 
        if(! strlen($body)) {
                notice( t('Empty post discarded.') . EOL );
-               goaway($a->get_baseurl() . "/" . $_POST['return'] );
-
+               if(x($_POST,'return')) 
+                       goaway($a->get_baseurl() . "/" . $_POST['return'] );
+               killme();
        }
 
        // get contact info for poster
 
-       if((x($_SESSION,'visitor_id')) && (intval($_SESSION['visitor_id']))) {
-               $contact_id = $_SESSION['visitor_id'];
+       $author = null;
+       $self   = false;
+
+       if(($_SESSION['uid']) && ($_SESSION['uid'] == $profile_uid)) {
+               $self = true;
+               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+                       intval($_SESSION['uid'])
+               );
        }
        else {
-               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
-                       intval($_SESSION['uid']));
-               if(count($r))
-                       $contact_id = $r[0]['id'];
+               if((x($_SESSION,'visitor_id')) && (intval($_SESSION['visitor_id']))) {
+                       $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+                               intval($_SESSION['visitor_id'])
+                       );
+               }
+       }
+
+       if(count($r)) {
+               $author = $r[0];
+               $contact_id = $author['id'];
        }
 
        // get contact info for owner
        
-       $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
-               intval($profile_uid)
-       );
-       if(count($r))
-               $contact_record = $r[0];
+       if($profile_uid == $_SESSION['uid']) {
+               $contact_record = $author;
+       }
+       else {
+               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+                       intval($profile_uid)
+               );
+               if(count($r))
+                       $contact_record = $r[0];
+       }
 
-       $post_type == notags(trim($_POST['type']));
+       $post_type = notags(trim($_POST['type']));
 
-       if($post_type == 'net-comment') {
+       if($post_type === 'net-comment') {
                if($parent_item !== null) {
-                       if($parent_item['type'] == 'remote')
+                       if($parent_item['type'] === 'remote') {
                                $post_type = 'remote-comment';
-                       else            
+                       } 
+                       else {          
                                $post_type = 'wall-comment';
+                       }
                }
        }
 
-       $notify_type = (($parent) ? 'comment-new' : 'wall-new' );
 
-       if(($_POST['type'] == 'wall') || ($_POST['type'] == 'wall-comment') || ($_POST['type'] == 'net-comment')) {
+       /**
+        *
+        * When a photo was uploaded into the message using the (profile wall) ajax 
+        * uploader, The permissions are initially set to disallow anybody but the
+        * owner from seeing it. This is because the permissions may not yet have been
+        * set for the post. If it's private, the photo permissions should be set
+        * appropriately. But we didn't know the final permissions on the post until
+        * now. So now we'll look for links of uploaded messages that are in the
+        * post and set them to the same permissions as the post itself.
+        *
+        */
+
+       $match = null;
+
+       if(preg_match_all("/\[img\](.+?)\[\/img\]/",$body,$match)) {
+               $images = $match[1];
+               if(count($images)) {
+                       foreach($images as $image) {
+                               if(! stristr($image,$a->get_baseurl() . '/photo/'))
+                                       continue;
+                               $image_uri = substr($image,strrpos($image,'/') + 1);
+                               $image_uri = substr($image_uri,0, strpos($image_uri,'-'));
+                               $r = q("UPDATE `photo` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
+                                       WHERE `resource-id` = '%s' AND `album` = '%s' ",
+                                       dbesc($str_contact_allow),
+                                       dbesc($str_group_allow),
+                                       dbesc($str_contact_deny),
+                                       dbesc($str_group_deny),
+                                       dbesc($image_uri),
+                                       dbesc( t('Wall Photos'))
+                               );
+                       }
+               }
+       }
 
-               do {
-                       $dups = false;
-                       $hash = random_string();
+       /**
+        * Fold multi-line [code] sequences
+        */
 
-                       $uri = "urn:X-dfrn:" . $a->get_hostname() . ':' . $profile_uid . ':' . $hash;
+       $body = preg_replace('/\[\/code\]\s*\[code\]/m',"\n",$body); 
 
-                       $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
-                       dbesc($uri));
-                       if(count($r))
-                               $dups = true;
-               } while($dups == true);
-
-
-               $r = q("INSERT INTO `item` (`uid`,`type`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, `created`,
-                       `edited`, `uri`, `title`, `body`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`)
-                       VALUES( %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
-                       intval($profile_uid),
-                       dbesc($_POST['type']),
-                       intval($contact_id),
-                       dbesc($contact_record['name']),
-                       dbesc($contact_record['url']),
-                       dbesc($contact_record['thumb']),
-                       datetime_convert(),
-                       datetime_convert(),
-                       dbesc($uri),
-                       dbesc($title),
-                       dbesc($body),
-                       dbesc($str_contact_allow),
-                       dbesc($str_group_allow),
-                       dbesc($str_contact_deny),
-                       dbesc($str_group_deny)
+       /**
+        * Look for any tags and linkify them
+        */
 
-               );
-               $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
-                       dbesc($uri));
-               if(count($r)) {
-                       $post_id = $r[0]['id'];
+       $str_tags = '';
+       $inform   = '';
 
-                       if($parent) {
 
-                               // This item is the last leaf and gets the comment box, clear any ancestors
-                               $r = q("UPDATE `item` SET `last-child` = 0 WHERE `parent` = %d ",
-                                       intval($parent)
-                               );
+       $tags = get_tags($body);
 
-                               // Inherit ACL's from the parent item.
-                               // TODO merge with subsequent UPDATE operation and save a db write 
+       if(($parent_contact) && ($parent_contact['network'] === 'stat') && ($parent_contact['nick']) && (! in_array('@' . $parent_contact['nick'],$tags))) {
+               $body = '@' . $parent_contact['nick'] . ' ' . $body;
+               $tags[] = '@' . $parent_contact['nick'];
+       }               
 
-                               $r = q("UPDATE `item` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
-                                       WHERE `id` = %d LIMIT 1",
-                                       dbesc($parent_item['allow_cid']),
-                                       dbesc($parent_item['allow_gid']),
-                                       dbesc($parent_item['deny_cid']),
-                                       dbesc($parent_item['deny_gid']),
-                                       intval($post_id)
-                               );
+       if(count($tags)) {
+               foreach($tags as $tag) {
+                       if(strpos($tag,'#') === 0) {
+                               $basetag = str_replace('_',' ',substr($tag,1));
+                               $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
+                               if(strlen($str_tags))
+                                       $str_tags .= ',';
+                               $str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+                               continue;
                        }
-                       else {
-                               $parent = $post_id;
+                       if(strpos($tag,'@') === 0) {
+                               $stat = false;
+                               $name = substr($tag,1);
+                               if((strpos($name,'@')) || (strpos($name,'http://'))) {
+                                       $newname = $name;
+                                       $links = @lrdd($name);
+                                       if(count($links)) {
+                                               foreach($links as $link) {
+                                                       if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
+                                       $profile = $link['@attributes']['href'];
+                                                       if($link['@attributes']['rel'] === 'salmon') {
+                                                               if(strlen($inform))
+                                                                       $inform .= ',';
+                                       $inform .= 'url:' . str_replace(',','%2c',$link['@attributes']['href']);
+                                                       }
+                                               }
+                                       }
+                               }
+                               else {
+                                       $newname = $name;
+                                       if(strstr($name,'_')) {
+                                               $newname = str_replace('_',' ',$name);
+                                               $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
+                                                       dbesc($newname),
+                                                       intval($profile_uid)
+                                               );
+                                       }
+                                       else {
+                                               $r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
+                                                       dbesc($name),
+                                                       intval($profile_uid)
+                                               );
+                                       }
+                                       if(count($r)) {
+                                               $profile = $r[0]['url'];
+                                               if($r[0]['network'] === 'stat') {
+                                                       $newname = $r[0]['nick'];
+                                                       $stat = true;
+                                               }
+                                               else
+                                                       $newname = $r[0]['name'];
+                                               if(strlen($inform))
+                                                       $inform .= ',';
+                                               $inform .= 'cid:' . $r[0]['id'];
+                                       }
+                               }
+                               if($profile) {
+                                       $body = str_replace('@' . $name, '@' . '[url=' . $profile . ']' . $newname      . '[/url]', $body);
+                                       $profile = str_replace(',','%2c',$profile);
+                                       if(strlen($str_tags))
+                                               $str_tags .= ',';
+                                       $str_tags .= '@[url=' . $profile . ']' . $newname       . '[/url]';
+                               }
                        }
+               }
+       }
+
 
-                       $r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `last-child` = 1, `visible` = 1
+
+       $wall = 0;
+       if($post_type === 'wall' || $post_type === 'wall-comment')
+               $wall = 1;
+
+       if(! strlen($verb))
+               $verb = ACTIVITY_POST ;
+
+       $gravity = (($parent) ? 6 : 0 );
+       $notify_type = (($parent) ? 'comment-new' : 'wall-new' );
+
+       $uri = item_new_uri($a->get_hostname(),$profile_uid);
+
+       $datarray = array();
+       $datarray['uid']           = $profile_uid;
+       $datarray['type']          = $post_type;
+       $datarray['wall']          = $wall;
+       $datarray['gravity']       = $gravity;
+       $datarray['contact-id']    = $contact_id;
+       $datarray['owner-name']    = $contact_record['name'];
+       $datarray['owner-link']    = $contact_record['url'];
+       $datarray['owner-avatar']  = $contact_record['thumb'];
+       $datarray['author-name']   = $author['name'];
+       $datarray['author-link']   = $author['url'];
+       $datarray['author-avatar'] = $author['thumb'];
+       $datarray['created']       = datetime_convert();
+       $datarray['edited']        = datetime_convert();
+       $datarray['changed']       = datetime_convert();
+       $datarray['uri']           = $uri;
+       $datarray['title']         = $title;
+       $datarray['body']          = $body;
+       $datarray['location']      = $location;
+       $datarray['coord']         = $coord;
+       $datarray['tag']           = $str_tags;
+       $datarray['inform']        = $inform;
+       $datarray['verb']          = $verb;
+       $datarray['allow_cid']     = $str_contact_allow;
+       $datarray['allow_gid']     = $str_group_allow;
+       $datarray['deny_cid']      = $str_contact_deny;
+       $datarray['deny_gid']      = $str_group_deny;
+       $datarray['private']       = $private;
+
+       /**
+        * These fields are for the convenience of plugins...
+        * 'self' if true indicates the owner is posting on their own wall
+        * If parent is 0 it is a top-level post.
+        */
+
+       $datarray['parent']        = $parent;
+       $datarray['self']          = $self;
+
+
+       call_hooks('post_local',$datarray);
+
+       $r = q("INSERT INTO `item` (`uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, 
+               `author-name`, `author-link`, `author-avatar`, `created`, `edited`, `changed`, `uri`, `title`, `body`, `location`, `coord`, 
+               `tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private` )
+               VALUES( %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d )",
+               intval($datarray['uid']),
+               dbesc($datarray['type']),
+               intval($datarray['wall']),
+               intval($datarray['gravity']),
+               intval($datarray['contact-id']),
+               dbesc($datarray['owner-name']),
+               dbesc($datarray['owner-link']),
+               dbesc($datarray['owner-avatar']),
+               dbesc($datarray['author-name']),
+               dbesc($datarray['author-link']),
+               dbesc($datarray['author-avatar']),
+               dbesc($datarray['created']),
+               dbesc($datarray['edited']),
+               dbesc($datarray['changed']),
+               dbesc($datarray['uri']),
+               dbesc($datarray['title']),
+               dbesc($datarray['body']),
+               dbesc($datarray['location']),
+               dbesc($datarray['coord']),
+               dbesc($datarray['tag']),
+               dbesc($datarray['inform']),
+               dbesc($datarray['verb']),
+               dbesc($datarray['allow_cid']),
+               dbesc($datarray['allow_gid']),
+               dbesc($datarray['deny_cid']),
+               dbesc($datarray['deny_gid']),
+               intval($datarray['private'])
+       );
+
+       $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
+               dbesc($datarray['uri']));
+       if(count($r)) {
+               $post_id = $r[0]['id'];
+               logger('mod_item: saved item ' . $post_id);
+
+               if($parent) {
+
+                       // This item is the last leaf and gets the comment box, clear any ancestors
+                       $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent` = %d ",
+                               dbesc(datetime_convert()),
+                               intval($parent)
+                       );
+
+                       // Inherit ACL's from the parent item.
+
+                       $r = q("UPDATE `item` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `private` = %d
                                WHERE `id` = %d LIMIT 1",
-                               intval($parent),
-                               dbesc(($parent == $post_id) ? $uri : $parent_item['uri']),
+                               dbesc($parent_item['allow_cid']),
+                               dbesc($parent_item['allow_gid']),
+                               dbesc($parent_item['deny_cid']),
+                               dbesc($parent_item['deny_gid']),
+                               intval($parent_item['private']),
                                intval($post_id)
                        );
-                       // photo comments turn the corresponding item visible to the profile wall
-                       if(! $parent_item['visible']) {
-                               $r = q("UPDATE `item` SET `visible = 1 WHERE `id` = %d LIMIT 1",
-                                       intval($parent_item['id'])
-                               );
-                       }
 
+                       // Send a notification email to the conversation owner, unless the owner is me and I wrote this item
+                       if(($user['notify-flags'] & NOTIFY_COMMENT) && ($contact_record != $author)) {
+                               require_once('bbcode.php');
+                               $from = $author['name'];
+                               $tpl = load_view_file('view/cmnt_received_eml.tpl');                    
+                               $email_tpl = replace_macros($tpl, array(
+                                       '$sitename' => $a->config['sitename'],
+                                       '$siteurl' =>  $a->get_baseurl(),
+                                       '$username' => $user['username'],
+                                       '$email' => $user['email'],
+                                       '$from' => $from,
+                                       '$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+                                       '$body' => strip_tags(bbcode($datarray['body']))
+                               ));
+
+                               $res = mail($user['email'], $from . t(" commented on your item at ") . $a->config['sitename'],
+                                       $email_tpl,t("From: Administrator@") . $a->get_hostname() );
+                       }
+               }
+               else {
+                       $parent = $post_id;
+
+                       // let me know if somebody did a wall-to-wall post on my profile
+
+                       if(($user['notify-flags'] & NOTIFY_WALL) && ($contact_record != $author)) {
+                               require_once('bbcode.php');
+                               $from = $author['name'];
+                               $tpl = load_view_file('view/wall_received_eml.tpl');                    
+                               $email_tpl = replace_macros($tpl, array(
+                                       '$sitename' => $a->config['sitename'],
+                                       '$siteurl' =>  $a->get_baseurl(),
+                                       '$username' => $user['username'],
+                                       '$email' => $user['email'],
+                                       '$from' => $from,
+                                       '$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+                                       '$body' => strip_tags(bbcode($datarray['body']))
+                               ));
+
+                               $res = mail($user['email'], $from . t(" posted on your profile wall at ") . $a->config['sitename'],
+                                       $email_tpl,t("From: Administrator@") . $a->get_hostname() );
+                       }
                }
 
-               $url = $a->get_baseurl();
+               $r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `plink` = '%s', `changed` = '%s', `last-child` = 1, `visible` = 1
+                       WHERE `id` = %d LIMIT 1",
+                       intval($parent),
+                       dbesc(($parent == $post_id) ? $uri : $parent_item['uri']),
+                       dbesc($a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id),
+                       dbesc(datetime_convert()),
+                       intval($post_id)
+               );
 
-               proc_close(proc_open("php include/notifier.php \"$url\" \"$notify_type\" \"$post_id\" > notify.log &",
-                       array(),$foo));
+               // photo comments turn the corresponding item visible to the profile wall
+               // This way we don't see every picture in your new photo album posted to your wall at once.
+               // They will show up as people comment on them.
 
+               if(! $parent_item['visible']) {
+                       $r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d LIMIT 1",
+                               intval($parent_item['id'])
+                       );
+               }
+       }
+       else {
+               logger('mod_item: unable to retrieve post that was just stored.');
+               notify( t('System error. Post not saved.'));
+               goaway($a->get_baseurl() . "/" . $_POST['return'] );
+               // NOTREACHED
        }
-       goaway($a->get_baseurl() . "/" . $_POST['return'] );
-       return; // NOTREACHED
+
+       $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+
+       logger('mod_item: notifier invoked: ' . "\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" &");
+
+       proc_run($php_path, "include/notifier.php", $notify_type, "$post_id");
+
+       $datarray['id'] = $post_id;
+
+       call_hooks('post_local_end', $datarray);
+
+       if(strlen($emailcc) && $profile_uid == local_user()) {
+               $erecips = explode(',', $emailcc);
+               if(count($erecips)) {
+                       foreach($erecips as $recip) {
+                               $addr = trim($recip);
+                               if(! strlen($addr))
+                                       continue;
+                               $disclaimer = '<hr />' . t('This message was sent to you by ') . $a->user['username'] 
+                                       . t(', a member of the Friendika social network.') . '<br />';
+                               $disclaimer .= t('You may visit them online at') . ' ' 
+                                       . $a->get_baseurl() . '/profile/' . $a->user['nickname'] . '<br />';
+                               $disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . '<br />'; 
+
+                               $subject  = '[Friendika]' . ' ' . $a->user['username'] . ' ' . t('posted an update.');
+                               $headers  = 'From: ' . $a->user['username'] . ' <' . $a->user['email'] . '>' . "\n";
+                               $headers .= 'MIME-Version: 1.0' . "\n";
+                               $headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
+                               $headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
+                               $link = '<a href="' . $a->get_baseurl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
+                               $html    = prepare_body($datarray);
+                               $message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';
+                               @mail($addr, $subject, $message, $headers);
+                       }
+               }
+       }
+
+       logger('post_complete');
+       if((x($_POST,'return')) && strlen($_POST['return'])) {
+               logger('return: ' . $_POST['return']);
+               goaway($a->get_baseurl() . "/" . $_POST['return'] );
+       }
+       $json = array('success' => 1);
+       if(x($_POST,'jsreload') && strlen($_POST['jsreload']))
+               $json['reload'] = $a->get_baseurl() . '/' . $_POST['jsreload'];
+
+       logger('post_json: ' . print_r($json,true), LOGGER_DEBUG);
+
+       echo json_encode($json);
+       killme();
+       // NOTREACHED
 }
 
+
+
+
+
 function item_content(&$a) {
 
        if((! local_user()) && (! remote_user()))
@@ -199,7 +525,7 @@ function item_content(&$a) {
 
        $uid = $_SESSION['uid'];
 
-       if(($a->argc == 3) && ($a->argv[1] == 'drop') && intval($a->argv[2])) {
+       if(($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
 
                // locate item to be deleted
 
@@ -208,7 +534,7 @@ function item_content(&$a) {
                );
 
                if(! count($r)) {
-                       notice("Item not found." . EOL);
+                       notice( t('Item not found.') . EOL);
                        goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
                }
                $item = $r[0];
@@ -219,7 +545,8 @@ function item_content(&$a) {
 
                        // delete the item
 
-                       $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s' WHERE `id` = %d LIMIT 1",
+                       $r = q("UPDATE `item` SET `deleted` = 1, `body` = '', `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
+                               dbesc(datetime_convert()),
                                dbesc(datetime_convert()),
                                intval($item['id'])
                        );
@@ -230,7 +557,7 @@ function item_content(&$a) {
                        // generate a resource-id and therefore aren't intimately linked to the item. 
 
                        if(strlen($item['resource-id'])) {
-                               $q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ",
+                               q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ",
                                        dbesc($item['resource-id']),
                                        intval($item['uid'])
                                );
@@ -240,30 +567,48 @@ function item_content(&$a) {
                        // If it's the parent of a comment thread, kill all the kids
 
                        if($item['uri'] == $item['parent-uri']) {
-                               $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s' 
+                               $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' 
                                        WHERE `parent-uri` = '%s' AND `uid` = %d ",
                                        dbesc(datetime_convert()),
+                                       dbesc(datetime_convert()),
                                        dbesc($item['parent-uri']),
                                        intval($item['uid'])
                                );
                                // ignore the result
                        }
-
-                       $url = $a->get_baseurl();
+                       else {
+                               // 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 ",
+                                       dbesc(datetime_convert()),
+                                       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 `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",
+                                               intval($r[0]['id'])
+                                       );
+                               }       
+                       }
                        $drop_id = intval($item['id']);
-
+                       $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+                       
                        // send the notification upstream/downstream as the case may be
 
-                       proc_close(proc_open("php include/notifier.php \"$url\" \"drop\" \"$drop_id\" > notify.log &",
-                               array(),$foo));
+                       //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" &", array(), $foo));
+                       proc_run($php_path,"include/notifier.php","drop","$drop_id");
 
                        goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
-                       return; //NOTREACHED
+                       //NOTREACHED
                }
                else {
-                       notice("Permission denied." . EOL);
+                       notice( t('Permission denied.') . EOL);
                        goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
-                       return; //NOTREACHED
+                       //NOTREACHED
                }
        }
 }
\ No newline at end of file